(#696) Fixed missing display of ternary config for separate fault result

This commit is contained in:
Magne Sjaastad 2015-12-08 17:43:07 +01:00
parent 75b476c063
commit a8d1dfa329

View File

@ -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());
}