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

#1059 Rename

Browse Source
This commit is contained in:
Magne Sjaastad
2017-01-05 07:57:37 +01:00
parent a9984c4bd5
commit a61b3ad5f6
10 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
View File

@@ -196,10 +196,10 @@ void RimWellLogFileCurve::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrd
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> optionList;
QList<caf::PdmOptionItemInfo> options;
optionList = RimWellLogCurve::calculateValueOptions(fieldNeedingOptions, useOptionsOnly);
if (optionList.size() > 0) return optionList;
options = RimWellLogCurve::calculateValueOptions(fieldNeedingOptions, useOptionsOnly);
if (options.size() > 0) return options;
if (fieldNeedingOptions == &m_wellPath)
{
@@ -213,13 +213,13 @@ QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const c
// Only include well paths coming from a well log file
if (wellPaths[i]->m_wellLogFile())
{
optionList.push_back(caf::PdmOptionItemInfo(wellPaths[i]->name(), wellPaths[i]));
options.push_back(caf::PdmOptionItemInfo(wellPaths[i]->name(), wellPaths[i]));
}
}
if (optionList.size() > 0)
if (options.size() > 0)
{
optionList.push_front(caf::PdmOptionItemInfo("None", nullptr));
options.push_front(caf::PdmOptionItemInfo("None", nullptr));
}
}
}
@@ -236,18 +236,18 @@ QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const c
for (size_t i = 0; i < fileLogs->size(); i++)
{
QString wellLogChannelName = (*fileLogs)[i]->name();
optionList.push_back(caf::PdmOptionItemInfo(wellLogChannelName, wellLogChannelName));
options.push_back(caf::PdmOptionItemInfo(wellLogChannelName, wellLogChannelName));
}
}
}
if (optionList.size() == 0)
if (options.size() == 0)
{
optionList.push_back(caf::PdmOptionItemInfo("None", "None"));
options.push_back(caf::PdmOptionItemInfo("None", "None"));
}
}
return optionList;
return options;
}
//--------------------------------------------------------------------------------------------------