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

Update calls to GetFileName with get GetCubeName (#4779) 

* Update calls to getfilename with get getcubename

* revert some file/cube changes

* typo

* filename cubename fixes
parent 7fbd8498

isis/src/apollo/apps/apollo2isis/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void IsisMain() { 
  p.SetPdsFile(inFile.expanded(), "", pdsLabel);



  QString filename = FileName(ui.GetFileName("FROM")).baseName();

  FileName toFile = ui.GetFileName("TO");

  FileName toFile = ui.GetCubeName("TO");



  apollo = new Apollo(filename);

isis/src/apollo/apps/apollocal/apollocal.cpp

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




  void apollocal(UserInterface &ui) {

    Cube cube(ui.GetFileName("FROM"), "r");

    Cube cube(ui.GetCubeName("FROM"), "r");

    apollocal(&cube, ui);

  }

isis/src/apollo/apps/apollofindrx/apollofindrx.cpp

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ namespace Isis { 
    double GoodnessOfFit = 1.0;



    void apollofindrx(UserInterface &ui) {

        Cube *cube = new Cube(ui.GetFileName("FROM"), "rw");

        Cube *cube = new Cube(ui.GetCubeName("FROM"), "rw");

        apollofindrx(cube, ui);

    }

isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ namespace Isis { 
    //define an output cube

    outputC.setDimensions(int(maxS), int(maxL), 1);

    outputC.setPixelType(panC[0]->pixelType());  //set pixel type

    tempString = ui.GetFileName("TO");

    tempString = ui.GetCubeName("TO");

    outputC.create(tempString);

    outputC.close();  //closing the output cube so that it can be opened by the mosaic process

    ProcessMosaic mosaic;

isis/src/apollo/apps/apolloremrx/apolloremrx.cpp

+5 −3
Original line number Diff line number Diff line
@@ -22,16 +22,18 @@ namespace Isis { 


  void cpy(Buffer &in, Buffer &out);





  void apolloremrx(UserInterface &ui) {

    Cube cube;

    CubeAttributeInput inAtt = ui.GetInputAttribute("FROM");

    if (inAtt.bands().size() != 0) {

      cube.setVirtualBands(inAtt.bands());

    }

    cube.open(ui.GetFileName("FROM"));

    cube.open(ui.GetCubeName("FROM"));

    apolloremrx(&cube, ui);

  }





  void apolloremrx(Cube *info, UserInterface &ui) {

    int dim;

    bool resvalid;
@@ -68,7 +70,7 @@ namespace Isis { 
    status = "Removed";



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

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

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



    // Start the processing

    p.StartProcess(cpy);
@@ -77,7 +79,7 @@ namespace Isis { 
    dim = apollo.ReseauDimension();



    // Get other user entered options

    QString out = ui.GetFileName("TO");

    QString out = ui.GetCubeName("TO");

    resvalid = ui.GetBoolean("RESVALID");

    action = ui.GetString("ACTION");