Commit 130c5ae3 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Removed const from AdvancedTrackTool and used the TrackingTable one instead.

parent 626bfda5

isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -578,7 +578,7 @@ namespace Isis { 




          unsigned int currentPixel = trackingPortal[0];

          unsigned int currentPixel = trackingPortal[0];

          if (currentPixel != NULLUI4) {  // If from an image

          if (currentPixel != NULLUI4) {  // If from an image

            Table table(TRACKINGTABLENAME);

            Table table(trackingTableName); // trackingTableName from TrackingTable

            trackingCube->read(table);

            trackingCube->read(table);

            TrackingTable trackingTable(table);

            TrackingTable trackingTable(table);
@@ -589,7 +589,7 @@ namespace Isis { 
          }

          }

        }

        }

        // Backwards compatability. Have this tool work with attached TRACKING bands

        // Backwards compatability. Have this tool work with attached TRACKING bands

        else if(cCube->hasTable(TRACKINGTABLENAME)) {

        else if(cCube->hasTable(trackingTableName)) {

          Pvl *cPvl = cCube->label();

          Pvl *cPvl = cCube->label();

          PvlObject cObjIsisCube = cPvl->findObject("IsisCube");

          PvlObject cObjIsisCube = cPvl->findObject("IsisCube");

          PvlGroup cGrpBandBin = cObjIsisCube.findGroup("BandBin");

          PvlGroup cGrpBandBin = cObjIsisCube.findGroup("BandBin");
@@ -624,7 +624,7 @@ namespace Isis { 
            }

            }





            // Get the input file name and serial number

            // Get the input file name and serial number

            Table cFileTable(TRACKINGTABLENAME);

            Table cFileTable(trackingTableName);

            cCube->read(cFileTable);

            cCube->read(cFileTable);

            int iRecs =   cFileTable.Records();

            int iRecs =   cFileTable.Records();

            if(piOrigin >= 0 && piOrigin < iRecs) {

            if(piOrigin >= 0 && piOrigin < iRecs) {

isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ 
class QAction;

class QAction;





namespace Isis {

namespace Isis {

  const QString TRACKINGTABLENAME = "InputImages";





  class TableMainWindow;

  class TableMainWindow;

  class MdiCubeViewport;

  class MdiCubeViewport;