Commit 626bfda5 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Changed the member variable storing the table name to a const QString.

parent 9b0694ea

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

+3 −4
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ namespace Isis { 
    installEventFilter(p_tableWin);



    m_showHelpOnStart = true;

    m_tableMosaicSrc = "InputImages";

    readSettings();

  }
@@ -579,7 +578,7 @@ namespace Isis { 


          unsigned int currentPixel = trackingPortal[0];

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

            Table table(m_tableMosaicSrc);

            Table table(TRACKINGTABLENAME);

            trackingCube->read(table);

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

        }

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

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

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

          Pvl *cPvl = cCube->label();

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

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



            // Get the input file name and serial number

            Table cFileTable(m_tableMosaicSrc);

            Table cFileTable(TRACKINGTABLENAME);

            cCube->read(cFileTable);

            int iRecs =   cFileTable.Records();

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

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

+3 −4
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
class QAction;



namespace Isis {

  const QString TRACKINGTABLENAME = "InputImages";



  class TableMainWindow;

  class MdiCubeViewport;
@@ -188,10 +190,7 @@ namespace Isis { 
      int p_id;                            //!< The record id

      TableMainWindow *p_tableWin;         //!< The table window

      bool m_showHelpOnStart;              //!< True to show dialog When tool is started

      QString m_tableMosaicSrc;  //! < Stores the name of the mosaic table



  };



};



#endif