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

#1768 Move RifReaderSettings to private member of RiaPreferences

Browse Source
This commit is contained in:
Magne Sjaastad
2017-08-29 08:27:42 +02:00
parent a9381b862f
commit 609bf4037b
6 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ApplicationCode/FileInterface/RifReaderInterface.cpp
View File

@@ -19,27 +19,17 @@
#include "RifReaderInterface.h"
#include "RifReaderSettings.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifReaderInterface::setReaderSetting(RifReaderSettings* settings)
{
m_settings = settings;
}
#include "RifReaderSettings.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifReaderInterface::isFaultImportEnabled()
{
if (m_settings.notNull())
{
return m_settings->importFaults;
}
return false;
return readerSettings()->importFaults;
}
//--------------------------------------------------------------------------------------------------
@@ -47,12 +37,7 @@ bool RifReaderInterface::isFaultImportEnabled()
//--------------------------------------------------------------------------------------------------
bool RifReaderInterface::isImportOfCompleteMswDataEnabled()
{
if (m_settings.notNull())
{
return m_settings->importAdvancedMswData;
}
return false;
return readerSettings()->importAdvancedMswData;
}
//--------------------------------------------------------------------------------------------------
@@ -60,12 +45,7 @@ bool RifReaderInterface::isImportOfCompleteMswDataEnabled()
//--------------------------------------------------------------------------------------------------
bool RifReaderInterface::isNNCsEnabled()
{
if (m_settings.notNull())
{
return m_settings->importNNCs;
}
return false;
return readerSettings()->importNNCs;
}
//--------------------------------------------------------------------------------------------------
@@ -73,12 +53,7 @@ bool RifReaderInterface::isNNCsEnabled()
//--------------------------------------------------------------------------------------------------
const QString RifReaderInterface::faultIncludeFileAbsolutePathPrefix()
{
if (m_settings.notNull())
{
return m_settings->faultIncludeFileAbsolutePathPrefix;
}
return QString();
return readerSettings()->faultIncludeFileAbsolutePathPrefix;
}
//--------------------------------------------------------------------------------------------------
@@ -120,3 +95,15 @@ size_t RifReaderInterface::timeStepIndexOnFile(size_t timeStepIndex) const
return timeStepIndex;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RifReaderSettings* RifReaderInterface::readerSettings() const
{
RiaPreferences* prefs = RiaApplication::instance()->preferences();
CVF_ASSERT(prefs->readerSettings());
return prefs->readerSettings();
}

10
ApplicationCode/FileInterface/RifReaderInterface.h
View File

@@ -49,8 +49,6 @@ public:
RifReaderInterface() { }
virtual ~RifReaderInterface() { }
void setReaderSetting(RifReaderSettings* settings);
bool isFaultImportEnabled();
bool isImportOfCompleteMswDataEnabled();
bool isNNCsEnabled();
@@ -72,8 +70,10 @@ protected:
size_t timeStepIndexOnFile(size_t timeStepIndex) const;
private:
std::vector<QString> m_filenamesWithFaults;
caf::PdmPointer<RifReaderSettings> m_settings;
const RifReaderSettings* readerSettings() const;
private:
std::vector<QString> m_filenamesWithFaults;
std::vector<size_t> m_fileTimeStepIndices;
std::vector<size_t> m_fileTimeStepIndices;
};