#5020 Flow Diag : Avoid creating plots in constructor to make pytest work

ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp

@@ -144,6 +144,14 @@ void RimFlowPlotCollection::addFlowCharacteristicsPlotToStoredPlots( RimFlowChar
 //--------------------------------------------------------------------------------------------------
 RimWellAllocationPlot* RimFlowPlotCollection::defaultWellAllocPlot()
 {
+    if ( !m_defaultWellAllocPlot() )
+    {
+        m_defaultWellAllocPlot = new RimWellAllocationPlot;
+        m_defaultWellAllocPlot->setDescription( "Default Flow Diagnostics Plot" );
+    }
+
+    this->updateConnectedEditors();
+
     return m_defaultWellAllocPlot();
 }
 
@@ -152,32 +160,29 @@ RimWellAllocationPlot* RimFlowPlotCollection::defaultWellAllocPlot()
 //--------------------------------------------------------------------------------------------------
 RimFlowCharacteristicsPlot* RimFlowPlotCollection::defaultFlowCharacteristicsPlot()
 {
+    if ( !m_flowCharacteristicsPlot() )
+    {
+        m_flowCharacteristicsPlot = new RimFlowCharacteristicsPlot;
+    }
+
+    this->updateConnectedEditors();
+
     return m_flowCharacteristicsPlot();
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFlowPlotCollection::ensureDefaultPlotsAreCreated()
+void RimFlowPlotCollection::ensureDefaultFlowPlotsAreCreated()
 {
-    bool isUpdateRequired = false;
-
-    if ( !m_flowCharacteristicsPlot() )
-    {
-        m_flowCharacteristicsPlot = new RimFlowCharacteristicsPlot;
-        isUpdateRequired          = true;
-    }
-
     if ( !m_defaultWellAllocPlot() )
     {
         m_defaultWellAllocPlot = new RimWellAllocationPlot;
         m_defaultWellAllocPlot->setDescription( "Default Flow Diagnostics Plot" );
-
-        isUpdateRequired = true;
     }
 
-    if ( isUpdateRequired )
+    if ( !m_flowCharacteristicsPlot() )
     {
-        this->updateConnectedEditors();
+        m_flowCharacteristicsPlot = new RimFlowCharacteristicsPlot;
     }
 }

ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.h

@@ -45,8 +45,7 @@ public:
     void                        addFlowCharacteristicsPlotToStoredPlots( RimFlowCharacteristicsPlot* plot );
     RimWellAllocationPlot*      defaultWellAllocPlot();
     RimFlowCharacteristicsPlot* defaultFlowCharacteristicsPlot();
-
-    void ensureDefaultPlotsAreCreated();
+    void                        ensureDefaultFlowPlotsAreCreated();
 
 private:
     caf::PdmChildField<RimFlowCharacteristicsPlot*>      m_flowCharacteristicsPlot;

ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp

@@ -154,6 +154,8 @@ RimWellAllocationPlot::~RimWellAllocationPlot()
 //--------------------------------------------------------------------------------------------------
 void RimWellAllocationPlot::setFromSimulationWell( RimSimWellInView* simWell )
 {
+    m_showWindow = true;
+
     RimEclipseView* eclView;
     simWell->firstAncestorOrThisOfType( eclView );
     RimEclipseResultCase* eclCase;
@@ -170,8 +172,6 @@ void RimWellAllocationPlot::setFromSimulationWell( RimSimWellInView* simWell )
         m_flowDiagSolution = m_case->defaultFlowDiagSolution();
     }
 
-    m_showWindow = true;
-
     onLoadDataAndUpdate();
 }
 

ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp

@@ -305,5 +305,5 @@ void RimMainPlotCollection::deleteAllCachedData()
 //--------------------------------------------------------------------------------------------------
 void RimMainPlotCollection::ensureDefaultFlowPlotsAreCreated()
 {
-    m_flowPlotCollection()->ensureDefaultPlotsAreCreated();
+    m_flowPlotCollection()->ensureDefaultFlowPlotsAreCreated();
 }

ApplicationCode/ProjectDataModel/RimMainPlotCollection.h

@@ -66,7 +66,6 @@ public:
     void updatePlotsWithFormations();
     void updatePlotsWithCompletions();
     void deleteAllCachedData();
-
     void ensureDefaultFlowPlotsAreCreated();
 
 private: