Commit f026fe10 authored by Jesse Mapel's avatar Jesse Mapel Committed by Makayla Shepherd
Browse files

Added deleteKeyword calls back to Pvl constructors

parent 49f48d1b

isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp

+5 −2
Original line number Diff line number Diff line
@@ -210,9 +210,11 @@ namespace Isis { 




      if (group.hasKeyword("Reference")) {

        if (group["Reference"][0].toLower() == "true")

        if (group["Reference"][0].toLower() == "true") {

          m_pointData->set_referenceindex(groupIndex);

        }

        group.deleteKeyword("Reference");

      }



      QString type = group["MeasureType"][0].toLower();

      if (type == "candidate") {
@@ -232,6 +234,7 @@ namespace Isis { 
                         "Unknown measure type [" + type + "]",

                         _FILEINFO_);

      }

      group.deleteKeyword("MeasureType");



      for (int key = 0; key < group.keywords(); key++) {

        ControlMeasureLogData interpreter(group[key]);

isis/src/control/objs/ControlNetVersioner/ControlPointV0003.cpp

+5 −2
Original line number Diff line number Diff line
@@ -202,9 +202,11 @@ namespace Isis { 
           measure, &ControlPointFileEntryV0002::Measure::set_linesigma);



      if (group.hasKeyword("Reference")) {

        if (group["Reference"][0].toLower() == "true")

        if (group["Reference"][0].toLower() == "true") {

          m_pointData->set_referenceindex(groupIndex);

        }

        group.deleteKeyword("Reference");

      }



      QString type = group["MeasureType"][0].toLower();

      if (type == "candidate") {
@@ -224,6 +226,7 @@ namespace Isis { 
                         "Unknown measure type [" + type + "]",

                         _FILEINFO_);

      }

      group.deleteKeyword("MeasureType");



      for (int key = 0; key < group.keywords(); key++) {

        ControlMeasureLogData interpreter(group[key]);