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

#4509 Guard access to gui application code in import and well path code to avoid crashes in console mode

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-07-25 15:54:20 +02:00
parent d6d1ebd25d
commit 000ce6db52
8 changed files with 113 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/UserInterface/Riu3DMainWindowTools.cpp
View File

@@ -33,7 +33,10 @@ QWidget* Riu3DMainWindowTools::mainWindowWidget()
//--------------------------------------------------------------------------------------------------
void Riu3DMainWindowTools::setActiveViewer(QWidget* subWindow)
{
RiuMainWindow::instance()->setActiveViewer(subWindow);
if (RiuMainWindow::instance())
{
RiuMainWindow::instance()->setActiveViewer(subWindow);
}
}
//--------------------------------------------------------------------------------------------------
@@ -41,7 +44,10 @@ void Riu3DMainWindowTools::setActiveViewer(QWidget* subWindow)
//--------------------------------------------------------------------------------------------------
void Riu3DMainWindowTools::setExpanded(const caf::PdmUiItem* uiItem, bool expanded /*= true*/)
{
RiuMainWindow::instance()->setExpanded(uiItem, expanded);
if (RiuMainWindow::instance())
{
RiuMainWindow::instance()->setExpanded(uiItem, expanded);
}
}
//--------------------------------------------------------------------------------------------------
@@ -49,7 +55,10 @@ void Riu3DMainWindowTools::setExpanded(const caf::PdmUiItem* uiItem, bool expand
//--------------------------------------------------------------------------------------------------
void Riu3DMainWindowTools::selectAsCurrentItem(const caf::PdmObject* object, bool allowActiveViewChange /*= true*/)
{
RiuMainWindow::instance()->selectAsCurrentItem(object, allowActiveViewChange);
if (RiuMainWindow::instance())
{
RiuMainWindow::instance()->selectAsCurrentItem(object, allowActiveViewChange);
}
}

39
ApplicationCode/UserInterface/RiuPlotMainWindowTools.cpp
View File

@@ -25,7 +25,10 @@
//--------------------------------------------------------------------------------------------------
void RiuPlotMainWindowTools::showPlotMainWindow()
{
RiaGuiApplication::instance()->getOrCreateAndShowMainPlotWindow();
if (RiaGuiApplication::isRunning())
{
RiaGuiApplication::instance()->getOrCreateAndShowMainPlotWindow();
}
}
//--------------------------------------------------------------------------------------------------
@@ -33,9 +36,12 @@ void RiuPlotMainWindowTools::showPlotMainWindow()
//--------------------------------------------------------------------------------------------------
void RiuPlotMainWindowTools::setActiveViewer(QWidget* subWindow)
{
RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
if (RiaGuiApplication::isRunning())
{
RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
if (mpw) mpw->setActiveViewer(subWindow);
if (mpw) mpw->setActiveViewer(subWindow);
}
}
//--------------------------------------------------------------------------------------------------
@@ -43,9 +49,12 @@ void RiuPlotMainWindowTools::setActiveViewer(QWidget* subWindow)
//--------------------------------------------------------------------------------------------------
void RiuPlotMainWindowTools::setExpanded(const caf::PdmUiItem* uiItem, bool expanded /*= true*/)
{
RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
if (RiaGuiApplication::isRunning())
{
RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
if (mpw) mpw->setExpanded(uiItem, expanded);
if (mpw) mpw->setExpanded(uiItem, expanded);
}
}
//--------------------------------------------------------------------------------------------------
@@ -53,9 +62,12 @@ void RiuPlotMainWindowTools::setExpanded(const caf::PdmUiItem* uiItem, bool expa
//--------------------------------------------------------------------------------------------------
void RiuPlotMainWindowTools::selectAsCurrentItem(const caf::PdmObject* object, bool allowActiveViewChange /*= true*/)
{
RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
if (RiaGuiApplication::isRunning())
{
RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
if (mpw) mpw->selectAsCurrentItem(object, allowActiveViewChange);
if (mpw) mpw->selectAsCurrentItem(object, allowActiveViewChange);
}
}
//--------------------------------------------------------------------------------------------------
@@ -63,12 +75,15 @@ void RiuPlotMainWindowTools::selectAsCurrentItem(const caf::PdmObject* object, b
//--------------------------------------------------------------------------------------------------
void RiuPlotMainWindowTools::refreshToolbars()
{
RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
if (mpw)
if (RiaGuiApplication::isRunning())
{
mpw->updateSummaryPlotToolBar();
mpw->updateWellLogPlotToolBar();
RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
if (mpw)
{
mpw->updateSummaryPlotToolBar();
mpw->updateWellLogPlotToolBar();
}
}
}