Commit f479f7ab authored by chrisryancombs's avatar chrisryancombs
Browse files

Implemented 'create detached labels' checkbox for JigsawRunWidget and set it to default

parent 51ceeb22

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

+59 −56
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ namespace Isis { 
    // create Control with output control net and add to m_bundleSolutionInfo

    m_bundleSolutionInfo->setOutputControl(new Control(m_project, outputControlName.expanded()));



    if (m_ui->detachedLabelsCheckBox->isChecked()) {

      // Iterate through all of the image lists (the "imports" in the project).

      QList<ImageList *> imageLists = m_bundleSolutionInfo->imageList();

      foreach (ImageList *imageList, imageLists) {
@@ -370,6 +371,8 @@ namespace Isis { 
        m_bundleSolutionInfo->addAdjustedImages(adjustedImages);

      }

      

    }



    // Tell the project about the BundleSolutionInfo

    m_project->addBundleSolutionInfo( new BundleSolutionInfo(*m_bundleSolutionInfo) );

isis/src/qisis/objs/JigsawRunWidget/JigsawRunWidget.h

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ namespace Isis { 
   *                           status bar, control net info, and rms adj point sigmas sections. 

   *                           Removed buttons for close and reject. Now inherits from QDockWidget

   *                           instead of QFrame, and handles close event if a bundle is running. 

   *   @history 2018-06-15 Christopher Combs - Implemented "Write detached labels" checkbox. 

   *                           made changes to on_JigsawAcceptButton_clicked to reflect this.

   */

  class JigsawRunWidget : public QDockWidget {

    Q_OBJECT

isis/src/qisis/objs/JigsawRunWidget/JigsawRunWidget.ui

+10 −1
Original line number Diff line number Diff line
@@ -479,10 +479,19 @@ 
         <item>

          <layout class="QVBoxLayout" name="verticalLayout_3">

           <item>

            <widget class="QCheckBox" name="checkBox">

            <widget class="QCheckBox" name="detachedLabelsCheckBox">

             <property name="enabled">

              <bool>true</bool>

             </property>

             <property name="text">

              <string>Write Detached Image Labels on Accept</string>

             </property>

             <property name="checked">

              <bool>true</bool>

             </property>

             <property name="tristate">

              <bool>false</bool>

             </property>

            </widget>

           </item>

           <item>