Commit 5e2ebe63 authored by Kris Becker's avatar Kris Becker
Browse files

Set CkFrameId properly for LO 3, 4 and 5 to fix ckwriter issue. References #1737. 

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

isis/src/lo/objs/LoHighCamera/LoHighCamera.cpp

+15 −0
Original line number Diff line number Diff line
@@ -82,6 +82,21 @@ namespace Isis { 
    new CameraGroundMap(this);

    new CameraSkyMap(this);



    //  Determine the NAIF ID for the CK frame reference.

    if ( spacecraft.contains("3") ) {

      m_ckFrameId = -533000;

    }

    else if ( spacecraft.contains("4") ) {

      m_ckFrameId = -534000;

    }

    else if ( spacecraft.contains("5") ) {

      m_ckFrameId = -535000;

    }

    else {

      QString msg = "File does not appear to be an LunarOrbiter 3,4,5 image";

      throw IException(IException::User, msg, _FILEINFO_);

    }



    setTime(time);

    LoadCache();

    NaifStatus::CheckErrors();

isis/src/lo/objs/LoHighCamera/LoHighCamera.h

+7 −1
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ namespace Isis { 
   *                          to files. Added NAIF error check to constructor.

   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 

   *                          coding standards. References #972.

   *   @history 2014-01-17 Kris Becker Corrected CkFrameId reference to

   *                          properly define LO 3,4,5 at runtime for generation

   *                          of CKs using ckwriter. References #1737.

   */

  class LoHighCamera : public FramingCamera {

    public:
@@ -68,7 +71,7 @@ namespace Isis { 
       * @return @b int The appropriate instrument code for the "Camera-matrix" 

       *         Kernel Frame ID

       */

      virtual int CkFrameId() const { return (-533000); }

      virtual int CkFrameId() const { return (m_ckFrameId); }



      /** 

       * CK Reference ID - J2000
@@ -85,6 +88,9 @@ namespace Isis { 
       *         Kernel Reference ID

       */

      virtual int SpkReferenceId() const { return (1); }



    private:

      int m_ckFrameId;                        // LO 3,4,5 CK frame id

  };

};

#endif

isis/src/lo/objs/LoHighCamera/LoHighCamera.truth

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ FileName: 4164H_Full_mirror.cub 
CK Frame: -534001



Kernel IDs: 

CK Frame ID = -533000

CK Frame ID = -534000

CK Reference ID = 1

SPK Target ID = -534

SPK Reference ID = 1

isis/src/lo/objs/LoMediumCamera/LoMediumCamera.cpp

+16 −0
Original line number Diff line number Diff line
@@ -104,6 +104,22 @@ namespace Isis { 
    new CameraGroundMap(this);

    new CameraSkyMap(this);



    //  Determine the NAIF ID for the CK frame reference.

    if ( spacecraft.contains("3") ) {

      m_ckFrameId = -533000;

    }

    else if ( spacecraft.contains("4") ) {

      m_ckFrameId = -534000;

    }

    else if ( spacecraft.contains("5") ) {

      m_ckFrameId = -535000;

    }

    else {

      QString msg = "File does not appear to be an LunarOrbiter 3,4,5 image";

      throw IException(IException::User, msg, _FILEINFO_);

    }





    setTime(time);

    LoadCache();

    NaifStatus::CheckErrors();

isis/src/lo/objs/LoMediumCamera/LoMediumCamera.h

+7 −1
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ namespace Isis { 
   *                          to files. Added NAIF error check to constructor.

   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 

   *                          coding standards. References #972.

   *   @history 2014-01-17 Kris Becker Corrected CkFrameId reference to

   *                          properly define LO 3,4,5 at runtime for generation

   *                          of CKs using ckwriter. References #1737.  

   */

  class LoMediumCamera : public FramingCamera {

    public:
@@ -79,7 +82,7 @@ namespace Isis { 
       * @return @b int The appropriate instrument code for the "Camera-matrix" 

       *         Kernel Frame ID

       */

      virtual int CkFrameId() const { return (-533000); }

      virtual int CkFrameId() const { return (m_ckFrameId); }



      /** 

       * CK Reference ID - J2000
@@ -96,6 +99,9 @@ namespace Isis { 
       *         Kernel Reference ID

       */

      virtual int SpkReferenceId() const { return (1); }



    private:

      int m_ckFrameId;                        // LO 3,4,5 CK frame id

  };

};

#endif