Removed obsolete code related to actions, menus and dock widgets

ApplicationCode/Application/RiaApplication.cpp

@@ -1322,13 +1322,15 @@ void RiaApplication::deleteMainPlotWindow()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuMainPlotWindow* RiaApplication::getOrCreateMainPlotWindow()
+RiuMainPlotWindow* RiaApplication::getOrCreateAndShowMainPlotWindow()
 {
     if (!m_mainPlotWindow)
     {
         createMainPlotWindow();
     }
 
+    m_mainPlotWindow->showWindow();
+
     return m_mainPlotWindow;
 }
 

ApplicationCode/Application/RiaApplication.h

@@ -164,7 +164,7 @@ public:
     int                 launchUnitTests();
     int                 launchUnitTestsWithConsole();
 
-    RiuMainPlotWindow*  getOrCreateMainPlotWindow();
+    RiuMainPlotWindow*  getOrCreateAndShowMainPlotWindow();
     RiuMainPlotWindow*  mainPlotWindow();
 
 private:

ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp

@@ -110,7 +110,7 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
     plotTrack->viewer()->replot();
 
     // Make sure the summary plot window is created and visible
-    RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateMainPlotWindow();
+    RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
 
     RiaApplication::instance()->project()->updateConnectedEditors();
 

ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp

