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/RiuMainWindow.cpp
View File

@@ -139,7 +139,7 @@ RiuMainWindow::RiuMainWindow()
sm_mainWindowInstance = this;
m_dragDropInterface = new RiuDragDrop;
m_dragDropInterface = std::make_unique<RiuDragDrop>();
initializeGuiNewProjectLoaded();
@@ -215,15 +215,16 @@ void RiuMainWindow::cleanupGuiBeforeProjectClose()
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::closeEvent(QCloseEvent* event)
{
saveWinGeoAndDockToolBarLayout();
RiaApplication* app = RiaApplication::instance();
if (!app->tryClosePlotWindow()) return;
if (!RiaApplication::instance()->closeProject(true))
{
event->ignore();
return;
}
delete m_dragDropInterface;
saveWinGeoAndDockToolBarLayout();
event->accept();
}
@@ -1212,7 +1213,7 @@ void RiuMainWindow::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());
for (size_t i = 0; i < additionalProjectViews.size(); i++)
{