gllssi2isis Original Label Fix

isis/src/base/objs/ProcessImport/ProcessImport.h

@@ -163,7 +163,7 @@ namespace Isis {
    *                           was made to accomodate Rosetta VIRTIS-m calibrated data files and
    *                           has no impact on other supported BIP files.
    *                           Fixes #5398.
-   *   @history 208-07-19 Tyler Wilson - Added support for 4-byte UnsignedInteger special pixel
+   *   @history 2018-07-19 Tyler Wilson - Added support for 4-byte UnsignedInteger special pixel
    *                            values.
    *
    */

isis/src/galileo/apps/gllssi2isis/main.cpp

@@ -5,6 +5,7 @@
 #include "IException.h"
 #include "iTime.h"
 #include "ProcessImportPds.h"
+#include "OriginalLabel.h"
 #include "UserInterface.h"
 
 #include <cstdio>
@@ -14,9 +15,6 @@
 #include <QFile>
 
 
-
-
-
 using namespace std;
 using namespace Isis;
 bool summed;
@@ -28,25 +26,19 @@ void translateLabels(Pvl &pdsLabel, Cube *ocube);
 void fixPvl(QString fileName);
 
 void IsisMain() {
-
   //initialize globals
   summed = false;
   summedOutput = NULL;
   // Grab the file to import
   ProcessImportPds p;
   UserInterface &ui = Application::GetUserInterface();
   FileName inFile = ui.GetFileName("FROM");
-  FileName out = ui.GetFileName("TO");
-
-
+  FileName outFile = ui.GetFileName("TO");
 
+  // Apply a fix to the gallileo pds labels so they can be read
   fixPvl(inFile.toString());
 
-
-
-
   // Make sure it is a Galileo SSI image
-
   Pvl lab(inFile.expanded());
 
   //Checks if in file is rdr
@@ -102,35 +94,34 @@ void IsisMain() {
   Pvl pdsLabel;
   p.SetPdsFile(inFile.expanded(), "", pdsLabel);
 
-  //Set up the output file
-  Cube *ocube;
-
+  // If summed handle the image similarly to pds2isis
+  // with an extra translation step
   if (!summed) {
-    ocube = p.SetOutputCube("TO");
+    Cube *ocube = p.SetOutputCube("TO");
     p.StartProcess();
+    translateLabels(pdsLabel, ocube);
+    p.EndProcess();
   }
   else {
+  // Otherwise the dimensions of the cube need to be cut in half before
+  // processsing. Since we didn't set the output cube we need to take care
+  // of writting the original label ourselves
     summedOutput = new Cube();
     summedOutput->setDimensions(p.Samples() / 2, p.Lines() / 2, p.Bands());
     summedOutput->setPixelType(p.PixelType());
     summedOutput->create(ui.GetFileName("TO"));
-    p.StartProcess(translateData);
-    ocube = summedOutput;
-  }
 
-  translateLabels(pdsLabel, ocube);
-  p.EndProcess();
+    p.StartProcess(translateData);
+    translateLabels(pdsLabel, summedOutput);
 
-  if (summed) {
+    OriginalLabel ol(Pvl(inFile.expanded()));
+    summedOutput->write(ol);
     summedOutput->close();
     delete summedOutput;
   }
-
   return;
 }
 
-
-
 /**
   * This fixes a problem with some of the Pvl files where a comment
   * was left open.  If the file has this error, the comment is closed
@@ -141,9 +132,6 @@ void IsisMain() {
   *     being checked
   *
   */
-
-
-
 void fixPvl(QString fileName){
 
     QFile pvlFile;
@@ -174,15 +162,7 @@ void fixPvl(QString fileName){
 
 }
 
-
-
-
-
-
-
-
-
-void translateData(Buffer &inData) {
+void translateData(Isis::Buffer &inData) {
   summedOutput->write(inData);
 }