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