#3952 Summary : Create plot if no plot exists when loading summary case

ApplicationCode/Application/RiaApplication.cpp

@@ -1984,8 +1984,6 @@ bool RiaApplication::openFile(const QString& fileName)
         if (loadingSucceded)
         {
             getOrCreateAndShowMainPlotWindow();
-
-            m_project->updateConnectedEditors();
         }
     }
 

ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp

@@ -18,7 +18,8 @@
 
 #include "RiaImportEclipseCaseTools.h"
 
-#include "../SummaryPlotCommands/RicNewSummaryPlotFeature.h"
+#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
+#include "SummaryPlotCommands/RicNewSummaryCurveFeature.h"
 
 #include "RiaApplication.h"
 #include "RiaLogging.h"
@@ -47,6 +48,7 @@
 #include "RimSummaryCurve.h"
 #include "RimSummaryCurveCollection.h"
 #include "RimSummaryCurveFilter.h"
+#include "RimSummaryPlot.h"
 #include "RimSummaryPlotCollection.h"
 
 #include "RiuMainWindow.h"
@@ -153,7 +155,11 @@ bool RiaImportEclipseCaseTools::openEclipseCasesFromFile(const QStringList& file
 
             if (!newSumCases.empty())
             {
-                RiuPlotMainWindowTools::setExpanded(newSumCases.back());
+                RimSummaryPlotCollection* summaryPlotColl = project->mainPlotCollection()->summaryPlotCollection();
+
+                RicNewSummaryCurveFeature::ensureAtLeastOnePlot(summaryPlotColl, newSumCases.front());
+
+                RiuPlotMainWindowTools::setExpanded(newSumCases.front());
             }
         }
     }

ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp

@@ -18,6 +18,8 @@
 
 #include "RicImportSummaryCasesFeature.h"
 
+#include "SummaryPlotCommands/RicNewSummaryCurveFeature.h"
+
 #include "RiaApplication.h"
 #include "RiaLogging.h"
 #include "RiaPreferences.h"
@@ -187,6 +189,12 @@ void RicImportSummaryCasesFeature::addSummaryCases(const std::vector<RimSummaryC
     RimProject* proj = app->project();
     RimSummaryCaseMainCollection* sumCaseColl = proj->activeOilField() ? proj->activeOilField()->summaryCaseMainCollection() : nullptr;
     sumCaseColl->addCases(cases);
+
+    if (!cases.empty())
+    {
+        RicNewSummaryCurveFeature::createNewPlot(proj->mainPlotCollection->summaryPlotCollection(), cases.front());
+    }
+
     sumCaseColl->updateAllRequiredEditors();
 }
 

ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFeature.cpp

@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2016-     Statoil ASA
-// 
+//
 //  ResInsight is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
 //  the Free Software Foundation, either version 3 of the License, or
 //  (at your option) any later version.
-// 
+//
 //  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
 //  WARRANTY; without even the implied warranty of MERCHANTABILITY or
 //  FITNESS FOR A PARTICULAR PURPOSE.
-// 
-//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
 //  for more details.
 //
 /////////////////////////////////////////////////////////////////////////////////
@@ -21,10 +21,10 @@
 #include "RiaApplication.h"
 #include "RiaColorTables.h"
 
+#include "RiaSummaryTools.h"
 #include "RimMainPlotCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
-#include "RiaSummaryTools.h"
 #include "RimSummaryCaseMainCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryPlot.h"
@@ -37,20 +37,83 @@
 #include "cvfAssert.h"
 
 #include <QAction>
