Move application-related data into the repository. #3804

krlberry · 2020-03-25T19:52:01Z

Description

Moves icons, templates, and translation files into this repository and makes the necessary associated code changes so that the code can locate the moved files. Also updates $ISIS3DATA and $ISIS3TESTDATA to $ISISDATA and $ISISTESTDATA.

Related Issue

#3727

Motivation and Context

See #3727

How Has This Been Tested?

The isis-appdata job on Jenkins has been running nightly and as of last night all tests were passing.
Graphical applications were opened individually to check that icons were still displaying, and that templates could be loaded.

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Documentation change (update to the documentation; no code change)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

I have read and agree to abide by the Code of Conduct
I have read the CONTRIBUTING document.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have added tests to cover my changes.
All new and existing tests passed.

Licensing

This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

…m dev (#3724) * Update meta.yaml to rename conda package to isis from isis3 * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * Add directory structure for appdata in source Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

…3726) * Update meta.yaml to rename conda package to isis from isis3 * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * Add directory structure for appdata in source * Update cmakelists to copy translation files over into the appdata/translations area in the build directory. * Update to install appdata * Add appdata/templates directory needed for apollo work. Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Changeing env variable ISIS3DATA to ISISDATA * Changed ISIS3DATA to ISISDATA and pointed to new data area * Updating PR with new location of ISISDATA

