Commit 6a3c44a8 authored by chrisryancombs's avatar chrisryancombs
Browse files

Changed population of accepted settings to fix segmentation fault.

parent 9f7fb256

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

+11 −4
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ namespace Isis { 
    // m_ui->positionComboBox->setCurrentIndex(observationSolveSettings.instrumentPositionSolveOption());

    m_ui->hermiteSplineCheckBox->setChecked(observationSolveSettings.solvePositionOverHermite());

    m_ui->spkDegreeSpinBox->setValue(observationSolveSettings.spkDegree());

    std::cout<<"observationSolveSettings.spkDegree(): " << observationSolveSettings.spkDegree() <<std::endl;

    m_ui->spkSolveDegreeSpinBox->setValue(observationSolveSettings.spkSolveDegree());
@@ -1058,12 +1059,18 @@ namespace Isis { 
      //m_ui->positionAprioriSigmaTable->item(arg1,2)->setText("meters");

    }

    else if (arg1 == 1) {

      m_ui->positionAprioriSigmaTable->item(arg1,0)->setText("VELOCITY");

      m_ui->positionAprioriSigmaTable->item(arg1,2)->setText("m/sec");

      QTableWidgetItem *twItem = new QTableWidgetItem();

      twItem->setText("VELOCITY");

      m_ui->positionAprioriSigmaTable->setItem(arg1,0, twItem);

      QTableWidgetItem *twItemunits = new QTableWidgetItem();

      twItemunits->setText("m/sec");

    }

    else if (arg1 == 2) {

      m_ui->positionAprioriSigmaTable->item(arg1,0)->setText("ACCELERATION");

      m_ui->positionAprioriSigmaTable->item(arg1,2)->setText("m/s^2");

      QTableWidgetItem *twItem = new QTableWidgetItem();

      twItem->setText("ACCELERATION");

      m_ui->positionAprioriSigmaTable->setItem(arg1,0, twItem);

      QTableWidgetItem *twItemunits = new QTableWidgetItem();

      twItemunits->setText("m/s^2");

    }

  /*

    else if (arg1 == 0) {

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.ui

+1 −1
Original line number Diff line number Diff line
@@ -1255,7 +1255,7 @@ 
                 <number>-1</number>

                </property>

                <property name="value">

                 <number>0</number>

                 <number>-1</number>

                </property>

               </widget>

              </item>