Commit 42b8ace5 authored by dcookastrog's avatar dcookastrog
Browse files

More from PR 328

parent 7bb490b9

isis/src/qisis/objs/StereoTool/StereoTool.cpp

+33 −33
Original line number Diff line number Diff line
@@ -803,10 +803,11 @@ namespace Isis { 
      m_serialNumberList->add( m_rightCube->fileName() );

    }



    std::vector<Distance> targetRadius = m_controlNet->GetTargetRadii();

    m_targetRadius = Distance(targetRadius[0]);

    //  If radius combo box set to ellipsoid, update the radius line edit

    if ( !m_targetRadius.isValid() ) {

    try {

      PvlGroup pvlRadii = Target::radiiGroup(m_controlNet->GetTarget());

      m_targetRadius = Distance(pvlRadii["EquatorialRadius"], Distance::Meters);

    }

    catch(IException &e) {

      QString message = "Could not determine target radius.";

      QMessageBox::critical(m_stereoTool,"Error",message);

      m_baseRadius = Distance(0., Distance::Meters);
@@ -1924,4 +1925,3 @@ namespace Isis { 


  }

}

isis/src/qisis/objs/StereoTool/StereoTool.h

+5 −3
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ namespace Isis { 
   *                           References #3892

   *   @history 2016-08-10 Jeannie Backer - Added std:: scope to vector to distinguish with boost

   *                           vectors. References #4163.

   *   @history 2018-07-06 Jesse Mapel - Changed call to get the target radius from using the

   *                           control network to using the Target class. Fixes #5457.

   *

   */

  class StereoTool : public AbstractPlotTool {