modified to allow prefix, suffix, both, or neither for better extensi…

…bility it also maintains original value names so older scripts and pipelines will retain functionality.
DOI-USGS · Aug 22, 2023 · 9e92ba3 · 9e92ba3
1 parent 793fe50
commit 9e92ba3
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git 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
@@ -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
@@ -63,6 +63,7 @@
         </filter>
       </parameter>
 
+<<<<<<< HEAD
       <parameter name="CUBENAME">
         <type>cube</type>
         <default><item></item></default>
@@ -82,6 +83,11 @@
       <parameter name="OUTPUTPREFIX">
         <type>cube</type>
         <default><item></item></default>
+=======
+      <parameter name="OUTPUTPREFIX">
+        <type>cube</type>
+        <default><item>nil</item></default>
+>>>>>>> db928751e (modified to allow prefix, suffix, both, or neither for better extensibility)
          <fileMode>output</fileMode>
          <brief>
            Output ISIS cube basename prefix.
@@ -98,7 +104,11 @@
 
       <parameter name="OUTPUTSUFFIX">
          <type>cube</type>
+<<<<<<< HEAD
          <default><item></item></default>
+=======
+         <default><item>nil</item></default>
+>>>>>>> db928751e (modified to allow prefix, suffix, both, or neither for better extensibility)
          <fileMode>output</fileMode>
          <brief>
            output ISIS cube basename suffix.