Unverified Commit fa47dac2 authored by Tim Giroux's avatar Tim Giroux Committed by GitHub
Browse files

improve error message and update app docs (#4417) 



Co-authored-by: default avatartgiroux <tgiroux@igswzawglt0019.gs.doi.net>
parent b953e984

isis/src/lro/apps/lronac2isis/lronac2isis.cpp

+6 −4
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ namespace Isis { 
  void lronac2isis(UserInterface &ui) {

    // Initialize variables

    ResetGlobals();



    // Check that the file comes from the right camera

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

    QString id;
@@ -50,10 +51,10 @@ namespace Isis { 
        QString msg = "Unable to read [DATA_SET_ID] from input file [" + inFile.expanded() + "]";

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

      }

      //Checks if in file is rdr

      // Checks if in file is RDR

      bool projected = lab.hasObject("IMAGE_MAP_PROJECTION");

      if(projected) {

        QString msg = "[" + inFile.name() + "] appears to be an rdr file.";

        QString msg = "[" + inFile.name() + "] appears to be an RDR file.";

        msg += " Use pds2isis.";

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

      }
@@ -90,7 +91,8 @@ namespace Isis { 
    id = id.simplified().trimmed();

    if(id.mid(13, 3) != "EDR") {

      QString msg = "Input file [" + inFile.expanded() + "] does not appear to be "

                   + "in LROC-NAC EDR format. DATA_SET_ID is [" + id + "]";

                   + "in LROC-NAC EDR format. DATA_SET_ID is [" + id + "]"

                   + " Use pds2isis for RDR or CDR.";

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

    }

isis/src/lro/apps/lronac2isis/lronac2isis.xml

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
    </brief>



    <description>

        This program takes an image from the Lunar Reconnaissance Orbiter Narrow Angle Camera

        and produces an Isis cube containing the image data.

        This program takes a raw EDR image from the Lunar Reconnaissance Orbiter Narrow Angle Camera

        and produces an Isis cube containing the image data. LRO NAC images in the CDR or RDR format should be ingested using pds2isis.

    </description>



    <history>