Commit 573e343f authored by Summer Stapleton's avatar Summer Stapleton
Browse files

Modified tgocassis2isis to accept .img datafiles

parent 3272598d

isis/src/tgo/apps/tgocassis2isis/tgocassis2isis.cpp

+13 −3
Original line number Diff line number Diff line
@@ -27,10 +27,20 @@ void IsisMain() { 
  try {

    ProcessImport importer;

    translateCoreInfo(xmlFileName, importer);

    // fails 

    

    if(xmlFileName.removeExtension().addExtension("dat").fileExists()){

      importer.SetInputFile(xmlFileName.removeExtension().addExtension("dat").expanded());

    } 

    else if (xmlFileName.removeExtension().addExtension("img").fileExists()) {

      importer.SetInputFile(xmlFileName.removeExtension().addExtension("img").expanded());

    }

    else {

      QString msg = "Cannot find image file for [" + xmlFileName.name() + "]. Confirm that the "

        ".dat or .img file for this XML exists and is located in the same directory.";

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

    }

    

    Cube *outputCube = importer.SetOutputCube("TO");

    // fails above

    translateLabels(xmlFileName, outputCube);



    FileName outputCubeFileName(ui.GetFileName("TO"));

isis/src/tgo/apps/tgocassis2isis/tgocassis2isis.xml

+3 −0
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ 
    <change name="Jeannie Backer" date="2017-09-05">

      Added check to verify input input xml file corresponds to valid filter image. 

    </change>

    <change name="Summer Stapleton" date="2018-02-16">

      Added handling for image file extesnions of either .dat or .img. Fixs #5334. 

    </change>

  </history>



  <category>