Commit 3cb167e9 authored by chrisryancombs's avatar chrisryancombs
Browse files

Made updates according to code review

parent 14d5defc

isis/src/qisis/apps/ipce/IpceMainWindow.h

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ namespace Isis { 
   *                           test to determine whether project needs saving.

   *   @history 2018-05-01 Tracie Sucharski - Code accidently left commented from previous checking.

   *                           Fixes #5412.

   *   @history 2018-05-31 Christopher Combs - Added support for JigsawRunWidget to be create as a 

   *                           dockable widget in addView(). Fixes #5428.

   *  

   */

  class IpceMainWindow : public QMainWindow {

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

+1 −1
Original line number Diff line number Diff line
@@ -935,7 +935,7 @@ namespace Isis { 
    return result;

  }



  JigsawRunWidget *Directory::addJigsawView() {

  JigsawRunWidget *Directory::addJigsawRunWidget() {

    if (jigsawRunWidget()) {

      return m_jigsawRunWidget;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ namespace Isis { 
   * @see WorkOrder::execute()

   */

  void JigsawWorkOrder::execute() {

    JigsawRunWidget *runDialog = project()->directory()->addJigsawView();

    JigsawRunWidget *runDialog = project()->directory()->addJigsawRunWidget();



    if (!runDialog) {

      QString msg = "Unable to open Jigsaw Run Widget";

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

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ namespace Isis { 
   *   @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.

   *   @history 2018-05-25 Christopher Combs - Updated to reflect change from JigsawDialog to 

   *   @history 2018-05-31 Christopher Combs - Updated to reflect change from JigsawDialog to 

   *                           JigsawRunWidget. Removed setupExecution() method. Fixes #5428.

   */

  class JigsawWorkOrder : public WorkOrder {

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

+2 −2
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ namespace Isis { 
   *                           argument QString outputControlFileName to constructor. Modified

   *                           acceptBundleResults method to take output control network filename

   *                           from the JigsawSetupDialog.

   *   @history 2018-05-28 Christopher Combs - Name changed from JigsawDialog to JigsawRunWidget.

   *   @history 2018-05-31 Christopher Combs - Name changed from JigsawDialog to JigsawRunWidget.

   *                           Now inherits from QFrame instead of QDialog. Added support for new

   *                           workflow in which JigsawSwttingDialog is only ever called from a

   *                           workflow in which JigsawSetupDialog is only ever called from a

   *                           button on this widget. Fixes #5428. 

   */

  class JigsawRunWidget : public QFrame {