Commit 761ddfe0 authored by John Bonn's avatar John Bonn
Browse files

Redesign of base workorder class and rename of execute to setupExecution 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce_FY17-Sprint1@7532 41f8697f-d340-4b68-9986-7bafba869bb8
parent c766037e

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

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ namespace Isis { 
   * 

   * @return @b bool True if WorkOrder::execute() returns true.

   */

  bool CloseProjectWorkOrder::execute() {

    bool success = WorkOrder::execute();

  bool CloseProjectWorkOrder::setupExecution() {

    bool success = WorkOrder::setupExecution();



//    // If more than this work order is in the history, don't allow this operation

//    if (success && project()->workOrderHistory().count()) {

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ namespace Isis { 
      virtual CloseProjectWorkOrder *clone() const;



      virtual bool isExecutable();

      bool execute();

      bool setupExecution();



    signals:

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

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ namespace Isis { 
  }





  bool CnetEditorViewWorkOrder::execute() {

    bool success = WorkOrder::execute();

  bool CnetEditorViewWorkOrder::setupExecution() {

    bool success = WorkOrder::setupExecution();



    if (success) {

      QUndoCommand::setText(tr("View control network [%1] in new cnet editor view")

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ namespace Isis { 
      virtual CnetEditorViewWorkOrder *clone() const;



      virtual bool isExecutable(ControlList *controls);

      bool execute();

      bool setupExecution();



    protected:

      bool dependsOn(WorkOrder *other) const;

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

+2 −2
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ namespace Isis { 
   * 

   * @return @b bool True if WorkOrder::execute() returns true.

   */

  bool CubeDnViewWorkOrder::execute() {

    bool success = WorkOrder::execute();

  bool CubeDnViewWorkOrder::setupExecution() {

    bool success = WorkOrder::setupExecution();