Commit cfef56dc authored by Adam Goins's avatar Adam Goins Committed by Makayla Shepherd
Browse files

Moved the sample/line initialization to the InitToNull() method in ControlMeasure.

parent cc7977a6

isis/src/control/objs/ControlMeasure/ControlMeasure.cpp

+5 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ namespace Isis { 
    p_jigsawRejected = false;

    p_ignore = false;



    p_sample = Isis::Null;//0.0;

    p_line = Isis::Null; //0.0;

  }
@@ -92,6 +90,11 @@ namespace Isis { 


  //! initialize pointers and other data to NULL

  void ControlMeasure::InitializeToNull() {



    // Previously these were initialized to 0.0 in the constructor.

    p_sample = Null;

    p_line = Null;



    p_serialNumber = NULL;

    p_chooserName = NULL;

    p_dateTime = NULL;

isis/src/control/objs/ControlMeasure/ControlMeasure.h

+2 −0
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ namespace Isis { 
   *   @history 2017-12-20 Jesse Mapel - Implemented GetLogDataEntries method for use in

   *                           ControlNetVersioner refactor.

   *   @history 2017-12-21 Adam Goins - Removed protobuf references.

   *   @history 2018-01-04 Adam Goins - Moved sample/line initialization from the constructor

   *                           to the InitToNull() method.

   */

  class ControlMeasure : public QObject {