…r. (#3731) * Update meta.yaml to rename conda package to isis from isis3 * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * Add directory structure for appdata in source * Update cmakelists to copy translation files over into the appdata/translations area in the build directory. * Update to install appdata * Add appdata/templates directory needed for apollo work. * Migrates everything in maps, labels, and and autoreg into source, adds placeholders for cmake for images and templates, and adds two actual base translation files and associated changes * Actually address all merge conflicts * Add placeholder for serialnumbers Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Just hard-code the apollo templates for now * Updated to have templates only search for *.def

* Abstracted campt app. * Revert "Merge branch 'campt' of https://github.com/kaitlyndlee/ISIS3 into dev" This reverts commit 521dd44, reversing changes made to 2874acf. * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * adds apollopantranstable translations * rename apollopantranstable0001.trn -> apollopantranstable.trn * move apollopantranstable0002.trn -> apollopantranstable.trn * adds apollo15 serialNumbers * renaming serial number files * moved SerialNumber0002 -> Apollo15SerialNumber and metricSerialNumber002 -> Apollo15MetricSerialNumber * moved metricSerialNumber0003.trn -> Apollo15MetricSerialNumber.trn * created templates directory and added apollo template. updated apollopaninit and apollopanstitcher to reflect data directory changes * added apollo templates directory * renamed apolloPanFiducialFinder.pvl -> apolloPanFiducialFinder.def * update paths referencing data * fixed redundant naming of apolloPanFiducialFinder.def -> PanFiducialFinder.def * renamed apollopantranstable.trn -> ApolloPanInit.trn, updated reference in source code * changed Instruments translation file to uper camel case * more tweaks to Instruments.trn Co-authored-by: Kaitlyn Lee <[email protected]> Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Abstracted campt app. * Revert "Merge branch 'campt' of https://github.com/kaitlyndlee/ISIS3 into dev" This reverts commit 521dd44, reversing changes made to 2874acf. * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * adds apollo16 serialnumbers * moved panoramicSerialNumber0001.trn -> Apollo15PanoramicSerialNumber.trn and metricSerialNumber0001.trn -> ApolloMetricSerialNumber.trn * moved metricSerialNumber0002.trn -> ApolloMetricSerialNumber.trn * moved metricSerialNumber0003.trn -> ApolloMetricSerialNumber.trn * fixed serialnumber file naming * removed serialnumbers DELETEME file Co-authored-by: Kaitlyn Lee <[email protected]> Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Abstracted campt app. * Revert "Merge branch 'campt' of https://github.com/kaitlyndlee/ISIS3 into dev" This reverts commit 521dd44, reversing changes made to 2874acf. * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * adds apollo17 serialnumber files * moved metricSerialNumber0001.trn -> Apollo17MetricSerialNumber.trn and panoramicSerialNumber0001.trn -> Apollo17PanoramicSerialNumber.trn * moved metricSerialNumber0002.trn Apollo17MetricSerialNumber.trn * moved metricSerialNumber0003.trn -> Apollo17MetricSerialNumber.trn * remove serialnumbers DELETEME file Co-authored-by: Kaitlyn Lee <[email protected]> Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Added translation files. * Renamed junoSerialNumber0001.trn * Updated Preference file to use ISISDATA env variable for juno. * Moved SN xfile to appdata and updated app to point to appdata/translations. * Removed commented line. * Renamed files to be upper camel case. * Fixed typo.

* Added translation files. * Renamed hrscSerialNumber0001.trn * Renamed Xfiles, updated app to point to /appdata/translations, and moved SN xfile to appdata. * Renamed files to be upper camel case. * Removed commented line Co-authored-by: Stuart Sides <[email protected]>

* Set MALLOC_CHECK_ in Jenkinsfile as a temporary fix for the failing tests * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * Copied dawn serial number files. * renamed files. * Updated serial number file with the most recent version. * copied over some xfiles. * New version. * updated to new version. * Added xfile. * New xfile. * new version. * new version. * new version. * copied xfile. * new version. * updated version. * copied xfile. * copied xfile. * updated version. * updated apps. * Updated env variable in preferences files. * Renamed files to be upper camel case. * Removed commented lines. * Renmaed serial number files to be upper camel case. Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Just hard-code the apollo templates for now * Updated to have templates only search for *.def * Add CMakeLists updates to support lro * Migrate icons and targets and update source code as needed * Migrate remaining base translation files and make any additional needed code changes * Move base serial number to serial numbers directory * Remove unneeded additional serial number trn file

* Changeing env variable ISIS3DATA to ISISDATA * Changed ISIS3DATA to ISISDATA and pointed to new data area * Updating PR with new location of ISISDATA * Converted LRO mission to new data area * Added MiniRF format files * Add pft files * Update typ paths, and add LRO serial number files

* Abstracted campt app. * Revert "Merge branch 'campt' of https://github.com/kaitlyndlee/ISIS3 into dev" This reverts commit 521dd44, reversing changes made to 2874acf. * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * moved mdessenger translation files into source * moved mdisArchive translation files to MessengerMdisArchive.trn * moved mdisBandBin translation files to MessengerMdisBandBin.trn * moved mdisInstrument translation files to MessengerMdisInstrument.trn * moved mdisCDRLabel translation files to MessengerMdisCdrLabel.trn * moved mdisDDRLabel translation files to MessengerMdisDdrLabel.trn * added translations directory with mdisCalibration translation files * moved mdisCalibration files to MessengerMdisCalibration.trn * updated mdis apps references to translation files. * renamed mdisSerialNumber files to MessengerMdisSerialNumber.trn * copied over mdis template files to source * renamed mdis template files * update references to template files in source code * changed naming and references of template files Co-authored-by: Kaitlyn Lee <[email protected]> Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

…move translation files from the ISIS3/isis/src/missionName/translations level (#3746)

* Abstracted campt app. * Revert "Merge branch 'campt' of https://github.com/kaitlyndlee/ISIS3 into dev" This reverts commit 521dd44, reversing changes made to 2874acf. * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * copied over translation files from data area * renamed kaguya translation files to upper camel case. Updated references to these files in source code. Co-authored-by: Kaitlyn Lee <[email protected]> Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Fix missed ProcessImportPds base references and update CMakelists to move translation files from the ISIS3/isis/src/missionName/translations level * Added templates files to revision control * Update source files to use moved template files

* Added ciss2isis files. * Added first version of file. * Added new version. * Renamed new version. * Updated vims2isis * Added cassini iss sn files. * New version. * New version. * Added cassini vims sn files. * Updated vims sn to v2. * Updated vims sn to v3.

* Abstracted campt app. * Revert "Merge branch 'campt' of https://github.com/kaitlyndlee/ISIS3 into dev" This reverts commit 521dd44, reversing changes made to 2874acf. * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * moved over translation and serialnumber files from isis3 data area into source * renaming translation and serial number files to fit naming conventions * updated references to newhorizons data are in application source code * fixed filename typo * actually fixed file name typo this time * isis/src/newhorizons/apps/leisa2isis/NewHorizonsLeisaKernels_fit.trn removed comment from leisa kernels translation file Co-authored-by: Kaitlyn Lee <[email protected]> Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * moves hayabusa2 translation and serial number files into source * renamed translation files to match naming conventions * updates references to translation files Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * moves hayabusa translation and serial file numbers from isis data area into source * renamed translation and serial number files to match convention * updated references to translation files in source code Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Fix missed ProcessImportPds base references and update CMakelists to move translation files from the ISIS3/isis/src/missionName/translations level * Update classes and tests with base-area changes that were uncovered via CI tests failing

* Set MALLOC_CHECK_ in Jenkinsfile as a temporary fix for the failing tests * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * Added near translation files. Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Changeing env variable ISIS3DATA to ISISDATA * Changed ISIS3DATA to ISISDATA and pointed to new data area * Updating PR with new location of ISISDATA * Converted LRO mission to new data area * Added MiniRF format files * Add pft files * Update typ paths, and add LRO serial number files * Move Viking 1 data files into git source repo * Additions to initial commit of Viking 1 and 2, move data to repo * Updated serial number file names * Removed uneeded translations and fixed now that there is one file per instrument

* Changeing env variable ISIS3DATA to ISISDATA * Changed ISIS3DATA to ISISDATA and pointed to new data area * Updating PR with new location of ISISDATA * Converted LRO mission to new data area * Added MiniRF format files * Add pft files * Update typ paths, and add LRO serial number files * Fixed LRO serial number file names

* Set MALLOC_CHECK_ in Jenkinsfile as a temporary fix for the failing tests * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * Added moc2isis translation files. * Added serial number files. * SN file v2. * SN file v3. * SN file v4. * Removed from unit test. * Updated truth data. * Update truthdata to strip out path before mgs * Update unit test Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

* Set MALLOC_CHECK_ in Jenkinsfile as a temporary fix for the failing tests * Used CK quality for PCK selection in spiceinit (#3716) * Changed PCK to use CK quality in spiceinit * Added spiceinit history for change * Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717) * Update meta.yaml to rename conda package to isis from isis3 * Initial stretch attempt * Now will write a single stretch with a name and type to the cube * Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now * Clean up Stretch class * Completely move stretchTypes into stretch class, and some minor cleanup * Fixed combo-box not updating bug and more cleanup * Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes * Removed added unneeded member variables from StretchType * Cleanup StretchTool class * Update enter-text dialogs to drop down selection options * Wrapped some long strings * Initial commit to address most of review comments * Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output Co-authored-by: Stuart Sides <[email protected]> * Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713) * Updated to allow ingestion of data provided by JAXA online archive * Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format. * Added tests + testing data * Replaced several label parsing tests with cube attribute tests. * Fixes ddd2isis to support updated uvflat files (#3719) * Fixes ddd2isis to support updated uvflat files * Added history comment * Changed version numbers for 4.1 RC (#3722) * Added themis sn files. * Updated sn file to v2. * Updated sn file to v3. * Updated sn file to v4. * Updated Pipeline's truth data since it had references to . * New truth data. * Updated pipeline truth data. Co-authored-by: Jesse Mapel <[email protected]> Co-authored-by: Kristin <[email protected]> Co-authored-by: Stuart Sides <[email protected]> Co-authored-by: AustinSanders <[email protected]> Co-authored-by: acpaquette <[email protected]>

…3759) * Changeing env variable ISIS3DATA to ISISDATA * Changed ISIS3DATA to ISISDATA and pointed to new data area * Updating PR with new location of ISISDATA * Converted LRO mission to new data area * Added MiniRF format files * Add pft files * Update typ paths, and add LRO serial number files * Fixed LRO serial number file names * Adding Voyager 1 and 2 application files to repo from the data area * Moved the voyager translation files to voy2isis

…ssorted issues that were causing tests to fail (#3756) * Fix missed ProcessImportPds base references and update CMakelists to move translation files from the ISIS3/isis/src/missionName/translations level * Move tgo translation files into revision control and update apps accordingly * Fix some failing tests unrelated to tgo * Update TestPreferences file. * Make necessary changes to tgocassis2isis and put in debug output for other baffling failing tests on Jenkins * Fix failing tgo tests and update SerialNumber class to use the correct new file names * Clean up commented-out groups from translation files * Fixed spiceinit path to MissionName2DataDir.trn * Modify path of Map formatting file to point to the /scratch/localhome/kberry/dev/ISIS3/appdata-debug/appdata/ area

* Fix missed ProcessImportPds base references and update CMakelists to move translation files from the ISIS3/isis/src/missionName/translations level * merge cmakelists * Initial commit of files with map paths that needed to be updated

…te, add controlnetwork template (#3793)

* move lopdsgen out of templates into translations, add hidtmgen template, add controlnetwork template * Move maps under appdata/templates * Move labels and maps under templates

* move lopdsgen out of templates into translations, add hidtmgen template, add controlnetwork template * Fixes mdiscal and osirisrex test failures in appdata branch

* move lopdsgen out of templates into translations, add hidtmgen template, add controlnetwork template * tesitng * Update cmakelists again * Cmake update

kaitlyndlee · 2020-03-26T17:48:23Z

Looks good except for the test failures.

acpaquette

Aside from a question this looks good! Also, are we only concerned about the change from ISIS3 to ISIS in the data/testData areas?

isis/CMakeLists.txt

Kelvinrr

The great find-replace of 2020. I generally trust if tests are passing that the changes are valid and nothing was missed so I think test results will speak most to its mergeability.

Once you filter based on important files and not the imported data files this isn't too terrible to review.

isis/src/base/apps/noproj/main.cpp

jessemapel

Just a few comments. I am mainly concerned about the status of the website documentation. There are likely many references to ISIS3DATA there and more references to ISIS3. That can likely be handled in a separate PR though.

jessemapel · 2020-03-26T18:54:13Z

isis/scripts/isis3Startup.csh

 else
-  setenv ISIS3TESTDATA /usgs/cpkgs/isis3/testData
+  setenv ISISTESTDATA /usgs/cpkgs/isis3/isis_testData


Is there a reason why these are changing? data and testData should still be okay directory names.

This was originally just so we could have two separate data areas with different names internally.

We'll still need to maintain two data areas for quite some time. Any other ideas for how to name the "new data areas" vs. the "old data areas" ?

isis/src/base/tsts/RayTracingShapeModel/Makefile

jessemapel · 2020-03-26T19:26:00Z

isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/unitTest.cpp

-    }
-    else {
-      cout << "SetImage succeeded." << endl; 
-    }


Why was this test removed?

I'll let @scsides answer this because he's the one that uncovered the issue, but I believe that it was removed because it was testing the Chandrayaan camera model on an LRO MiniRF image and that didn't really make sense.

Because the test was hitting a Chandrayaan MiniRF cube inside an M3 test, the LRO MiniRF tests also test Chandrayaan1 cubes.

jessemapel · 2020-03-26T19:40:31Z

isis/src/docsys/documents/InstallGuide/InstallGuide.xml

@@ -197,12 +197,12 @@ is a popular choice and may be downloaded below.
   translation tables to convert labels, calibration applications require flat files to do


This whole section still references ISIS3 and ISIS3 data a bunch

This is a good point. Do we want to update this page, archive it, or take it down? I don't think there's any way to access this page anymore via the existing links on the website, which all redirect to the installation instructions on github, but people may have bookmarks.

If all of the links to this page are gone, then we can just replace it with a link to the github readme.

krlberry · 2020-03-26T20:47:09Z

@jessemapel For website documentation, remarkably, the only things that came up in my recursive, case-insensitive grep for ISIS3DATA and ISIS3TESTDATA at the isis/src/ level were in the InstallGuide that you pointed out in your comment, or in the LegacyInstallGuide, in which I think the continued use of these variables is appropriate. ISIS3, though, I didn't grep for, and I'm sure instances of that abound, but our repo is still called `ISIS3 so I think those documentation updates can be handled when we actually go through and remove all "3"s from ISIS.

jessemapel

This looks good to go

Kelvinrr · 2020-03-26T21:03:59Z

Spiceserver tests seem to be failing due to looking for translation files in old area, spiceserver probably is missing an update?

Kelvinrr · 2020-03-27T19:39:27Z

Current test failures:

The following tests FAILED:
	1034 - jigsaw_app_test_scconfig (Failed)
	1035 - jigsaw_app_test_scconfigHeld (Failed)
Errors while running CTest

I don't believe these are expected failures?

krlberry · 2020-03-27T20:14:03Z

@Kelvinrr We're fixing this right now.

#3811) * Update viking serial number translation files for backwards compatability * Readd default option for translation

krlberry and others added 30 commits March 3, 2020 09:59

Change ISIS3DATA to ISISDATA (#3728)

de8cd58

* Changeing env variable ISIS3DATA to ISISDATA * Changed ISIS3DATA to ISISDATA and pointed to new data area * Updating PR with new location of ISISDATA

Updates cmake to copy apollo templates (#3732)

250ef2b

* Just hard-code the apollo templates for now * Updated to have templates only search for *.def

Fix missed ProcessImportPds base references and update CMakelists to …

43210f2

…move translation files from the ISIS3/isis/src/missionName/translations level (#3746)

krlberry added 4 commits March 23, 2020 15:58

move lopdsgen out of templates into translations, add hidtmgen templa…

6d2e680

…te, add controlnetwork template (#3793)

Moves maps and labels under templates in appdata (#3794)

6eb8363

* move lopdsgen out of templates into translations, add hidtmgen template, add controlnetwork template * Move maps under appdata/templates * Move labels and maps under templates

Fixes mdiscal and osirisrex test failures in appdata branch (#3799)

88187d7

* move lopdsgen out of templates into translations, add hidtmgen template, add controlnetwork template * Fixes mdiscal and osirisrex test failures in appdata branch

Cmake update for appdata branch (#3803)

b938882

* move lopdsgen out of templates into translations, add hidtmgen template, add controlnetwork template * tesitng * Update cmakelists again * Cmake update

krlberry requested review from Kelvinrr, acpaquette, jessemapel, kaitlyndlee and ladoramkershner March 25, 2020 19:52

krlberry assigned scsides Mar 25, 2020

krlberry added 2 commits March 25, 2020 13:06

Merge branch 'dev' into appdata

35cb70d

Merge branch 'dev' into appdata

34252e5

acpaquette reviewed Mar 26, 2020

View reviewed changes

isis/CMakeLists.txt Show resolved Hide resolved

Kelvinrr previously approved these changes Mar 26, 2020

View reviewed changes

isis/src/base/apps/noproj/main.cpp Show resolved Hide resolved

acpaquette previously approved these changes Mar 26, 2020

View reviewed changes

jessemapel reviewed Mar 26, 2020

View reviewed changes

jessemapel previously approved these changes Mar 26, 2020

View reviewed changes

Update path in spiceserver from merge failure (#3808)

7803650

krlberry dismissed stale reviews from jessemapel, acpaquette, and Kelvinrr via 7803650 March 27, 2020 02:39

Update viking serial number translation files for backwards compatabi… (

e12fe21

#3811) * Update viking serial number translation files for backwards compatability * Readd default option for translation

scsides approved these changes Mar 27, 2020

View reviewed changes

scsides merged commit 98a24a7 into dev Mar 27, 2020

jessemapel deleted the appdata branch June 9, 2020 21:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move application-related data into the repository. #3804

Move application-related data into the repository. #3804

krlberry commented Mar 25, 2020 •

edited

Loading

kaitlyndlee commented Mar 26, 2020

acpaquette left a comment

Kelvinrr left a comment •

edited

Loading

jessemapel left a comment

jessemapel Mar 26, 2020

krlberry Mar 26, 2020

krlberry Mar 26, 2020

jessemapel Mar 26, 2020

krlberry Mar 26, 2020

scsides Mar 26, 2020

jessemapel Mar 26, 2020

krlberry Mar 26, 2020

jessemapel Mar 26, 2020

krlberry commented Mar 26, 2020 •

edited

Loading

jessemapel left a comment

Kelvinrr commented Mar 26, 2020 •

edited

Loading

Kelvinrr commented Mar 27, 2020

krlberry commented Mar 27, 2020

		@@ -197,12 +197,12 @@ is a popular choice and may be downloaded below.
		translation tables to convert labels, calibration applications require flat files to do

Move application-related data into the repository. #3804

Move application-related data into the repository. #3804

Conversation

krlberry commented Mar 25, 2020 • edited Loading

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

Licensing

kaitlyndlee commented Mar 26, 2020

acpaquette left a comment

Choose a reason for hiding this comment

Kelvinrr left a comment • edited Loading

Choose a reason for hiding this comment

jessemapel left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

krlberry commented Mar 26, 2020 • edited Loading

jessemapel left a comment

Choose a reason for hiding this comment

Kelvinrr commented Mar 26, 2020 • edited Loading

Kelvinrr commented Mar 27, 2020

krlberry commented Mar 27, 2020

krlberry commented Mar 25, 2020 •

edited

Loading

Kelvinrr left a comment •

edited

Loading

krlberry commented Mar 26, 2020 •

edited

Loading

Kelvinrr commented Mar 26, 2020 •

edited

Loading