Commit e0565ed1 authored by Kristin Berry's avatar Kristin Berry Committed by Makayla Shepherd
Browse files

Moved setting of choosername and datetime in... 

Moved setting of choosername and datetime in ControlNetVersioner::CreateMeasure so values are preserved.
parent 5b745e6e

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

+8 −7
Original line number Diff line number Diff line
@@ -1411,13 +1411,6 @@ namespace Isis { 
    // serial number is required, no need for if-statement

    newMeasure->SetCubeSerialNumber(QString(measure.serialnumber().c_str()));



    if ( measure.has_choosername() ) {

      newMeasure->SetChooserName(QString(measure.choosername().c_str()));

    }

    if ( measure.has_datetime() ) {

      newMeasure->SetDateTime(QString(measure.datetime().c_str()));

    }



    // measure type is required, no need for if-statement

    ControlMeasure::MeasureType measureType;

    switch ( measure.type() ) {
@@ -1482,6 +1475,14 @@ namespace Isis { 
      newMeasure->SetLogData(logEntry);

    }



    if ( measure.has_choosername() ) {

      newMeasure->SetChooserName(QString(measure.choosername().c_str()));

    }



    if ( measure.has_datetime() ) {

      newMeasure->SetDateTime(QString(measure.datetime().c_str()));

    }



    // It is VERY important that the edit lock flag is set last because it prevents

    // all of the other mutators from working if true.

    if ( measure.has_editlock() ) {

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

+6 −3
Original line number Diff line number Diff line
@@ -575,8 +575,9 @@ namespace Isis { 
                               QSharedPointer<ControlPointFileEntryV0002> point,

                               void (ControlPointFileEntryV0002::*setter)(bool)) {



    if (!container.hasKeyword(keyName))

    if (!container.hasKeyword(keyName)) {

      return;

    }



    QString value = container[keyName][0];

    container.deleteKeyword(keyName);
@@ -606,8 +607,9 @@ namespace Isis { 
                               QSharedPointer<ControlPointFileEntryV0002> point,

                               void (ControlPointFileEntryV0002::*setter)(double)) {



    if (!container.hasKeyword(keyName))

    if (!container.hasKeyword(keyName)) {

      return;

    }



    double value = toDouble(container[keyName][0]);

    container.deleteKeyword(keyName);
@@ -722,8 +724,9 @@ namespace Isis { 
                               void (ControlPointFileEntryV0002_Measure::*setter)

                                      (const std::string &)) {



    if (!container.hasKeyword(keyName))

    if (!container.hasKeyword(keyName)) {

      return;

    }



    QString value = container[keyName][0];

    container.deleteKeyword(keyName);

isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp

+1 −1

File changed.

Contains only whitespace changes.