Unverified Commit def75c52 authored by Stuart Sides's avatar Stuart Sides Committed by GitHub
Browse files

Missed file and cube changes (#4827)

parent 18fd6888

isis/src/base/apps/demprep/demprep.cpp

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ namespace Isis{ 


    if(!proj->IsEquatorialCylindrical()) {

      CubeAttributeOutput &att = ui.GetOutputAttribute("TO");

      ocube = p.SetOutputCube(ui.GetFileName("TO"), att);

      ocube = p.SetOutputCube(ui.GetCubeName("TO"), att);

      p.StartProcess(GetStats);



      PvlGroup demRange("Results");
@@ -248,7 +248,7 @@ namespace Isis{ 




    CubeAttributeOutput &att = ui.GetOutputAttribute("TO");

    ocube = p.SetOutputCube(ui.GetFileName("TO"), att, ns, nl, nb);

    ocube = p.SetOutputCube(ui.GetCubeName("TO"), att, ns, nl, nb);

    // Make sure everything is propagated and closed

    p.EndProcess();
@@ -257,7 +257,7 @@ namespace Isis{ 


    // We need to create the output file

    ocube = new Cube();

    ocube->open(FileName(ui.GetFileName("TO")).expanded(), "rw");

    ocube->open(FileName(ui.GetCubeName("TO")).expanded(), "rw");



    p.StartProcess(DoWrap);

isis/src/base/apps/isisimport/isisimport.cpp

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace Isis { 
    FileName fileTemplate = ("$ISISROOT/appdata/import/fileTemplate.tpl");

    json jsonData;

    bool isPDS4 = false;

    FileName inputFileName = ui.GetFileName("FROM");

    FileName inputFileName = ui.GetCubeName("FROM");



    if (inputFileName.extension().toUpper() == "IMQ"){

      QString msg = "Input image may be compressed. Please run image through vdcomp to uncompress"
@@ -76,7 +76,7 @@ namespace Isis { 
      }

      catch(const std::exception& e) {

        QString msg = "Cannot locate a template named [" + QString::fromStdString(templateFile) + "] for input label [";

        msg += FileName(ui.GetFileName("FROM")).expanded();

        msg += FileName(ui.GetCubeName("FROM")).expanded();

        msg += "]. You can explicitly provide a template file using the [TEMPLATE] parameter. ";

        msg += e.what();

        throw IException(IException::User, msg, _FILEINFO_);

isis/src/base/apps/segment/segment.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ namespace Isis { 
  void segment(Cube *cube, UserInterface &ui) {



    //Get user parameters

    FileName inFile = ui.GetFileName("FROM");

    FileName inFile = ui.GetCubeName("FROM");

    int numberOfLines = ui.GetInteger("NL");

    int lineOverlap   = ui.GetInteger("OVERLAP");

isis/src/base/apps/shadow/shadow.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ namespace Isis { 
                                  "spkpos_c.html");



    if (ui.GetString("SUNPOSITIONSOURCE") == "MATCH") {

      functor.setSunPosition(ui.GetFileName("MATCH"));

      functor.setSunPosition(ui.GetCubeName("MATCH"));

    }

    else {

      QStringList allKernelFiles;

isis/src/clipper/apps/eis2isis/eis2isis.cpp

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ namespace Isis { 
    if (ui.WasEntered("MAINREADOUT")) {



      // Create and write normalized time values in the range [-1,1] to the primary EIS cube

      Table normalizedReadout = normalizeTimeTable(FileName(ui.GetCubeName("MAINREADOUT")),

      Table normalizedReadout = normalizeTimeTable(FileName(ui.GetFileName("MAINREADOUT")),

                                  "Normalized Main Readout Line Times",

                                  outputCube->lineCount());