Commit 7e35e182 authored by chrisryancombs's avatar chrisryancombs
Browse files

Cleaned up commented out code

parent c1f5bea3

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

+43 −48
Original line number Diff line number Diff line
@@ -229,14 +229,8 @@ namespace Isis { 
    m_ui->pointRadiusSigmaLineEdit->setEnabled(checked);

  }







//  void JigsawSetupDialog::on_outlierRejectionCheckBox_toggled(bool checked) {

//    m_ui->outlierRejectionMultiplierLabel->setEnabled(checked);

//    m_ui->outlierRejectionMultiplierLineEdit->setEnabled(checked);

//  }





//  m_ui->positionComboBox has been removed from the general tab, it is planned to be moved to 

//  the obs solve settings tab. This function will be commented out until it is added back.

//   void JigsawSetupDialog::on_positionComboBox_currentIndexChanged(int index) {



//     // indices:
@@ -266,7 +260,8 @@ namespace Isis { 


//   }





//  m_ui->pointingComboBox has been removed from the general tab, it is planned to be moved to 

//  the obs solve settings tab. This function will be commented out until it is added back.

//   void JigsawSetupDialog::on_pointingComboBox_currentIndexChanged(int index) {



//     // indices:
@@ -1046,45 +1041,45 @@ namespace Isis { 
  }





  // void Isis::JigsawSetupDialog::on_spkSolveDegreeSpinBox_2_valueChanged(int arg1) {

  //   if (arg1 == -1) {

  //     m_ui->spkSolveDegreeSpinBox_2->setSuffix("(NONE)");

  //     m_ui->positionAprioriSigmaTable->setRowCount(0);

  //   }

  //   m_ui->positionAprioriSigmaTable->setRowCount(arg1+1);

  //   m_ui->positionAprioriSigmaTable->resizeColumnsToContents();



  //   if (arg1 == 0) {

  //     QTableWidgetItem *twItem = new QTableWidgetItem();

  //     twItem->setText("POSITION");

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

  //     QTableWidgetItem *twItemunits = new QTableWidgetItem();

  //     twItemunits->setText("meters");

  //     //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");

  //   }

  //   else if (arg1 == 2) {

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

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

  //   }

  // /*

  //   else if (arg1 == 0) {

  //     m_ui->spkSolveDegreeSpinBox_2->setSuffix("(POSITION)");

  //     int nRows = m_ui->positionAprioriSigmaTable->rowCount();

  void Isis::JigsawSetupDialog::on_spkSolveDegreeSpinBox_valueChanged(int arg1) {

    if (arg1 == -1) {

      m_ui->spkSolveDegreeSpinBox->setSuffix("(NONE)");

      m_ui->positionAprioriSigmaTable->setRowCount(0);

    }

    m_ui->positionAprioriSigmaTable->setRowCount(arg1+1);

    m_ui->positionAprioriSigmaTable->resizeColumnsToContents();



  //     m_ui->positionAprioriSigmaTable->insertRow(nRows);

  //   }

  //   else if (arg1 == 1)

  //     m_ui->spkSolveDegreeSpinBox_2->setSuffix("(VELOCITY)");

  //   else if (arg1 == 2)

  //     m_ui->spkSolveDegreeSpinBox_2->setSuffix("(ACCELERATION)");

  //   else

  //     m_ui->spkSolveDegreeSpinBox_2->setSuffix("");

  // */

  // }

    if (arg1 == 0) {

      QTableWidgetItem *twItem = new QTableWidgetItem();

      twItem->setText("POSITION");

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

      QTableWidgetItem *twItemunits = new QTableWidgetItem();

      twItemunits->setText("meters");

      //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");

    }

    else if (arg1 == 2) {

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

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

    }

  /*

    else if (arg1 == 0) {

      m_ui->spkSolveDegreeSpinBox_2->setSuffix("(POSITION)");

      int nRows = m_ui->positionAprioriSigmaTable->rowCount();



      m_ui->positionAprioriSigmaTable->insertRow(nRows);

    }

    else if (arg1 == 1)

      m_ui->spkSolveDegreeSpinBox_2->setSuffix("(VELOCITY)");

    else if (arg1 == 2)

      m_ui->spkSolveDegreeSpinBox_2->setSuffix("(ACCELERATION)");

    else

      m_ui->spkSolveDegreeSpinBox_2->setSuffix("");

  */

  }





  void Isis::JigsawSetupDialog::on_rightAscensionLineEdit_textChanged(const QString &arg1) {

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

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ namespace Isis { 
    void on_radiiButtonGroupClicked(int arg1);

    void on_aRadiusLineEdit_textChanged(const QString &arg1);

    void on_targetBodyComboBox_currentIndexChanged(int index);

    // void on_spkSolveDegreeSpinBox_2_valueChanged(int arg1);

    void on_spkSolveDegreeSpinBox_valueChanged(int arg1);

    void on_rightAscensionLineEdit_textChanged(const QString &arg1);

    void on_declinationLineEdit_textChanged(const QString &arg1);

    void on_rightAscensionVelocityLineEdit_textChanged(const QString &arg1);

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

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

         </property>

         <property name="currentIndex">

          <number>0</number>

          <number>1</number>

         </property>

         <widget class="QWidget" name="generalSettingsTab">

          <attribute name="title">