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

Property filer: Do not show (combined) per face results

Browse Source
This commit is contained in:
Magne Sjaastad 2014-08-19 13:35:10 +02:00
parent a2f4887d56
commit eb96c5a7ed
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
View File

@ -128,21 +128,31 @@ QList<caf::PdmOptionItemInfo> RimCellPropertyFilter::calculateValueOptions(const
{ {
QList<caf::PdmOptionItemInfo> optionItems = resultDefinition->calculateValueOptions(fieldNeedingOptions, useOptionsOnly); QList<caf::PdmOptionItemInfo> optionItems = resultDefinition->calculateValueOptions(fieldNeedingOptions, useOptionsOnly);
// Remove ternary from list, as it is not supported to perform filtering on a ternary result std::vector<int> indicesToRemove;
int ternaryIndex = -1;
for (int i = 0; i < optionItems.size(); i++) for (int i = 0; i < optionItems.size(); i++)
{ {
QString text = optionItems[i].optionUiText; QString text = optionItems[i].optionUiText;
if (text.compare(RimDefines::ternarySaturationResultName(), Qt::CaseInsensitive) == 0) if (text.compare(RimDefines::ternarySaturationResultName(), Qt::CaseInsensitive) == 0)
{ {
ternaryIndex = i; indicesToRemove.push_back(i);
}
else if (text.compare(RimDefines::combinedMultResultName(), Qt::CaseInsensitive) == 0)
{
indicesToRemove.push_back(i);
}
else if (text.compare(RimDefines::combinedTransmissibilityResultName(), Qt::CaseInsensitive) == 0)
{
indicesToRemove.push_back(i);
} }
} }
if (ternaryIndex != -1) std::sort(indicesToRemove.begin(), indicesToRemove.end());
std::vector<int>::reverse_iterator rit;
for (rit = indicesToRemove.rbegin(); rit != indicesToRemove.rend(); ++rit)
{ {
optionItems.takeAt(ternaryIndex); optionItems.takeAt(*rit);
} }
return optionItems; return optionItems;