From ccf689b20339c6b485a54c8dfdbb8bcdb388c6a1 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 22 Jan 2014 14:04:09 +0100 Subject: [PATCH] Show combined transmissibility first in list --- .../ProjectDataModel/RimResultDefinition.cpp | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp index e91d54ff3d..ed298330b8 100644 --- a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp @@ -158,12 +158,27 @@ QList RimResultDefinition::calculateValueOptions(const c if (this->currentGridCellResults()) { QStringList varList = getResultVariableListForCurrentUIFieldSettings(); + + bool hasCombinedTransmissibility = false; QList optionList; - int i; - for (i = 0; i < varList.size(); ++i) + for (int i = 0; i < varList.size(); ++i) { - optionList.push_back(caf::PdmOptionItemInfo( varList[i], varList[i])); + + if (varList[i].compare(RimDefines::combinedTransmissibilityResultName(), Qt::CaseInsensitive) == 0) + { + hasCombinedTransmissibility = true; + continue; + } + + optionList.push_back(caf::PdmOptionItemInfo(varList[i], varList[i])); + } + + if (hasCombinedTransmissibility) + { + optionList.push_front(caf::PdmOptionItemInfo(RimDefines::combinedTransmissibilityResultName(), RimDefines::combinedTransmissibilityResultName())); + } + optionList.push_front(caf::PdmOptionItemInfo( RimDefines::undefinedResultName(), RimDefines::undefinedResultName() )); if (useOptionsOnly) *useOptionsOnly = true;