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

Merge pull request #5083 from OPM/fix-plot-crash-release-2019.11

Browse Source 
Fix crash when closing and reopening plots
This commit is contained in:
Magne Sjaastad
2019-11-25 09:43:56 +01:00
committed by GitHub
parent 9f0c4b4bed d6ec710fd9
commit 3f75cda593
9 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/UserInterface/RiuQwtPlotWidget.cpp
View File

@@ -549,6 +549,10 @@ bool RiuQwtPlotWidget::eventFilter( QObject* watched, QEvent* event )
void RiuQwtPlotWidget::hideEvent( QHideEvent* event )
{
resetCurveHighlighting();
if ( plotDefinition() )
{
plotDefinition()->detachAllCurves();
}
QwtPlot::hideEvent( event );
}
@@ -563,19 +567,11 @@ void RiuQwtPlotWidget::showEvent( QShowEvent* event )
m_canvasStyleSheet = createCanvasStyleSheet();
m_canvasStyleSheet.applyToWidget( canvas() );
QwtPlot::showEvent( event );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::closeEvent( QCloseEvent* event )
{
if ( plotDefinition() )
{
plotDefinition()->detachAllCurves();
plotDefinition()->reattachAllCurves();
}
QwtPlot::closeEvent( event );
QwtPlot::showEvent( event );
}
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/UserInterface/RiuQwtPlotWidget.h
View File

@@ -109,7 +109,6 @@ protected:
bool eventFilter( QObject* watched, QEvent* event ) override;
void hideEvent( QHideEvent* event ) override;
void showEvent( QShowEvent* event ) override;
void closeEvent( QCloseEvent* event ) override;
void applyAxisTitleToQwt( QwtPlot::Axis axis );