Commit e2a35205 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

qview reads new tracking cube.

parent 15d1f24c

isis/src/base/objs/TrackingTable/TrackingTable.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ namespace Isis { 
   * @internal

   *   @history 2018-07-26 Jesse Mapel - Added offset based on minimum unsigned integer value.

   *                           Renamed methods to better convey output/input meaning.

   *   @history 2018-07-30 Kaitlyn Lee - Added pixelToSN() and fileNameToIndex().

   */

  class TrackingTable{

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

+8 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "TProjection.h"

#include "TrackingTable.h"



#include <iostream>

namespace Isis {



  // For mosaic tracking
@@ -571,15 +572,13 @@ namespace Isis { 
        int iTrackBand = -1;



        if(cCube->fileName().contains("_tracking")) {



          // Read the cube DN value from TRACKING cube at location (piLine, piSample)

          Portal trackingPortal(cCube->sampleCount(), 1, cCube->pixelType());

          trackingPortal.SetPosition(piSample, piLine, 1);

          cCube->read(trackingPortal);

          int currentPixel = trackingPortal[0];



          if (currentPixel != NULLUI4) {

            // Get the input file name and serial number

          unsigned int currentPixel = trackingPortal[0];

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

            Table table(m_tableMosaicSrc);

            cCube->read(table);

            TrackingTable trackingTable(table);
@@ -635,6 +634,11 @@ namespace Isis { 
            }

          }

        }



        if (piOrigin == -1) { // If not from an image, display N/A

          psSrcFileName = "N/A";

          psSrcSerialNum = "N/A";

        }

      }

      catch (IException &e) {

          QMessageBox::warning((QWidget *)parent(), "Warning", e.toString());

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

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ namespace Isis { 
   *                          to record the point into so that the first recorded point is drawn.

   *                          Fixes #5143.

   *  @history 2018-07-18 Kristin Berry and Kaitlyn Lee - Updated TrackMosaicOrigin to work with

   *                          an external tracking band.

   *                          TrackingTable and an external tracking cube.

   */

  class AdvancedTrackTool : public Tool {

      Q_OBJECT