diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt index dae6e8effd..706c3cbd9c 100644 --- a/isis/CMakeLists.txt +++ b/isis/CMakeLists.txt @@ -465,10 +465,10 @@ execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/templates/kernels) execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/templates/photometry) # *.pvl execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/templates/hidtmgen) # *.pvl -execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/maps) +execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/templates/maps) execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/images/icons) execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/images/targets) -execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/labels) +execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/templates/labels) #execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/autoreg) # Create an xml folder in the source directory that we will need later @@ -614,11 +614,11 @@ add_custom_target(targets ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different add_dependencies(isis3 targets) add_custom_target(maps ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${CMAKE_SOURCE_DIR}/appdata/maps/*.map ${CMAKE_BINARY_DIR}/appdata/maps) + ${CMAKE_SOURCE_DIR}/appdata/templates/maps/*.map ${CMAKE_BINARY_DIR}/appdata/templates/maps) add_dependencies(isis3 maps) add_custom_target(labels ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${CMAKE_SOURCE_DIR}/appdata/labels/*.pft ${CMAKE_BINARY_DIR}/appdata/labels) + ${CMAKE_SOURCE_DIR}/appdata/templates/labels/*.pft ${CMAKE_BINARY_DIR}/appdata/templates/labels) add_dependencies(isis3 labels) #add_custom_target(autoreg ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different diff --git a/isis/appdata/labels/CubeFormatTemplate.pft b/isis/appdata/templates/labels/CubeFormatTemplate.pft similarity index 83% rename from isis/appdata/labels/CubeFormatTemplate.pft rename to isis/appdata/templates/labels/CubeFormatTemplate.pft index 7892776cf6..fe8a96a89e 100644 --- a/isis/appdata/labels/CubeFormatTemplate.pft +++ b/isis/appdata/templates/labels/CubeFormatTemplate.pft @@ -24,7 +24,7 @@ Object = IsisCube End_Group Group = Mapping - Isis:PvlTemplate:File = $ISISROOT/appdata/labels/MappingGroupKeywords.pft + Isis:PvlTemplate:File = $ISISROOT/appdata/templates/labels/MappingGroupKeywords.pft End_Group Group = AlphaCube diff --git a/isis/appdata/labels/MappingGroupKeywords.pft b/isis/appdata/templates/labels/MappingGroupKeywords.pft similarity index 100% rename from isis/appdata/labels/MappingGroupKeywords.pft rename to isis/appdata/templates/labels/MappingGroupKeywords.pft diff --git a/isis/appdata/labels/pdsExportAllMapping.pft b/isis/appdata/templates/labels/pdsExportAllMapping.pft similarity index 100% rename from isis/appdata/labels/pdsExportAllMapping.pft rename to isis/appdata/templates/labels/pdsExportAllMapping.pft diff --git a/isis/appdata/maps/ellipsoidtransverseazimuthal.map b/isis/appdata/templates/maps/ellipsoidtransverseazimuthal.map similarity index 100% rename from isis/appdata/maps/ellipsoidtransverseazimuthal.map rename to isis/appdata/templates/maps/ellipsoidtransverseazimuthal.map diff --git a/isis/appdata/maps/equirectangular.map b/isis/appdata/templates/maps/equirectangular.map similarity index 100% rename from isis/appdata/maps/equirectangular.map rename to isis/appdata/templates/maps/equirectangular.map diff --git a/isis/appdata/maps/lambertazimuthalequalarea.map b/isis/appdata/templates/maps/lambertazimuthalequalarea.map similarity index 100% rename from isis/appdata/maps/lambertazimuthalequalarea.map rename to isis/appdata/templates/maps/lambertazimuthalequalarea.map diff --git a/isis/appdata/maps/lambertconformal.map b/isis/appdata/templates/maps/lambertconformal.map similarity index 100% rename from isis/appdata/maps/lambertconformal.map rename to isis/appdata/templates/maps/lambertconformal.map diff --git a/isis/appdata/maps/mercator.map b/isis/appdata/templates/maps/mercator.map similarity index 100% rename from isis/appdata/maps/mercator.map rename to isis/appdata/templates/maps/mercator.map diff --git a/isis/appdata/maps/mollweide.map b/isis/appdata/templates/maps/mollweide.map similarity index 100% rename from isis/appdata/maps/mollweide.map rename to isis/appdata/templates/maps/mollweide.map diff --git a/isis/appdata/maps/obliquecylindrical.map b/isis/appdata/templates/maps/obliquecylindrical.map similarity index 100% rename from isis/appdata/maps/obliquecylindrical.map rename to isis/appdata/templates/maps/obliquecylindrical.map diff --git a/isis/appdata/maps/orthographic.map b/isis/appdata/templates/maps/orthographic.map similarity index 100% rename from isis/appdata/maps/orthographic.map rename to isis/appdata/templates/maps/orthographic.map diff --git a/isis/appdata/maps/planar.map b/isis/appdata/templates/maps/planar.map similarity index 100% rename from isis/appdata/maps/planar.map rename to isis/appdata/templates/maps/planar.map diff --git a/isis/appdata/maps/pointperspective.map b/isis/appdata/templates/maps/pointperspective.map similarity index 100% rename from isis/appdata/maps/pointperspective.map rename to isis/appdata/templates/maps/pointperspective.map diff --git a/isis/appdata/maps/polarstereographic.map b/isis/appdata/templates/maps/polarstereographic.map similarity index 100% rename from isis/appdata/maps/polarstereographic.map rename to isis/appdata/templates/maps/polarstereographic.map diff --git a/isis/appdata/maps/ringcylindrical.map b/isis/appdata/templates/maps/ringcylindrical.map similarity index 100% rename from isis/appdata/maps/ringcylindrical.map rename to isis/appdata/templates/maps/ringcylindrical.map diff --git a/isis/appdata/maps/robinson.map b/isis/appdata/templates/maps/robinson.map similarity index 100% rename from isis/appdata/maps/robinson.map rename to isis/appdata/templates/maps/robinson.map diff --git a/isis/appdata/maps/simplecylindrical.map b/isis/appdata/templates/maps/simplecylindrical.map similarity index 100% rename from isis/appdata/maps/simplecylindrical.map rename to isis/appdata/templates/maps/simplecylindrical.map diff --git a/isis/appdata/maps/sinusoidal.map b/isis/appdata/templates/maps/sinusoidal.map similarity index 100% rename from isis/appdata/maps/sinusoidal.map rename to isis/appdata/templates/maps/sinusoidal.map diff --git a/isis/appdata/maps/transversemercator.map b/isis/appdata/templates/maps/transversemercator.map similarity index 100% rename from isis/appdata/maps/transversemercator.map rename to isis/appdata/templates/maps/transversemercator.map diff --git a/isis/src/base/apps/cam2map/cam2map.xml b/isis/src/base/apps/cam2map/cam2map.xml index 357cc1503a..c270280377 100644 --- a/isis/src/base/apps/cam2map/cam2map.xml +++ b/isis/src/base/apps/cam2map/cam2map.xml @@ -315,8 +315,8 @@ File containing mapping parameters - $ISISROOT/appdata/maps - $ISISROOT/appdata/maps/sinusoidal.map + $ISISROOT/appdata/templates/maps + $ISISROOT/appdata/templates/maps/sinusoidal.map A file containing the desired output mapping parameters in PVL format. This file can be a simple label file, or can be hand produced, or created via diff --git a/isis/src/base/apps/footprintinit/footprintinit.xml b/isis/src/base/apps/footprintinit/footprintinit.xml index 5da0e0a957..323ca2ef96 100644 --- a/isis/src/base/apps/footprintinit/footprintinit.xml +++ b/isis/src/base/apps/footprintinit/footprintinit.xml @@ -368,8 +368,8 @@ File containing mapping parameters - $ISISROOT/appdata/maps - $ISISROOT/appdata/maps/sinusoidal.map + $ISISROOT/appdata/templates/maps + $ISISROOT/appdata/templates/maps/sinusoidal.map A file containing the desired XY mapping parameters. This file can be a simple label file, hand produced or created via diff --git a/isis/src/base/apps/map2map/map2map.xml b/isis/src/base/apps/map2map/map2map.xml index cd4dcc9f1c..35007bd769 100644 --- a/isis/src/base/apps/map2map/map2map.xml +++ b/isis/src/base/apps/map2map/map2map.xml @@ -167,8 +167,8 @@ File containing mapping parameters - $ISISROOT/appdata/maps - $ISISROOT/appdata/maps/sinusoidal.map + $ISISROOT/appdata/templates/maps + $ISISROOT/appdata/templates/maps/sinusoidal.map A file containing the desired output mapping parameters in PVL. This file can be a simple label file, hand produced or created via diff --git a/isis/src/base/apps/maptemplate/maptemplate.xml b/isis/src/base/apps/maptemplate/maptemplate.xml index 6e48a65830..9f5209b181 100644 --- a/isis/src/base/apps/maptemplate/maptemplate.xml +++ b/isis/src/base/apps/maptemplate/maptemplate.xml @@ -46,7 +46,7 @@ To convert a raw instrument/camera cube (Level1) to a map projected image (Level2) the user must (1) create a custom PVL formatted text file, (2) use this maptemplate application to produce one, or (3) use - the automated, projection-specific Map File Template in $ISISROOT/appdata/maps. + the automated, projection-specific Map File Template in $ISISROOT/templates/appdata/maps. Whichever method that you choose, the Map File Template should contain the necessary keywords to project an image.

