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
commit 3f75cda593
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp
View File

@ -217,7 +217,7 @@ void RimGridCrossPlot::calculateZoomRangeAndUpdateQwt()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridCrossPlot::reattachCurvesToQwtAndReplot()
void RimGridCrossPlot::reattachAllCurves()
{
if ( m_plotWidget )
{

12
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h
View File

@ -74,15 +74,17 @@ public:
QImage snapshotWindowContent() override;
void zoomAll() override;
void calculateZoomRangeAndUpdateQwt();
void reattachCurvesToQwtAndReplot();
QString createAutoName() const override;
bool showInfoBox() const;
caf::PdmFieldHandle* userDescriptionField() override;
void detachAllCurves() override;
void performAutoNameUpdate() override;
void updateCurveNamesAndPlotTitle();
void swapAxes();
void detachAllCurves() override;
void reattachAllCurves() override;
void performAutoNameUpdate() override;
void updateCurveNamesAndPlotTitle();
void swapAxes();
QString asciiTitleForPlotExport( int dataSetIndex ) const;
QString asciiDataForGridCrossPlotExport( int dataSetIndex ) const;

2
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurve.cpp
View File

@ -147,7 +147,7 @@ void RimGridCrossPlotCurve::updateLegendsInPlot()
this->firstAncestorOrThisOfType( plot );
if ( plot )
{
plot->reattachCurvesToQwtAndReplot();
plot->reattachAllCurves();
}
RimPlotCurve::updateLegendsInPlot();
}

2
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
View File

@ -1216,7 +1216,7 @@ void RimGridCrossPlotDataSet::triggerPlotNameUpdateAndReplot()
if ( parent )
{
parent->updateCurveNamesAndPlotTitle();
parent->reattachCurvesToQwtAndReplot();
parent->reattachAllCurves();
parent->updateConnectedEditors();
}
}

5
ApplicationCode/ProjectDataModel/RimPlotInterface.h
View File

@ -94,8 +94,9 @@ public:
virtual QString asciiDataForPlotExport() const;
virtual void createPlotWidget() = 0;
virtual void detachAllCurves() = 0;
virtual void createPlotWidget() = 0;
virtual void detachAllCurves() = 0;
virtual void reattachAllCurves() = 0;
virtual caf::PdmObject* findPdmObjectFromQwtCurve( const QwtPlotCurve* curve ) const = 0;

2
ApplicationCode/ProjectDataModel/RimWellLogTrack.h
View File

@ -125,7 +125,7 @@ public:
void createPlotWidget();
void detachAllCurves();
void reattachAllCurves();
void reattachAllCurves() override;
void loadDataAndUpdate() override;

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@ -102,7 +102,7 @@ public:
size_t curveCount() const;
void detachAllCurves() override;
void reattachAllCurves();
void reattachAllCurves() override;
void updateCaseNameHasChanged();
void updateAxes() override;

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 );