Commit 1ebd1b0c authored by Amy Stamile's avatar Amy Stamile
Browse files

large chunk of PVL updates

parent ee5843aa

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

+8 −8
Original line number Diff line number Diff line
@@ -239,9 +239,9 @@ void TranslateApolloLabels (IString filename, Cube *opack) { 
    PvlGroup error("ERROR");

    error.addComment("The decrypted code is invalid.");

    for (int i=0; i<4; i++) {

      PvlKeyword keyword("Column"+toString(i+1));

      PvlKeyword keyword("Column"+std::to_string(i+1));

      for (int j=0; j<32; j++) {

        keyword += toString((int)code[i][j]);

        keyword += std::to_string((int)code[i][j]);

      }

      error.addKeyword(keyword);

      codeGroup += keyword;
@@ -250,17 +250,17 @@ void TranslateApolloLabels (IString filename, Cube *opack) { 
  }

  else {

    codeGroup += PvlKeyword("StartTime", FrameTime());

    codeGroup += PvlKeyword("SpacecraftAltitude", toString(Altitude()),"meters");

    codeGroup += PvlKeyword("SpacecraftAltitude", std::to_string(Altitude()),"meters");



    if (apollo->IsMetric()){

      codeGroup += PvlKeyword("ExposureDuration", toString(ShutterInterval()), "milliseconds");

      codeGroup += PvlKeyword("ExposureDuration", std::to_string(ShutterInterval()), "milliseconds");

      codeGroup += PvlKeyword("ForwardMotionCompensation", FMC());

    }



    for (int i=0; i<4; i++) {

      PvlKeyword keyword("Column"+toString(i+1));

      PvlKeyword keyword("Column"+ std::to_string(i+1));

      for (int j=0; j<32; j++) {

        keyword += toString((int)code[i][j]);

        keyword += std::to_string((int)code[i][j]);

      }

      codeGroup += keyword;

    }
@@ -292,9 +292,9 @@ void TranslateApolloLabels (IString filename, Cube *opack) { 
        y += 20;

    }



    reseaus->findKeyword("Sample")[i] = toString(

    reseaus->findKeyword("Sample")[i] = std::to_string(

        cos(rotation)*(x-sampleTranslation) - sin(rotation)*(y-lineTranslation) + sampleTranslation);

    reseaus->findKeyword("Line")[i] = toString(

    reseaus->findKeyword("Line")[i] = std::to_string(

        sin(rotation)*(x-sampleTranslation) + cos(rotation)*(y-lineTranslation) + lineTranslation);

  }

  inst += PvlKeyword("StartTime", utcTime);

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

+13 −13
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ void IsisMain() { 


  keyword.setName("LineExposureDuration");

  //converted led to msec/mm--negative sign to account for the anti-parallel time and line axes

  keyword.setValue(iStrTEMP=toString(-led),"sec/mm");

  keyword.setValue(iStrTEMP=std::to_string(-led),"sec/mm");

  inst_pvlG.addKeyword(keyword);



  panCube.putGroup(inst_pvlG);
@@ -191,7 +191,7 @@ void IsisMain() { 
  kernels_pvlG.clear();



  keyword.setName("NaifFrameCode");

  keyword.setValue(toString(insCode));

  keyword.setValue(std::to_string(insCode));

  kernels_pvlG.addKeyword(keyword);



  keyword.setName("LeapSecond");
@@ -404,7 +404,7 @@ void IsisMain() { 
  recordPos[2] = posJ20[2];

  recordPos[3] = temp;  //temp = et (right now anyway)

  tablePos += recordPos;

  tablePos.Label() += PvlKeyword("SpkTableStartTime",toString(temp));

  tablePos.Label() += PvlKeyword("SpkTableStartTime",std::to_string(temp));

  //now the other node

  temp = 0.515*(time1-time0);      //3% extension

  posSel[0] = pos0[0] + temp*vel[0];    //selenocentric coordinate calculation
@@ -424,7 +424,7 @@ void IsisMain() { 
  recordPos[2] = posJ20[2];

  recordPos[3] = temp;  //temp = et (right now anyway)

  tablePos += recordPos;

  tablePos.Label() += PvlKeyword("SpkTableEndTime",toString(temp));

  tablePos.Label() += PvlKeyword("SpkTableEndTime",std::to_string(temp));

  tablePos.Label() += PvlKeyword("CacheType","Linear");

  tablePos.Label() += PvlKeyword("Description","Created by apollopaninit");

  panCube.write(tablePos);  //now attach it to the table
@@ -547,18 +547,18 @@ void IsisMain() { 
    recordRot[4] = Q[i][4];

    tableRot += recordRot;

  }

  tableRot.Label() += PvlKeyword("CkTableStartTime", toString(Q[0][4]));

  tableRot.Label() += PvlKeyword("CkTableEndTime", toString(Q[NODES-1][4]));

  tableRot.Label() += PvlKeyword("CkTableStartTime", std::to_string(Q[0][4]));

  tableRot.Label() += PvlKeyword("CkTableEndTime", std::to_string(Q[NODES-1][4]));

  tableRot.Label() += PvlKeyword("Description", "Created by appollopan2isis");



  keyword.setName("TimeDependentFrames");

  keyword.setValue(toString(scFrameCode));

  keyword.setValue(std::to_string(scFrameCode));

  keyword.addValue("1");

  tableRot.Label() += keyword;



  keyword.setName("ConstantFrames");

  keyword.setValue(toString(insCode));

  keyword.addValue(toString(scFrameCode));

  keyword.setValue(std::to_string(insCode));

  keyword.addValue(std::to_string(scFrameCode));

  tableRot.Label() += keyword;



  keyword.setName("ConstantRotation");
@@ -777,10 +777,10 @@ void IsisMain() { 
  ApolloPanoramicCamera* cam = (ApolloPanoramicCamera*)(panCube.camera());

  //log the residual report from interior orientation

  PvlGroup residualStats("InteriorOrientationStats");

  residualStats += PvlKeyword("FiducialsFound",  toString(tableFid.Records()));

  residualStats += PvlKeyword("ResidualMax",  toString(cam->intOriResidualMax()),"pixels");

  residualStats += PvlKeyword("ResidualMean", toString(cam->intOriResidualMean()),"pixels");

  residualStats += PvlKeyword("ResidualStdev", toString(cam->intOriResidualStdev()),"pixels");

  residualStats += PvlKeyword("FiducialsFound",  std::to_string(tableFid.Records()));

  residualStats += PvlKeyword("ResidualMax",  std::to_string(cam->intOriResidualMax()),"pixels");

  residualStats += PvlKeyword("ResidualMean", std::to_string(cam->intOriResidualMean()),"pixels");

  residualStats += PvlKeyword("ResidualStdev", std::to_string(cam->intOriResidualStdev()),"pixels");



  Application::Log( residualStats );

isis/src/base/apps/automos/automos.cpp

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ namespace Isis { 
    for (int i = 0; i < list.size(); i++) {

      if (!m.StartProcess(list[i].toString())) {

        PvlGroup outsiders("Outside");

        outsiders += PvlKeyword("File", list[i].toString());

        outsiders += PvlKeyword("File", (list[i].toString().toStdString()));

        Application::AppendAndLog(outsiders, log);

      }

      else {

isis/src/base/apps/cam2cam/cam2cam.cpp

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ namespace Isis { 
    // Set the reference band we want to match

    PvlGroup instgrp = mcube->group("Instrument");

    if (!outcam->IsBandIndependent()) {

      PvlKeyword rBand("ReferenceBand", toString(referenceBand));

      PvlKeyword rBand("ReferenceBand", std::to_string(referenceBand));

      rBand.addComment("# All bands are aligned to reference band");

      instgrp += rBand;

      mcube->putGroup(instgrp);

isis/src/base/apps/cam2map/cam2map.cpp

+27 −27
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ namespace Isis { 


    // Get the map projection file provided by the user

    Pvl userMap;

    userMap.read(ui.GetFileName("MAP"));

    userMap.read(ui.GetFileName("MAP").toStdString());

    PvlGroup &userGrp = userMap.findGroup("Mapping", Pvl::Traverse);



    cam2map(&icube, userMap, userGrp, ui, log);
@@ -66,10 +66,10 @@ namespace Isis { 
    // Make the target info match the user mapfile

    double minlat, maxlat, minlon, maxlon;

    incam->GroundRange(minlat, maxlat, minlon, maxlon, userMap);

    camGrp.addKeyword(PvlKeyword("MinimumLatitude", toString(minlat)), Pvl::Replace);

    camGrp.addKeyword(PvlKeyword("MaximumLatitude", toString(maxlat)), Pvl::Replace);

    camGrp.addKeyword(PvlKeyword("MinimumLongitude", toString(minlon)), Pvl::Replace);

    camGrp.addKeyword(PvlKeyword("MaximumLongitude", toString(maxlon)), Pvl::Replace);

    camGrp.addKeyword(PvlKeyword("MinimumLatitude", std::to_string(minlat)), Pvl::Replace);

    camGrp.addKeyword(PvlKeyword("MaximumLatitude", std::to_string(maxlat)), Pvl::Replace);

    camGrp.addKeyword(PvlKeyword("MinimumLongitude", std::to_string(minlon)), Pvl::Replace);

    camGrp.addKeyword(PvlKeyword("MaximumLongitude", std::to_string(maxlon)), Pvl::Replace);





    // We want to delete the keywords we just added if the user wants the range
@@ -84,10 +84,10 @@ namespace Isis { 


    // Make sure the target name of the input cube and map file match.

    if (userGrp.hasKeyword("TargetName") && !icube->group("Instrument").findKeyword("TargetName").isNull()) {

      if (!PvlKeyword::stringEqual(incam->target()->name(), userGrp.findKeyword("TargetName")[0])) {

        QString msg = "The TargetName: [" + incam->target()->name() + "] of the input cube: [" + icube->fileName() +

      if (!PvlKeyword::stringEqual(incam->target()->name().toStdString(), userGrp.findKeyword("TargetName")[0])) {

        std::string msg = "The TargetName: [" + incam->target()->name().toStdString() + "] of the input cube: [" + icube->fileName().toStdString() +

                      "] does not match the TargetName: [" + userGrp.findKeyword("TargetName")[0] + "] of the map file: [" +

                      ui.GetFileName("MAP") + "].";

                      ui.GetFileName("MAP").toStdString() + "].";

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

      }

    }
@@ -119,22 +119,22 @@ namespace Isis { 
      // If the user decided to enter a ground range then override

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

        userGrp.addKeyword(PvlKeyword("MinimumLongitude",

                                      toString(ui.GetDouble("MINLON"))), Pvl::Replace);

                                      std::to_string(ui.GetDouble("MINLON"))), Pvl::Replace);

      }



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

        userGrp.addKeyword(PvlKeyword("MaximumLongitude",

                                      toString(ui.GetDouble("MAXLON"))), Pvl::Replace);

                                      std::to_string(ui.GetDouble("MAXLON"))), Pvl::Replace);

      }



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

        userGrp.addKeyword(PvlKeyword("MinimumLatitude",

                                      toString(ui.GetDouble("MINLAT"))), Pvl::Replace);

                                      std::to_string(ui.GetDouble("MINLAT"))), Pvl::Replace);

      }



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

        userGrp.addKeyword(PvlKeyword("MaximumLatitude",

                                      toString(ui.GetDouble("MAXLAT"))), Pvl::Replace);

                                      std::to_string(ui.GetDouble("MAXLAT"))), Pvl::Replace);

      }



      // If they want the res. from the mapfile, delete it from the camera so
@@ -164,7 +164,7 @@ namespace Isis { 
      if (ui.WasEntered("PIXRES")) {

        if (ui.GetString("PIXRES") == "MPP") {

          userGrp.addKeyword(PvlKeyword("PixelResolution",

                                        toString(ui.GetDouble("RESOLUTION"))),

                                        std::to_string(ui.GetDouble("RESOLUTION"))),

                            Pvl::Replace);

          if (userGrp.hasKeyword("Scale")) {

            userGrp.deleteKeyword("Scale");
@@ -172,7 +172,7 @@ namespace Isis { 
        }

        else if (ui.GetString("PIXRES") == "PPD") {

          userGrp.addKeyword(PvlKeyword("Scale",

                                        toString(ui.GetDouble("RESOLUTION"))),

                                        std::to_string(ui.GetDouble("RESOLUTION"))),

                            Pvl::Replace);

          if (userGrp.hasKeyword("PixelResolution")) {

            userGrp.deleteKeyword("PixelResolution");
@@ -205,16 +205,16 @@ namespace Isis { 
            double minlat, maxlat, minlon, maxlon;

            incam->GroundRange(minlat, maxlat, minlon, maxlon, userMap);

            if (!ui.WasEntered("MINLAT")) {

              userGrp.addKeyword(PvlKeyword("MinimumLatitude", toString(minlat)), Pvl::Replace);

              userGrp.addKeyword(PvlKeyword("MinimumLatitude", std::to_string(minlat)), Pvl::Replace);

            }

            if (!ui.WasEntered("MAXLAT")) {

              userGrp.addKeyword(PvlKeyword("MaximumLatitude", toString(maxlat)), Pvl::Replace);

              userGrp.addKeyword(PvlKeyword("MaximumLatitude", std::to_string(maxlat)), Pvl::Replace);

            }

            if (!ui.WasEntered("MINLON")) {

              userGrp.addKeyword(PvlKeyword("MinimumLongitude", toString(minlon)), Pvl::Replace);

              userGrp.addKeyword(PvlKeyword("MinimumLongitude", std::to_string(minlon)), Pvl::Replace);

            }

            if (!ui.WasEntered("MAXLON")) {

              userGrp.addKeyword(PvlKeyword("MaximumLongitude", toString(maxlon)), Pvl::Replace);

              userGrp.addKeyword(PvlKeyword("MaximumLongitude", std::to_string(maxlon)), Pvl::Replace);

            }

          }
@@ -294,14 +294,14 @@ namespace Isis { 
    // Create an alpha cube group for the output cube

    if (!ocube->hasGroup("AlphaCube")) {

      PvlGroup alpha("AlphaCube");

      alpha += PvlKeyword("AlphaSamples", toString(icube->sampleCount()));

      alpha += PvlKeyword("AlphaLines", toString(icube->lineCount()));

      alpha += PvlKeyword("AlphaStartingSample", toString(0.5));

      alpha += PvlKeyword("AlphaStartingLine", toString(0.5));

      alpha += PvlKeyword("AlphaEndingSample", toString(icube->sampleCount() + 0.5));

      alpha += PvlKeyword("AlphaEndingLine", toString(icube->lineCount() + 0.5));

      alpha += PvlKeyword("BetaSamples", toString(icube->sampleCount()));

      alpha += PvlKeyword("BetaLines", toString(icube->lineCount()));

      alpha += PvlKeyword("AlphaSamples", std::to_string(icube->sampleCount()));

      alpha += PvlKeyword("AlphaLines", std::to_string(icube->lineCount()));

      alpha += PvlKeyword("AlphaStartingSample", std::to_string(0.5));

      alpha += PvlKeyword("AlphaStartingLine", std::to_string(0.5));

      alpha += PvlKeyword("AlphaEndingSample", std::to_string(icube->sampleCount() + 0.5));

      alpha += PvlKeyword("AlphaEndingLine", std::to_string(icube->lineCount() + 0.5));

      alpha += PvlKeyword("BetaSamples", std::to_string(icube->sampleCount()));

      alpha += PvlKeyword("BetaLines", std::to_string(icube->lineCount()));

      ocube->putGroup(alpha);

    }
@@ -404,7 +404,7 @@ namespace Isis { 
        startLine -= offset;

      }



      if (((QString)instGrp["Framelets"]).toUpper() == "EVEN") {

      if ((QString::fromStdString(instGrp["Framelets"])).toUpper() == "EVEN") {

        startLine += frameSize;

      }