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

#5026 Fix summary plot closing crash

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-11-13 10:32:38 +01:00
parent f8468dc7a6
commit aa40816f49
7 changed files with 10 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimGridPlotWindow.cpp
View File

@ -604,18 +604,6 @@ bool RimGridPlotWindow::applyFontSize( RiaDefines::FontSettingType fontSettingTy
return somethingChanged; return somethingChanged;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridPlotWindow::detachAllCurves()
{
auto plotVector = plots();
for ( size_t tIdx = 0; tIdx < plotVector.size(); ++tIdx )
{
plotVector[tIdx]->detachAllCurves();
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimGridPlotWindow.h
View File

@ -51,7 +51,7 @@ public:
public: public:
RimGridPlotWindow(); RimGridPlotWindow();
~RimGridPlotWindow(); ~RimGridPlotWindow() override;
RimGridPlotWindow& operator=( RimGridPlotWindow&& rhs ); RimGridPlotWindow& operator=( RimGridPlotWindow&& rhs );
@ -116,8 +116,6 @@ protected:
bool forceChange = false ) override; bool forceChange = false ) override;
private: private:
void detachAllCurves() override;
void cleanupBeforeClose(); void cleanupBeforeClose();
static RimPlotInterface* toPlotInterfaceAsserted( caf::PdmObject* pdmObject ); static RimPlotInterface* toPlotInterfaceAsserted( caf::PdmObject* pdmObject );

3
ApplicationCode/ProjectDataModel/RimPlotWindow.h
View File

@ -32,7 +32,7 @@ class RimPlotWindow : public RimViewWindow
public: public:
RimPlotWindow(); RimPlotWindow();
~RimPlotWindow(); ~RimPlotWindow() override;
RimPlotWindow& operator=( RimPlotWindow&& rhs ); RimPlotWindow& operator=( RimPlotWindow&& rhs );
@ -49,7 +49,6 @@ public:
int legendFontSize() const; int legendFontSize() const;
void setLegendFontSize( int fontSize ); void setLegendFontSize( int fontSize );
virtual void detachAllCurves() = 0;
virtual void handleKeyPressEvent( QKeyEvent* keyEvent ) {} virtual void handleKeyPressEvent( QKeyEvent* keyEvent ) {}
virtual void updateLayout() = 0; virtual void updateLayout() = 0;

17
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@ -1513,22 +1513,7 @@ std::set<RimPlotAxisPropertiesInterface*> RimSummaryPlot::allPlotAxes() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryPlot::cleanupBeforeClose() void RimSummaryPlot::cleanupBeforeClose()
{ {
if ( m_summaryCurveCollection ) detachAllCurves();
{
m_summaryCurveCollection->detachQwtCurves();
}
m_ensembleCurveSetCollection->detachQwtCurves();
for ( RimGridTimeHistoryCurve* curve : m_gridTimeHistoryCurves )
{
curve->detachQwtCurve();
}
for ( RimAsciiDataCurve* curve : m_asciiDataCurves )
{
curve->detachQwtCurve();
}
if ( m_plotWidget ) if ( m_plotWidget )
{ {

11
ApplicationCode/UserInterface/RiuGridPlotWindow.cpp
View File

@ -109,17 +109,6 @@ RiuGridPlotWindow::RiuGridPlotWindow( RimGridPlotWindow* plotDefinition, QWidget
this->setObjectName( QString( "%1" ).arg( reinterpret_cast<uint64_t>( this ) ) ); this->setObjectName( QString( "%1" ).arg( reinterpret_cast<uint64_t>( this ) ) );
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuGridPlotWindow::~RiuGridPlotWindow()
{
if ( m_plotDefinition )
{
m_plotDefinition->detachAllCurves();
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/UserInterface/RiuGridPlotWindow.h
View File

@ -55,8 +55,6 @@ class RiuGridPlotWindow : public QWidget, public RiuInterfaceToViewWindow, publi
public: public:
RiuGridPlotWindow( RimGridPlotWindow* plotDefinition, QWidget* parent = nullptr ); RiuGridPlotWindow( RimGridPlotWindow* plotDefinition, QWidget* parent = nullptr );
~RiuGridPlotWindow() override;
RimGridPlotWindow* ownerPlotDefinition(); RimGridPlotWindow* ownerPlotDefinition();
RimViewWindow* ownerViewWindow() const override; RimViewWindow* ownerViewWindow() const override;

8
ApplicationCode/UserInterface/RiuQwtPlotWidget.cpp
View File

@ -76,7 +76,13 @@ RiuQwtPlotWidget::RiuQwtPlotWidget( RimPlotInterface* plotTrackDefinition, QWidg
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuQwtPlotWidget::~RiuQwtPlotWidget() {} RiuQwtPlotWidget::~RiuQwtPlotWidget()
{
if ( plotDefinition() )
{
plotDefinition()->detachAllCurves();
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///