From a8d1dfa329e94af612f350cc76319b94d9025741 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 8 Dec 2015 17:43:07 +0100 Subject: [PATCH] (#696) Fixed missing display of ternary config for separate fault result --- .../ProjectDataModel/RimEclipseFaultColors.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp b/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp index 7a28274b07..5122a5ff1b 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp @@ -23,8 +23,10 @@ #include "RigMainGrid.h" #include "RimEclipseCase.h" -#include "RimEclipseView.h" #include "RimEclipseCellColors.h" +#include "RimEclipseView.h" +#include "RimTernaryLegendConfig.h" + #include "RiuMainWindow.h" #include "cafPdmUiTreeOrdering.h" @@ -144,7 +146,12 @@ bool RimEclipseFaultColors::hasValidCustomResult() //-------------------------------------------------------------------------------------------------- void RimEclipseFaultColors::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) { - if (m_customFaultResultColors()->legendConfig()) + if (m_customFaultResultColors()->ternaryLegendConfig() + && !m_customFaultResultColors()->ternaryLegendConfig.uiCapability()->isUiChildrenHidden(uiConfigName)) + { + uiTreeOrdering.add(m_customFaultResultColors()->ternaryLegendConfig()); + } + else if (m_customFaultResultColors()->legendConfig()) { uiTreeOrdering.add(m_customFaultResultColors()->legendConfig()); }