Commit 8941bdb7 authored by chrisryancombs's avatar chrisryancombs
Browse files

Fixed segfault when closing JigsawRunWidget after one run, Fixed grayed out... 

Fixed segfault when closing JigsawRunWidget after one run, Fixed grayed out fields on JigsawRunWidget.
parent 9070ec16

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

+8 −10
Original line number Diff line number Diff line
@@ -117,10 +117,11 @@ namespace Isis { 
    }

    if (m_bundleAdjust) {

      m_bundleAdjust->deleteLater();

      // m_bundleAdjust = NULL;

      m_bundleAdjust = NULL;    

    }

    if (m_bundleThread) {

      m_bundleThread->quit();

      m_bundleThread->deleteLater();

      m_bundleThread = NULL;

    }

    if (m_ui) {
@@ -235,10 +236,6 @@ namespace Isis { 
      connect( m_bundleAdjust, SIGNAL( resultsReady(BundleSolutionInfo *) ),

               this, SLOT( bundleFinished(BundleSolutionInfo *) ) );



      // Schedule the bundle thread for deletion when it finishes.

      connect( m_bundleThread, SIGNAL( finished() ),

               m_bundleThread, SLOT( deleteLater() ) );



      // ken testing

      // Notify the dialog that the bundle thread is finished, and update the gui elements.

      connect( m_bundleThread, SIGNAL( finished() ),
@@ -597,6 +594,7 @@ namespace Isis { 
    }



    if (m_bundleSettings->errorPropagation()) {

      m_ui->rmsAdjustedPointSigmasGroupBox->setEnabled(true);

      m_ui->latitudeLcdNumber->display(

                              m_bundleSolutionInfo->bundleResults().sigmaLatitudeStatisticsRms());

      m_ui->longitudeLcdNumber->display(
@@ -605,16 +603,17 @@ namespace Isis { 
      if (m_bundleSettings->solveRadius()) {

        m_ui->radiusLcdNumber->display(

                              m_bundleSolutionInfo->bundleResults().sigmaRadiusStatisticsRms());

        m_ui->radiusLcdNumber->setEnabled(true);

        m_ui->radiusLcdLabel->setEnabled(true);

      }

      else {

        m_ui->radiusLcdNumber->setEnabled(false);

        m_ui->radiusLcdLabel->setEnabled(false);

      }

      

    }

    else {

      m_ui->latitudeLcdNumber->setEnabled(false);

      m_ui->longitudeLcdNumber->setEnabled(false);

      m_ui->radiusLcdNumber->setEnabled(false);

      m_ui->rmsAdjustedPointSigmasGroupBox->setEnabled(false);

    }



    // Since this slot is invoked when the thread finishes, the bundle adjustment is no longer
@@ -665,7 +664,6 @@ namespace Isis { 
      }

    }

    event->accept();



  }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ namespace Isis { 
                                                  new QDoubleValidator(1.0e-10, 1.0, 8, this));



    // convergence criteria

    m_ui->sigma0ThresholdLineEdit->setValidator(new QDoubleValidator(1.0e-10, 1.0e+10, 8, this));

    m_ui->sigma0ThresholdLineEdit->setValidator(new QDoubleValidator(1.0e-20, 1.0e+10, 8, this));

    m_ui->maximumIterationsLineEdit->setValidator(new QIntValidator(1, 10000, this));