Commit a7e99bb5 authored by Adam Goins's avatar Adam Goins
Browse files

Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into documentation

parents 221bf9bc efb1c186

isis/src/base/objs/Gui/Gui.cpp

+6 −9
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ namespace Isis { 


      abort();

    }

    else {

      XCloseDisplay(NULL);

    }

    #endif

  }

isis/src/base/objs/Gui/Gui.h

+1 −3
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ namespace Isis { 
   *                         setup. Fixes #4731.

   *  @history 2017-05-19 Marjorie Hahn - Applied font style and font size from the 

   *                         IsisPreferences file. Fixes #198.

   *  @history 2018-01-08 Summer Stapleton - Fixed memory leak involved in the X-forwarding check.

   *                         Fixes #4736.

   */



  class Gui : public QMainWindow {

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

+8 −8
Original line number Diff line number Diff line
@@ -1354,14 +1354,14 @@ namespace Isis { 
    switch ( protoPoint.type() ) {

      case ControlPointFileEntryV0002_PointType_obsolete_Tie:

      case ControlPointFileEntryV0002_PointType_Free:

        pointType = ControlPoint::PointType::Free;

        pointType = ControlPoint::Free;

        break;

      case ControlPointFileEntryV0002_PointType_Constrained:

        pointType = ControlPoint::PointType::Constrained;

        pointType = ControlPoint::Constrained;

        break;

      case ControlPointFileEntryV0002_PointType_obsolete_Ground:

      case ControlPointFileEntryV0002_PointType_Fixed:

        pointType = ControlPoint::PointType::Fixed;

        pointType = ControlPoint::Fixed;

        break;

      default:

        QString msg = "Unable to create ControlPoint [" + toString(protoPoint.id().c_str()) + "] from file. "
@@ -1808,13 +1808,13 @@ namespace Isis { 


      ControlPointFileEntryV0002_PointType pointType;

      switch ( controlPoint->GetType() ) {

        case ControlPoint::PointType::Free:

        case ControlPoint::Free:

          pointType = ControlPointFileEntryV0002_PointType_Free;

          break;

        case ControlPoint::PointType::Constrained:

        case ControlPoint::Constrained:

          pointType = ControlPointFileEntryV0002_PointType_Constrained;

          break;

        case ControlPoint::PointType::Fixed:

        case ControlPoint::Fixed:

          pointType = ControlPointFileEntryV0002_PointType_Fixed;

          break;

        default:
@@ -1965,11 +1965,11 @@ namespace Isis { 
        protoMeasure.set_serialnumber(controlMeasure.GetCubeSerialNumber().toLatin1().data());



        switch ( controlMeasure.GetType() ) {

            case (ControlMeasure::MeasureType::Candidate):

            case (ControlMeasure::Candidate):

                protoMeasure.set_type(ControlPointFileEntryV0002_Measure_MeasureType_Candidate);

                break;



            case (ControlMeasure::MeasureType::Manual):

            case (ControlMeasure::Manual):

                protoMeasure.set_type(ControlPointFileEntryV0002_Measure_MeasureType_Manual);

                break;

isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.h

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ namespace Isis { 
   *   @history 2018-01-12 Adam Goins - Added the ControlPoint radii to the header to avoid

   *                           Target::GetRadii calls to speed up createPoint().

   *   @history 2018-01-12 Adam Goins - Added Progress during reads.

   *   @history 2018-01-24 Jesse Mapel - Fixed c++11 build warnings.

   */

  class ControlNetVersioner {