Commit a0ea48f2 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Updated jigsaw dialog to clear its displays when running a new bundle. Fixes #4808. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce_FY17-Sprint1@7615 41f8697f-d340-4b68-9986-7bafba869bb8
parent 0f142624

isis/src/qisis/objs/JigsawDialog/JigsawDialog.cpp

+33 −16
Original line number Diff line number Diff line
@@ -191,6 +191,9 @@ namespace Isis { 
         }

      }



      // Clear the dialog displays.

      clearDialog();



      QThread *bundleThread = new QThread;



      m_bundleAdjust = new BundleAdjust(m_bundleSettings, *m_selectedControl, m_project->images(),
@@ -334,16 +337,11 @@ namespace Isis { 
    m_accept->setEnabled(false);

    m_reject->setEnabled(false);



    // Reset the dialog.

    m_ui->iterationLcdNumber->display(0);

    m_ui->sigma0LcdNumber->display(0);

    m_ui->statusUpdatesLabel->clear();

    // Clear the dialog so the lcd's are 0 and the status text is cleared.

    clearDialog();

    QString statusText("Bundle Rejected.\n\n");

    m_ui->statusUpdatesLabel->setText(statusText);



    m_ui->statusUpdateScrollArea->verticalScrollBar()->setSliderPosition(

        m_ui->statusUpdateScrollArea->verticalScrollBar()->maximum());



    // Cleanup the results (bundle solution info)

    // How does this affect m_bundleSettings or m_bundleAdjustment?

    // How does this affect using the last (most recent) settings for the run?
@@ -352,6 +350,28 @@ namespace Isis { 
  }





  /**

   * Resets the dialog's status widgets to their default state. This will clear the status text,

   * reset the lcd displays to 0, and update the scroll on the scroll bar. This does NOT affect

   * the state of the buttons.

   */

  void JigsawDialog::clearDialog() {

    m_ui->iterationLcdNumber->display(0);

    m_ui->sigma0LcdNumber->display(0);

    m_ui->statusUpdatesLabel->clear();

    updateScrollBar();

  }





  /**

   * Updates the scroll bar to position to its maximum setting (the bottom).

   */

  void JigsawDialog::updateScrollBar() {

    m_ui->statusUpdateScrollArea->verticalScrollBar()->setSliderPosition(

        m_ui->statusUpdateScrollArea->verticalScrollBar()->maximum());

  }





  /**

   * Update the label or text edit area with the most recent status update by appending to list and

   * refreshing.
@@ -363,8 +383,7 @@ namespace Isis { 


    m_ui->statusUpdatesLabel->setText( m_ui->statusUpdatesLabel->text().append(updateStr) );



    m_ui->statusUpdateScrollArea->verticalScrollBar()->setSliderPosition(

          m_ui->statusUpdateScrollArea->verticalScrollBar()->maximum());

    updateScrollBar();



    update();

  }
@@ -379,8 +398,7 @@ namespace Isis { 
    QString errorStr = "\n" + error;

    m_ui->statusUpdatesLabel->setText( m_ui->statusUpdatesLabel->text().append(errorStr) );



    m_ui->statusUpdateScrollArea->verticalScrollBar()->setSliderPosition(

          m_ui->statusUpdateScrollArea->verticalScrollBar()->maximum());

    updateScrollBar();



    update();

  }
@@ -395,8 +413,7 @@ namespace Isis { 
    QString exceptionStr = "\n" + exception;

    m_ui->statusUpdatesLabel->setText( m_ui->statusUpdatesLabel->text().append(exceptionStr) );



    m_ui->statusUpdateScrollArea->verticalScrollBar()->setSliderPosition(

          m_ui->statusUpdateScrollArea->verticalScrollBar()->maximum());

    updateScrollBar();



    update();

  }
@@ -431,10 +448,10 @@ namespace Isis { 
    // Since this slot is invoked when the thread finishes, the bundle adjustment is no longer

    // running.

    m_bRunning = false;

    update();



    m_ui->statusUpdateScrollArea->verticalScrollBar()->setSliderPosition(

          m_ui->statusUpdateScrollArea->verticalScrollBar()->maximum());

    updateScrollBar();



    update();

  }

isis/src/qisis/objs/JigsawDialog/JigsawDialog.h

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ namespace Isis { 
   *   @history 2017-04-25 Ian Humphrey - Updated the setup clicked slot to load the current

   *                           settings into the setup dialog if we are not using the last

   *                           (most recent) settings in the project. Fixes #4817.

   *   @history 2017-04-26 Ian Humphrey - Added updateScrollBar() and clearDialog() to reduce

   *                           code duplication. Modified the run clicked slot to clear the

   *                           dialog display anytime that a bundle adjust is re-ran. Fixes #4808.

   */

  class JigsawDialog : public QDialog {

    Q_OBJECT
@@ -92,6 +95,8 @@ namespace Isis { 
    void on_JigsawRunButton_clicked();

    void acceptBundleResults();

    void rejectBundleResults();

    void clearDialog();

    void updateScrollBar();



  private:

    /** Captures the most recent results of a bundle. JigsawDialog owns this pointer. */