Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor updates to base area and CMakelists #3746

Merged
merged 1 commit into from
Mar 10, 2020
Merged

Minor updates to base area and CMakelists #3746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion isis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,8 @@ add_dependencies(isis3 incs)
add_custom_target(appdata ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/serialnumbers/*.trn ${CMAKE_SOURCE_DIR}/appdata/translations/*.trn
${CMAKE_SOURCE_DIR}/appdata/translations/*.typ ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.typ
${CMAKE_SOURCE_DIR}/src/*/apps/*/*.trn ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pft
${CMAKE_SOURCE_DIR}/src/*/apps/*/*.trn ${CMAKE_SOURCE_DIR}/src/*/translations/*.trn
${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pft
${CMAKE_BINARY_DIR}/appdata/translations)
add_dependencies(isis3 appdata)

Expand Down
13 changes: 5 additions & 8 deletions isis/src/base/objs/ProcessImportPds/ProcessImportPds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ namespace Isis {
p_projectionOffsetGroup.setName("ProjectionOffsets");

// Set up a translater for PDS file of type IMAGE
Isis::PvlGroup &dataDir = Isis::Preference::Preferences().findGroup("DataDirectory");
p_transDir = "$ISISROOT/appdata";
}

Expand Down Expand Up @@ -1463,13 +1462,12 @@ namespace Isis {
/**
* Fill as many of the Isis3 BandBin labels as possible
*
* @param lab The lable where the translated Isis2 keywords will
* @param lab The label where the translated Isis2 keywords will
* be placed
*/
void ProcessImportPds::TranslateIsis2BandBin(Isis::Pvl &lab) {
// Set up a translater for Isis2 labels
Isis::PvlGroup &dataDir = Isis::Preference::Preferences().findGroup("DataDirectory");
QString transDir = (QString) dataDir["Base"];
QString transDir = "$ISISROOT/appdata";

Isis::FileName transFile(transDir + "/" + "translations/isis2bandbin.trn");
Isis::PvlToPvlTranslationManager isis2Xlater(p_pdsLabel, transFile.expanded());
Expand All @@ -1487,8 +1485,8 @@ namespace Isis {
*/
void ProcessImportPds::TranslateIsis2Instrument(Isis::Pvl &lab) {
// Set up a translater for Isis2 labels
Isis::PvlGroup &dataDir = Isis::Preference::Preferences().findGroup("DataDirectory");
QString transDir = (QString) dataDir["Base"];
QString transDir = "$ISISROOT/appdata";

Isis::FileName transFile(transDir + "/" + "translations/isis2instrument.trn");
Isis::PvlToPvlTranslationManager isis2Xlater(p_pdsLabel, transFile.expanded());

Expand Down Expand Up @@ -1599,8 +1597,7 @@ namespace Isis {
Isis::PvlToPvlTranslationManager projType(p_pdsLabel, trnsStrm);

// Set up the correct projection translation table for this label
Isis::PvlGroup &dataDir = Isis::Preference::Preferences().findGroup("DataDirectory");
QString transDir = (QString) dataDir["Base"];
QString transDir = "$ISISROOT/appdata";

Isis::FileName transFile;
if (projType.InputHasKeyword("PdsProjectionTypeImage")) {
Expand Down