gllssi2isis Original Label Fix

isis/src/base/objs/ProcessImport/ProcessImport.cpp

@@ -1199,21 +1199,26 @@ namespace Isis {
     }
   }
 
-
   /**
-   * Create the output file. Note that all the appropiate calls to at least
-   * SetDimensions and SetPixelType should be made prior to calling this method.
+   * Create the output file. This method will use the cube attribute object
+   * passed in to populate the pixel type and pass the desired samples, lines,
+   * and band numbers into the process setOutputCube method.
    *
    * @param parameter The parameter name that holds the output file name.
    *
+   * @param att The CubeAttributeOutput object with defined attributes
+   *
+   * @param ns The number of samples in the output cube
+   *
+   * @param nl The number of lines in the output cube
+   *
+   * @param nb The number of bands in the output cube
+   *
    * @return @b Isis::Cube Output cube.
    *
    * @throws Isis::iException::Message "Unsupported pixel type."
    */
-  Isis::Cube *ProcessImport::SetOutputCube(const QString &parameter) {
-    CubeAttributeOutput &att =
-      Application::GetUserInterface().GetOutputAttribute(parameter);
-
+  Isis::Cube *ProcessImport::SetOutputCube(const QString &parameter, CubeAttributeOutput &att, const int ns, const int nl, const int nb) {
     if (att.propagateMinimumMaximum()) {
       double min, max;
       if ((p_pixelType == Isis::Double) ||
@@ -1264,7 +1269,22 @@ namespace Isis {
       }
     }
 
-    return Process::SetOutputCube(Application::GetUserInterface().GetFileName(parameter), att, p_ns, p_nl, p_nb);
+    return Process::SetOutputCube(Application::GetUserInterface().GetFileName(parameter), att, ns, nl, nb);
+  }
+
+
+  /**
+   * Create the output file. Note that all the appropiate calls to at least
+   * SetDimensions and SetPixelType should be made prior to calling this method.
+   *
+   * @param parameter The parameter name that holds the output file name.
+   *
+   * @return @b Isis::Cube Output cube.
+   */
+  Isis::Cube *ProcessImport::SetOutputCube(const QString &parameter) {
+    CubeAttributeOutput &att =
+      Application::GetUserInterface().GetOutputAttribute(parameter);
+    return ProcessImport::SetOutputCube(parameter, att, p_ns, p_nl, p_nb);
   }
 
 
@@ -1278,6 +1298,7 @@ namespace Isis {
    *            output cube.
    *
    * @return @b Isis::Cube Output cube.
+   *
    * @throws Isis::iException::Message "File is not in a supported
    *             organization."
    */
@@ -1315,6 +1336,7 @@ namespace Isis {
    * @param funct Method that accepts Isis::Buffer as an input
    *              parameter, processes the image, and has no
    *              return value.
+   *
    * @throws Isis::iException::Message "File is not a supported
    *             organization."
    */
@@ -1977,7 +1999,7 @@ namespace Isis {
               break;
             case Isis::SignedInteger:
               (*out)[samp] = (double)swapper.Int(&in[bufferIndex]);
-              break;            
+              break;
           case Isis::UnsignedInteger:
             (*out)[samp] = (double)swapper.Uint32_t(&in[bufferIndex]);
             break;

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

@@ -163,9 +163,11 @@ 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.
-   *
+   *   @history 2019-04-15 Adam Paquette - Exposed the ns, nl, nb (number of samples, lines, and bands)
+   *                           for the setOutputCube function. Updated existing setOutputCube methods
+   *                           accordingly.
    */
   class ProcessImport : public Isis::Process {
     public:
@@ -199,6 +201,7 @@ namespace Isis {
 
       using Isis::Process::SetOutputCube;  // make parent functions visable
       Isis::Cube *SetOutputCube(const QString &parameter);
+      Isis::Cube *SetOutputCube(const QString &parameter, CubeAttributeOutput &att, const int ns, const int nl, const int nb);
       virtual Isis::Cube *SetOutputCube(const QString &fname,
                                 Isis::CubeAttributeOutput &att);
 

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

@@ -28,7 +28,6 @@ void translateLabels(Pvl &pdsLabel, Cube *ocube);
 void fixPvl(QString fileName);
 
 void IsisMain() {
-
   //initialize globals
   summed = false;
   summedOutput = NULL;
@@ -110,22 +109,16 @@ void IsisMain() {
     p.StartProcess();
   }
   else {
-    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);
+    Isis::CubeAttributeOutput &att = Application::GetUserInterface().GetOutputAttribute("TO");
+    att.setPixelType(p.PixelType());
+    summedOutput = p.SetOutputCube("TO", att, p.Samples() / 2, p.Lines() / 2, p.Bands());
     ocube = summedOutput;
+    p.StartProcess(translateData);
   }
 
   translateLabels(pdsLabel, ocube);
   p.EndProcess();
 
-  if (summed) {
-    summedOutput->close();
-    delete summedOutput;
-  }
-
   return;
 }
 
@@ -182,7 +175,7 @@ void fixPvl(QString fileName){
 
 
 
-void translateData(Buffer &inData) {
+void translateData(Isis::Buffer &inData) {
   summedOutput->write(inData);
 }