Unverified Commit b7380cf6 authored by Tyler Wilson's avatar Tyler Wilson Committed by GitHub
Browse files

Merge pull request #323 from chrisryancombs/ipceBundleWindow_settings 

Added ability to reopen the bundlesettings object owned by IPCE's jig…
parents cb3a3e5e ad122f2a

isis/src/qisis/objs/JigsawRunWidget/JigsawRunWidget.cpp

+8 −1
Original line number Diff line number Diff line
@@ -146,7 +146,14 @@ namespace Isis { 
    // We want to use the current settings if not use the most recently accepted bundle settings.

    // This allows user to click "Setup", make changes, "OK", then click "Setup", and those changes

    // are present in the setup dialog.

    if (m_bundleSettings && !m_ui->useLastSettings->isChecked()) {

    if (m_ui->useLastSettings->isChecked() && m_project->bundleSolutionInfo().size() > 0) {

      QList<BundleSolutionInfo *> bundleSolutionInfo = m_project->bundleSolutionInfo();

      BundleSettingsQsp lastBundleSettings = (bundleSolutionInfo.last())->bundleSettings();

      setupdlg.loadSettings(lastBundleSettings);

      // We also tell the setup dialog what the last selected control is.

      setupdlg.selectControl(m_selectedControlName);

    }

    else if (m_bundleSettings) {

      setupdlg.loadSettings(m_bundleSettings);

      // We also tell the setup dialog what the last selected control is.

      setupdlg.selectControl(m_selectedControlName);

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

+2 −13
Original line number Diff line number Diff line
@@ -152,19 +152,6 @@ namespace Isis { 


    m_bundleSettings->setObservationSolveOptions(solveSettingsList);





    QList<BundleSolutionInfo *> bundleSolutionInfo = m_project->bundleSolutionInfo();

    if (useLastSettings && bundleSolutionInfo.size() > 0) {

      BundleSettingsQsp lastBundleSettings = (bundleSolutionInfo.last())->bundleSettings();

      // Retrieve the control net name used in the last bundle adjustment.

      // Note that this returns a fully specified path and filename, while the cnet combo box

      // only stores file names.

      selectControl(bundleSolutionInfo.last()->inputControlNetFileName());

      fillFromSettings(lastBundleSettings);

      m_bundleSettings->setObservationSolveOptions(lastBundleSettings->observationSolveSettings());

    }





    // Populate the solve option comboboxes

    const QStringList positionOptions{"NONE", "POSITION", "VELOCITY", "ACCELERATION", "ALL"};

    m_ui->positionComboBox->insertItems(0, positionOptions);
@@ -498,6 +485,8 @@ namespace Isis { 


    }



    m_bundleSettings->setObservationSolveOptions(settings->observationSolveSettings());



    update();



  }