Merge pull request #5021 from OPM/improve-default-flow-diag-plots

#5020 Flow Diag : Improve default initialization of plots

ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp

@@ -144,14 +144,6 @@ 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();
 }
 
@@ -160,12 +152,32 @@ RimWellAllocationPlot* RimFlowPlotCollection::defaultWellAllocPlot()
 //--------------------------------------------------------------------------------------------------
 RimFlowCharacteristicsPlot* RimFlowPlotCollection::defaultFlowCharacteristicsPlot()
 {
+    return m_flowCharacteristicsPlot();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimFlowPlotCollection::ensureDefaultPlotsAreCreated()
+{
+    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 )
+    {
         this->updateConnectedEditors();
-
+    }
-    return m_flowCharacteristicsPlot();
 }

ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.h

@@ -46,6 +46,8 @@ public:
     RimWellAllocationPlot*      defaultWellAllocPlot();
     RimFlowCharacteristicsPlot* defaultFlowCharacteristicsPlot();
 
+    void ensureDefaultPlotsAreCreated();
+
 private:
     caf::PdmChildField<RimFlowCharacteristicsPlot*>      m_flowCharacteristicsPlot;
     caf::PdmChildField<RimWellAllocationPlot*>           m_defaultWellAllocPlot;

ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp

@@ -127,6 +127,8 @@ RimWellAllocationPlot::RimWellAllocationPlot()
         {RimWellLogPlot::CONNECTION_NUMBER, RimWellLogPlot::TRUE_VERTICAL_DEPTH, RimWellLogPlot::PSEUDO_LENGTH} );
 
     m_accumulatedWellFlowPlot->setCommonDataSourceEnabled( false );
+
+    m_showWindow = false;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -168,6 +170,8 @@ void RimWellAllocationPlot::setFromSimulationWell( RimSimWellInView* simWell )
         m_flowDiagSolution = m_case->defaultFlowDiagSolution();
     }
 
+    m_showWindow = true;
+
     onLoadDataAndUpdate();
 }
 
@@ -647,6 +651,11 @@ QList<caf::PdmOptionItemInfo>
         {
             options.push_back( caf::PdmOptionItemInfo( timeStepNames[i], i ) );
         }
+
+        if ( options.size() == 0 )
+        {
+            options.push_front( caf::PdmOptionItemInfo( "None", -1 ) );
+        }
     }
     else if ( fieldNeedingOptions == &m_case )
     {

ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp

@@ -299,3 +299,11 @@ void RimMainPlotCollection::deleteAllCachedData()
     m_rftPlotCollection()->deleteAllExtractors();
     m_pltPlotCollection()->deleteAllExtractors();
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimMainPlotCollection::ensureDefaultFlowPlotsAreCreated()
+{
+    m_flowPlotCollection()->ensureDefaultPlotsAreCreated();
+}

ApplicationCode/ProjectDataModel/RimMainPlotCollection.h

@@ -67,6 +67,8 @@ public:
     void updatePlotsWithCompletions();
     void deleteAllCachedData();
 
+    void ensureDefaultFlowPlotsAreCreated();
+
 private:
     // Overridden PDM methods
     caf::PdmFieldHandle* objectToggleField() override;

ApplicationCode/UserInterface/RiuPlotMainWindow.cpp

@@ -24,6 +24,7 @@
 #include "RiaSummaryTools.h"
 
 #include "RimEnsembleCurveSetCollection.h"
+#include "RimMainPlotCollection.h"
 #include "RimProject.h"
 #include "RimSummaryCaseMainCollection.h"
 #include "RimSummaryCurveCollection.h"
@@ -98,7 +99,8 @@ QString RiuPlotMainWindow::mainWindowName()
 //--------------------------------------------------------------------------------------------------
 void RiuPlotMainWindow::initializeGuiNewProjectLoaded()
 {
-    setPdmRoot( RiaApplication::instance()->project() );
+    auto project = RiaApplication::instance()->project();
+    setPdmRoot( project );
     restoreTreeViewState();
 
     if ( m_pdmUiPropertyView && m_pdmUiPropertyView->currentObject() )
@@ -140,6 +142,11 @@ void RiuPlotMainWindow::initializeGuiNewProjectLoaded()
     }
 
     refreshToolbars();
+
+    if ( project && project->mainPlotCollection() )
+    {
+        project->mainPlotCollection()->ensureDefaultFlowPlotsAreCreated();
+    }
 }
 
 //--------------------------------------------------------------------------------------------------