Commit de038190 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

PROG: Commented out some functions/includes in cpp files for... 

PROG:  Commented out some functions/includes in cpp files for ExportControlNetWorkOrder/Footprint2DViewWorkOrder/JigsawWorkOrder/MatrixViewWorkOrder/TargetGetInfoWorkOrder because they had dependencies on other classes which have not been committed to ISIS yet.  Also, there were dependencies to Directory functions which were commented out for the same reason.  References #4038.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6862 41f8697f-d340-4b68-9986-7bafba869bb8
parent b8ab92f2

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

+4 −4
Original line number Diff line number Diff line
@@ -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/Footprint2DViewWorkOrder.cpp

+9 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ namespace Isis { 
  bool Footprint2DViewWorkOrder::execute() {

    bool success = WorkOrder::execute();



    /*   //tjw

    int maxRecommendedFootprints = 50000;

    if (success && imageList()->count() > maxRecommendedFootprints) {

      QMessageBox::StandardButton selectedOpt = QMessageBox::warning(NULL,
@@ -109,6 +110,7 @@ namespace Isis { 
    }



    if (success) {



      QStringList viewOptions;



      QList<MosaicSceneWidget *> existingViews = project()->directory()->footprint2DViews();
@@ -179,8 +181,10 @@ namespace Isis { 
      internalData.append(QString::number(viewToUse));

      internalData.append(newView? "new view" : "existing view");

      setInternalData(internalData);



    }



    */

    return success;

  }
@@ -201,6 +205,8 @@ namespace Isis { 
   * 

   */

  void Footprint2DViewWorkOrder::syncRedo() {



    /*  //tjw

    int viewToUse = internalData().first().toInt();



    MosaicSceneWidget *footprintViewToUse = NULL;
@@ -232,10 +238,12 @@ namespace Isis { 
                        .arg(nonFootprintableImage->displayProperties()->displayName()));



    }

    */

  }





  void Footprint2DViewWorkOrder::syncUndo() {

    /*  //tjw

    int viewToUse = internalData().first().toInt();



    if (internalData()[1] == "new view") {
@@ -250,6 +258,7 @@ namespace Isis { 
        delete footprintView->cubeToMosaic(imageToRemoveFromView);

      }

    }

   */

  }

}

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

+9 −14
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


#include "Control.h"

#include "Directory.h"

#include "JigsawDialog.h"

//#include "JigsawDialog.h"  //tjw

#include "Project.h"



namespace Isis {
@@ -87,16 +87,11 @@ namespace Isis { 
   */

  bool JigsawWorkOrder::execute() {

    bool success = WorkOrder::execute();

/*

    if (success) {

        JigsawDialog* bundledlg = new JigsawDialog(project());

        bundledlg->setAttribute(Qt::WA_DeleteOnClose);

        bundledlg->show();

//      QUndoCommand::setText(tr("&Bundle Adjustment")

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

    }

*/



    /*  //tjw

    if (success) {





//      QDockWidget* dock = new QDockWidget();

//      dock->setMinimumWidth(525);

//      dock->setMinimumHeight(325);
@@ -107,7 +102,7 @@ namespace Isis { 
//      dock->setWidget(bundledlg);

//      dock->show();

    }



    */

    return success;

  }

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

+12 −6
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "CorrelationMatrix.h"

#include "Directory.h"

#include "IException.h"

#include "MatrixSceneWidget.h"

//#include "MatrixSceneWidget.h"  //tjw

#include "Project.h"



namespace Isis {
@@ -91,7 +91,9 @@ namespace Isis { 
   * @return @b bool True if WorkOrder::execute() returns true.

   */

  bool MatrixViewWorkOrder::execute() {



    bool success = WorkOrder::execute();

    /*  //tjw



    if (success) {

      QStringList viewOptions;
@@ -141,7 +143,7 @@ namespace Isis { 
      internalData.append(newView? "new view" : "existing view");

      setInternalData(internalData);

    }



    */

    return success;

  }
@@ -164,12 +166,13 @@ namespace Isis { 
   * This method computes and displays the correlation matrix.

   */

  void MatrixViewWorkOrder::syncRedo() {

    /*  //tjw

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

    CorrelationMatrix corrMat = correlationMatrix();

    /*

     * Since computing the correlation matrix is potentially time consuming we only want to

     * do it if the user wants to see it.

     */

    //

    // Since computing the correlation matrix is potentially time consuming we only want to

    // do it if the user wants to see it.

    //

    corrMat.computeCorrelationMatrix();

    matrixViewToUse->setUpOptions(corrMat);

    matrixViewToUse->drawElements(corrMat);
@@ -178,6 +181,7 @@ namespace Isis { 
      QString msg = "The Correlation Matrix for this bundle could not be displayed";

      throw IException(IException::Programmer, msg, _FILEINFO_);

    }

    */

  }
@@ -185,9 +189,11 @@ namespace Isis { 
   * This method deletes the last matrix viewed

   */

  void MatrixViewWorkOrder::syncUndo() {

    /*  //tjw

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

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

    }

    */

  }

}

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

+5 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "IException.h"

#include "Project.h"

#include "TargetBody.h"

#include "TargetInfoWidget.h"

//#include "TargetInfoWidget.h"



namespace Isis {
@@ -76,6 +76,7 @@ namespace Isis { 
   * @return  @b bool True if a view already exists, False otherwise.

   */

  bool TargetGetInfoWorkOrder::isExecutable(TargetBodyQsp targetBody) {

    /*   //tjw

    if (!targetBody)

      return false;
@@ -85,7 +86,7 @@ namespace Isis { 
      if (existingViews.at(i)->objectName() == targetBody->displayProperties()->displayName() )

        return false;

    }



    */

    return true;

  }
@@ -125,6 +126,7 @@ namespace Isis { 
   * @brief  Redisplays the Target info.

   */

  void TargetGetInfoWorkOrder::syncRedo() {

    /*

    TargetInfoWidget *targetInfoWidget =

        project()->directory()->addTargetInfoView(targetBody());
@@ -133,6 +135,7 @@ namespace Isis { 
      QString msg = "error displaying target info";

      throw IException(IException::Programmer, msg, _FILEINFO_);

    }

    */

  }