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

App test fixes #3779

Merged
merged 18 commits into from
Mar 19, 2020
Merged

App test fixes #3779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8c19f1e
Removed ISIS3DATA from base apps
scsides Mar 18, 2020
5e46290
Removing ISIS3DATA from base/objs
scsides Mar 18, 2020
2c92fa5
more ISIS3DATAs
scsides Mar 18, 2020
50a141f
more ISIS3DATAs
scsides Mar 18, 2020
c5170bf
Other non base ISIS3DATAs
scsides Mar 18, 2020
0b861ad
Remove ISIS3DATA from docsys
scsides Mar 18, 2020
cb69019
Update maptemplate.xml
scsides Mar 18, 2020
32d0b9f
Update smtk.xml
scsides Mar 18, 2020
a5adef7
Update unitTest.xml
scsides Mar 18, 2020
68cdd53
Fixed another file name
scsides Mar 18, 2020
d0d398b
Merge branch 'baseapps' of github.com:scsides/ISIS3 into baseapps
scsides Mar 18, 2020
2ea2161
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into bas…
scsides Mar 18, 2020
ba38a99
Removed local Standard preference file references and took all but th…
scsides Mar 18, 2020
f9d12c4
Moving ISIS3DATA to ISISDATA fixing apptests
scsides Mar 19, 2020
b7329bb
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into bas…
scsides Mar 19, 2020
806fde8
Fixing app tests
scsides Mar 19, 2020
469f5cd
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into bas…
scsides Mar 19, 2020
632f8fa
More app test fixes
scsides Mar 19, 2020
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
1 change: 0 additions & 1 deletion isis/src/messenger/apps/mdis2isis/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@ int CreateFilterSpecs(const QString &instId, int filter_code,
else if(instId == "MDIS-WAC") {
// Set up WAC calibration file
FileName calibFile("$ISISROOT/appdata/translations/MessengerMdisCalibration.trn");
calibFile = calibFile.highestVersion();
Pvl config(calibFile.expanded());

PvlGroup &confgrp = config.findGroup("FilterWheel");
Expand Down
1 change: 0 additions & 1 deletion isis/src/messenger/apps/mdiscal/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ void IsisMain() {
// calibration a one pass system in this case, rather than two.
ProcessByLine p;
FileName calibFile("$ISISROOT/appdata/translations/MessengerMdisCalibration.trn");
calibFile = calibFile.highestVersion();
g_configFile.read(calibFile.expanded());

// Initialize variables
Expand Down
2 changes: 1 addition & 1 deletion isis/src/messenger/apps/mdisddr/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ void IsisMain() {
p.CheckStatus();

// All done...write result.
pdsLabel.setFormatTemplate("$ISISROOT/appdata/templates/mdisddr/mdisPdsDdr.def");
pdsLabel.setFormatTemplate("$ISISROOT/appdata/translations/mdisPdsDdr.def");
QString ofile(output.expanded());
ofstream outstream(ofile.toLatin1().data());
processPds.OutputLabel(outstream);
Expand Down