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

18
ApplicationCode/Application/RiaPreferences.cpp
View File

@@ -83,8 +83,8 @@ RiaPreferences::RiaPreferences(void)
CAF_PDM_InitField(&loadAndShowSoil, "loadAndShowSoil", true, "Load and Show SOIL", "", "", "");
loadAndShowSoil.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitFieldNoDefault(&readerSettings, "readerSettings", "Reader Settings", "", "", "");
readerSettings = new RifReaderSettings;
CAF_PDM_InitFieldNoDefault(&m_readerSettings, "readerSettings", "Reader Settings", "", "", "");
m_readerSettings = new RifReaderSettings;
CAF_PDM_InitField(&autoCreatePlotsOnImport, "AutoCreatePlotsOnImport", true, "Automatically Create Summary Plots On Import", "", "", "");
autoCreatePlotsOnImport.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
@@ -102,7 +102,7 @@ RiaPreferences::RiaPreferences(void)
//--------------------------------------------------------------------------------------------------
RiaPreferences::~RiaPreferences(void)
{
delete readerSettings;
delete m_readerSettings;
}
//--------------------------------------------------------------------------------------------------
@@ -110,7 +110,7 @@ RiaPreferences::~RiaPreferences(void)
//--------------------------------------------------------------------------------------------------
void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute)
{
readerSettings->defineEditorAttribute(field, uiConfigName, attribute);
m_readerSettings->defineEditorAttribute(field, uiConfigName, attribute);
if (field == &scriptDirectories)
{
@@ -172,7 +172,7 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
newCaseBehaviourGroup->add(&autocomputeDepthRelatedProperties);
newCaseBehaviourGroup->add(&loadAndShowSoil);
readerSettings->defineUiOrdering(uiConfigName, *newCaseBehaviourGroup);
m_readerSettings->defineUiOrdering(uiConfigName, *newCaseBehaviourGroup);
}
else if (uiConfigName == m_tabNames[2])
{
@@ -227,3 +227,11 @@ QStringList RiaPreferences::tabNames()
return m_tabNames;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RifReaderSettings* RiaPreferences::readerSettings() const
{
return m_readerSettings;
}