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

GetFileName and GetCubeName errors (#4843)

parent 8f7de498

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

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ namespace Isis{ 
    p.EndProcess();



    // Now we'll really be processing our input cube

    p.SetInputCube(ui.GetFileName("FROM"), inputAtt);

    p.SetInputCube(ui.GetCubeName("FROM"), inputAtt);



    // We need to create the output file

    ocube = new Cube();

isis/src/base/apps/spkwriter/spkwriter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ namespace Isis { 


    // Get the list of names of input CCD cubes to stitch together

    FileList flist;

    if (ui.WasEntered("FROM")) flist.push_back(ui.GetCubeName("FROM"));

    if (ui.WasEntered("FROM")) flist.push_back(ui.GetFileName("FROM"));

    if (ui.WasEntered("FROMLIST")) flist.read(ui.GetFileName("FROMLIST"));

    if (flist.size() < 1) {

      QString msg = "Files must be specified in FROM and/or FROMLIST - none found!";

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

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ namespace Isis { 


    // Handle an optional checkline cube.

    if (ui.WasEntered("FROM2")) {

      FileName checklineXmlFileName = ui.GetCubeName("FROM2");

      FileName checklineXmlFileName = ui.GetFileName("FROM2");



      if (ui.WasEntered("CHECKLINEREADOUT")) {

        // Process the checkline image to an ISIS cube and write the checkline tables

isis/tests/FunctionalTestsApollopanstitcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ TEST_F(TempTestingFiles, FunctionalTestApollopanstitcherDefault) { 
  catch (IException &e) {

    FAIL() << "Unable to stitcher apollo images: " << e.toString().toStdString().c_str() << std::endl;

  }

  Cube outputCube(options.GetFileName("TO"));

  Cube outputCube(options.GetCubeName("TO"));



  std::unique_ptr<Histogram> hist (outputCube.histogram());

isis/tests/FunctionalTestsHimos.cpp

+4 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ TEST_F(MroHiriseCube, FunctionalTestHimosDefault) { 
  catch (IException &e) {

    FAIL() << "Unable to create mosaic image: " << e.toString().toStdString().c_str() << std::endl;

  }

  Cube outputMos(options.GetFileName("TO"));

  Cube outputMos(options.GetCubeName("TO"));

  PvlObject inputCubeLabel = dejitteredCube.label()->findObject("IsisCube");

  PvlObject outputCubeLabel = outputMos.label()->findObject("IsisCube");

  PvlGroup dimensions = outputCubeLabel.findObject("Core").findGroup("Dimensions");
@@ -96,7 +96,7 @@ TEST_F(MroHiriseCube, FunctionalTestHimosError) { 
  UserInterface options(APP_XML, args);

  try {

   himos(options);

   FAIL() << "Should not have been able to create mosaic: " << options.GetFileName("TO").toStdString().c_str() << std::endl;

   FAIL() << "Should not have been able to create mosaic: " << options.GetCubeName("TO").toStdString().c_str() << std::endl;

  }

  catch (IException &e) {

    EXPECT_THAT(e.what(), testing::HasSubstr("was NOT created"));
@@ -122,7 +122,7 @@ TEST_F(MroHiriseCube, FunctionalTestHimosMismatchObs) { 
  UserInterface options(APP_XML, args);

  try {

   himos(options);

   FAIL() << "Should not have been able to create mosaic: " << options.GetFileName("TO").toStdString().c_str() << std::endl;

   FAIL() << "Should not have been able to create mosaic: " << options.GetCubeName("TO").toStdString().c_str() << std::endl;

  }

  catch (IException &e) {

    EXPECT_THAT(e.what(), testing::HasSubstr("was NOT created"));
@@ -148,7 +148,7 @@ TEST_F(MroHiriseCube, FunctionalTestHimosMismatchFilter) { 
  UserInterface options(APP_XML, args);

  try {

   himos(options);

   FAIL() << "Should not have been able to create mosaic: " << options.GetFileName("TO").toStdString().c_str() << std::endl;

   FAIL() << "Should not have been able to create mosaic: " << options.GetCubeName("TO").toStdString().c_str() << std::endl;

  }

  catch (IException &e) {

    EXPECT_THAT(e.what(), testing::HasSubstr("was NOT created"));