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

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

View File

@@ -1387,10 +1387,8 @@ RiuMainPlotWindow* RiaApplication::getOrCreateAndShowMainPlotWindow()
createMainPlotWindow();
}
if (!m_mainPlotWindow->isVisible())
{
m_mainPlotWindow->show();
}
m_mainPlotWindow->show();
m_mainPlotWindow->raise();
return m_mainPlotWindow;
}
@@ -1440,6 +1438,37 @@ RimViewWindow* RiaApplication::activeViewWindow()
return viewWindow;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaApplication::tryCloseMainWindow()
{
RiuMainWindow* mainWindow = RiuMainWindow::instance();
if (mainWindow && !mainWindow->isVisible())
{
mainWindow->close();
return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaApplication::tryClosePlotWindow()
{
if (m_mainPlotWindow && !m_mainPlotWindow->isVisible())
{
m_mainPlotWindow->close();
return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------