Loading isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.h +8 −3 Original line number Diff line number Diff line Loading @@ -44,6 +44,11 @@ namespace Isis { * @internal * @history 2016-09-30 Tracie Sucharski - Pass in directory to constructor, so that we can * query for shapes and other data from the project. * @history 2018-05-28 Kaitlyn Lee - Since AbstractProjectItemView now inherits * from QMainWindow, I added a dummy central widget * and set its layout to QVBoxLayout. We used to set * the whole CnetEditorView widget's layout, now we only * set the central widget's layout. */ class ControlPointEditView : public AbstractProjectItemView { Loading isis/src/qisis/objs/CubeDnView/CubeDnView.cpp +30 −23 Original line number Diff line number Diff line Loading @@ -29,7 +29,6 @@ #include <QMdiArea> #include <QMdiSubWindow> #include <QMenu> #include <QMenuBar> #include <QModelIndex> #include <QSize> #include <QSizePolicy> Loading Loading @@ -103,52 +102,54 @@ namespace Isis { m_workspace = new Workspace(false, this); m_workspace->mdiArea()->setActivationOrder(QMdiArea::StackingOrder); // Since this is a QMainWindow, set the workspace as the central widget. setCentralWidget(m_workspace); createActions(directory); connect(m_workspace, SIGNAL( cubeViewportActivated(MdiCubeViewport *) ), this, SLOT( onCubeViewportActivated(MdiCubeViewport *) ) ); connect(m_workspace, SIGNAL( cubeViewportAdded(MdiCubeViewport *) ), this, SLOT( onCubeViewportAdded(MdiCubeViewport *) ) ); // !!!!!!! TODO LOOK AT THIS !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // These connections should be at higher level, directory or project???? ::addCubeDnView(). Project *activeProject = directory->project(); // These connect signals listen to the active project, and if a control network // or list of control networks is added, then the enableControlNetTool() function is called. connect(activeProject, SIGNAL(controlListAdded(ControlList *)), this, SLOT(enableControlNetTool())); connect(activeProject, SIGNAL(controlAdded(Control *)), this, SLOT(enableControlNetTool())); } void CubeDnView::createActions(Directory *directory) { QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); //m_toolBar = new QWidget(this); m_permToolBar = addToolBar("Standard Tools"); //QHBoxLayout *toolBarLayout = new QHBoxLayout; m_permToolBar = new QToolBar("Standard Tools", 0); m_permToolBar->setObjectName("permToolBar"); m_permToolBar->setIconSize(QSize(22, 22)); //toolBarLayout->addWidget(m_permToolBar); m_activeToolBar = addToolBar("Active Tool"); m_activeToolBar = new QToolBar("Active Tool", 0); m_activeToolBar->setObjectName("activeToolBar"); m_activeToolBar->setIconSize(QSize(22, 22)); //toolBarLayout->addWidget(m_activeToolBar); m_toolPad = new ToolPad("Tool Pad", 0); m_toolPad->setObjectName("toolPad"); addToolBar(m_toolPad); //toolBarLayout->addWidget(m_toolPad); //m_toolBar->setLayout(toolBarLayout); //layout->addWidget(m_toolBar); layout->addWidget(m_workspace); // Create tools ToolList *tools = new ToolList; // !!!!!!! TODO LOOK AT THIS !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! //******* TODO : Look at code below. What is defaultActiveTool used for? Why is NULL // appended?? *************** Tool *defaultActiveTool = NULL; tools->append(new RubberBandTool(this)); // QnetTool *qnetTool = new QnetTool(m_workspace); //tools->append(new FileTool(this)); //tools->append(new QnetFileTool(qnetTool, this)); tools->append(NULL); ControlNetTool *controlNetTool = new ControlNetTool(directory, this); Loading Loading @@ -198,16 +199,18 @@ namespace Isis { tools->append(new StereoTool(this)); tools->append(new HelpTool(this)); tools->append(new TrackTool(statusBar())); QStatusBar *statusBar = new QStatusBar(this); layout->addWidget(statusBar); tools->append(new TrackTool(statusBar)); m_separatorAction = new QAction(this); m_separatorAction->setSeparator(true); m_fileMenu = menuBar()->addMenu("&File"); m_viewMenu = menuBar()->addMenu("&View"); m_optionsMenu = menuBar()->addMenu("&Options"); m_windowMenu = menuBar()->addMenu("&Window"); m_helpMenu = menuBar()->addMenu("&Help"); m_fileMenu = new QMenu; m_viewMenu = new QMenu; m_optionsMenu = new QMenu; m_windowMenu = new QMenu; m_helpMenu = new QMenu; for (int i = 0; i < tools->count(); i++) { Tool *tool = (*tools)[i]; Loading Loading @@ -250,6 +253,10 @@ namespace Isis { m_toolPadActions.append( m_toolPad->actions() ); QSizePolicy policy = sizePolicy(); policy.setHorizontalPolicy(QSizePolicy::Expanding); policy.setVerticalPolicy(QSizePolicy::Expanding); setSizePolicy(policy); } Loading isis/src/qisis/objs/CubeDnView/CubeDnView.h +2 −4 Original line number Diff line number Diff line #ifndef CubeDnViewMW_h #define CubeDnViewMW_h #ifndef CubeDnView_h #define CubeDnView_h /** * @file * $Date$ Loading Loading @@ -123,8 +123,6 @@ namespace Isis { void enableControlNetTool(); private slots: void createActions(Directory *directory); void onCurrentChanged(const QModelIndex ¤t); void onCubeViewportActivated(MdiCubeViewport *); void onItemAdded(ProjectItem *item); Loading Loading
isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.h +8 −3 Original line number Diff line number Diff line Loading @@ -44,6 +44,11 @@ namespace Isis { * @internal * @history 2016-09-30 Tracie Sucharski - Pass in directory to constructor, so that we can * query for shapes and other data from the project. * @history 2018-05-28 Kaitlyn Lee - Since AbstractProjectItemView now inherits * from QMainWindow, I added a dummy central widget * and set its layout to QVBoxLayout. We used to set * the whole CnetEditorView widget's layout, now we only * set the central widget's layout. */ class ControlPointEditView : public AbstractProjectItemView { Loading
isis/src/qisis/objs/CubeDnView/CubeDnView.cpp +30 −23 Original line number Diff line number Diff line Loading @@ -29,7 +29,6 @@ #include <QMdiArea> #include <QMdiSubWindow> #include <QMenu> #include <QMenuBar> #include <QModelIndex> #include <QSize> #include <QSizePolicy> Loading Loading @@ -103,52 +102,54 @@ namespace Isis { m_workspace = new Workspace(false, this); m_workspace->mdiArea()->setActivationOrder(QMdiArea::StackingOrder); // Since this is a QMainWindow, set the workspace as the central widget. setCentralWidget(m_workspace); createActions(directory); connect(m_workspace, SIGNAL( cubeViewportActivated(MdiCubeViewport *) ), this, SLOT( onCubeViewportActivated(MdiCubeViewport *) ) ); connect(m_workspace, SIGNAL( cubeViewportAdded(MdiCubeViewport *) ), this, SLOT( onCubeViewportAdded(MdiCubeViewport *) ) ); // !!!!!!! TODO LOOK AT THIS !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // These connections should be at higher level, directory or project???? ::addCubeDnView(). Project *activeProject = directory->project(); // These connect signals listen to the active project, and if a control network // or list of control networks is added, then the enableControlNetTool() function is called. connect(activeProject, SIGNAL(controlListAdded(ControlList *)), this, SLOT(enableControlNetTool())); connect(activeProject, SIGNAL(controlAdded(Control *)), this, SLOT(enableControlNetTool())); } void CubeDnView::createActions(Directory *directory) { QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); //m_toolBar = new QWidget(this); m_permToolBar = addToolBar("Standard Tools"); //QHBoxLayout *toolBarLayout = new QHBoxLayout; m_permToolBar = new QToolBar("Standard Tools", 0); m_permToolBar->setObjectName("permToolBar"); m_permToolBar->setIconSize(QSize(22, 22)); //toolBarLayout->addWidget(m_permToolBar); m_activeToolBar = addToolBar("Active Tool"); m_activeToolBar = new QToolBar("Active Tool", 0); m_activeToolBar->setObjectName("activeToolBar"); m_activeToolBar->setIconSize(QSize(22, 22)); //toolBarLayout->addWidget(m_activeToolBar); m_toolPad = new ToolPad("Tool Pad", 0); m_toolPad->setObjectName("toolPad"); addToolBar(m_toolPad); //toolBarLayout->addWidget(m_toolPad); //m_toolBar->setLayout(toolBarLayout); //layout->addWidget(m_toolBar); layout->addWidget(m_workspace); // Create tools ToolList *tools = new ToolList; // !!!!!!! TODO LOOK AT THIS !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! //******* TODO : Look at code below. What is defaultActiveTool used for? Why is NULL // appended?? *************** Tool *defaultActiveTool = NULL; tools->append(new RubberBandTool(this)); // QnetTool *qnetTool = new QnetTool(m_workspace); //tools->append(new FileTool(this)); //tools->append(new QnetFileTool(qnetTool, this)); tools->append(NULL); ControlNetTool *controlNetTool = new ControlNetTool(directory, this); Loading Loading @@ -198,16 +199,18 @@ namespace Isis { tools->append(new StereoTool(this)); tools->append(new HelpTool(this)); tools->append(new TrackTool(statusBar())); QStatusBar *statusBar = new QStatusBar(this); layout->addWidget(statusBar); tools->append(new TrackTool(statusBar)); m_separatorAction = new QAction(this); m_separatorAction->setSeparator(true); m_fileMenu = menuBar()->addMenu("&File"); m_viewMenu = menuBar()->addMenu("&View"); m_optionsMenu = menuBar()->addMenu("&Options"); m_windowMenu = menuBar()->addMenu("&Window"); m_helpMenu = menuBar()->addMenu("&Help"); m_fileMenu = new QMenu; m_viewMenu = new QMenu; m_optionsMenu = new QMenu; m_windowMenu = new QMenu; m_helpMenu = new QMenu; for (int i = 0; i < tools->count(); i++) { Tool *tool = (*tools)[i]; Loading Loading @@ -250,6 +253,10 @@ namespace Isis { m_toolPadActions.append( m_toolPad->actions() ); QSizePolicy policy = sizePolicy(); policy.setHorizontalPolicy(QSizePolicy::Expanding); policy.setVerticalPolicy(QSizePolicy::Expanding); setSizePolicy(policy); } Loading
isis/src/qisis/objs/CubeDnView/CubeDnView.h +2 −4 Original line number Diff line number Diff line #ifndef CubeDnViewMW_h #define CubeDnViewMW_h #ifndef CubeDnView_h #define CubeDnView_h /** * @file * $Date$ Loading Loading @@ -123,8 +123,6 @@ namespace Isis { void enableControlNetTool(); private slots: void createActions(Directory *directory); void onCurrentChanged(const QModelIndex ¤t); void onCubeViewportActivated(MdiCubeViewport *); void onItemAdded(ProjectItem *item); Loading