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

#8034 Pass reader settings to eclipse loading methods.

Browse Source
This commit is contained in:
Kristian Bendiksen
2021-09-27 12:14:06 +02:00
parent 51808d5ba7
commit f407acd5fa
19 changed files with 158 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationLibCode/FileInterface/RifReaderInterface.cpp
View File

@@ -47,6 +47,14 @@ bool RifReaderInterface::isNNCsEnabled()
return readerSettings()->importNNCs;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifReaderInterface::isSkipWellData()
{
return readerSettings()->skipWellData;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -115,9 +123,24 @@ size_t RifReaderInterface::timeStepIndexOnFile( size_t timeStepIndex ) const
//--------------------------------------------------------------------------------------------------
const RifReaderSettings* RifReaderInterface::readerSettings() const
{
RiaPreferences* prefs = RiaPreferences::current();
if ( m_readerSettings )
{
return m_readerSettings.get();
}
else
{
RiaPreferences* prefs = RiaPreferences::current();
CVF_ASSERT( prefs->readerSettings() );
CVF_ASSERT( prefs->readerSettings() );
return prefs->readerSettings();
return prefs->readerSettings();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifReaderInterface::setReaderSettings( std::shared_ptr<RifReaderSettings> readerSettings )
{
m_readerSettings = readerSettings;
}