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

Fixes mro test failures in appdata branch #3778

Merged
merged 23 commits into from
Mar 20, 2020
Merged

Fixes mro test failures in appdata branch #3778

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2a18e92
Fix missed ProcessImportPds base references and update CMakelists to …
krlberry Mar 10, 2020
77a69b6
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 12, 2020
bc4176a
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 12, 2020
16535cd
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 12, 2020
f989176
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 13, 2020
a0fa894
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 13, 2020
2ae4f43
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 14, 2020
2c1d644
merge cmakelists
krlberry Mar 15, 2020
a56e702
Merge CMakeLists.txt
krlberry Mar 16, 2020
90c0af6
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 17, 2020
efa1b0c
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 18, 2020
74446d4
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 18, 2020
328b4a9
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 18, 2020
13860cc
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 18, 2020
df4ebe7
Remove unneeded references to DataDirectory, fix paths where needed, …
krlberry Mar 18, 2020
947ffaf
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 19, 2020
8640b76
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 19, 2020
389d080
Fixes failing mro tests and remove unused label file in chan1
krlberry Mar 19, 2020
8b59123
Update MroHirisePdsRdrEqui.pft
krlberry Mar 19, 2020
6e15e61
Update MroHirisePdsRdrEquiJP2.pft
krlberry Mar 19, 2020
d956262
Update MroHirisePdsRdrPolarJP2.pft
krlberry Mar 19, 2020
0e28a7b
Update MroHirisePdsRdrPolar.pft
krlberry Mar 19, 2020
f554936
Update MroHirisePdsRdrPolar.pft
krlberry 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
239 changes: 0 additions & 239 deletions isis/src/chandrayaan1/apps/chan1m32isis/labels.pvl
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions isis/src/mro/apps/hideal2pds/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading