Commit 0af16392 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Added documentation to members functions/removed deprecated functions/variables. Fixes #3956 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6843 41f8697f-d340-4b68-9986-7bafba869bb8
parent 00ef12a7

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

+6 −6
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


#include "CnetEditorWidget.h"

#include "Control.h"

#include "ControlList.h"

#include "ControlDisplayProperties.h"

#include "Directory.h"

#include "MosaicSceneItem.h"
@@ -58,10 +59,9 @@ namespace Isis { 
  }





  bool CnetEditorViewWorkOrder::isExecutable(QList<Control *> controls) {

//  return (controls.count() == 1);

  bool CnetEditorViewWorkOrder::isExecutable(ControlList * controls) {



    if (controls.count() >= 1)

    if (controls->count() >= 1)

      return true;

    else

      return false;
@@ -73,7 +73,7 @@ namespace Isis { 


    if (success) {

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

          .arg(controlList().first()->displayProperties()->displayName()));

          .arg(controlList()->first()->displayProperties()->displayName()));

    }



    return success;
@@ -87,9 +87,9 @@ namespace Isis { 




  void CnetEditorViewWorkOrder::syncRedo() {

    for (int i = 0; i < controlList().size(); i++) {

    for (int i = 0; i < controlList()->size(); i++) {

      //project()->directory()->addCnetEditorView(controlList().first());

      project()->directory()->addCnetEditorView(controlList().at(i));

      project()->directory()->addCnetEditorView(controlList()->at(i));

    }

  }

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ namespace Isis { 


      virtual CnetEditorViewWorkOrder *clone() const;



      virtual bool isExecutable(QList<Control *> controls);

      virtual bool isExecutable(ControlList *controls);

      bool execute();



    protected:

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

+6 −6
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ namespace Isis { 
   * 

   * @return bool True if this work order functions with the given control list

   */

  bool ExportControlNetWorkOrder::isExecutable(QList<Control *> controls) {

    return (controls.count() == 1);

  bool ExportControlNetWorkOrder::isExecutable(ControlList *controls) {

    return (controls->count() == 1);

  }
@@ -84,7 +84,7 @@ namespace Isis { 
      QStringList internalData;



      Control *control = NULL;

      if (controlList().isEmpty()) {

      if (controlList()->isEmpty()) {

        QMap<Control *, QString> cnetChoices;

        foreach (ControlList *list, project()->controls()) {

          foreach (Control *control, *list) {
@@ -103,7 +103,7 @@ namespace Isis { 
        internalData.append(control->id());

      }

      else {

        control = controlList().first();

        control = controlList()->first();

      }



      QString destination =
@@ -130,7 +130,7 @@ namespace Isis { 
    QString destination;

    Control *control = NULL;



    if (controlList().isEmpty()) {

    if (controlList()->isEmpty()) {

      destination = internalData()[1];



      QString controlId = internalData()[0];
@@ -138,7 +138,7 @@ namespace Isis { 
    }

    else {

      destination = internalData()[0];

      control = controlList().first();

      control = controlList()->first();

    }



    try {

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

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ namespace Isis { 


      virtual ExportControlNetWorkOrder *clone() const;



      bool isExecutable(QList<Control *> controls);

      bool isExecutable(ControlList *controls);





      bool execute();

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

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ namespace Isis { 
   * @return @b bool True if data (passed to this method as the matrix parameter by 

   *                 supportedActions) is of type CorrelationMatrix.

   */

  bool MatrixViewWorkOrder::isExecutable(CorrelationMatrix *matrix) {

    return matrix->isValid();

  bool MatrixViewWorkOrder::isExecutable(CorrelationMatrix matrix) {

    return matrix.isValid();

  }