Unverified Commit 668181ba authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Moved logic around a bit for cameraPointInfo allowError option (#5474)

parent 58dc9461

isis/src/base/objs/CameraPointInfo/CameraPointInfo.cpp

+13 −16
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ namespace Isis { 
    }



    if (!noErrors) {

      if (!allowErrors) {

      for (int i = 0; i < gp->keywords(); i++) {

        QString name = (*gp)[i].name();

        // These three keywords have 3 values, so they must have 3 NULLs
@@ -363,9 +362,8 @@ namespace Isis { 
          (*gp)[i].setValue("NULL");

        }

      }

      }

      else {

        double pB[3], spB[3], sB[3];

      if (!allowErrors) {

        double spB[3], sB[3];



        m_camera->instrumentPosition(spB);

        gp->findKeyword("SpacecraftPosition").addValue(toString(spB[0]), "km");
@@ -413,7 +411,6 @@ namespace Isis { 
          gp->findKeyword("LookDirectionCamera").addValue("Null");

          gp->findKeyword("LookDirectionCamera").addValue("Null");

        }



      }



      // Set all keywords that still have valid information