-
Notifications
You must be signed in to change notification settings - Fork 165
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.
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
Add new locations of import and export templates and update cmake accordingly #4477
Conversation
isis/CMakeLists.txt
Outdated
${CMAKE_BINARY_DIR}/appdata/templates/jigsaw | ||
${CMAKE_BINARY_DIR}/appdata/templates/kernels | ||
${CMAKE_BINARY_DIR}/appdata/templates/labels | ||
${CMAKE_BINARY_DIR}/appdata/templates/topds4 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need still need this directory since the template here is now moved to appdata/export?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good!
* Initial isisimport application (#4470) * Initial isisimport application modeled to work on importing tgocassis images * Add template to toisis * Draft cassis template file added to pds4 branch (#4472) * Initial isisimport application modeled to work on importing tgocassis images * Add template to toisis * actual cassis label template * Reverted accidently modified template * Add new locations of import and export templates and update cmake accordingly (#4477) * Update cmake to new locations of import and export templates * Fix mixed tabs and spaces * Removed topds4 directory from CMakeLists * Updates XmlToJson parsing to be more inja-friendly (#4478) * Updates XmlToJson parsing to indicate XML attributes and text values in a way friendly to inja parsing of the json * Update XmlToJson tests * Tgocassis Template Completed for Instruments and Archive Groups (#4481) * Updates to cassis label template * Further updates to cassis template * Updates to accomodate PR 4478 changes * Cassis template completed for Instrument and Archive Groups. * Generalize PDS4 cube creation setup (#4485) * Updates XmlToJson parsing to indicate XML attributes and text values in a way friendly to inja parsing of the json * Update XmlToJson tests * Generalized line/sample/band setup * PDS4PixelType as a callback, TEMPLATE default option, and working TGOCaSSIS.tpl (#4479) * Cassis Template Updated BandBin and AlphaCube Groups (#4482) * tgocassis Template Completed for AlphaCube and BandBin groups * Additional template cleanup * Updated Pixels Group * Removed core object from template. * protect template search and improve TGOCASSIS template (#4486) * Renamed topds4 to isisexport (#4488) * Updates to Cassis Template and XML and Minor corrections to isisimport (#4490) * Updates to cassis template. Corrections to isisimport to allow module tests to work properly. * Added disclaimer to xml file. * Added mapping group template file (#4492) * Added checks for existing keywords to be able to export an imported tgo image * Added separate mapping group translation file * Callbacks for YearDOY and ConvertUniqueIdtoObservationId (#4491) * isisimport can now default to correct template using a file template. Updated Cassis template name. Minor updates in isisimport. (#4493) * Updates mapping group in template. Added callback to handle added Z to StartTime. (#4495) * PDS4 - Fix template search and targetGroup template variable for tgocassis.tpl (#4494) * fix template search and targetGroup template variable for tgocassis.tpl * remove accidental extra tag * address feedback from amy * Updated export template to produce parsable xml (#4497) * Updated export template to be functioning xml to be used in isisimport. * Added back 3D_Array but left in comments. * Adds tests with test data and fixes off-by-one error in isisimport (#4502) * Added intial working section of tests * Update test with test data and fix off-by-one in isisimport * Add test input image * Clean up from old design of test * Updated based on feedback * Moved local function into ISIS namespace * Ticked ISIS version to 6 * More tick to 6 * Updated CHANGELOG We don't add the 6.0.0 heading until just before the actual release. I also added some missing periods. Co-authored-by: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com> Co-authored-by: Tim Giroux <62255438+tgiroux@users.noreply.github.com> Co-authored-by: Stuart Sides <ssides@usgs.gov> Co-authored-by: Kaitlyn Lee <kdl222@nau.edu> Co-authored-by: Jesse Mapel <jmapel@usgs.gov>
* Initial isisimport application (DOI-USGS#4470) * Initial isisimport application modeled to work on importing tgocassis images * Add template to toisis * Draft cassis template file added to pds4 branch (DOI-USGS#4472) * Initial isisimport application modeled to work on importing tgocassis images * Add template to toisis * actual cassis label template * Reverted accidently modified template * Add new locations of import and export templates and update cmake accordingly (DOI-USGS#4477) * Update cmake to new locations of import and export templates * Fix mixed tabs and spaces * Removed topds4 directory from CMakeLists * Updates XmlToJson parsing to be more inja-friendly (DOI-USGS#4478) * Updates XmlToJson parsing to indicate XML attributes and text values in a way friendly to inja parsing of the json * Update XmlToJson tests * Tgocassis Template Completed for Instruments and Archive Groups (DOI-USGS#4481) * Updates to cassis label template * Further updates to cassis template * Updates to accomodate PR 4478 changes * Cassis template completed for Instrument and Archive Groups. * Generalize PDS4 cube creation setup (DOI-USGS#4485) * Updates XmlToJson parsing to indicate XML attributes and text values in a way friendly to inja parsing of the json * Update XmlToJson tests * Generalized line/sample/band setup * PDS4PixelType as a callback, TEMPLATE default option, and working TGOCaSSIS.tpl (DOI-USGS#4479) * Cassis Template Updated BandBin and AlphaCube Groups (DOI-USGS#4482) * tgocassis Template Completed for AlphaCube and BandBin groups * Additional template cleanup * Updated Pixels Group * Removed core object from template. * protect template search and improve TGOCASSIS template (DOI-USGS#4486) * Renamed topds4 to isisexport (DOI-USGS#4488) * Updates to Cassis Template and XML and Minor corrections to isisimport (DOI-USGS#4490) * Updates to cassis template. Corrections to isisimport to allow module tests to work properly. * Added disclaimer to xml file. * Added mapping group template file (DOI-USGS#4492) * Added checks for existing keywords to be able to export an imported tgo image * Added separate mapping group translation file * Callbacks for YearDOY and ConvertUniqueIdtoObservationId (DOI-USGS#4491) * isisimport can now default to correct template using a file template. Updated Cassis template name. Minor updates in isisimport. (DOI-USGS#4493) * Updates mapping group in template. Added callback to handle added Z to StartTime. (DOI-USGS#4495) * PDS4 - Fix template search and targetGroup template variable for tgocassis.tpl (DOI-USGS#4494) * fix template search and targetGroup template variable for tgocassis.tpl * remove accidental extra tag * address feedback from amy * Updated export template to produce parsable xml (DOI-USGS#4497) * Updated export template to be functioning xml to be used in isisimport. * Added back 3D_Array but left in comments. * Adds tests with test data and fixes off-by-one error in isisimport (DOI-USGS#4502) * Added intial working section of tests * Update test with test data and fix off-by-one in isisimport * Add test input image * Clean up from old design of test * Updated based on feedback * Moved local function into ISIS namespace * Ticked ISIS version to 6 * More tick to 6 * Updated CHANGELOG We don't add the 6.0.0 heading until just before the actual release. I also added some missing periods. Co-authored-by: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com> Co-authored-by: Tim Giroux <62255438+tgiroux@users.noreply.github.com> Co-authored-by: Stuart Sides <ssides@usgs.gov> Co-authored-by: Kaitlyn Lee <kdl222@nau.edu> Co-authored-by: Jesse Mapel <jmapel@usgs.gov>
Description
Adds the following directories to store import and export templates in:
isis/src/appdata/import
isis/src/appdata/export
Additionally, moves existing templates to these new locations and updates CMakelists to copy these files to the build.
Related Issue
PDS4 work.
Motivation and Context
Reorganization after discussion about how the
templates
appdata area is used for another purpose already.How Has This Been Tested?
cmake copies the files to the build as expected.
Screenshots (if appropriate):
Types of changes
Checklist:
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: