Commit 007e34bf authored by Tyler Wilson's avatar Tyler Wilson
Browse files

PROG: Functions commented out in... 

PROG:  Functions commented out in MosaicControlNetTool/MosaicSceneItem/MosaicSceneWidget/MosaicSceneWorkOrder because of Directory dependencies.  These changes will be uncommented once further IPCE classes are merged into ISIS.

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

isis/src/qisis/objs/MosaicSceneWidget/MosaicControlNetTool.cpp

+2 −0
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ namespace Isis { 
   *

   */

  void MosaicControlNetTool::openControlNet() {

    /*  //tjw

    if (!getWidget()->directory()) {

      // Bring up a file dialog for user to select their cnet file.

      QString netFile = FileDialog::getOpenFileName(getWidget(),
@@ -540,6 +541,7 @@ namespace Isis { 
          m_displayControlNetButton->setChecked(true);

      }

    }

    */

  }

isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneItem.cpp

+4 −0
Original line number Diff line number Diff line
@@ -550,6 +550,8 @@ namespace Isis { 
   */

  void MosaicSceneItem::contextMenuEvent(

      QGraphicsSceneContextMenuEvent *event) {



    /*  //tjw

    if(m_image) {

      QMenu menu;
@@ -587,6 +589,8 @@ namespace Isis { 


      menu.exec(event->screenPos());

    }



    */

  }

isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp

+10 −2
Original line number Diff line number Diff line
@@ -429,7 +429,10 @@ namespace Isis { 
   * Return false if not handled, true if handled.

   */

  bool MosaicSceneWidget::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {





    bool handled = false;

    /*  //tjw



    QList<QGraphicsItem *> selectedGraphicsItems = getScene()->selectedItems();

    QList<MosaicSceneItem *> selectedImageItems;
@@ -478,7 +481,10 @@ namespace Isis { 
      menu.exec(event->screenPos());

    }



     */

    return handled;





  }
@@ -759,6 +765,7 @@ namespace Isis { 
  QList<QAction *> MosaicSceneWidget::supportedActions(ImageList *images) {

    QList<QAction *> results;



    /*   //tjw

    bool allImagesInView = !images->isEmpty();



    foreach (Image *image, *images) {
@@ -793,7 +800,7 @@ namespace Isis { 
      connect(zoomFitAct, SIGNAL(triggered()), this, SLOT(fitInView()));

      results.append(zoomFitAct);

    }



    */

    return results;

  }
@@ -2053,6 +2060,7 @@ namespace Isis { 
      const QString &localName, const QString &qName, const QXmlAttributes &atts) {

    bool result = XmlStackedHandler::startElement(namespaceURI, localName, qName, atts);



    /*

    m_characterData = "";



    if (result) {
@@ -2071,7 +2079,7 @@ namespace Isis { 
        m_scrollBarYValue = atts.value("scrollBarYValue").toInt();

      }

    }



    */

    return result;

  }

isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWorkOrder.cpp

+3 −1
Original line number Diff line number Diff line
@@ -35,14 +35,16 @@ namespace Isis { 




  MosaicSceneWidget *MosaicSceneWorkOrder::scene() {



    MosaicSceneWidget *result = NULL;

    /*  //tjw



    foreach (MosaicSceneWidget *scene, directory()->footprint2DViews()) {

      if (internalData().first() == scene->windowTitle()) {

        result = scene;

      }

    }



    */

    return result;

  }