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

Added Progress support back to read methods in ControlNet

parent f9983118

isis/src/control/objs/ControlNet/ControlNet.cpp

+10 −0
Original line number Diff line number Diff line
@@ -252,8 +252,18 @@ namespace Isis { 
    p_description = versionedReader.description();



    int numPoints = versionedReader.numPoints();



    if (progress) {

      progress->SetText("Adding Control Points to Network...");

      progress->SetMaximumSteps(numPoints);

      progress->CheckStatus();

    }



    for (int i = 0; i < numPoints; i++) {

      AddPoint( versionedReader.takeFirstPoint() );

      if (progress) {

        progress->CheckStatus();

      }

    }

  }

isis/src/control/objs/ControlNet/ControlNet.h

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ namespace Isis { 
   *   @history 2017-12-21 Jesse Mapel - Modified read and write methods to use the refactored

   *                           ControlNetVersioner instead of directly parsing the protobuf

   *                           objects from the LatestControlNetFile.

   *   @history 2018-01-12 Adam Goins - Added Progress support back to Read methods.

   */

  class ControlNet : public QObject {

      Q_OBJECT