@@ -91,7 +91,7 @@ it requires keywords that are not defined in the program.

  • - Templates in $ISISROOT/appdata/maps: the template contains all the + Templates in $ISISROOT/templates/appdata/maps: the template contains all the parameters necessary to project an image, and only the Projection name is "uncommented" in the file. This is because some projections only require that you enter a projection name, and the default values are computed for diff --git a/isis/src/base/apps/mosrange/mosrange.xml b/isis/src/base/apps/mosrange/mosrange.xml index abcb28084c..6828eb93f8 100644 --- a/isis/src/base/apps/mosrange/mosrange.xml +++ b/isis/src/base/apps/mosrange/mosrange.xml @@ -137,7 +137,7 @@ End filename input - $ISISROOT/appdata/maps + $ISISROOT/appdata/templates/maps None *.map *.cub diff --git a/isis/src/base/apps/mosrange/tsts/default/Makefile b/isis/src/base/apps/mosrange/tsts/default/Makefile index cc42fb5e30..fd4016ca30 100644 --- a/isis/src/base/apps/mosrange/tsts/default/Makefile +++ b/isis/src/base/apps/mosrange/tsts/default/Makefile @@ -11,7 +11,7 @@ include $(ISISROOT)/make/isismake.tsts commands: $(LS) $(INPUT)/*.cub > $(OUTPUT)/files.lis; $(APPNAME) FROMLIST=$(OUTPUT)/files.lis \ - MAP=$(ISISROOT)/appdata/maps/equirectangular.map \ + MAP=$(ISISROOT)/appdata/templates/maps/equirectangular.map \ TO=$(OUTPUT)/mosrange_equi.map PRECISION=4 > /dev/null; /bin/mv $(OUTPUT)/mosrange_equi.map $(OUTPUT)/mosrange_equi.txt $(RM) $(OUTPUT)/files.lis; diff --git a/isis/src/base/apps/nocam2map/nocam2map.xml b/isis/src/base/apps/nocam2map/nocam2map.xml index 166e322e12..56fd742d07 100644 --- a/isis/src/base/apps/nocam2map/nocam2map.xml +++ b/isis/src/base/apps/nocam2map/nocam2map.xml @@ -346,8 +346,8 @@ File containing mapping parameters - $ISISROOT/appdata/maps - $ISISROOT/appdata/maps/sinusoidal.map + $ISISROOT/appdata/templates/maps + $ISISROOT/appdata/templates/maps/sinusoidal.map A file containing the desired output mapping parameters in PVL form. This file can be a simple hand produced label diff --git a/isis/src/base/apps/pixel2map/pixel2map.xml b/isis/src/base/apps/pixel2map/pixel2map.xml index fc3ace2ee6..e00ac2cfee 100755 --- a/isis/src/base/apps/pixel2map/pixel2map.xml +++ b/isis/src/base/apps/pixel2map/pixel2map.xml @@ -393,8 +393,8 @@ File containing mapping parameters - $ISISROOT/appdata/maps - $ISISROOT/appdata/maps/sinusoidal.map + $ISISROOT/appdata/templates/maps + $ISISROOT/appdata/templates/maps/sinusoidal.map A file containing the desired output mapping parameters in PVL. This file can be a simple label file, hand produced, or created via @@ -843,7 +843,7 @@ from=C1621694254_1.ir.band248.cub - map=/usgs/cpkgs/isis3/data/base/templates/maps/equirectangular.map + map=$ISISROOT/appdata/templates/maps/equirectangular.map to=default.cub lonseam=continue @@ -903,7 +903,7 @@ from=VIR_IR_1B_1_506266095_refl_1.b75.l1.cub - map=/usgs/cpkgs/isis3/data/base/templates/maps/equirectangular.map + map=$ISISROOT/appdata/templates/maps/equirectangular.map to=dawn_vir_instantaneous_fov.cub @@ -957,7 +957,7 @@ from=VIR_IR_1B_1_506266095_refl_1.b75.l1.cub - map=/usgs/cpkgs/isis3/data/base/templates/maps/equirectangular.map + map=$ISISROOT/appdata/templates/maps/equirectangular.map to=dawn_vir_full_fov.cub fovrange=fullexposure diff --git a/isis/src/base/apps/pixel2map/tsts/crismpolyoverlap/Makefile b/isis/src/base/apps/pixel2map/tsts/crismpolyoverlap/Makefile index c763095e03..3da498cfb3 100755 --- a/isis/src/base/apps/pixel2map/tsts/crismpolyoverlap/Makefile +++ b/isis/src/base/apps/pixel2map/tsts/crismpolyoverlap/Makefile @@ -5,6 +5,6 @@ include $(ISISROOT)/make/isismake.tsts commands: $(APPNAME) from=$(INPUT)/crism.cub \ to=$(OUTPUT)/crismequi.cub \ - map=$(ISISROOT)/appdata/maps/equirectangular.map \ + map=$(ISISROOT)/appdata/templates/maps/equirectangular.map \ method=wholepixel \ > /dev/null; diff --git a/isis/src/base/apps/pixel2map/tsts/lonboundary/Makefile b/isis/src/base/apps/pixel2map/tsts/lonboundary/Makefile index e922ebc19c..283bed3492 100755 --- a/isis/src/base/apps/pixel2map/tsts/lonboundary/Makefile +++ b/isis/src/base/apps/pixel2map/tsts/lonboundary/Makefile @@ -6,5 +6,5 @@ commands: $(APPNAME) from=$(INPUT)/C1621694254_1.ir.band248.cub \ to=$(OUTPUT)/C1621694254_1.ir.equi.cub \ lonseam=continue \ - map=$(ISISROOT)/appdata/maps/equirectangular.map \ + map=$(ISISROOT)/appdata/templates/maps/equirectangular.map \ > /dev/null; diff --git a/isis/src/base/apps/pixel2map/tsts/pole/Makefile b/isis/src/base/apps/pixel2map/tsts/pole/Makefile index 834d09d633..50cd223447 100755 --- a/isis/src/base/apps/pixel2map/tsts/pole/Makefile +++ b/isis/src/base/apps/pixel2map/tsts/pole/Makefile @@ -5,5 +5,5 @@ include $(ISISROOT)/make/isismake.tsts commands: $(APPNAME) from= $(INPUT)/C1596102183_1.ir.cub \ to=$(OUTPUT)/C1596102183_1.ir.polar.cub \ - map=$(ISISROOT)/appdata/maps/polarstereographic.map \ + map=$(ISISROOT)/appdata/templates/maps/polarstereographic.map \ > /dev/null; diff --git a/isis/src/base/apps/pixel2map/tsts/vimshires/Makefile b/isis/src/base/apps/pixel2map/tsts/vimshires/Makefile index 5048ba6a9f..1c686a7e41 100755 --- a/isis/src/base/apps/pixel2map/tsts/vimshires/Makefile +++ b/isis/src/base/apps/pixel2map/tsts/vimshires/Makefile @@ -5,7 +5,7 @@ include $(ISISROOT)/make/isismake.tsts commands: $(APPNAME) from= $(INPUT)/C1716334271_1.irBand248.cub \ to=$(OUTPUT)/C1716334271_1.irBand248.polar.cub \ - map=$(ISISROOT)/appdata/maps/polarstereographic.map \ + map=$(ISISROOT)/appdata/templates/maps/polarstereographic.map \ pixres=ppd \ res=20 \ > /dev/null; diff --git a/isis/src/base/apps/ringscam2map/ringscam2map.xml b/isis/src/base/apps/ringscam2map/ringscam2map.xml index 6d62df87e8..0df2b90e18 100644 --- a/isis/src/base/apps/ringscam2map/ringscam2map.xml +++ b/isis/src/base/apps/ringscam2map/ringscam2map.xml @@ -13,7 +13,7 @@ be run on it with shape set to RingPlane prior to ringscam2map. The map projection is defined using a PVL file specified with the MAP parameter. The system default is to use the Planar projection - ($ISISROOT/appdata/maps/planar.map). To learn more about using map projections in + ($ISISROOT/appdata/templates/maps/planar.map). To learn more about using map projections in ISIS, refer to the ISIS Workshop "Learning About Map Projections". @@ -294,8 +294,8 @@ File containing mapping parameters - $ISISROOT/appdata/maps - $ISISROOT/appdata/maps/planar.map + $ISISROOT/appdata/templates/maps + $ISISROOT/appdata/templates/maps/planar.map A file containing the desired output mapping parameters in PVL. This file can be a simple label file, hand produced, or created via diff --git a/isis/src/base/apps/skymap/skymap.xml b/isis/src/base/apps/skymap/skymap.xml index 8af8df5bc6..30c181cfa6 100644 --- a/isis/src/base/apps/skymap/skymap.xml +++ b/isis/src/base/apps/skymap/skymap.xml @@ -126,8 +126,8 @@ File containing mapping parameters - $ISISROOT/appdata/maps - $ISISROOT/appdata/maps/simplecylindrical.map + $ISISROOT/appdata/templates/maps + $ISISROOT/appdata/templates/maps/simplecylindrical.map A file containing the desired output mapping parameters in PVL form. This file can be a simple hand produced label file. It can also be an existing cube label diff --git a/isis/src/base/objs/Cube/Cube.cpp b/isis/src/base/objs/Cube/Cube.cpp index ca342bcdc6..cb7926cc5a 100644 --- a/isis/src/base/objs/Cube/Cube.cpp +++ b/isis/src/base/objs/Cube/Cube.cpp @@ -1937,7 +1937,7 @@ namespace Isis { m_mutex = new QMutex(); m_formatTemplateFile = - new FileName("$ISISROOT/appdata/labels/CubeFormatTemplate.pft"); + new FileName("$ISISROOT/appdata/templates/labels/CubeFormatTemplate.pft"); initialize(); } diff --git a/isis/src/cassini/tsts/vims/Makefile b/isis/src/cassini/tsts/vims/Makefile index fb0d87a32a..d05eb7ac5a 100644 --- a/isis/src/cassini/tsts/vims/Makefile +++ b/isis/src/cassini/tsts/vims/Makefile @@ -99,7 +99,7 @@ commands: # images because the vims camera model finds solution for any lat/lon and the range checking # was not working correctly. $(CAM2MAP) $(TSTARGS) from=$(INPUT)/C1514302573_1.irBand71.cub to=$(OUTPUT)/C1514302573_1.irBand71.sinu.cub \ - map=$(ISISROOT)/appdata/maps/sinusoidal.map \ + map=$(ISISROOT)/appdata/templates/maps/sinusoidal.map \ pixres=ppd resolution=2 defaultrange=map minlat=-90 maxlat=90 minlon=0 maxlon=360 \ trim=yes > /dev/null diff --git a/isis/src/control/apps/seedgrid/seedgrid.xml b/isis/src/control/apps/seedgrid/seedgrid.xml index e1ab0dcb23..f7d0ec79b3 100644 --- a/isis/src/control/apps/seedgrid/seedgrid.xml +++ b/isis/src/control/apps/seedgrid/seedgrid.xml @@ -96,8 +96,8 @@ File containing mapping parameters - $ISISROOT/appdata/maps - $ISISROOT/appdata/maps/sinusoidal.map + $ISISROOT/appdata/templates/maps + $ISISROOT/appdata/templates/maps/sinusoidal.map A file containing the mapping parameters in PVL form. This file can be a simple PVL file or an existing cube label that contains a diff --git a/isis/src/control/objs/ControlNetVersioner/unitTest.cpp b/isis/src/control/objs/ControlNetVersioner/unitTest.cpp index ad1c8d6435..ef7c28846d 100644 --- a/isis/src/control/objs/ControlNetVersioner/unitTest.cpp +++ b/isis/src/control/objs/ControlNetVersioner/unitTest.cpp @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) { cout << endl << "Test reading a random PVL file" << endl << endl; try { - ControlNetVersioner invalidVersioner("$ISISROOT/appdata/maps/equirectangular.map"); + ControlNetVersioner invalidVersioner("$ISISROOT/appdata/templates/maps/equirectangular.map"); } catch (IException &e) { e.print(); diff --git a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEqui.pft b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEqui.pft index c2bdcab4cf..b9baf4b0d3 100644 --- a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEqui.pft +++ b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEqui.pft @@ -97,6 +97,6 @@ OBJECT = IMAGE_MAP_PROJECTION A_AXIS_RADIUS B_AXIS_RADIUS C_AXIS_RADIUS - Isis:PvlTemplate:File = $ISISROOT/appdata/labels/pdsExportAllMapping.pft + Isis:PvlTemplate:File = $ISISROOT/appdata/templates/labels/pdsExportAllMapping.pft END_OBJECT = IMAGE_MAP_PROJECTION End diff --git a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEquiJP2.pft b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEquiJP2.pft index dcca0e889c..d4dce39ec0 100644 --- a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEquiJP2.pft +++ b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEquiJP2.pft @@ -110,6 +110,6 @@ OBJECT = IMAGE_MAP_PROJECTION A_AXIS_RADIUS B_AXIS_RADIUS C_AXIS_RADIUS - Isis:PvlTemplate:File = $ISISROOT/appdata/labels/pdsExportAllMapping.pft + Isis:PvlTemplate:File = $ISISROOT/appdata/templates/labels/pdsExportAllMapping.pft END_OBJECT = IMAGE_MAP_PROJECTION End diff --git a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolar.pft b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolar.pft index c86052f6a8..342f7d8d29 100644 --- a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolar.pft +++ b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolar.pft @@ -81,6 +81,6 @@ OBJECT = IMAGE END_OBJECT = IMAGE OBJECT = IMAGE_MAP_PROJECTION - Isis:PvlTemplate:File = $ISISROOT/appdata/labels/pdsExportAllMapping.pft + Isis:PvlTemplate:File = $ISISROOT/appdata/templates/labels/pdsExportAllMapping.pft END_OBJECT = IMAGE_MAP_PROJECTION End diff --git a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolarJP2.pft b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolarJP2.pft index 90f7d49721..ed2286afa7 100644 --- a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolarJP2.pft +++ b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolarJP2.pft @@ -94,6 +94,6 @@ OBJECT = UNCOMPRESSED_FILE END_OBJECT = UNCOMPRESSED_FILE OBJECT = IMAGE_MAP_PROJECTION - Isis:PvlTemplate:File = $ISISROOT/appdata/labels/pdsExportAllMapping.pft + Isis:PvlTemplate:File = $ISISROOT/appdata/templates/labels/pdsExportAllMapping.pft END_OBJECT = IMAGE_MAP_PROJECTION End diff --git a/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp b/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp index 03fc90780e..7d15094e8f 100644 --- a/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp +++ b/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp @@ -342,7 +342,7 @@ namespace Isis { return proj->Mapping(); } catch (IException &) { - Pvl mappingPvl("$ISISROOT/appdata/maps/equirectangular.map"); + Pvl mappingPvl("$ISISROOT/appdata/templates/maps/equirectangular.map"); PvlGroup &mappingGrp = mappingPvl.findGroup("Mapping"); mappingGrp += PvlKeyword("LatitudeType", "Planetocentric"); mappingGrp += PvlKeyword("LongitudeDirection", "PositiveEast"); @@ -386,7 +386,7 @@ namespace Isis { "scene. Cubes can not be shown in the scene without a projection, so " "if one is not selected, a default of Equirectangular will be used. " "The selected file should be a map file, examples are available in " - "$ISISROOT/appdata/maps.")); + "$ISISROOT/appdata/templates/maps.")); m_mapButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); connect(m_mapButton, SIGNAL(clicked()), this, SLOT(configProjectionParameters())); @@ -1151,7 +1151,7 @@ namespace Isis { "on creating a custom map file that defines the desired projection, latitude " "system, and longitude direction and domain. This program will use the latitude range " "and longitude range if they exist in the loaded file. A choice of map templates that can be used as " - "a starting point for supported map projections can be found in $ISISROOT/appdata/maps (refer " + "a starting point for supported map projections can be found in $ISISROOT/appdata/templates/maps (refer " "to maptemplate or mosrange for more details and information on the required parameters " "for a projection). The website: " "%1 also provides useful information about map projections.")