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

Changed how ControlNet::GetPoints work to improve speed.

parent ca5664dd

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1484,7 +1484,7 @@ namespace Isis { 
    QList< ControlPoint * > orderedPoints;

    QList< ControlPoint * > orderedPoints;





    for (int i = 0; i < pointIds->size(); i++) {

    for (int i = 0; i < pointIds->size(); i++) {

      orderedPoints.append(GetPoint(i));

      orderedPoints.append( points->value( pointIds->at(i) ) );

    }

    }





    return orderedPoints;

    return orderedPoints;

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

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

   *   @history 2017-12-21 Jesse Mapel - Modified read and write methods to use the refactored

   *                           ControlNetVersioner instead of directly parsing the protobuf

   *                           ControlNetVersioner instead of directly parsing the protobuf

   *                           objects from the LatestControlNetFile.

   *                           objects from the LatestControlNetFile.

   *   @history 2017-12-21 Jesse Mapel - Modified GetPoints to use QHash's values method instead

   *                           GetPoint for every Serial Number.

   */

   */

  class ControlNet : public QObject {

  class ControlNet : public QObject {

      Q_OBJECT

      Q_OBJECT