Commit 25f6f3cf authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Fixed issue with merge of WorkOrder.h. 

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

isis/src/qisis/objs/WorkOrder/WorkOrder.h

+5 −0
Original line number Diff line number Diff line
@@ -291,6 +291,9 @@ namespace Isis { 
   *   @history 2017-04-04 JP Bonn - Updated to new design.  setupExecution() used for preparation.

   *                          No longer separate methods for sync/async - workorder::execute()

   *                          handles both sync/async

   *   @history 2017-04-16 Ian Humphrey - Added enableWorkOrder and disableWorkOrder slots for

   *                           enabling and disabling work orders. Copy constructor now copies

   *                           what's this and tool tip (hover text) state.

   */

  class WorkOrder : public QAction, public QUndoCommand {

    Q_OBJECT
@@ -384,6 +387,8 @@ namespace Isis { 
      void statusChanged(WorkOrder *);



    public slots:

      void enableWorkOrder();

      void disableWorkOrder();



      virtual bool setupExecution();