Fixes mro test failures in appdata branch (#3778)

* Fix missed ProcessImportPds base references and update CMakelists to move translation files from the ISIS3/isis/src/missionName/translations level * merge cmakelists * Remove unneeded references to DataDirectory, fix paths where needed, and add rolo translation files to this repo * Fixes failing mro tests and remove unused label file in chan1 * Update MroHirisePdsRdrEqui.pft * Update MroHirisePdsRdrEquiJP2.pft * Update MroHirisePdsRdrPolarJP2.pft * Update MroHirisePdsRdrPolar.pft * Update MroHirisePdsRdrPolar.pft
DOI-USGS · Mar 20, 2020 · 41384e0 · 41384e0
1 parent 62e5413
commit 41384e0
Show file tree

Hide file tree

Showing 12 changed files with 851 additions and 248 deletions.
diff --git a/isis/src/chandrayaan1/apps/chan1m32isis/labels.pvl b/isis/src/chandrayaan1/apps/chan1m32isis/labels.pvl
diff --git a/isis/src/mro/apps/hideal2pds/main.cpp b/isis/src/mro/apps/hideal2pds/main.cpp
@@ -287,10 +287,10 @@ void IsisMain() {
   // Read in the proper keyword types (Real, Enum, String, Integer, etc) for 
   // each PvlKeyword so that the PDS labels have proper format
   PvlFormat *formatter = pdsLabel.format();
-  formatter->add("$mro/templates/labels/hiriseIdealPds.typ");
+  formatter->add("$ISISROOT/appdata/translations/MroHiriseIdealPds.typ");
 
   // Format ordering of keywords/objects/groups/comments in the PDS labels
-  pdsLabel.setFormatTemplate("$mro/templates/labels/hiriseIdealPds.pft");
+  pdsLabel.setFormatTemplate("$ISISROOT/appdata/translations/MroHiriseIdealPds.pft");
 
   // image line/byte offsets are calculated and values are updated in the labels
   // now that all translations/additions/modifications to the labels have been