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

Fix crash when closing and reopening plots

ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp

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

ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h

@@ -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 detachAllCurves() override;
-    void                 updateCurveNamesAndPlotTitle();
+    void reattachAllCurves() override;
-    void                 swapAxes();
+
+    void performAutoNameUpdate() override;
+    void updateCurveNamesAndPlotTitle();
+    void swapAxes();
     QString              asciiTitleForPlotExport( int dataSetIndex ) const;
     QString              asciiDataForGridCrossPlotExport( int dataSetIndex ) const;
 

ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurve.cpp

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

ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp

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

ApplicationCode/ProjectDataModel/RimPlotInterface.h

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

ApplicationCode/ProjectDataModel/RimWellLogTrack.h

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

ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h

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

ApplicationCode/UserInterface/RiuQwtPlotWidget.cpp

@@ -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 );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/UserInterface/RiuQwtPlotWidget.h

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