From dbdd28fcdeebd3f9022619ee15dfdcd391ef6ec1 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 9 May 2014 07:34:27 +0200 Subject: [PATCH] When no ternary component is present, hide TERNARY result --- ApplicationCode/ProjectDataModel/RimReservoirView.cpp | 3 ++- ApplicationCode/ProjectDataModel/RimResultDefinition.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index 6e83c97a77..40350f8c1b 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -1453,7 +1453,8 @@ void RimReservoirView::updateLegends() viewer()->removeOverlayItem(this->cellResult()->ternaryLegendConfig->legend()); - if (this->cellResult()->isTernarySaturationSelected()) + size_t maxTimeStepCount = results->maxTimeStepCount(); + if (this->cellResult()->isTernarySaturationSelected() && maxTimeStepCount > 1) { RimReservoirCellResultsStorage* gridCellResults = this->cellResult()->currentGridCellResults(); { diff --git a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp index 7a039c0ae8..110036ffb8 100644 --- a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp @@ -178,7 +178,12 @@ QList RimResultDefinition::calculateValueOptions(const c optionList.push_front(caf::PdmOptionItemInfo(RimDefines::combinedTransmissibilityResultName(), RimDefines::combinedTransmissibilityResultName())); } - if (m_resultTypeUiField == RimDefines::DYNAMIC_NATIVE) + bool hasAtLeastOneTernaryComponent = false; + if (varList.contains("SOIL")) hasAtLeastOneTernaryComponent = true; + else if (varList.contains("SGAS")) hasAtLeastOneTernaryComponent = true; + else if (varList.contains("SWAT")) hasAtLeastOneTernaryComponent = true; + + if (m_resultTypeUiField == RimDefines::DYNAMIC_NATIVE && hasAtLeastOneTernaryComponent) { optionList.push_front(caf::PdmOptionItemInfo(RimDefines::ternarySaturationResultName(), RimDefines::ternarySaturationResultName())); }