From b668393021a17a357f61c308fafb287acf2cae53 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Fri, 24 Feb 2023 11:01:56 -0700 Subject: [PATCH 01/16] Squashing things added suffix and prefix capabilities in tgocassisstitch addresses #5125, this allows the user to optionally use either the prefix or suffix option when stitching frames together, just use OUTPUTSUFFIX instead of OUTPUTPREFIX to use it. minor fixes typo more typos close to done, one error left need to figure out a replacement for ui.IsOptionSet as that is not actually a function. I need another way to test CLLI args. final fixes to implement ui changes fixed now employs a boolean flag to decide if the name parsed with out is a suffix or prefix, it defaults to a prefix. adding some tests to confirm output runs as expected. --- .../apps/tgocassisstitch/tgocassisstitch.cpp | 16 +++++++++---- .../apps/tgocassisstitch/tgocassisstitch.xml | 23 ++++++++++++++++++- .../tgo/apps/tgocassisstitch/tsts/Makefile | 4 ++++ .../tgocassisstitch/tsts/default/Makefile | 9 ++++++++ 4 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 isis/src/tgo/apps/tgocassisstitch/tsts/Makefile create mode 100644 isis/src/tgo/apps/tgocassisstitch/tsts/default/Makefile diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp index 64de84ac90..7d0acd9f4a 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp @@ -67,19 +67,27 @@ namespace Isis { } // Stitch together the individual frames - FileName outputFileName(ui.GetCubeName("OUTPUTPREFIX")); + FileName outputFileName(ui.GetCubeName("OUT")); + bool suff(ui.GetBoolean("SUFFIX")); QString outputBaseName = outputFileName.expanded(); QStringList frameKeys = frameMap.uniqueKeys(); Progress stitchProgress; stitchProgress.SetText("Stitching Frames"); stitchProgress.SetMaximumSteps(frameKeys.size()); stitchProgress.CheckStatus(); + foreach(QString frameKey, frameKeys) { try { QString frameIdentifier = frameKey.split("/").last(); - FileName frameFileName(outputBaseName + "-" + frameIdentifier + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); + if (suff == true) { + FileName frameFileName(frameIdentifier + "-" + outputBaseName + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } else { + FileName frameFileName(outputBaseName + "-" + frameIdentifier + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } } catch (IException &e) { QString msg = "Failed stitch frame for observation [" diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml index ff10ca1895..26b403a71d 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml @@ -29,6 +29,10 @@ Modified stitchFrame to store the Archive group for ingested framelets. Fixes #5333. + + Modified stitchFrame to have logic for suffix or prefix in the output + filename. Fixes #5125. + @@ -54,7 +58,7 @@ - + cube output @@ -68,6 +72,23 @@ *.cub + + + + boolean + FALSE + output + + output using suffix instead of prefix. + + + The stitched cubes will be output as the last component of the serial + number plus this basename. Usually this will be the start time for + the frame. + + + *.cub + diff --git a/isis/src/tgo/apps/tgocassisstitch/tsts/Makefile b/isis/src/tgo/apps/tgocassisstitch/tsts/Makefile new file mode 100644 index 0000000000..46d84c74c2 --- /dev/null +++ b/isis/src/tgo/apps/tgocassisstitch/tsts/Makefile @@ -0,0 +1,4 @@ +BLANKS = "%-6s" +LENGTH = "%-40s" + +include $(ISISROOT)/make/isismake.tststree diff --git a/isis/src/tgo/apps/tgocassisstitch/tsts/default/Makefile b/isis/src/tgo/apps/tgocassisstitch/tsts/default/Makefile new file mode 100644 index 0000000000..9d990a66ed --- /dev/null +++ b/isis/src/tgo/apps/tgocassisstitch/tsts/default/Makefile @@ -0,0 +1,9 @@ +APPNAME = tgocassisstitch + +include $(ISISROOT)/make/isismake.tsts + +commands: + $(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/stitch.lis; + $(APPNAME) fromlist=$(OUTPUT)/stitch.lis out=testxyza suffix=true; + $(RM) $(OUTPUT)/stitch.lis; + $(RM) $(OUTPUT)/*testxyza.cub From 1b4abfff3f2a325eae018d87e918019b8f1d9db6 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Mon, 27 Feb 2023 08:51:43 -0700 Subject: [PATCH 02/16] adding to changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5b5dd3cb2..161d9b69b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,11 @@ release. - Removed the `.py` extention from the _isisdataeval_ tool `isisdata_mockup` for consistency and install it in $ISISROOT/bin; added the `--tojson` and `--hasher` option to _isisdata_mockup_ tool improve utility; updated the tool `README.md` documentation to reflect this change, removed help output and trimmed example results; fixed paths to test data in `make_isisdata_mockup.sh`. [#5163](https://github.com/DOI-USGS/ISIS3/pull/5163) - Significantly refactored FASTGEOM processing in findfeatures to accommodate stability and functionality. The scope of the algorithm was taken out of the ImageSource class and isolated to support this feature. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) - Report better information regarding the behavior of findfeatures, FASTGEOM algorithms, and creation of the output network. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) +- Updated download location for Dawn source files to include updated pck from HAMO Dawn mosaic [#4001](https://github.com/USGS-Astrogeology/ISIS3/issues/4001) +- Pinned cspice version to 67 [#5083](https://github.com/USGS-Astrogeology/ISIS3/issues/5083) +- Changed the `rsync` related commands in the ISIS SPICE Web Service document to `downloadIsisData` command +- Modified tgocassisstitch to optionally output naming convention as a suffix + rather than prefix with a new flag. ### Added - Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183) From 43f3be549a17de15d3b4ae9c4df12171c9a96455 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Mon, 27 Feb 2023 12:54:26 -0700 Subject: [PATCH 03/16] modified to allow prefix, suffix, both, or neither for better extensibility it also maintains original value names so older scripts and pipelines will retain functionality. adds another optional arg, cubename lets the user specify an optional cubename parameter which replaces the timestamp style naming for the output stitched cube. If the parameter is not given it defaults to the timestamp style naming convention for retaining existing functionality. --- CHANGELOG.md | 4 +- .../apps/tgocassisstitch/tgocassisstitch.cpp | 66 +++++++++++++++---- .../apps/tgocassisstitch/tgocassisstitch.xml | 31 +++++++-- 3 files changed, 81 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 161d9b69b0..4460a9226e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,11 +41,11 @@ release. - Removed the `.py` extention from the _isisdataeval_ tool `isisdata_mockup` for consistency and install it in $ISISROOT/bin; added the `--tojson` and `--hasher` option to _isisdata_mockup_ tool improve utility; updated the tool `README.md` documentation to reflect this change, removed help output and trimmed example results; fixed paths to test data in `make_isisdata_mockup.sh`. [#5163](https://github.com/DOI-USGS/ISIS3/pull/5163) - Significantly refactored FASTGEOM processing in findfeatures to accommodate stability and functionality. The scope of the algorithm was taken out of the ImageSource class and isolated to support this feature. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) - Report better information regarding the behavior of findfeatures, FASTGEOM algorithms, and creation of the output network. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) +- Modified tgocassisstitch to optionally allow either a outputprefix or an + outputsuffix, both, or neither for naming convention purposes. [#5162](https://github.com/DOI-USGS/ISIS3/pull/5162) - Updated download location for Dawn source files to include updated pck from HAMO Dawn mosaic [#4001](https://github.com/USGS-Astrogeology/ISIS3/issues/4001) - Pinned cspice version to 67 [#5083](https://github.com/USGS-Astrogeology/ISIS3/issues/5083) - Changed the `rsync` related commands in the ISIS SPICE Web Service document to `downloadIsisData` command -- Modified tgocassisstitch to optionally output naming convention as a suffix - rather than prefix with a new flag. ### Added - Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183) diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp index 7d0acd9f4a..24a972c808 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp @@ -66,11 +66,19 @@ namespace Isis { throw IException(e, IException::Unknown, msg, _FILEINFO_); } + // read the optional cubename + FileName frameletCubeFlag(ui.GetCubeName("CUBENAME")); + QString frameletCubeName = frameletCubeFlag.expanded(); + // Stitch together the individual frames - FileName outputFileName(ui.GetCubeName("OUT")); - bool suff(ui.GetBoolean("SUFFIX")); - QString outputBaseName = outputFileName.expanded(); + FileName outputPrefix(ui.GetCubeName("OUTPUTPREFIX")); + FileName outputSuffix(ui.GetCubeName("OUTPUTSUFFIX")); + QString outputPrefBaseName = outputPrefix.expanded(); + QString outputSuffBaseName = outputSuffix.expanded(); QStringList frameKeys = frameMap.uniqueKeys(); + foreach (const QString& key, frameKeys) { + std::cout << key.toStdString() << std::endl; + } Progress stitchProgress; stitchProgress.SetText("Stitching Frames"); stitchProgress.SetMaximumSteps(frameKeys.size()); @@ -79,14 +87,50 @@ namespace Isis { foreach(QString frameKey, frameKeys) { try { QString frameIdentifier = frameKey.split("/").last(); - if (suff == true) { - FileName frameFileName(frameIdentifier + "-" + outputBaseName + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } else { - FileName frameFileName(outputBaseName + "-" + frameIdentifier + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); + if ((outputPrefix != "nil") && (outputSuffix == "nil")) { + if (frameletCubeName != "nil") { + FileName frameFileName(outputPrefBaseName + "-" + frameletCubeName + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } else { + FileName frameFileName(outputPrefBaseName + "-" + frameIdentifier + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } + } else if ((outputSuffix != "nil") && (outputPrefix == "nil")) { + if (frameletCubeName != "nil") { + FileName frameFileName(frameletCubeName + "-" + outputSuffBaseName + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } else { + FileName frameFileName(frameIdentifier + "-" + outputSuffBaseName + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } + } else if ((outputPrefix != "nil") && (outputSuffix != "nil")) { + if (frameletCubeName != "nil") { + FileName frameFileName(outputPrefBaseName + + "-" + frameletCubeName + + "-" + outputSuffBaseName + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } else { + FileName frameFileName(outputPrefBaseName + + "-" + frameIdentifier + + "-" + outputSuffBaseName + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } + } else if ((outputPrefix == "nil") && (outputSuffix == "nil")) { + if (frameletCubeName != "nil") { + FileName frameFileName(frameletCubeName + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } else { + FileName frameFileName(frameIdentifier + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } } } catch (IException &e) { diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml index 26b403a71d..61bcfda40a 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml @@ -58,11 +58,28 @@ - - cube + + cube + nil + input + + An optional name for the output cube. + + + An optional name for the output cube instead of the default timestamp + style naming. + + + *.cub + + + + + cube + nil output - Output ISIS cube basename. + Output ISIS cube basename prefix. The stitched cubes will be output as this basename plus the last @@ -74,12 +91,12 @@ - - boolean - FALSE + + cube + nil output - output using suffix instead of prefix. + output ISIS cube basename suffix. The stitched cubes will be output as the last component of the serial From 6eb568c2c7a73d59e346507c0d447bc649cffc3e Mon Sep 17 00:00:00 2001 From: antonhibl Date: Wed, 1 Mar 2023 15:55:14 -0700 Subject: [PATCH 04/16] added details to changelog removed debugging code added changelog notes to xml for tgocassisstitch --- CHANGELOG.md | 4 ++++ isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp | 3 --- isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4460a9226e..56ade3691d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,10 @@ release. - Added new option GEOMSOURCE=BOTH to findfeatures to check both the MATCH and FROM/FROMLIST images for valid control measure geometry to produce better networks and prevent downstream processing errors. Ignore points that end up with no valid measures (but can be retained with use of PreserveIgnoredControl via GLOBALS parameterization). [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) - Added new gtests for findfeatures that replaces all the old application tests. These tests are FunctionalTestFindfeaturesFastGeomDefault, FunctionalTestFindfeaturesFastGeomRadialConfig, FunctionalTestFindfeaturesFastGeomGridDefault and FunctionalTestFindfeaturesFastGeomGridConfig. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) +- Added an optional cubename parameter which lets the user override the + timestamp style naming convention of the output cube with their own name; if + not specified retains existing behavior [#5125](https://github.com/USGS-Astrogeology/ISIS3/issues/5125) + ### Deprecated ### Removed diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp index 24a972c808..37f5dc206f 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp @@ -76,9 +76,6 @@ namespace Isis { QString outputPrefBaseName = outputPrefix.expanded(); QString outputSuffBaseName = outputSuffix.expanded(); QStringList frameKeys = frameMap.uniqueKeys(); - foreach (const QString& key, frameKeys) { - std::cout << key.toStdString() << std::endl; - } Progress stitchProgress; stitchProgress.SetText("Stitching Frames"); stitchProgress.SetMaximumSteps(frameKeys.size()); diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml index 61bcfda40a..5eddd40c44 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml @@ -33,6 +33,11 @@ Modified stitchFrame to have logic for suffix or prefix in the output filename. Fixes #5125. + + Added an optional argument to tgocassisstitch which allows for an optional + cubename to override the default timestamp-style naming convention and + bahavior for the output cube. Fixes #5125. + From 6cc1809a1265f3d4bc6eafb7dfde34dd06c62959 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Fri, 3 Mar 2023 09:12:43 -0700 Subject: [PATCH 05/16] typo in changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56ade3691d..da2bcc1413 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,9 +56,9 @@ release. - Added new option GEOMSOURCE=BOTH to findfeatures to check both the MATCH and FROM/FROMLIST images for valid control measure geometry to produce better networks and prevent downstream processing errors. Ignore points that end up with no valid measures (but can be retained with use of PreserveIgnoredControl via GLOBALS parameterization). [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) - Added new gtests for findfeatures that replaces all the old application tests. These tests are FunctionalTestFindfeaturesFastGeomDefault, FunctionalTestFindfeaturesFastGeomRadialConfig, FunctionalTestFindfeaturesFastGeomGridDefault and FunctionalTestFindfeaturesFastGeomGridConfig. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) -- Added an optional cubename parameter which lets the user override the - timestamp style naming convention of the output cube with their own name; if - not specified retains existing behavior [#5125](https://github.com/USGS-Astrogeology/ISIS3/issues/5125) +- Added an optional cubename parameter to tgocassisstitch which lets the user + override the timestamp style naming convention of the output cube with their + own name; if not specified retains existing behavior [#5125](https://github.com/USGS-Astrogeology/ISIS3/issues/5125) ### Deprecated From 44f3e42db390247947ea9b671e8923b34804c2bf Mon Sep 17 00:00:00 2001 From: antonhibl Date: Fri, 3 Mar 2023 11:01:33 -0700 Subject: [PATCH 06/16] fixes from review added cubename argument logic typo in else statement --- .../apps/tgocassisstitch/tgocassisstitch.cpp | 62 ++++++------------- 1 file changed, 18 insertions(+), 44 deletions(-) diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp index 37f5dc206f..22b75d1eea 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp @@ -84,50 +84,24 @@ namespace Isis { foreach(QString frameKey, frameKeys) { try { QString frameIdentifier = frameKey.split("/").last(); - if ((outputPrefix != "nil") && (outputSuffix == "nil")) { - if (frameletCubeName != "nil") { - FileName frameFileName(outputPrefBaseName + "-" + frameletCubeName + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } else { - FileName frameFileName(outputPrefBaseName + "-" + frameIdentifier + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } - } else if ((outputSuffix != "nil") && (outputPrefix == "nil")) { - if (frameletCubeName != "nil") { - FileName frameFileName(frameletCubeName + "-" + outputSuffBaseName + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } else { - FileName frameFileName(frameIdentifier + "-" + outputSuffBaseName + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } - } else if ((outputPrefix != "nil") && (outputSuffix != "nil")) { - if (frameletCubeName != "nil") { - FileName frameFileName(outputPrefBaseName + - "-" + frameletCubeName + - "-" + outputSuffBaseName + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } else { - FileName frameFileName(outputPrefBaseName + - "-" + frameIdentifier + - "-" + outputSuffBaseName + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } - } else if ((outputPrefix == "nil") && (outputSuffix == "nil")) { - if (frameletCubeName != "nil") { - FileName frameFileName(frameletCubeName + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } else { - FileName frameFileName(frameIdentifier + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } + if(outputPrefix == "nil"){ + outputPrefix = ""; + } + if (outputSuffix == "nil"){ + outputSuffix = ""; + } + if (frameletCubeName != "nil") { + FileName frameFileName(outputPrefBaseName + + frameletCubeName + + outputSuffBaseName + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } else { + FileName frameFileName(outputPrefBaseName + + frameIdentifier + + outputSuffBaseName + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); } } catch (IException &e) { From 54427999ce728bc3223a130e20d68c6b564c4eb5 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Fri, 3 Mar 2023 11:32:58 -0700 Subject: [PATCH 07/16] modifying tests removed faulty/old tests based on makefiles fixed single and multi frame tests for tgocassisstitch remaining tests fixed, one on EFS to check with jenkins. removed debug lines updated to remove nil randomly appearing in tests modified first stitch test to use fallback naming behaviour. --- .../tgo/apps/tgocassisstitch/tgocassisstitch.cpp | 8 +------- .../tgo/apps/tgocassisstitch/tgocassisstitch.xml | 6 +++--- isis/src/tgo/apps/tgocassisstitch/tsts/Makefile | 4 ---- .../apps/tgocassisstitch/tsts/default/Makefile | 9 --------- isis/tests/FunctionalTestsTgocassisstitch.cpp | 15 ++++++++++----- isis/tests/TgoCassisModuleTests.cpp | 4 ++-- 6 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 isis/src/tgo/apps/tgocassisstitch/tsts/Makefile delete mode 100644 isis/src/tgo/apps/tgocassisstitch/tsts/default/Makefile diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp index 22b75d1eea..64bcddb1cb 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp @@ -84,13 +84,7 @@ namespace Isis { foreach(QString frameKey, frameKeys) { try { QString frameIdentifier = frameKey.split("/").last(); - if(outputPrefix == "nil"){ - outputPrefix = ""; - } - if (outputSuffix == "nil"){ - outputSuffix = ""; - } - if (frameletCubeName != "nil") { + if (frameletCubeName != "") { FileName frameFileName(outputPrefBaseName + frameletCubeName + outputSuffBaseName + ".cub"); diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml index 5eddd40c44..5ad519c5c3 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml @@ -65,7 +65,7 @@ cube - nil + input An optional name for the output cube. @@ -81,7 +81,7 @@ cube - nil + output Output ISIS cube basename prefix. @@ -98,7 +98,7 @@ cube - nil + output output ISIS cube basename suffix. diff --git a/isis/src/tgo/apps/tgocassisstitch/tsts/Makefile b/isis/src/tgo/apps/tgocassisstitch/tsts/Makefile deleted file mode 100644 index 46d84c74c2..0000000000 --- a/isis/src/tgo/apps/tgocassisstitch/tsts/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -BLANKS = "%-6s" -LENGTH = "%-40s" - -include $(ISISROOT)/make/isismake.tststree diff --git a/isis/src/tgo/apps/tgocassisstitch/tsts/default/Makefile b/isis/src/tgo/apps/tgocassisstitch/tsts/default/Makefile deleted file mode 100644 index 9d990a66ed..0000000000 --- a/isis/src/tgo/apps/tgocassisstitch/tsts/default/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -APPNAME = tgocassisstitch - -include $(ISISROOT)/make/isismake.tsts - -commands: - $(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/stitch.lis; - $(APPNAME) fromlist=$(OUTPUT)/stitch.lis out=testxyza suffix=true; - $(RM) $(OUTPUT)/stitch.lis; - $(RM) $(OUTPUT)/*testxyza.cub diff --git a/isis/tests/FunctionalTestsTgocassisstitch.cpp b/isis/tests/FunctionalTestsTgocassisstitch.cpp index 038d351306..91a69de4ac 100644 --- a/isis/tests/FunctionalTestsTgocassisstitch.cpp +++ b/isis/tests/FunctionalTestsTgocassisstitch.cpp @@ -22,12 +22,14 @@ TEST(TgoCassisstitch, TgoCassisstitchMultiframeTest) { cubeList->append("data/tgoCassis/tgocassisstitch/CAS-MCO-2016-11-22T16.16.16.833-RED-01006-B1_crop.cub"); cubeList->append("data/tgoCassis/tgocassisstitch/CAS-MCO-2016-11-22T16.16.16.833-NIR-02006-B1_crop.cub"); cubeList->append("data/tgoCassis/tgocassisstitch/CAS-MCO-2016-11-22T16.16.16.833-PAN-00006-B1_crop.cub"); - + QString cubeListFile = prefix.path() + "/cubelist.lis"; cubeList->write(cubeListFile); + QString cubeName = "default"; + QVector args = {"fromlist=" + cubeListFile, - "outputprefix=" + prefix.path() + "/CAS-MCO"}; + "outputprefix=" + prefix.path() + "/CAS-MCO-"}; UserInterface options(APP_XML, args); try { @@ -220,8 +222,11 @@ TEST(TgoCassisstitch, TgoCassisstitchSingleframeTest) { QString cubeListFile = prefix.path() + "/cubelist.lis"; cubeList->write(cubeListFile); + QString cubeName = "default"; + QVector args = {"fromlist=" + cubeListFile, - "outputprefix=" + prefix.path() + "/CAS-MCO"}; + "cubename=" + cubeName, + "outputprefix=" + prefix.path() + "/CAS-MCO-"}; UserInterface options(APP_XML, args); try { @@ -231,7 +236,7 @@ TEST(TgoCassisstitch, TgoCassisstitchSingleframeTest) { FAIL() << "Unable to run tgocassisstitch with cube list: " << e.what() << std::endl; } - Cube cube(prefix.path() + "/CAS-MCO-2016-11-22T16:16:10.833.cub"); + Cube cube(prefix.path() + "/CAS-MCO-default.cub"); Pvl *isisLabel = cube.label(); // Dimensions Group @@ -401,4 +406,4 @@ TEST(TgoCassisstitch, TgoCassisstitchSingleframeTest) { EXPECT_EQ(hist->ValidPixels(), 100); EXPECT_NEAR(hist->StandardDeviation(), 0.063902362199265747, 0.0001); -} \ No newline at end of file +} diff --git a/isis/tests/TgoCassisModuleTests.cpp b/isis/tests/TgoCassisModuleTests.cpp index d26fe37c34..5b8e03b06d 100644 --- a/isis/tests/TgoCassisModuleTests.cpp +++ b/isis/tests/TgoCassisModuleTests.cpp @@ -138,7 +138,7 @@ TEST_F(TgoCassisModuleKernels, TgoCassisStitchUnstitch) { cubeList->write(cubeListFile); QVector stitchArgs = {"fromlist=" + cubeListFile, - "outputprefix=" + prefix.path() + "/stitched"}; + "outputprefix=" + prefix.path() + "/stitched-"}; UserInterface stitchOptions(STITCH_XML, stitchArgs); try { @@ -2288,7 +2288,7 @@ TEST_F(TgoCassisModuleKernels, TgoCassisTestProjSingleStitchedFrame) { cubeList->write(cubeListFile); QVector stitchArgs = {"fromlist=" + cubeListFile, - "outputprefix=" + prefix.path() + "/stitched"}; + "outputprefix=" + prefix.path() + "/stitched-"}; UserInterface stitchOptions(STITCH_XML, stitchArgs); try { From 54cd9563ee43cb2036eea3cad5bfa82d27aee997 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Mon, 22 May 2023 11:35:31 -0700 Subject: [PATCH 08/16] simplified some logic and removed repeat lines in different logic branches removing redundant lines from 8.0 release addresses prefix and filename convention topical issues --- CHANGELOG.md | 3 --- isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp | 11 +++++------ isis/tests/FunctionalTestsTgocassisstitch.cpp | 7 ++++--- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da2bcc1413..a75c14155b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,9 +43,6 @@ release. - Report better information regarding the behavior of findfeatures, FASTGEOM algorithms, and creation of the output network. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) - Modified tgocassisstitch to optionally allow either a outputprefix or an outputsuffix, both, or neither for naming convention purposes. [#5162](https://github.com/DOI-USGS/ISIS3/pull/5162) -- Updated download location for Dawn source files to include updated pck from HAMO Dawn mosaic [#4001](https://github.com/USGS-Astrogeology/ISIS3/issues/4001) -- Pinned cspice version to 67 [#5083](https://github.com/USGS-Astrogeology/ISIS3/issues/5083) -- Changed the `rsync` related commands in the ISIS SPICE Web Service document to `downloadIsisData` command ### Added - Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183) diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp index 64bcddb1cb..8a2b531635 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp @@ -84,19 +84,18 @@ namespace Isis { foreach(QString frameKey, frameKeys) { try { QString frameIdentifier = frameKey.split("/").last(); + FileName frameFileName; if (frameletCubeName != "") { - FileName frameFileName(outputPrefBaseName + + frameFileName = FileName(outputPrefBaseName + "-" + frameletCubeName + outputSuffBaseName + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); } else { - FileName frameFileName(outputPrefBaseName + + frameFileName = FileName(outputPrefBaseName + frameIdentifier + outputSuffBaseName + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); } + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); } catch (IException &e) { QString msg = "Failed stitch frame for observation [" diff --git a/isis/tests/FunctionalTestsTgocassisstitch.cpp b/isis/tests/FunctionalTestsTgocassisstitch.cpp index 91a69de4ac..db8387b786 100644 --- a/isis/tests/FunctionalTestsTgocassisstitch.cpp +++ b/isis/tests/FunctionalTestsTgocassisstitch.cpp @@ -29,7 +29,8 @@ TEST(TgoCassisstitch, TgoCassisstitchMultiframeTest) { QString cubeName = "default"; QVector args = {"fromlist=" + cubeListFile, - "outputprefix=" + prefix.path() + "/CAS-MCO-"}; + "cubename=" + cubeName, + "outputprefix=" + prefix.path() + "/CAS-MCO"}; UserInterface options(APP_XML, args); try { @@ -39,7 +40,7 @@ TEST(TgoCassisstitch, TgoCassisstitchMultiframeTest) { FAIL() << "Unable to run tgocassisstitch with cube list: " << e.what() << std::endl; } - Cube cube(prefix.path() + "/CAS-MCO-2016-11-22T16:16:16.833.cub"); + Cube cube(prefix.path() + "/CAS-MCO-default.cub"); Pvl *isisLabel = cube.label(); // Dimensions Group @@ -226,7 +227,7 @@ TEST(TgoCassisstitch, TgoCassisstitchSingleframeTest) { QVector args = {"fromlist=" + cubeListFile, "cubename=" + cubeName, - "outputprefix=" + prefix.path() + "/CAS-MCO-"}; + "outputprefix=" + prefix.path() + "/CAS-MCO"}; UserInterface options(APP_XML, args); try { From 7bc829688696cab040884192fbd029e40a985592 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Thu, 10 Aug 2023 12:32:37 -0700 Subject: [PATCH 09/16] resolving changelog merge conflicts (I think) added details to changelog small typo in link --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a75c14155b..941c1defa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,8 @@ release. - Report better information regarding the behavior of findfeatures, FASTGEOM algorithms, and creation of the output network. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) - Modified tgocassisstitch to optionally allow either a outputprefix or an outputsuffix, both, or neither for naming convention purposes. [#5162](https://github.com/DOI-USGS/ISIS3/pull/5162) +- Updated download location for Dawn source files to include updated pck from HAMO Dawn mosaic [#4001](https://github.com/USGS-Astrogeology/ISIS3/issues/4001) +- Changed the `rsync` related commands in the ISIS SPICE Web Service document to `downloadIsisData` command ### Added - Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183) @@ -52,10 +54,9 @@ release. - Added two new examples demonstrating/documenting the use of FASTGEOM algorithm, parameterization using GLOBALS and creation of a regional mosaic using findfeatures. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) - Added new option GEOMSOURCE=BOTH to findfeatures to check both the MATCH and FROM/FROMLIST images for valid control measure geometry to produce better networks and prevent downstream processing errors. Ignore points that end up with no valid measures (but can be retained with use of PreserveIgnoredControl via GLOBALS parameterization). [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) - Added new gtests for findfeatures that replaces all the old application tests. These tests are FunctionalTestFindfeaturesFastGeomDefault, FunctionalTestFindfeaturesFastGeomRadialConfig, FunctionalTestFindfeaturesFastGeomGridDefault and FunctionalTestFindfeaturesFastGeomGridConfig. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) - - Added an optional cubename parameter to tgocassisstitch which lets the user override the timestamp style naming convention of the output cube with their - own name; if not specified retains existing behavior [#5125](https://github.com/USGS-Astrogeology/ISIS3/issues/5125) + own name; if not specified retains existing behavior [#5125](https://github.com/USGS-Astrogeology/ISIS3/issues/5162) ### Deprecated From d289ae55b774689b262e8bd96520ee1f15f1b8eb Mon Sep 17 00:00:00 2001 From: antonhibl Date: Mon, 14 Aug 2023 09:27:19 -0700 Subject: [PATCH 10/16] removed some dashes in tests and replaced a mistaken default filename --- isis/tests/FunctionalTestsTgocassisstitch.cpp | 3 +-- isis/tests/TgoCassisModuleTests.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/isis/tests/FunctionalTestsTgocassisstitch.cpp b/isis/tests/FunctionalTestsTgocassisstitch.cpp index db8387b786..fffa24b51c 100644 --- a/isis/tests/FunctionalTestsTgocassisstitch.cpp +++ b/isis/tests/FunctionalTestsTgocassisstitch.cpp @@ -226,7 +226,6 @@ TEST(TgoCassisstitch, TgoCassisstitchSingleframeTest) { QString cubeName = "default"; QVector args = {"fromlist=" + cubeListFile, - "cubename=" + cubeName, "outputprefix=" + prefix.path() + "/CAS-MCO"}; UserInterface options(APP_XML, args); @@ -237,7 +236,7 @@ TEST(TgoCassisstitch, TgoCassisstitchSingleframeTest) { FAIL() << "Unable to run tgocassisstitch with cube list: " << e.what() << std::endl; } - Cube cube(prefix.path() + "/CAS-MCO-default.cub"); + Cube cube(prefix.path() + "/CAS-MCO-2016-11-22T16:16:16.833.cub"); Pvl *isisLabel = cube.label(); // Dimensions Group diff --git a/isis/tests/TgoCassisModuleTests.cpp b/isis/tests/TgoCassisModuleTests.cpp index 5b8e03b06d..dddbb03b81 100644 --- a/isis/tests/TgoCassisModuleTests.cpp +++ b/isis/tests/TgoCassisModuleTests.cpp @@ -138,7 +138,7 @@ TEST_F(TgoCassisModuleKernels, TgoCassisStitchUnstitch) { cubeList->write(cubeListFile); QVector stitchArgs = {"fromlist=" + cubeListFile, - "outputprefix=" + prefix.path() + "/stitched-"}; + "outputprefix=" + prefix.path() + "/stitched"}; UserInterface stitchOptions(STITCH_XML, stitchArgs); try { From 793fe507fabfae4215026914e6a55d8eee34b336 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Mon, 14 Aug 2023 09:31:00 -0700 Subject: [PATCH 11/16] fixing the changleog resolves --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 941c1defa1..156172a557 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,8 @@ release. outputsuffix, both, or neither for naming convention purposes. [#5162](https://github.com/DOI-USGS/ISIS3/pull/5162) - Updated download location for Dawn source files to include updated pck from HAMO Dawn mosaic [#4001](https://github.com/USGS-Astrogeology/ISIS3/issues/4001) - Changed the `rsync` related commands in the ISIS SPICE Web Service document to `downloadIsisData` command +- Pinned cspice version to 67 [#5083](https://github.com/USGS-Astrogeology/ISIS3/issues/5083) +- Changed the `rsync` related commands in the ISIS SPICE Web Service document to `downloadIsisData` command ### Added - Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183) From 9e92ba379d6566a7dc7bede8562b0808851ed861 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Mon, 14 Aug 2023 09:32:39 -0700 Subject: [PATCH 12/16] modified to allow prefix, suffix, both, or neither for better extensibility it also maintains original value names so older scripts and pipelines will retain functionality. --- CHANGELOG.md | 1 - .../apps/tgocassisstitch/tgocassisstitch.cpp | 21 +++++++++++++++++++ .../apps/tgocassisstitch/tgocassisstitch.xml | 10 +++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 156172a557..5427b009b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,7 +44,6 @@ release. - Modified tgocassisstitch to optionally allow either a outputprefix or an outputsuffix, both, or neither for naming convention purposes. [#5162](https://github.com/DOI-USGS/ISIS3/pull/5162) - Updated download location for Dawn source files to include updated pck from HAMO Dawn mosaic [#4001](https://github.com/USGS-Astrogeology/ISIS3/issues/4001) -- Changed the `rsync` related commands in the ISIS SPICE Web Service document to `downloadIsisData` command - Pinned cspice version to 67 [#5083](https://github.com/USGS-Astrogeology/ISIS3/issues/5083) - Changed the `rsync` related commands in the ISIS SPICE Web Service document to `downloadIsisData` command diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp index 8a2b531635..44deea63e7 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp @@ -84,6 +84,7 @@ namespace Isis { foreach(QString frameKey, frameKeys) { try { QString frameIdentifier = frameKey.split("/").last(); +<<<<<<< HEAD FileName frameFileName; if (frameletCubeName != "") { frameFileName = FileName(outputPrefBaseName + "-" + @@ -93,6 +94,26 @@ namespace Isis { frameFileName = FileName(outputPrefBaseName + frameIdentifier + outputSuffBaseName + ".cub"); +======= + if ((outputPrefix != "nil") && (outputSuffix == "nil")) { + FileName frameFileName(outputPrefBaseName + "-" + frameIdentifier + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } else if ((outputSuffix != "nil") && (outputPrefix == "nil")) { + FileName frameFileName(frameIdentifier + "-" + outputSuffBaseName + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } else if ((outputPrefix != "nil") && (outputSuffix != "nil")) { + FileName frameFileName(outputPrefBaseName + + "-" + frameIdentifier + + "-" + outputSuffBaseName + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); + } else if ((outputPrefix == "nil") && (outputSuffix == "nil")) { + FileName frameFileName(frameIdentifier + ".cub"); + stitchFrame( frameMap.values(frameKey), frameFileName ); + stitchProgress.CheckStatus(); +>>>>>>> db928751e (modified to allow prefix, suffix, both, or neither for better extensibility) } stitchFrame( frameMap.values(frameKey), frameFileName ); stitchProgress.CheckStatus(); diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml index 5ad519c5c3..473e2a67be 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml @@ -63,6 +63,7 @@ +<<<<<<< HEAD cube @@ -82,6 +83,11 @@ cube +======= + + cube + nil +>>>>>>> db928751e (modified to allow prefix, suffix, both, or neither for better extensibility) output Output ISIS cube basename prefix. @@ -98,7 +104,11 @@ cube +<<<<<<< HEAD +======= + nil +>>>>>>> db928751e (modified to allow prefix, suffix, both, or neither for better extensibility) output output ISIS cube basename suffix. From 821ff47d9c601f6fbe95da68faa2e5d0dee23703 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Wed, 1 Mar 2023 15:55:14 -0700 Subject: [PATCH 13/16] added details to changelog changelog fixes removed typo --- isis/tests/TgoCassisModuleTests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/isis/tests/TgoCassisModuleTests.cpp b/isis/tests/TgoCassisModuleTests.cpp index dddbb03b81..d26fe37c34 100644 --- a/isis/tests/TgoCassisModuleTests.cpp +++ b/isis/tests/TgoCassisModuleTests.cpp @@ -2288,7 +2288,7 @@ TEST_F(TgoCassisModuleKernels, TgoCassisTestProjSingleStitchedFrame) { cubeList->write(cubeListFile); QVector stitchArgs = {"fromlist=" + cubeListFile, - "outputprefix=" + prefix.path() + "/stitched-"}; + "outputprefix=" + prefix.path() + "/stitched"}; UserInterface stitchOptions(STITCH_XML, stitchArgs); try { From 50ee2362d6f096e885d88f5432370dd6bd3acfda Mon Sep 17 00:00:00 2001 From: antonhibl Date: Mon, 14 Aug 2023 09:52:20 -0700 Subject: [PATCH 14/16] small test changes --- isis/tests/FunctionalTestsTgocassisstitch.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/isis/tests/FunctionalTestsTgocassisstitch.cpp b/isis/tests/FunctionalTestsTgocassisstitch.cpp index fffa24b51c..df0b73b237 100644 --- a/isis/tests/FunctionalTestsTgocassisstitch.cpp +++ b/isis/tests/FunctionalTestsTgocassisstitch.cpp @@ -29,7 +29,6 @@ TEST(TgoCassisstitch, TgoCassisstitchMultiframeTest) { QString cubeName = "default"; QVector args = {"fromlist=" + cubeListFile, - "cubename=" + cubeName, "outputprefix=" + prefix.path() + "/CAS-MCO"}; UserInterface options(APP_XML, args); @@ -40,7 +39,7 @@ TEST(TgoCassisstitch, TgoCassisstitchMultiframeTest) { FAIL() << "Unable to run tgocassisstitch with cube list: " << e.what() << std::endl; } - Cube cube(prefix.path() + "/CAS-MCO-default.cub"); + Cube cube(prefix.path() + "/CAS-MCO-2016-11-22T16:16:16.833.cub"); Pvl *isisLabel = cube.label(); // Dimensions Group @@ -226,6 +225,7 @@ TEST(TgoCassisstitch, TgoCassisstitchSingleframeTest) { QString cubeName = "default"; QVector args = {"fromlist=" + cubeListFile, + "cubename=" + cubeName, "outputprefix=" + prefix.path() + "/CAS-MCO"}; UserInterface options(APP_XML, args); @@ -236,7 +236,7 @@ TEST(TgoCassisstitch, TgoCassisstitchSingleframeTest) { FAIL() << "Unable to run tgocassisstitch with cube list: " << e.what() << std::endl; } - Cube cube(prefix.path() + "/CAS-MCO-2016-11-22T16:16:16.833.cub"); + Cube cube(prefix.path() + "/CAS-MCO-default.cub"); Pvl *isisLabel = cube.label(); // Dimensions Group From 77aafab31d60921073bc338532334308dd40a0ce Mon Sep 17 00:00:00 2001 From: antonhibl Date: Tue, 22 Aug 2023 11:44:35 -0700 Subject: [PATCH 15/16] cleaning up git artifacts left by squashing --- .../apps/tgocassisstitch/tgocassisstitch.cpp | 23 +------------------ .../apps/tgocassisstitch/tgocassisstitch.xml | 10 -------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp index 44deea63e7..f5afc8332b 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp @@ -84,36 +84,15 @@ namespace Isis { foreach(QString frameKey, frameKeys) { try { QString frameIdentifier = frameKey.split("/").last(); -<<<<<<< HEAD FileName frameFileName; if (frameletCubeName != "") { frameFileName = FileName(outputPrefBaseName + "-" + frameletCubeName + outputSuffBaseName + ".cub"); } else { - frameFileName = FileName(outputPrefBaseName + + frameFileName = FileName(outputPrefBaseName + "-" + frameIdentifier + outputSuffBaseName + ".cub"); -======= - if ((outputPrefix != "nil") && (outputSuffix == "nil")) { - FileName frameFileName(outputPrefBaseName + "-" + frameIdentifier + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } else if ((outputSuffix != "nil") && (outputPrefix == "nil")) { - FileName frameFileName(frameIdentifier + "-" + outputSuffBaseName + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } else if ((outputPrefix != "nil") && (outputSuffix != "nil")) { - FileName frameFileName(outputPrefBaseName + - "-" + frameIdentifier + - "-" + outputSuffBaseName + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); - } else if ((outputPrefix == "nil") && (outputSuffix == "nil")) { - FileName frameFileName(frameIdentifier + ".cub"); - stitchFrame( frameMap.values(frameKey), frameFileName ); - stitchProgress.CheckStatus(); ->>>>>>> db928751e (modified to allow prefix, suffix, both, or neither for better extensibility) } stitchFrame( frameMap.values(frameKey), frameFileName ); stitchProgress.CheckStatus(); diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml index 473e2a67be..5ad519c5c3 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.xml @@ -63,7 +63,6 @@ -<<<<<<< HEAD cube @@ -83,11 +82,6 @@ cube -======= - - cube - nil ->>>>>>> db928751e (modified to allow prefix, suffix, both, or neither for better extensibility) output Output ISIS cube basename prefix. @@ -104,11 +98,7 @@ cube -<<<<<<< HEAD -======= - nil ->>>>>>> db928751e (modified to allow prefix, suffix, both, or neither for better extensibility) output output ISIS cube basename suffix. From 0a3d63c9f778aeb7964c4be52b2156db19fa3200 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Tue, 22 Aug 2023 11:50:56 -0700 Subject: [PATCH 16/16] changelog resolves --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5427b009b5..6954571097 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,9 +43,6 @@ release. - Report better information regarding the behavior of findfeatures, FASTGEOM algorithms, and creation of the output network. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772) - Modified tgocassisstitch to optionally allow either a outputprefix or an outputsuffix, both, or neither for naming convention purposes. [#5162](https://github.com/DOI-USGS/ISIS3/pull/5162) -- Updated download location for Dawn source files to include updated pck from HAMO Dawn mosaic [#4001](https://github.com/USGS-Astrogeology/ISIS3/issues/4001) -- Pinned cspice version to 67 [#5083](https://github.com/USGS-Astrogeology/ISIS3/issues/5083) -- Changed the `rsync` related commands in the ISIS SPICE Web Service document to `downloadIsisData` command ### Added - Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183)