From 3455b305e015963e4635974ce31367897be8ab4b Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 12 Nov 2019 18:25:38 +0100
Subject: [PATCH] Revert "#5031 Summary Data : Make sure the reader is created
 in constructor"

This reverts commit 2b8219a855ef64d60f9c672c1dbc9c54102a8349.
---
 .../Summary/RimFileSummaryCase.cpp            | 29 ++++++++++++++-----
 .../Summary/RimFileSummaryCase.h              |  4 ++-
 .../Summary/RimGridSummaryCase.cpp            |  8 ++---
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
index b5f9c74096..67671726bf 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
@@ -44,8 +44,6 @@ RimFileSummaryCase::RimFileSummaryCase()
     CAF_PDM_InitField( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files", "", "", "" );
 
     m_includeRestartFiles.uiCapability()->setUiHidden( true );
-
-    m_summaryFileReader = new RifReaderEclipseSummary;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -85,12 +83,8 @@ void RimFileSummaryCase::updateFilePathsFromProjectPath( const QString& newProje
 //--------------------------------------------------------------------------------------------------
 void RimFileSummaryCase::createSummaryReaderInterface()
 {
-    if ( !m_summaryFileReader->open( this->summaryHeaderFilename(), m_includeRestartFiles ) )
-    {
-        RiaLogging::warning( QString( "Failed to open summary file %1" ).arg( this->summaryHeaderFilename() ) );
-
-        m_summaryFileReader = nullptr;
-    }
+    m_summaryFileReader = RimFileSummaryCase::findRelatedFilesAndCreateReader( this->summaryHeaderFilename(),
+                                                                               m_includeRestartFiles );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -105,6 +99,25 @@ void RimFileSummaryCase::createRftReaderInterface()
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RifReaderEclipseSummary* RimFileSummaryCase::findRelatedFilesAndCreateReader( const QString& headerFileName,
+                                                                              bool           includeRestartFiles )
+{
+    RifReaderEclipseSummary* summaryFileReader = new RifReaderEclipseSummary;
+
+    if ( !summaryFileReader->open( headerFileName, includeRestartFiles ) )
+    {
+        RiaLogging::warning( QString( "Failed to open summary file %1" ).arg( headerFileName ) );
+
+        delete summaryFileReader;
+        summaryFileReader = nullptr;
+    }
+
+    return summaryFileReader;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.h b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.h
index 9b33930fe6..902bb5dfe0 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.h
@@ -50,7 +50,9 @@ public:
 
     void setIncludeRestartFiles( bool includeRestartFiles );
 
-    static RifReaderEclipseRft* findRftDataAndCreateReader( const QString& headerFileName );
+    static RifReaderEclipseSummary* findRelatedFilesAndCreateReader( const QString& headerFileName,
+                                                                     bool           includeRestartFiles );
+    static RifReaderEclipseRft*     findRftDataAndCreateReader( const QString& headerFileName );
 
 private:
     cvf::ref<RifReaderEclipseSummary> m_summaryFileReader;
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp
index c980f11fa2..c5f5eac66e 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp
@@ -52,8 +52,6 @@ RimGridSummaryCase::RimGridSummaryCase()
 
     CAF_PDM_InitField( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files", "", "", "" );
     m_includeRestartFiles.uiCapability()->setUiHidden( true );
-
-    m_summaryFileReader = new RifReaderEclipseSummary;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -175,10 +173,8 @@ void RimGridSummaryCase::updateFilePathsFromProjectPath( const QString& newProje
 //--------------------------------------------------------------------------------------------------
 void RimGridSummaryCase::createSummaryReaderInterface()
 {
-    if ( !m_summaryFileReader->open( this->summaryHeaderFilename(), m_includeRestartFiles ) )
-    {
-        m_summaryFileReader = nullptr;
-    }
+    m_summaryFileReader = RimFileSummaryCase::findRelatedFilesAndCreateReader( this->summaryHeaderFilename(),
+                                                                               m_includeRestartFiles );
 }
 
 //--------------------------------------------------------------------------------------------------