Commit bfdb2365 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG: Fixed issues with context menus not working and opening a control... 

PROG: Fixed issues with context menus not working and opening a control network in trunk's qmos. These issues were introduced when fixing build issues with some of IPCE's merges into trunk (see r6861-4). Fixes #4111.

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

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

+4 −7
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
#include "OpenRecentProjectWorkOrder.h"





//#include "Project.h"  //tjw

#include "Project.h"

//#include "ProjectItem.h"  //tjw

//#include "ProjectItemModel.h"  //tjw

//#include "ProjectItemTreeView.h"  //tjw
@@ -107,8 +107,8 @@ namespace Isis { 
          _FILEINFO_);

    }



    //connect( m_project, SIGNAL(imagesAdded(ImageList *) ),

             //this, SLOT(imagesAddedToProject(ImageList *) ) );

    connect( m_project, SIGNAL(imagesAdded(ImageList *) ),

             this, SLOT(imagesAddedToProject(ImageList *) ) );



    //connect( m_project, SIGNAL(targetsAdded(TargetBodyList *) ),

             //this, SLOT(targetsAddedToProject(TargetBodyList *) ) );
@@ -165,8 +165,7 @@ namespace Isis { 
   */

  Directory::~Directory() {



    //delete m_project;  //tjw

    //m_project = NULL;  //tjw

    delete m_project;



    foreach (WorkOrder *workOrder, m_workOrders) {

      delete workOrder;
@@ -863,11 +862,9 @@ namespace Isis { 
   * @return @b (Project *) Returns a pointer to the Project.

   */



  /*

  Project *Directory::project() const {

    return m_project;

  }

*/



  /**

   * @brief Returns a list of all the control network views for this directory.

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

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ namespace Isis { 


      //ProjectItemModel *model();  //tjw



      //Project *project() const;  //tjw

      Project *project() const;



      QList<QAction *> fileMenuActions();

      QList<QAction *> projectMenuActions();
@@ -267,7 +267,7 @@ namespace Isis { 




      QPointer<HistoryTreeWidget> m_historyTreeWidget;  //!< Pointer to the HistoryTreeWidget.

      //QPointer<Project> m_project;   //tjw                   //!< Pointer to the Project.

      QPointer<Project> m_project;                      //!< Pointer to the Project.

      QPointer<WarningTreeWidget> m_warningTreeWidget;  //!< Pointer to the WarningTreeWidget.



      QList< QPointer<CnetEditorWidget> > m_cnetEditorViewWidgets;  //!< List of CnetEditorWidgets

isis/src/qisis/objs/ImageFileListWidget/ImageTreeWidget.cpp

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




  void ImageTreeWidget::contextMenuEvent(QContextMenuEvent *event) {

    /*

    ImageList selectedCubes = selectedDisplays();



    bool selectedGroup = groupInList(selectedItems());
@@ -689,7 +688,6 @@ namespace Isis { 
    }



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

    */

  }

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

+0 −2
Original line number Diff line number Diff line
@@ -488,7 +488,6 @@ 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(),
@@ -541,7 +540,6 @@ namespace Isis { 
          m_displayControlNetButton->setChecked(true);

      }

    }

    */

  }

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

+1 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "MosaicGraphicsView.h"

#include "MosaicSceneWidget.h"

#include "PolygonTools.h"

#include "Project.h"

#include "SerialNumber.h"

#include "Statistics.h"

#include "Stretch.h"
@@ -551,7 +552,6 @@ namespace Isis { 
  void MosaicSceneItem::contextMenuEvent(

      QGraphicsSceneContextMenuEvent *event) {



    /*  //tjw

    if(m_image) {

      QMenu menu;
@@ -590,7 +590,6 @@ namespace Isis { 
      menu.exec(event->screenPos());

    }



    */

  }