From da7c8170236bb4c63c5fbd6e4206c86560727fa6 Mon Sep 17 00:00:00 2001
From: Rebecca Cox <rebecca.cox@acando.no>
Date: Mon, 13 Nov 2017 08:56:22 +0100
Subject: [PATCH] #2129 Rft/Plt plot: Show formations on default, and not
 always

---
 .../ProjectDataModel/Flow/RimWellPltPlot.cpp      | 15 ++++++++++-----
 .../ProjectDataModel/Flow/RimWellPltPlot.h        |  1 +
 .../ProjectDataModel/Flow/RimWellRftPlot.cpp      | 12 ++++++++++--
 .../ProjectDataModel/Flow/RimWellRftPlot.h        |  1 +
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
index 0dc81625dd..80d8f094d8 100644
--- a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
@@ -128,6 +128,7 @@ RimWellPltPlot::RimWellPltPlot()
 
     this->setAsPlotMdiWindow();
     m_doInitAfterLoad = false;
+    m_isOnLoad = true;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1256,11 +1257,6 @@ void RimWellPltPlot::initAfterLoad()
         }
     }
     m_selectedSources = std::vector<RifWellRftAddress>(selectedSources.begin(), selectedSources.end());
-
-    if( m_wellLogPlot->trackCount() > 0);
-    {
-        m_wellLogPlot->trackByIndex(0)->setShowFormations(true);
-    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1444,6 +1440,15 @@ void RimWellPltPlot::onLoadDataAndUpdate()
         m_doInitAfterLoad = false;
     }
 
+    if (m_isOnLoad)
+    {
+        if (m_wellLogPlot->trackCount() > 0)
+        {
+            m_wellLogPlot->trackByIndex(0)->setShowFormations(true);
+        }
+        m_isOnLoad = false;
+    }
+
     updateMdiWindowVisibility();
     updateFormationsOnPlot();
     syncCurvesFromUiSelection();
diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h
index 3693ed1810..2dc77f98ba 100644
--- a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h
+++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h
@@ -161,4 +161,5 @@ private:
     caf::PdmField<std::vector<caf::AppEnum<FlowPhase>>> m_phases;
 
     bool                                            m_doInitAfterLoad;
+    bool                                            m_isOnLoad;
 };
diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
index 315f9c4d2f..ea8281ec9b 100644
--- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
@@ -98,6 +98,7 @@ RimWellRftPlot::RimWellRftPlot()
 
     this->setAsPlotMdiWindow();
     m_selectedSourcesOrTimeStepsFieldsChanged = false;
+    m_isOnLoad = true;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -258,8 +259,6 @@ void RimWellRftPlot::updateFormationsOnPlot() const
 {
     if (m_wellLogPlot->trackCount() > 0)
     {
-        m_wellLogPlot->trackByIndex(0)->setShowFormations(true);
-
         RimProject* proj = RiaApplication::instance()->project();
         RimWellPath* wellPath = proj->wellPathByName(m_wellPathNameOrSimWellName);
 
@@ -1042,6 +1041,15 @@ QString RimWellRftPlot::description() const
 //--------------------------------------------------------------------------------------------------
 void RimWellRftPlot::onLoadDataAndUpdate()
 {
+    if (m_isOnLoad)
+    {
+        if (m_wellLogPlot->trackCount() > 0)
+        {
+            m_wellLogPlot->trackByIndex(0)->setShowFormations(true);
+        }
+
+        m_isOnLoad = false;
+    }
     updateMdiWindowVisibility();
     updateFormationsOnPlot();
     m_wellLogPlot->loadDataAndUpdate();
diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h
index ff9a83b1e3..1ccb764ad3 100644
--- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h
+++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h
@@ -149,4 +149,5 @@ private:
     std::map<QDateTime, std::set<RifWellRftAddress>> m_timeStepsToAddresses;
 
     bool m_selectedSourcesOrTimeStepsFieldsChanged;
+    bool m_isOnLoad;
 };