OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "#5031 Summary Data : Make sure the reader is created in constructor"

Browse Source 
This reverts commit 2b8219a855.
This commit is contained in:
Magne Sjaastad 2019-11-12 18:25:38 +01:00
parent e82f6a5ab7
commit 3455b305e0
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
View File

@ -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;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.h
View File

@ -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;

8
ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp
View File

@ -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 );
}
//--------------------------------------------------------------------------------------------------