Commit c9f7017e authored by Ken Edmundson's avatar Ken Edmundson
Browse files

PROG: Modified acceptBundleResults method to take output control network... 

PROG: Modified acceptBundleResults method to take output control network filename from the JigsawSetupDialog.
parent 8a9ff5e9

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

+1 −2
Original line number Diff line number Diff line
@@ -386,8 +386,7 @@ namespace Isis { 
    FileName outputControlName;

    if (!m_outputControlName.isEmpty()) {

      outputControlName

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

                     m_outputControlName + ".net");

          = FileName(m_project->bundleSolutionInfoRoot() + "/" + m_outputControlName );

    }

    else {

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

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

+3 −1
Original line number Diff line number Diff line
@@ -80,7 +80,9 @@ namespace Isis { 
   *   @history 2017-11-01 Ian Humphrey - Create ecubs in the bundle results directory which contain

   *                           updated SPICE.  Fixes #4804, #4849.

   *   @history 2018-03-22 Ken Edmundson - Added member variable QString m_outputControlName. Added

   *                           argument QString outputControlFileName to constructor.

   *                           argument QString outputControlFileName to constructor. Modified

   *                           acceptBundleResults method to take output control network filename

   *                           from the JigsawSetupDialog.

   */

  class JigsawDialog : public QDialog {

    Q_OBJECT