OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused code, move implementation to cpp

Browse Source
This commit is contained in:
Magne Sjaastad 2017-11-29 12:57:31 +01:00
parent f2bd87762c
commit c9ae3821e2
2 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ApplicationCode/UserInterface/RiuMainPlotWindow.cpp
View File

@ -64,9 +64,7 @@
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuMainPlotWindow::RiuMainPlotWindow() RiuMainPlotWindow::RiuMainPlotWindow()
: m_pdmRoot(NULL), : m_activePlotViewWindow(nullptr),
m_mainViewer(NULL),
m_activePlotViewWindow(nullptr),
m_windowMenu(NULL), m_windowMenu(NULL),
m_blockSlotSubWindowActivated(false) m_blockSlotSubWindowActivated(false)
{ {
@ -75,9 +73,6 @@ RiuMainPlotWindow::RiuMainPlotWindow()
connect(m_mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow *)), SLOT(slotSubWindowActivated(QMdiSubWindow*))); connect(m_mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow *)), SLOT(slotSubWindowActivated(QMdiSubWindow*)));
setCentralWidget(m_mdiArea); setCentralWidget(m_mdiArea);
//m_mainViewer = createViewer();
createActions();
createMenus(); createMenus();
createToolBars(); createToolBars();
createDockPanels(); createDockPanels();
@ -93,6 +88,14 @@ RiuMainPlotWindow::RiuMainPlotWindow()
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiuMainPlotWindow::mainWindowName()
{
return "RiuMainPlotWindow";
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -165,14 +168,6 @@ void RiuMainPlotWindow::closeEvent(QCloseEvent* event)
app->closeProject(); app->closeProject();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainPlotWindow::createActions()
{
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -498,8 +493,6 @@ void RiuMainPlotWindow::addViewer(QWidget* viewer, const RimMdiWindowGeometry& w
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuMainPlotWindow::setPdmRoot(caf::PdmObject* pdmRoot) void RiuMainPlotWindow::setPdmRoot(caf::PdmObject* pdmRoot)
{ {
m_pdmRoot = pdmRoot;
m_projectTreeView->setPdmItem(pdmRoot); m_projectTreeView->setPdmItem(pdmRoot);
// For debug only : m_projectTreeView->treeView()->expandAll(); // For debug only : m_projectTreeView->treeView()->expandAll();
m_projectTreeView->setDragDropInterface(m_dragDropInterface.get()); m_projectTreeView->setDragDropInterface(m_dragDropInterface.get());
@ -543,6 +536,14 @@ void RiuMainPlotWindow::setActiveViewer(QWidget* viewer)
m_blockSlotSubWindowActivated = false; m_blockSlotSubWindowActivated = false;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiTreeView* RiuMainPlotWindow::projectTreeView()
{
return m_projectTreeView;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -689,20 +690,6 @@ void RiuMainPlotWindow::restoreTreeViewState()
void RiuMainPlotWindow::selectAsCurrentItem(caf::PdmObject* object) void RiuMainPlotWindow::selectAsCurrentItem(caf::PdmObject* object)
{ {
m_projectTreeView->selectAsCurrentItem(object); m_projectTreeView->selectAsCurrentItem(object);
std::vector<caf::PdmFieldHandle*> toolBarFields;
/*
RimSummaryPlot* summaryPlot = nullptr;
object->firstAncestorOrThisOfType(summaryPlot);
if (summaryPlot)
{
toolBarFields = summaryPlot->summaryCurveCollection()->fieldsToShowInToolbar();
}
m_summaryPlotToolBar->setFields(toolBarFields);
m_summaryPlotToolBar->updateUi();
*/
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

8
ApplicationCode/UserInterface/RiuMainPlotWindow.h
View File

@ -54,7 +54,7 @@ class RiuMainPlotWindow : public RiuMainWindowBase
public: public:
RiuMainPlotWindow(); RiuMainPlotWindow();
virtual QString mainWindowName() { return "RiuMainPlotWindow"; } virtual QString mainWindowName();
void initializeGuiNewProjectLoaded(); void initializeGuiNewProjectLoaded();
void cleanupGuiBeforeProjectClose(); void cleanupGuiBeforeProjectClose();
@ -64,7 +64,7 @@ public:
void addViewer(QWidget* viewer, const RimMdiWindowGeometry& windowsGeometry) override; void addViewer(QWidget* viewer, const RimMdiWindowGeometry& windowsGeometry) override;
void setActiveViewer(QWidget* subWindow) override; void setActiveViewer(QWidget* subWindow) override;
caf::PdmUiTreeView* projectTreeView() { return m_projectTreeView;} caf::PdmUiTreeView* projectTreeView();
void hideAllDockWindows(); void hideAllDockWindows();
@ -89,7 +89,6 @@ protected:
private: private:
void setPdmRoot(caf::PdmObject* pdmRoot); void setPdmRoot(caf::PdmObject* pdmRoot);
void createActions();
void createMenus(); void createMenus();
void createToolBars(); void createToolBars();
void createDockPanels(); void createDockPanels();
@ -100,7 +99,6 @@ private:
static QStringList toolbarCommandIds(const QString& toolbarName = ""); static QStringList toolbarCommandIds(const QString& toolbarName = "");
private slots: private slots:
friend class RiuMdiSubWindow; friend class RiuMdiSubWindow;
@ -116,7 +114,6 @@ private:
QByteArray m_initialDockAndToolbarLayout; // Initial dock window and toolbar layout, used to reset GUI QByteArray m_initialDockAndToolbarLayout; // Initial dock window and toolbar layout, used to reset GUI
QMdiArea* m_mdiArea; QMdiArea* m_mdiArea;
RiuViewer* m_mainViewer;
RimViewWindow* m_activePlotViewWindow; RimViewWindow* m_activePlotViewWindow;
QMenu* m_windowMenu; QMenu* m_windowMenu;
@ -125,7 +122,6 @@ private:
caf::PdmUiToolBarEditor* m_summaryPlotToolBar; caf::PdmUiToolBarEditor* m_summaryPlotToolBar;
std::unique_ptr<caf::PdmUiDragDropInterface> m_dragDropInterface; std::unique_ptr<caf::PdmUiDragDropInterface> m_dragDropInterface;
caf::PdmObject* m_pdmRoot;
caf::PdmUiPropertyView* m_pdmUiPropertyView; caf::PdmUiPropertyView* m_pdmUiPropertyView;
bool m_blockSlotSubWindowActivated; bool m_blockSlotSubWindowActivated;