@@ -138,7 +138,7 @@ RimWellLogExtractionCurve* RicNewWellLogCurveExtractionFeature::addCurve(RimWell
     plotTrack->updateConnectedEditors();
 
     // Make sure the summary plot window is created and visible
-    RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateMainPlotWindow();
+    RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
 
     RiaApplication::instance()->project()->updateConnectedEditors();
 

ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp

@@ -152,7 +152,7 @@ RimWellLogFileCurve* RicNewWellLogFileCurveFeature::addCurve(RimWellLogTrack* pl
 
     plotTrack->updateConnectedEditors();
 
-    RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateMainPlotWindow();
+    RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
     plotwindow->selectAsCurrentItem(curve);
 
     return curve;

ApplicationCode/ProjectDataModel/RimSummaryPlot.cpp

@@ -232,7 +232,7 @@ void RimSummaryPlot::setDescription(const QString& description)
 //--------------------------------------------------------------------------------------------------
 void RimSummaryPlot::updateViewerWidget()
 {
-    RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateMainPlotWindow();
+    RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
 
     if (m_showWindow())
     {

ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp

@@ -103,7 +103,7 @@ RimWellLogPlot::~RimWellLogPlot()
 //--------------------------------------------------------------------------------------------------
 void RimWellLogPlot::updateViewerWidget()
 {
-    RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateMainPlotWindow();
+    RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
 
     if (m_showWindow())
     {

ApplicationCode/UserInterface/RiuMainPlotWindow.h

@@ -20,45 +20,21 @@
 
 #include "RiuMainWindowBase.h"
 
-#include <QEvent>
-#include <QPointer>
 #include <QMdiArea>
 
-class QActionGroup;
-class QComboBox;
-class QFrame;
-class QItemSelection;
-class QLabel;
-class QLineEdit;
 class QMdiSubWindow;
-class QSpinBox;
-class QTreeView;
-class QUndoView;
 
-class RimCase;
-class RimEclipseCase;
-class RiuProcessMonitor;
-class RiuResultInfoPanel;
 class RiuViewer;
-class RiuWellLogPlot;
+
-class RiuResultQwtPlot;
 struct RimMdiWindowGeometry;
 
 namespace caf
 {
-    class PdmUiTreeView;
+     class PdmUiTreeView;
-    class AnimationToolBar;
+     class PdmObject;
-    class FrameAnimationControl;
+     class PdmUiPropertyView;
-    class PdmObject;
+     class PdmUiItem;
-    class PdmUiPropertyView;
+     class PdmUiDragDropInterface;
-    class UiPropertyCreatorPdm;
-    class PdmUiItem;
-    class PdmUiDragDropInterface;
-}
-
-namespace ssihub
-{
-    class Interface;
 }
 
 //==================================================================================================
@@ -83,29 +59,16 @@ public:
     void            addViewer(QWidget* viewer, const RimMdiWindowGeometry& windowsGeometry);
     void            setActiveViewer(QWidget* subWindow);
 
-    void            setResultInfo(const QString& info) const;
-
-    void            refreshAnimationActions();
-    void            updateScaleValue();
-
     caf::PdmUiTreeView* projectTreeView() { return m_projectTreeView;}
-    RiuProcessMonitor* processMonitor();
 
     void            hideAllDockWindows();
 
     void            selectAsCurrentItem(caf::PdmObject* object);
 
-    void            selectedCases(std::vector<RimCase*>& cases);
-
     void            setDefaultWindowSize();
 
-    void            refreshDrawStyleActions();
-    
     void            setExpanded(const caf::PdmUiItem* uiItem, bool expanded);
 
-    void            addRecentFiles(const QString& file);
-    void            removeRecentFiles(const QString& file);
-
     RimMdiWindowGeometry    windowGeometryForViewer(QWidget* viewer);
     RimMdiWindowGeometry    windowGeometryForWidget(QWidget* widget);
 
@@ -114,8 +77,6 @@ public:
     QMdiSubWindow*  findMdiSubWindow(QWidget* viewer);
 	QList<QMdiSubWindow*> subWindowList(QMdiArea::WindowOrder order);
 
-    RiuResultQwtPlot* resultPlot();
-
 protected:
     virtual void    closeEvent(QCloseEvent* event);
 
@@ -125,10 +86,6 @@ private:
     void            createToolBars();
     void            createDockPanels();
 
-    bool            checkForDocumentModifications();
-
-    void            updateRecentFileActions();
-
     void            storeTreeViewState();
     void            restoreTreeViewState();
 
@@ -136,70 +93,12 @@ private:
     QByteArray                m_initialDockAndToolbarLayout;    // Initial dock window and toolbar layout, used to reset GUI
 
 private:
-    // File actions
-    QAction*            m_importGeoMechCaseAction;
-    QAction*            m_openProjectAction;
-    QAction*            m_openLastUsedProjectAction;
-    QAction*            m_saveProjectAction;
-    QAction*            m_saveProjectAsAction;
-    QAction*            m_closeProjectAction;
-    QAction*            m_exitAction;
-
-    // Recent files
-    enum { MaxRecentFiles = 5 };
-    QAction*            m_recentFilesSeparatorAction;
-    QMenu*              m_recentFilesMenu;
-    QAction*            m_recentFileActions[MaxRecentFiles];
-
-
-    // Edit actions
-    QAction*            m_editPreferences;
-    QAction*            m_newPropertyView;
-
-    // View actions
-    QAction*            m_viewFromNorth;
-    QAction*            m_viewFromSouth;
-    QAction*            m_viewFromEast;
-    QAction*            m_viewFromWest;
-    QAction*            m_viewFromAbove;
-    QAction*            m_viewFromBelow;
-    QAction*            m_zoomAll;
-
-    // Mock actions
-    QAction*            m_mockModelAction;
-    QAction*            m_mockResultsModelAction;
-    QAction*            m_mockLargeResultsModelAction;
-    QAction*            m_mockModelCustomizedAction;
-    QAction*            m_mockInputModelAction;
-
     QAction*            m_snapshotToFile;
     QAction*            m_snapshotToClipboard;
     QAction*            m_snapshotAllViewsToFile;
 
-    QAction*            m_createCommandObject;
-    QAction*            m_showRegressionTestDialog;
-    QAction*            m_executePaintEventPerformanceTest;
-
-    // Help actions
-    QAction*            m_aboutAction;
-    QAction*            m_commandLineHelpAction;
-    QAction*            m_openUsersGuideInBrowserAction;
-
-    // Animation
-    caf::AnimationToolBar* m_animationToolBar;
-
-    // Toolbars
-    QToolBar*           m_viewToolBar;
-    QToolBar*           m_standardToolBar;
-    QToolBar*           m_snapshotToolbar;
-
-
     QMdiArea*           m_mdiArea;
     RiuViewer*          m_mainViewer;
-    RiuResultInfoPanel* m_resultInfoPanel;
-    RiuProcessMonitor*  m_processMonitor;
-    
-    RiuResultQwtPlot*   m_resultQwtPlot;
     
     QMenu*              m_windowMenu;
 
@@ -209,81 +108,20 @@ private slots:
 
     friend class RiuMdiSubWindow;
 
-    // File slots
-    void    slotImportGeoMechModel();
-    void    slotOpenProject();
-    void    slotOpenLastUsedProject();
-    void    slotSaveProject();
-    void    slotSaveProjectAs();
-    void    slotCloseProject();
-
-    void    slotOpenRecentFile();
-
-    void    slotRefreshFileActions();
-
-    // Edit slots
-    void    slotRefreshEditActions();
-    void    slotEditPreferences();
-    void    slotNewObjectPropertyView();
-
-    // View slots
-    void    slotRefreshViewActions();
-    void    slotViewFromNorth();
-    void    slotViewFromSouth();
-    void    slotViewFromEast();
-    void    slotViewFromWest();
-    void    slotViewFromAbove();
-    void    slotViewFromBelow();
-    void    slotZoomAll();
-    void    slotScaleChanged(int scaleValue);
-
-    void slotDrawStyleChanged(QAction* activatedAction);
-    void slotToggleHideGridCellsAction(bool);
-    void slotToggleFaultLabelsAction(bool);
-    void slotDisableLightingAction(bool);
-
-    void slotAddWellCellsToRangeFilterAction(bool doAdd);
-
-    // Debug slots
-    void    slotUseShaders(bool enable);
-    void    slotShowPerformanceInfo(bool enable);
-    
     void    slotSnapshotToFile();
     void    slotSnapshotToClipboard();
     void    slotSnapshotAllViewsToFile();
 
-    void    slotCreateCommandObject();
-
-    void    slotShowRegressionTestDialog();
-    void    slotExecutePaintEventPerformanceTest();
-
-    // Mock models
-    void    slotMockModel();
-    void    slotMockResultsModel();
-    void    slotMockLargeResultsModel();
-    void    slotMockModelCustomized();
-    void    slotInputMockModel();
-
-    // Windows slots
     void    slotBuildWindowActions();
 
-    // Help slots
-    void    slotAbout();
-    void    slotShowCommandLineHelp();
-    void    slotOpenUsersGuideInBrowserAction();
-
     void    slotSubWindowActivated(QMdiSubWindow* subWindow);
 
     void    selectedObjectsChanged();
     void    customMenuRequested(const QPoint& pos);
 
-
-    // Animation slots
-    void    slotFramerateChanged(double frameRate);
-
-    // Pdm System :
 public:
     void setPdmRoot(caf::PdmObject* pdmRoot);
+
 private:
     caf::PdmUiTreeView*            m_projectTreeView;
     
@@ -292,19 +130,5 @@ private:
     caf::PdmObject*             m_pdmRoot;
     caf::PdmUiPropertyView*     m_pdmUiPropertyView;
 
-    QSpinBox*                   m_scaleFactor;
-
-    QActionGroup*               m_dsActionGroup;
-    QAction*                    m_disableLightingAction;
-    QAction*                    m_drawStyleHideGridCellsAction;
-    QAction*                    m_toggleFaultsLabelAction;
-    QAction*                    m_drawStyleLinesAction;
-    QAction*                    m_drawStyleLinesSolidAction;
-    QAction*                    m_drawStyleFaultLinesSolidAction;
-    QAction*                    m_drawStyleSurfOnlyAction;
-    QAction*                    m_addWellCellsToRangeFilterAction;
-
-    std::vector<QPointer<QDockWidget> > additionalProjectViews;
-
     bool                        m_blockSlotSubWindowActivated;
 };

ApplicationCode/UserInterface/RiuMdiSubWindow.cpp

@@ -44,11 +44,6 @@ RiuMdiSubWindow::RiuMdiSubWindow(QWidget* parent /*= 0*/, Qt::WindowFlags flags
 RiuMdiSubWindow::~RiuMdiSubWindow()
 {
     RiuMainWindow::instance()->slotRefreshViewActions();
-
-    if (RiaApplication::instance()->mainPlotWindow())
-    {
-        RiaApplication::instance()->mainPlotWindow()->slotRefreshViewActions();
-    }
 }
 
 //--------------------------------------------------------------------------------------------------