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

8
ApplicationCode/ProjectDataModel/RimCellFilter.cpp
View File

@@ -128,7 +128,7 @@ caf::PdmFieldHandle* RimCellFilter::objectToggleField()
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimCellFilter::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> optionList;
QList<caf::PdmOptionItemInfo> options;
if (&m_selectedCategoryValues == fieldNeedingOptions)
{
@@ -141,7 +141,7 @@ QList<caf::PdmOptionItemInfo> RimCellFilter::calculateValueOptions(const caf::Pd
int categoryValue = m_categoryValues[i];
QString categoryName = m_categoryNames[i];
optionList.push_back(caf::PdmOptionItemInfo(categoryName, categoryValue));
options.push_back(caf::PdmOptionItemInfo(categoryName, categoryValue));
}
}
else
@@ -149,12 +149,12 @@ QList<caf::PdmOptionItemInfo> RimCellFilter::calculateValueOptions(const caf::Pd
for (auto it : m_categoryValues)
{
QString str = QString::number(it);
optionList.push_back(caf::PdmOptionItemInfo(str, it));
options.push_back(caf::PdmOptionItemInfo(str, it));
}
}
}
return optionList;
return options;
}
//--------------------------------------------------------------------------------------------------