Commit 6894256f authored by Ken Edmundson's avatar Ken Edmundson
Browse files

PROG: In execute method, removed search for input control network in... 

PROG: In execute method, removed search for input control network in BundleSolutionInfos. No longer needed as control is now properly saved in projects m_idToControlMap.
parent 39502ad8

isis/src/qisis/objs/Directory/JigsawWorkOrder.cpp

+0 −20
Original line number Diff line number Diff line
@@ -178,28 +178,8 @@ namespace Isis { 
    // Get the selected control and bundle settings and give them to the JigsawDialog for now.

    Control *selectedControl = proj->control(internalData().first());



    // if selectedControl is NULL, maybe the Control we want is an output Control in a

    // BundleSolutionInfo, so let's look there (I think the project()->control() method above should

    // look in the results area for this automatically

    // this is a workaround because the BundleSolutionInfo's Control is not in the project's control

    // list

    if (!selectedControl) {

      int nBundles = proj->bundleSolutionInfo().size();

      for (int i = 0; i < nBundles; i++) {

        BundleSolutionInfo *bundleSolution = proj->bundleSolutionInfo().at(i);

        Control *bundleControl = bundleSolution->control();

        if (bundleControl->id() != internalData().first()) {

            continue;

        }

        else {

          selectedControl = bundleControl;

        }

      }

    }



    QString outputControlFileName = internalData().at(1);



//    JigsawDialog *runDialog = new JigsawDialog(project(), m_bundleSettings, selectedControl);

    JigsawDialog *runDialog = new JigsawDialog(project(), m_bundleSettings, selectedControl,

                                               outputControlFileName);

    runDialog->setAttribute(Qt::WA_DeleteOnClose);

isis/src/qisis/objs/Directory/JigsawWorkOrder.h

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ namespace Isis { 
   *                           network filename to internalData. Modified execute method to look for

   *                           input control network in BundleSolutionInfos if not found under main

   *                           part of project tree.

   *   @history 2018-03-23 Ken Edmundson - In execute method, removed search for input control

   *                           network in BundleSolutionInfos. No longer needed as control is now

   *                           properly saved in projects m_idToControlMap.

   */

  class JigsawWorkOrder : public WorkOrder {

      Q_OBJECT