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

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

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

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

@ -44,6 +44,8 @@ RimFileSummaryCase::RimFileSummaryCase()
CAF_PDM_InitField( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files", "", "", "" ); CAF_PDM_InitField( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files", "", "", "" );
m_includeRestartFiles.uiCapability()->setUiHidden( true ); m_includeRestartFiles.uiCapability()->setUiHidden( true );
m_summaryFileReader = new RifReaderEclipseSummary;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -83,8 +85,12 @@ void RimFileSummaryCase::updateFilePathsFromProjectPath( const QString& newProje
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimFileSummaryCase::createSummaryReaderInterface() void RimFileSummaryCase::createSummaryReaderInterface()
{ {
m_summaryFileReader = RimFileSummaryCase::findRelatedFilesAndCreateReader( this->summaryHeaderFilename(), if ( !m_summaryFileReader->open( this->summaryHeaderFilename(), m_includeRestartFiles ) )
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;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

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

@ -50,9 +50,7 @@ public:
void setIncludeRestartFiles( bool includeRestartFiles ); void setIncludeRestartFiles( bool includeRestartFiles );
static RifReaderEclipseSummary* findRelatedFilesAndCreateReader( const QString& headerFileName, static RifReaderEclipseRft* findRftDataAndCreateReader( const QString& headerFileName );
bool includeRestartFiles );
static RifReaderEclipseRft* findRftDataAndCreateReader( const QString& headerFileName );
private: private:
cvf::ref<RifReaderEclipseSummary> m_summaryFileReader; cvf::ref<RifReaderEclipseSummary> m_summaryFileReader;

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

@ -52,6 +52,8 @@ RimGridSummaryCase::RimGridSummaryCase()
CAF_PDM_InitField( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files", "", "", "" ); CAF_PDM_InitField( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files", "", "", "" );
m_includeRestartFiles.uiCapability()->setUiHidden( true ); m_includeRestartFiles.uiCapability()->setUiHidden( true );
m_summaryFileReader = new RifReaderEclipseSummary;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -173,8 +175,10 @@ void RimGridSummaryCase::updateFilePathsFromProjectPath( const QString& newProje
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGridSummaryCase::createSummaryReaderInterface() void RimGridSummaryCase::createSummaryReaderInterface()
{ {
m_summaryFileReader = RimFileSummaryCase::findRelatedFilesAndCreateReader( this->summaryHeaderFilename(), if ( !m_summaryFileReader->open( this->summaryHeaderFilename(), m_includeRestartFiles ) )
m_includeRestartFiles ); {
m_summaryFileReader = nullptr;
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------