From cf190b05c1020b698319330a9704aff71eb6a1a6 Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Wed, 27 Nov 2019 14:03:20 +0100
Subject: [PATCH] #5051 Do not auto zoom when adding/removing curves in plot

---
 ApplicationCode/ProjectDataModel/RimPlotCurve.cpp   | 13 ++++---------
 ApplicationCode/ProjectDataModel/RimPlotCurve.h     |  2 +-
 .../Summary/RimEnsembleCurveSet.cpp                 |  4 ++--
 ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp |  2 ++
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimPlotCurve.cpp b/ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
index 95ed87052f..1645919324 100644
--- a/ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
@@ -197,8 +197,8 @@ void RimPlotCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
 {
     if ( changedField == &m_showCurve )
     {
-        this->updateCurveVisibility( true );
-        if ( m_showCurve() ) loadDataAndUpdate( true );
+        this->updateCurveVisibility();
+        if ( m_showCurve() ) loadDataAndUpdate( false );
     }
     else if ( changedField == &m_curveName )
     {
@@ -284,7 +284,7 @@ void RimPlotCurve::setLegendEntryText( const QString& legendEntryText )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimPlotCurve::updateCurveVisibility( bool updateParentPlot )
+void RimPlotCurve::updateCurveVisibility()
 {
     if ( canCurveBeAttached() )
     {
@@ -295,11 +295,6 @@ void RimPlotCurve::updateCurveVisibility( bool updateParentPlot )
         m_qwtPlotCurve->detach();
         m_qwtCurveErrorBars->detach();
     }
-
-    if ( updateParentPlot )
-    {
-        updateZoomInParentPlot();
-    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -318,7 +313,7 @@ void RimPlotCurve::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 void RimPlotCurve::updateCurvePresentation( bool updatePlotLegendAndTitle )
 {
-    this->updateCurveVisibility( updatePlotLegendAndTitle );
+    this->updateCurveVisibility();
 
     if ( updatePlotLegendAndTitle )
     {
diff --git a/ApplicationCode/ProjectDataModel/RimPlotCurve.h b/ApplicationCode/ProjectDataModel/RimPlotCurve.h
index d4696ccf87..6fb5cf0d96 100644
--- a/ApplicationCode/ProjectDataModel/RimPlotCurve.h
+++ b/ApplicationCode/ProjectDataModel/RimPlotCurve.h
@@ -100,7 +100,7 @@ public:
     QString legendEntryText() const;
     void    setLegendEntryText( const QString& legendEntryText );
 
-    void updateCurveVisibility( bool updateParentPlot );
+    void updateCurveVisibility();
     void updateLegendEntryVisibilityAndPlotLegend();
     void updateLegendEntryVisibilityNoPlotUpdate();
 
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
index 81faa8ffaa..a7396418cd 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
@@ -1007,7 +1007,7 @@ void RimEnsembleCurveSet::updateEnsembleCurves( const std::vector<RimSummaryCase
 
                 addCurve( curve );
 
-                curve->updateCurveVisibility( false );
+                curve->updateCurveVisibility();
                 curve->loadDataAndUpdate( false );
                 curve->updateQwtPlotAxis();
 
@@ -1104,7 +1104,7 @@ void RimEnsembleCurveSet::updateStatisticsCurves( const std::vector<RimSummaryCa
         curve->setSummaryAddressYAndApplyInterpolation( address );
         curve->setLeftOrRightAxisY( m_plotAxis() );
 
-        curve->updateCurveVisibility( false );
+        curve->updateCurveVisibility();
         curve->loadDataAndUpdate( false );
         curve->updateQwtPlotAxis();
     }
diff --git a/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp b/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp
index e0970cffc4..0d0d299a16 100644
--- a/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp
+++ b/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp
@@ -321,6 +321,8 @@ void RiuSummaryQwtPlot::endZoomOperations()
 //--------------------------------------------------------------------------------------------------
 void RiuSummaryQwtPlot::onZoomedSlot()
 {
+    plotDefinition()->setAutoScaleXEnabled( false );
+    plotDefinition()->setAutoScaleYEnabled( false );
     plotDefinition()->updateZoomFromQwt();
 }