Commit 0d44d6d6 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Updated JigsawSetupDialog fillFromSettings so weightings are properly saved and restored. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7747 41f8697f-d340-4b68-9986-7bafba869bb8
parent 05b58b97

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.cpp

+13 −3
Original line number Diff line number Diff line
@@ -340,40 +340,50 @@ namespace Isis { 
    // weighting tab

    if ( !IsNullPixel(settings->globalLatitudeAprioriSigma()) ) {

      m_ui->pointLatitudeSigmaLineEdit->setText(toString(settings->globalLatitudeAprioriSigma()));

      m_ui->pointLatitudeSigmaLineEdit->setModified(true);

    }

    if ( !IsNullPixel(settings->globalLongitudeAprioriSigma()) ) {

      m_ui->pointLongitudeSigmaLineEdit->setText(toString(settings->globalLongitudeAprioriSigma()));

      m_ui->pointLongitudeSigmaLineEdit->setModified(true);

    }

    if ( !IsNullPixel(settings->globalRadiusAprioriSigma()) ) {

      m_ui->pointRadiusSigmaLineEdit->setText(toString(settings->globalRadiusAprioriSigma()));

      m_ui->pointRadiusSigmaLineEdit->setModified(true);



    }



    QList<double> aprioriPositionSigmas = observationSolveSettings.aprioriPositionSigmas();



    if ( aprioriPositionSigmas.size() > 0 && !IsNullPixel(aprioriPositionSigmas[0]) ) {

      m_ui->positionSigmaLineEdit->setText(toString(aprioriPositionSigmas[0]));

      m_ui->positionSigmaLineEdit->setModified(true);

    }



    if ( aprioriPositionSigmas.size() > 1 && !IsNullPixel(aprioriPositionSigmas[1]) ) {

      m_ui->velocitySigmaLineEdit->setText(toString(aprioriPositionSigmas[1]));

      m_ui->velocitySigmaLineEdit->setModified(true);

    }



    if ( aprioriPositionSigmas.size() > 2 && !IsNullPixel(aprioriPositionSigmas[2]) ) {

      m_ui->accelerationSigmaLineEdit->setText(toString(aprioriPositionSigmas[2]));

      m_ui->accelerationSigmaLineEdit->setModified(true);

    }



    QList<double> aprioriPointingSigmas = observationSolveSettings.aprioriPointingSigmas();



    if ( aprioriPointingSigmas.size() > 0 && !IsNullPixel(aprioriPointingSigmas[0]) ) {

      m_ui->pointingAnglesSigmaLineEdit->setText(toString(aprioriPointingSigmas[0]));

      m_ui->pointingAnglesSigmaLineEdit->setModified(true);

    }



    if ( aprioriPointingSigmas.size() > 1 && !IsNullPixel(aprioriPointingSigmas[1]) ) {

      m_ui->pointingAngularVelocitySigmaLineEdit->setText(toString(aprioriPointingSigmas[1]));

      m_ui->pointingAngularVelocitySigmaLineEdit->setModified(true);

    }



    if ( aprioriPointingSigmas.size() > 2 && !IsNullPixel(aprioriPointingSigmas[2]) ) {

      m_ui->pointingAngularAccelerationSigmaLineEdit->setText(toString(aprioriPointingSigmas[2]));

      m_ui->pointingAngularAccelerationSigmaLineEdit->setModified(true);

    }



    // maximum liklihood tab

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.h

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ namespace Isis { 
   *   @history 2017-05-23 Tracie Sucharski - Added a QGroupBox for the target parameters so that

   *                           the box can be disabled/enabled rather than each parameter

   *                           separately.

   *   @history 2017-06-07 Ian Humphrey - Modified fillFromSettings() so when the weightings are

   *                           loaded into the text line edits they are set to modified, which

   *                           allows for proper restoring of user defined weightings.

   */



  class JigsawSetupDialog : public QDialog {