From 8a88208f65066012f2c566a7c55a04550db059f7 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 10 Dec 2019 15:35:00 +0100
Subject: [PATCH] #5207 Curve Calculator : Move dialog to RiuPlotMainWindow

---
 .../RicShowSummaryCurveCalculatorFeature.cpp       | 13 +++++++++++--
 .../UserInterface/RiuPlotMainWindow.cpp            | 14 ++++++++++++++
 ApplicationCode/UserInterface/RiuPlotMainWindow.h  |  7 +++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicShowSummaryCurveCalculatorFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicShowSummaryCurveCalculatorFeature.cpp
index 48cfdb5219..e990905f39 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicShowSummaryCurveCalculatorFeature.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicShowSummaryCurveCalculatorFeature.cpp
@@ -21,9 +21,13 @@
 #include "RicSummaryCurveCalculatorDialog.h"
 
 #include "RiaApplication.h"
+#include "RiaGuiApplication.h"
+
 #include "RimProject.h"
 #include "RimSummaryCalculationCollection.h"
 
+#include "RiuPlotMainWindow.h"
+
 #include <QAction>
 
 CAF_CMD_SOURCE_INIT( RicShowSummaryCurveCalculatorFeature, "RicShowSummaryCurveCalculatorFeature" );
@@ -33,9 +37,14 @@ CAF_CMD_SOURCE_INIT( RicShowSummaryCurveCalculatorFeature, "RicShowSummaryCurveC
 //--------------------------------------------------------------------------------------------------
 RicSummaryCurveCalculatorDialog* RicShowSummaryCurveCalculatorFeature::curveCalculatorDialog()
 {
-    static RicSummaryCurveCalculatorDialog* singleton = new RicSummaryCurveCalculatorDialog( nullptr );
+    RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow();
 
-    return singleton;
+    if ( mainPlotWindow )
+    {
+        return mainPlotWindow->summaryCurveCalculatorDialog();
+    }
+
+    return nullptr;
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp b/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
index d1a8ab7df9..2baa3074f6 100644
--- a/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
+++ b/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
@@ -37,6 +37,7 @@
 #include "RimWellLogPlot.h"
 #include "RimWellRftPlot.h"
 
+#include "SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h"
 #include "SummaryPlotCommands/RicSummaryCurveCreatorDialog.h"
 
 #include "RiuDockWidgetTools.h"
@@ -654,6 +655,19 @@ RicSummaryCurveCreatorDialog* RiuPlotMainWindow::summaryCurveCreatorDialog()
     return m_summaryCurveCreatorDialog;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RicSummaryCurveCalculatorDialog* RiuPlotMainWindow::summaryCurveCalculatorDialog()
+{
+    if ( m_summaryCurveCalculatorDialog.isNull() )
+    {
+        m_summaryCurveCalculatorDialog = new RicSummaryCurveCalculatorDialog( this );
+    }
+
+    return m_summaryCurveCalculatorDialog;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/UserInterface/RiuPlotMainWindow.h b/ApplicationCode/UserInterface/RiuPlotMainWindow.h
index 2f4d12a3c9..48264fae18 100644
--- a/ApplicationCode/UserInterface/RiuPlotMainWindow.h
+++ b/ApplicationCode/UserInterface/RiuPlotMainWindow.h
@@ -35,6 +35,7 @@ class RiuViewer;
 struct RimMdiWindowGeometry;
 class RimViewWindow;
 class RicSummaryCurveCreatorDialog;
+class RicSummaryCurveCalculatorDialog;
 
 namespace caf
 {
@@ -87,7 +88,8 @@ public:
     void updateSummaryPlotToolBar( bool forceUpdateUi = false );
     void setFocusToLineEditInSummaryToolBar();
 
-    RicSummaryCurveCreatorDialog* summaryCurveCreatorDialog();
+    RicSummaryCurveCreatorDialog*    summaryCurveCreatorDialog();
+    RicSummaryCurveCalculatorDialog* summaryCurveCalculatorDialog();
 
 protected:
     void closeEvent( QCloseEvent* event ) override;
@@ -132,7 +134,8 @@ private:
 
     caf::PdmUiPropertyView* m_pdmUiPropertyView;
 
-    QPointer<RicSummaryCurveCreatorDialog> m_summaryCurveCreatorDialog;
+    QPointer<RicSummaryCurveCreatorDialog>    m_summaryCurveCreatorDialog;
+    QPointer<RicSummaryCurveCalculatorDialog> m_summaryCurveCalculatorDialog;
 
     std::vector<QWidget*> m_temporaryWidgets;
 };