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

#851 Added "Open 3D Window" tool button in plot window. Raise mainWindow when activated from toolbar

Browse Source
This commit is contained in:
Magne Sjaastad
2016-10-04 09:29:45 +02:00
parent 0fc1d9cbf8
commit 3a2454cba0
10 changed files with 151 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/UserInterface/RiuMainPlotWindow.cpp
View File

@@ -80,7 +80,7 @@ RiuMainPlotWindow::RiuMainPlotWindow()
// Store the layout so we can offer reset option
m_initialDockAndToolbarLayout = saveState(0);
m_dragDropInterface = new RiuDragDrop;
m_dragDropInterface = std::make_unique<RiuDragDrop>();
initializeGuiNewProjectLoaded();
@@ -90,14 +90,6 @@ RiuMainPlotWindow::RiuMainPlotWindow()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuMainPlotWindow::~RiuMainPlotWindow()
{
delete m_dragDropInterface;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -126,6 +118,8 @@ void RiuMainPlotWindow::cleanupGuiBeforeProjectClose()
void RiuMainPlotWindow::closeEvent(QCloseEvent* event)
{
saveWinGeoAndDockToolBarLayout();
RiaApplication::instance()->tryClosePlotWindow();
}
//--------------------------------------------------------------------------------------------------
@@ -189,6 +183,7 @@ void RiuMainPlotWindow::createToolBars()
QToolBar* toolbar = addToolBar(tr("Window Management"));
toolbar->setObjectName(toolbar->windowTitle());
toolbar->addAction(cmdFeatureMgr->action("RicTilePlotWindowsFeature"));
toolbar->addAction(cmdFeatureMgr->action("RicShowMainWindowFeature"));
}
}
@@ -358,7 +353,7 @@ void RiuMainPlotWindow::setPdmRoot(caf::PdmObject* pdmRoot)
m_projectTreeView->setPdmItem(pdmRoot);
// For debug only : m_projectTreeView->treeView()->expandAll();
m_projectTreeView->setDragDropInterface(m_dragDropInterface);
m_projectTreeView->setDragDropInterface(m_dragDropInterface.get());
}
//--------------------------------------------------------------------------------------------------