From 81686707ec4288fb471213112e0afd1013053119 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Mon, 24 Oct 2016 13:54:35 +0200
Subject: [PATCH] #916 Summary : Preferences - Autogenerate plot if summary is
 found, and default vector filter

---
 ApplicationCode/Application/RiaApplication.cpp     | 11 ++++++++---
 ApplicationCode/Application/RiaPreferences.cpp     | 14 +++++++++++++-
 ApplicationCode/Application/RiaPreferences.h       |  6 ++++++
 .../RicNewSummaryPlotFeature.cpp                   |  3 ++-
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index 3417c41329..a2333df888 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -847,10 +847,15 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
             {
                 newSumCase->loadCase();
 
-                RimMainPlotCollection* mainPlotColl = m_project->mainPlotCollection();
-                RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
+                if (m_preferences->autoCreatePlotsOnImport())
+                {
+                    getOrCreateAndShowMainPlotWindow();
+
+                    RimMainPlotCollection* mainPlotColl = m_project->mainPlotCollection();
+                    RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
                 
-                RicNewSummaryPlotFeature::createNewSummaryPlot(summaryPlotColl, newSumCase);
+                    RicNewSummaryPlotFeature::createNewSummaryPlot(summaryPlotColl, newSumCase);
+                }
 
                 sumCaseColl->updateConnectedEditors();
             }
diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp
index 43d21b2b31..11a6f025b9 100644
--- a/ApplicationCode/Application/RiaPreferences.cpp
+++ b/ApplicationCode/Application/RiaPreferences.cpp
@@ -86,8 +86,14 @@ RiaPreferences::RiaPreferences(void)
     CAF_PDM_InitFieldNoDefault(&readerSettings,        "readerSettings", "Reader settings", "", "", "");
     readerSettings = new RifReaderSettings;
 
+    CAF_PDM_InitField(&autoCreatePlotsOnImport,         "AutoCreatePlotsOnImport", true, "Create Summary Plots When Importing Eclipse Case", "", "", "");
+    autoCreatePlotsOnImport.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
+    
+    CAF_PDM_InitField(&defaultCurveFilter,              "DefaultCurveFilter", QString("F*PT"), "Default Vector Selection Filter", "", "", "");
+
     m_tabNames << "General";
     m_tabNames << "Octave";
+    m_tabNames << "Summary";
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -120,7 +126,8 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
             field == &useShaders ||
             field == &showHud ||
             field == &appendClassNameToUiText ||
-            field == &showLasCurveWithoutTvdWarning )
+            field == &showLasCurveWithoutTvdWarning ||
+            field == &autoCreatePlotsOnImport)
     {
         caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
         if (myAttr)
@@ -178,6 +185,11 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
         scriptGroup->add(&scriptDirectories);
         scriptGroup->add(&scriptEditorExecutable);
     }
+    else if (uiConfigName == m_tabNames[2])
+    {
+        uiOrdering.add(&autoCreatePlotsOnImport);
+        uiOrdering.add(&defaultCurveFilter);
+    }
 
     uiOrdering.setForgetRemainingFields(true);
 }
diff --git a/ApplicationCode/Application/RiaPreferences.h b/ApplicationCode/Application/RiaPreferences.h
index 966d90ab62..4c340f0d3d 100644
--- a/ApplicationCode/Application/RiaPreferences.h
+++ b/ApplicationCode/Application/RiaPreferences.h
@@ -75,6 +75,12 @@ public: // Pdm Fields
 
     caf::PdmChildField<RifReaderSettings*> readerSettings;
 
+    // Summary
+
+    caf::PdmField<bool>     autoCreatePlotsOnImport;
+    caf::PdmField<QString>  defaultCurveFilter;
+
+
 protected:
     virtual void                            defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
     virtual void                            defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp
index 3a7f15bd80..35612bec54 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp
@@ -19,6 +19,7 @@
 #include "RicNewSummaryPlotFeature.h"
 
 #include "RiaApplication.h"
+#include "RiaPreferences.h"
 
 #include "RimMainPlotCollection.h"
 #include "RimProject.h"
@@ -102,7 +103,7 @@ void RicNewSummaryPlotFeature::createNewSummaryPlot(RimSummaryPlotCollection* su
 
     if (summaryCase)
     {
-        newCurveFilter->createCurves(summaryCase, "F*PT");
+        newCurveFilter->createCurves(summaryCase, RiaApplication::instance()->preferences()->defaultCurveFilter());
     }
 
     plot->addCurveFilter(newCurveFilter);