Unverified Commit 81dad0cf authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge pull request #123 from jessemapel/pcnaifid 

ORex SamCam and MapCam won't use PolyCam focus ID. Fixes #5213
parents 9a854dbc 76fba46e

isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.cpp

+28 −26
Original line number Diff line number Diff line
@@ -74,9 +74,11 @@ namespace Isis { 


    Pvl &lab = *cube.label();

    PvlGroup inst = lab.findGroup("Instrument", Pvl::Traverse);



    QString ikCode = toString(frameCode);

    if (inst.hasKeyword("PolyCamFocusPositionNaifId")) {

      if (QString::compare("NONE", inst["PolyCamFocusPositionNaifId"], Qt::CaseInsensitive) != 0) {

    if (inst.hasKeyword("PolyCamFocusPositionNaifId") && frameCode == -64360) {

      if (QString::compare("NONE", inst["PolyCamFocusPositionNaifId"],

                           Qt::CaseInsensitive) != 0) {

        ikCode = inst["PolyCamFocusPositionNaifId"][0];

      }

    }

isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.h

+9 −7
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ namespace Isis { 
   *                           the Instrument group for focus position specific values (such ase

   *                           focal length) and we read NaifFrameId from the Kernels group the

   *                           instrument frame code. Fixes #5127

   *   @history 2018-03-27 Jesse Mapel - Changed to only replace the IK code with the PolyCam focus

   *                                     setting ID if the image is a PolyCam image. Fixes #5213.

   *

   */

  class OsirisRexOcamsCamera : public FramingCamera {