Commit ac55875b authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Distorted and undistorted focal plane tracking has been added to qview's... 

Distorted and undistorted focal plane tracking has been added to qview's Advanced Track Tool. References #1953.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6426 41f8697f-d340-4b68-9986-7bafba869bb8
parent 87a2820e

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

+22 −1
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 


#include "Angle.h"

#include "Camera.h"

#include "CameraDistortionMap.h"

#include "CameraFocalPlaneMap.h"

#include "Distance.h"

#include "iTime.h"

#include "Longitude.h"
@@ -81,6 +83,9 @@ namespace Isis { 
                           -1, Qt::Horizontal, "The X, Y, and Z of the spacecraft position");

    p_tableWin->addToTable(false, "Spacecraft Azimuth", "Spacecraft Azimuth");

    p_tableWin->addToTable(false, "Slant Distance", "Slant Distance");

    p_tableWin->addToTable(false, "Focal Plane X:Focal Plane Y", "Focal Plane X:Y");

    p_tableWin->addToTable(false, "Undistorted Focal X:Undistorted Focal Y: Undistorted Focal Z",

                           "Undistorted Focal Plane X:Y:Z");

    p_tableWin->addToTable(false, "Ephemeris Time", "Ephemeris iTime");

    p_tableWin->addToTable(false, "Local Solar Time", "Local Solar iTime");

    p_tableWin->addToTable(false, "UTC", "UTC", -1, Qt::Horizontal, "Internal time in UTC format");
@@ -182,7 +187,7 @@ namespace Isis { 
  }



  /**

   * This method is called when the mouse leaved the viewport and clears any rows

   * This method is called when the mouse leaves the viewport and clears any rows

   * accordingly.

   *

   */
@@ -418,6 +423,22 @@ namespace Isis { 
        p_tableWin->table()->item(row, SOLAR_TIME)->setText(QString::number(lst));

      } // end if set image succeeds

      

      // Always write out the x/y/z of the undistorted focal plane

      CameraDistortionMap *distortedMap = cvp->camera()->DistortionMap();

      double undistortedFocalPlaneX = distortedMap->UndistortedFocalPlaneX();

      p_tableWin->table()->item(row, UNDISTORTED_FOCAL_X)->setText(QString::number(undistortedFocalPlaneX));

      double undistortedFocalPlaneY = distortedMap->UndistortedFocalPlaneY();

      p_tableWin->table()->item(row, UNDISTORTED_FOCAL_Y)->setText(QString::number(undistortedFocalPlaneY));

      double undistortedFocalPlaneZ = distortedMap->UndistortedFocalPlaneZ();

      p_tableWin->table()->item(row, UNDISTORTED_FOCAL_Z)->setText(QString::number(undistortedFocalPlaneZ));



      // Always write out the x/y of the distorted focal plane

      CameraFocalPlaneMap *focalPlaneMap = cvp->camera()->FocalPlaneMap();

      double distortedFocalPlaneX = focalPlaneMap->FocalPlaneX();

      p_tableWin->table()->item(row, DISTORTED_FOCAL_X)->setText(QString::number(distortedFocalPlaneX));

      double distortedFocalPlaneY = focalPlaneMap->FocalPlaneY();

      p_tableWin->table()->item(row, DISTORTED_FOCAL_Y)->setText(QString::number(distortedFocalPlaneY));



      // Always write out columns ra/dec, regardless of whether set image succeeds

      double ra = cvp->camera()->RightAscension();

      p_tableWin->table()->item(row, RIGHT_ASCENSION)->setText(QString::number(ra));

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

+9 −2
Original line number Diff line number Diff line
@@ -71,8 +71,10 @@ namespace Isis { 
   *  @history 2014-06-17 Jeannie Backer - Modified to print set value to empty strings for

   *                          photometric angles, azimuths, resolutions if not valid.

   *                          References #1659.

   *  @history 2015-05-13 Makayla Shepherd - Modified to improve handling of undefined slot behavior.

   *                          References #2210.

   *  @history 2015-05-13 Makayla Shepherd - Modified to improve handling of 

   *                          undefined slot behavior. References #2210.

   *  @history 2015-06-19 Makayla Shepherd - Added distorted Focal Plane and undistorted 

   *                          Focal Plane to the table. References #1953.

   */

  class AdvancedTrackTool : public Tool {

      Q_OBJECT
@@ -139,6 +141,11 @@ namespace Isis { 
        DECLINATION,            //!< The declination for this point

        RESOLUTION,             //!< The resoultion for this point

        PHASE,                  //!< The phase for this point

        DISTORTED_FOCAL_X,      //!< The x of the distorted focal plane

        DISTORTED_FOCAL_Y,      //!< The y of the distorted focal plane

        UNDISTORTED_FOCAL_X,    //!< The x of the undistorted focal plane

        UNDISTORTED_FOCAL_Y,    //!< The y of the undistorted focal plane

        UNDISTORTED_FOCAL_Z,    //!< The z of the undistorted focal plane

        INCIDENCE,              //!< The incidence for this point

        EMISSION,               //!< The emission for this point

        LOCAL_INCIDENCE,        //!< The local incidence for this point