OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-08 15:14:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4287 Preferences : Rename from fault file prefix to general prefix

Browse Source
This commit is contained in:
Magne Sjaastad 2019-04-04 20:28:36 +02:00
parent a812190af3
commit b8ff8a2de8
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifReaderInterface.cpp
View File

@ -53,7 +53,7 @@ bool RifReaderInterface::isNNCsEnabled()
//--------------------------------------------------------------------------------------------------
const QString RifReaderInterface::faultIncludeFileAbsolutePathPrefix()
{
return readerSettings()->faultIncludeFileAbsolutePathPrefix;
return readerSettings()->includeFileAbsolutePathPrefix;
}
//--------------------------------------------------------------------------------------------------

11
ApplicationCode/FileInterface/RifReaderSettings.cpp
View File

@ -50,7 +50,14 @@ RifReaderSettings::RifReaderSettings()
CAF_PDM_InitField(&skipWellData, "skipWellData", false, "Skip Import of Simulation Well Data", "", "", "");
skipWellData.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&faultIncludeFileAbsolutePathPrefix, "faultIncludeFileAbsolutePathPrefix", QString(), "Fault Include File Absolute Path Prefix", "", "Path used to prefix absolute UNIX paths in fault include statements on Windows", "");
CAF_PDM_InitField(
&includeFileAbsolutePathPrefix,
"includeFileAbsolutePathPrefix",
QString(),
"Include File Absolute Path Prefix",
"",
"Path used to prefix absolute UNIX paths in include statements on Windows, used when searching for FAULTS and EQUIL",
"");
}
//--------------------------------------------------------------------------------------------------
@ -79,7 +86,7 @@ void RifReaderSettings::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderin
{
uiOrdering.add(&importFaults);
#ifdef WIN32
uiOrdering.add(&faultIncludeFileAbsolutePathPrefix);
uiOrdering.add(&includeFileAbsolutePathPrefix);
#endif
uiOrdering.add(&importNNCs);
uiOrdering.add(&importAdvancedMswData);

2
ApplicationCode/FileInterface/RifReaderSettings.h
View File

@ -39,7 +39,7 @@ public:
caf::PdmField<bool> importFaults;
caf::PdmField<bool> importNNCs;
caf::PdmField<bool> importAdvancedMswData;
caf::PdmField<QString> faultIncludeFileAbsolutePathPrefix;
caf::PdmField<QString> includeFileAbsolutePathPrefix;
caf::PdmField<bool> useResultIndexFile;
caf::PdmField<bool> skipWellData;

2
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -171,7 +171,7 @@ void RimEclipseCase::ensureDeckIsParsedForEquilData()
RiaPreferences* prefs = RiaApplication::instance()->preferences();
if (prefs->readerSettings())
{
includeFileAbsolutePathPrefix = prefs->readerSettings()->faultIncludeFileAbsolutePathPrefix();
includeFileAbsolutePathPrefix = prefs->readerSettings()->includeFileAbsolutePathPrefix();
}
}