Commit d229bf2e authored by Amy Stamile's avatar Amy Stamile
Browse files

compiling updates

parent 9f0abd51

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

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ namespace Isis { 
        QString instrument = (cube->label()->findGroup("Instrument",Pvl::Traverse))["InstrumentId"];

        Apollo apollo(mission, instrument);

        if (mission.mid(0,6) != "APOLLO") {

            QString msg = "This application is for use with Apollo spacecrafts only.";

            std::string msg = "This application is for use with Apollo spacecrafts only.";

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

        }
@@ -163,7 +163,7 @@ namespace Isis { 
            reseaus["Status"] = "Refined";

        }

        else {

            QString msg = "No Reseaus located. Labels will not be changed.";

            std::string msg = "No Reseaus located. Labels will not be changed.";

            msg += "Try changing the registration parameters.";

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

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ void IsisMain() { 
  FileName fiducialFileName("$apollo15/calibration/ApolloPanFiducialMark.cub");

  fidC.open(fiducialFileName.expanded(),"r");

  if( !fidC.isOpen() ) {

    QString msg = "Unable to open the fiducial patternS cube: ApolloPanFiducialMark.cub\n";

    std::string msg = "Unable to open the fiducial patternS cube: ApolloPanFiducialMark.cub\n";

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

  }

  refL = fidC.lineCount();

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ namespace Isis { 
    QString spacecraft = (info->group("Instrument")["SpacecraftName"]);

    QString instrument = (info->group("Instrument")["InstrumentId"]);

    if (spacecraft.mid(0,6) != "APOLLO") {

      QString msg = "This application is for use with Apollo spacecrafts only. ";

      std::string msg = "This application is for use with Apollo spacecrafts only. ";

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

    }

    Apollo apollo(spacecraft, instrument);

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

+2 −2
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ void IsisMain() { 
  PvlGroup &reseaus = ipacket->group("Reseaus");

  QString mission = (ipacket->group("Instrument"))["SpacecraftName"];

  if (mission.mid(0,6) != "APOLLO") {

    QString msg = "This application is for use with Apollo spacecrafts only. ";

    std::string msg = "This application is for use with Apollo spacecrafts only. ";

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

  }

  if ((QString)reseaus["Status"] != "Refined" && (QString)reseaus["Status"] != "Removed") {

    QString msg = "This application can only be run after findapollorx.";

    std::string msg = "This application can only be run after findapollorx.";

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

  }

isis/src/apollo/objs/Apollo/Apollo.h

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ namespace Isis { 
        else if (filename.mid(0,4) == "AS17") spacecraft = "APOLLO 17";

        // throw an error

        else {

          QString msg = "The image filename does not match the required formatting.";

          std::string msg = "The image filename does not match the required formatting.";

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

        }
@@ -66,7 +66,7 @@ namespace Isis { 
        else if (filename.mid(5,1) == "H") instrument = "HASSELBLAD";

        // throw an error

        else {

          QString msg = "The image filename does not match the required formatting.";

          std::string msg = "The image filename does not match the required formatting.";

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

        }