-
+#include "RiuPlotMainWindowTools.h"
 
 CAF_CMD_SOURCE_INIT(RicNewSummaryCurveFeature, "RicNewSummaryCurveFeature");
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimSummaryCurve* RicNewSummaryCurveFeature::addCurveToPlot(RimSummaryPlot* plot, RimSummaryCase* summaryCase)
+{
+    if (plot)
+    {
+        RimSummaryCurve* newCurve = new RimSummaryCurve();
+
+        // Use same counting as RicNewSummaryEnsembleCurveSetFeature::onActionTriggered
+        cvf::Color3f curveColor = RiaColorTables::summaryCurveDefaultPaletteColors().cycledColor3f(plot->singleColorCurveCount());
+        newCurve->setColor(curveColor);
+
+        plot->addCurveAndUpdate(newCurve);
+
+        if (summaryCase)
+        {
+            newCurve->setSummaryCaseY(summaryCase);
+        }
+
+        newCurve->setSummaryAddressY(RifEclipseSummaryAddress::fieldAddress("FOPT"));
+
+        newCurve->loadDataAndUpdate(true);
+
+        return newCurve;
+    }
+
+    return nullptr;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
+void RicNewSummaryCurveFeature::ensureAtLeastOnePlot(RimSummaryPlotCollection* summaryPlotCollection, RimSummaryCase* summaryCase)
+{
+    if (summaryPlotCollection && summaryCase)
+    {
+        if (summaryPlotCollection->summaryPlots.empty())
+        {
+            createNewPlot(summaryPlotCollection, summaryCase);
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicNewSummaryCurveFeature::createNewPlot(RimSummaryPlotCollection* summaryPlotCollection, RimSummaryCase* summaryCase)
+{
+    if (summaryPlotCollection && summaryCase)
+    {
+        auto plot = summaryPlotCollection->createSummaryPlotWithAutoTitle();
+
+        auto curve = RicNewSummaryCurveFeature::addCurveToPlot(plot, summaryCase);
+        plot->loadDataAndUpdate();
+
+        summaryPlotCollection->updateConnectedEditors();
+
+        RiuPlotMainWindowTools::setExpanded(curve);
+        RiuPlotMainWindowTools::selectAsCurrentItem(curve);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
 bool RicNewSummaryCurveFeature::isCommandEnabled()
 {
     return (selectedSummaryPlot());
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 void RicNewSummaryCurveFeature::onActionTriggered(bool isChecked)
 {
@@ -60,25 +123,14 @@ void RicNewSummaryCurveFeature::onActionTriggered(bool isChecked)
     RimSummaryPlot* plot = selectedSummaryPlot();
     if (plot)
     {
-        RimSummaryCurve* newCurve = new RimSummaryCurve();
-        
-        // Use same counting as RicNewSummaryEnsembleCurveSetFeature::onActionTriggered
-        cvf::Color3f curveColor = RiaColorTables::summaryCurveDefaultPaletteColors().cycledColor3f(plot->singleColorCurveCount());
-        newCurve->setColor(curveColor);
-
-        plot->addCurveAndUpdate(newCurve);
-
-        RimSummaryCase* defaultCase = nullptr; 
+        RimSummaryCase* defaultCase = nullptr;
         if (project->activeOilField()->summaryCaseMainCollection()->summaryCaseCount() > 0)
         {
             defaultCase = project->activeOilField()->summaryCaseMainCollection()->summaryCase(0);
-            newCurve->setSummaryCaseY(defaultCase);
-
-            newCurve->setSummaryAddressY(RifEclipseSummaryAddress::fieldAddress("FOPT"));
-
-            newCurve->loadDataAndUpdate(true);
         }
-        
+
+        RimSummaryCurve* newCurve = addCurveToPlot(plot, defaultCase);
+
         plot->updateConnectedEditors();
 
         RiaApplication::instance()->getOrCreateAndShowMainPlotWindow()->selectAsCurrentItem(newCurve);
@@ -89,7 +141,7 @@ void RicNewSummaryCurveFeature::onActionTriggered(bool isChecked)
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 void RicNewSummaryCurveFeature::setupActionLook(QAction* actionToSetup)
 {
@@ -98,13 +150,13 @@ void RicNewSummaryCurveFeature::setupActionLook(QAction* actionToSetup)
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 RimSummaryPlot* RicNewSummaryCurveFeature::selectedSummaryPlot() const
 {
     RimSummaryPlot* sumPlot = nullptr;
 
-    caf::PdmObject* selObj =  dynamic_cast<caf::PdmObject*>(caf::SelectionManager::instance()->selectedItem());
+    caf::PdmObject* selObj = dynamic_cast<caf::PdmObject*>(caf::SelectionManager::instance()->selectedItem());
     if (selObj)
     {
         sumPlot = RiaSummaryTools::parentSummaryPlot(selObj);

ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFeature.h

@@ -23,6 +23,9 @@
 #include <vector>
 
 class RimSummaryPlot;
+class RimSummaryCase;
+class RimSummaryCurve;
+class RimSummaryPlotCollection;
 
 //==================================================================================================
 /// 
@@ -30,6 +33,12 @@ class RimSummaryPlot;
 class RicNewSummaryCurveFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
+
+public:
+    static RimSummaryCurve* addCurveToPlot(RimSummaryPlot* plot, RimSummaryCase* summaryCase);
+    static void ensureAtLeastOnePlot(RimSummaryPlotCollection* summaryPlotCollection, RimSummaryCase* summaryCase);
+    static void createNewPlot(RimSummaryPlotCollection* summaryPlotCollection, RimSummaryCase* summaryCase);
+
 protected:
     // Overrides
     bool isCommandEnabled() override;

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -1067,7 +1067,7 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
     if (uiConfigName == "PlotWindow")
     {
         {
-            auto itemCollection = uiTreeOrdering.add("Input case data", ":/Folder.png");
+            auto itemCollection = uiTreeOrdering.add("Cases", ":/Folder.png");
 
             RimOilField* oilField = activeOilField();
             if (oilField)
@@ -1085,7 +1085,7 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
 
         if (mainPlotCollection)
         {
-            auto itemCollection = uiTreeOrdering.add("Plot definitions", ":/Folder.png");
+            auto itemCollection = uiTreeOrdering.add("Plots", ":/Folder.png");
             if (mainPlotCollection->summaryPlotCollection())
             {
                 itemCollection->add(mainPlotCollection->summaryPlotCollection());