Commit 61d04914 authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Updated MatrixViewWorkOrder according to WorkOrder's redesign. 

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

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

+6 −4
Original line number Diff line number Diff line
@@ -161,9 +161,10 @@ namespace Isis { 
  



  /**

   * This method computes and displays the correlation matrix.

   * @description This method computes and displays the correlation matrix. This was renamed from

   * syncRedo() to execute() according to the WorkOrder redesign.

   */

  void MatrixViewWorkOrder::syncRedo() {

  void MatrixViewWorkOrder::execute() {

    MatrixSceneWidget *matrixViewToUse = project()->directory()->addMatrixView();

    CorrelationMatrix corrMat = correlationMatrix();

    /*
@@ -182,9 +183,10 @@ namespace Isis { 


  

  /**

   * This method deletes the last matrix viewed

   * @description This method deletes the last matrix viewed. This was renamed from syncUndo() to

   * execute() according to the WorkOrder redesign.

   */

  void MatrixViewWorkOrder::syncUndo() {

  void MatrixViewWorkOrder::undoExecution() {

    if (internalData()[1] == "new view") {

      delete project()->directory()->matrixViews().last();

    }

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

+6 −2
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ namespace Isis { 
   * @internal

   *   @history 2014-07-14 Kimberly Oyama - Adapted from Mosaic2DViewWorkOrder.

   *   @history 2016-06-06 Makayla Shepherd - Updated documentation. Fixes #3993.

   *   @history 2017-04-10 Makayla Shepherd - Renamed syncRedo() to execute() and syncUndo() to 

   *                           undoExecution() according to the WorkOrder redesign.

   */

  class MatrixViewWorkOrder : public WorkOrder {

      Q_OBJECT
@@ -48,10 +50,12 @@ namespace Isis { 
      virtual bool isExecutable(CorrelationMatrix matrix);

      bool setupExecution();

      

      void execute();

      void undoExecution()



    protected:

      bool dependsOn(WorkOrder *other) const;

      void syncRedo();

      void syncUndo();

      ;



    private:

      MatrixViewWorkOrder &operator=(const MatrixViewWorkOrder &rhs);