Commit 823269bb authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Updated to use BundleSolutionInfo methods to get input and output control.... 

Updated to use BundleSolutionInfo methods to get input and output control. Prefix the output control with 'Out-'.
parent 5de0093b

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

+7 −3
Original line number Diff line number Diff line
@@ -209,7 +209,8 @@ namespace Isis { 
         }



         // Grab the control name that was used in that bundle adjustment.

         m_selectedControlName = FileName(bundleSolutionInfo.last()->controlNetworkFileName()).name();

         m_selectedControlName

             = FileName(bundleSolutionInfo.last()->inputControlNetFileName()).name();

      }



      // Clear the dialog displays.
@@ -381,11 +382,14 @@ namespace Isis { 


    // create output control net

    // Write the new jigged control net with correct path to results folder + runtime

    FileName jiggedControlName(m_project->bundleSolutionInfoRoot() + "/" + runTime + "/" +

                               FileName(m_bundleSolutionInfo->controlNetworkFileName()).name());

    FileName jiggedControlName(m_project->bundleSolutionInfoRoot() + "/" + runTime + "/Out-" +

                               runTime + "-" +

                               FileName(m_bundleSolutionInfo->inputControlNetFileName()).name());



    m_bundleSolutionInfo->bundleResults().outputControlNet()->Write(jiggedControlName.toString());



    m_bundleSolutionInfo->setOutputControlNetworkFileName(jiggedControlName);



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

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

    foreach (ImageList *imageList, imageLists) {

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

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ namespace Isis { 
   *                           accepted. Fixes #4960

   *   @history 2017-11-01 Ian Humphrey - Create ecubs in the bundle results directory which contain

   *                           updated SPICE.  Fixes #4804, #4849.

   *   @history 2018-03-16 Ken Edmundson - Updated to use new BundleSolutionInfo methods to get the

   *                           input and output control.  Prefix the output control with "Out-".

   */

  class JigsawDialog : public QDialog {

    Q_OBJECT