#5226 Ensemble Filter : Remove colors group from property editor

This commit is contained in:
Magne Sjaastad 2019-12-16 11:44:25 +01:00
parent 91e8b1a839
commit b6b5b014ad

View File

@ -142,71 +142,60 @@ void RimEnsembleCurveFilterCollection::fieldChangedByUi( const caf::PdmFieldHand
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveFilterCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
RimEnsembleCurveSet* curveSet = nullptr;
this->firstAncestorOrThisOfType( curveSet );
if ( curveSet )
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Filters" );
group->add( &m_newFilterButton );
for ( auto& filter : m_filters )
{
// Show the color control group
curveSet->appendColorGroup( uiOrdering );
}
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Filters" );
group->add( &m_newFilterButton );
for ( auto& filter : m_filters )
QString groupTitle;
auto selEnsembleParam = filter->selectedEnsembleParameter();
if ( selEnsembleParam.isNumeric() )
{
QString groupTitle;
auto selEnsembleParam = filter->selectedEnsembleParameter();
if ( selEnsembleParam.isNumeric() )
groupTitle = filter->ensembleParameterName();
if ( !filter->isActive() )
{
groupTitle = filter->ensembleParameterName();
if ( !filter->isActive() )
{
groupTitle += " - [Disabled]";
}
else
{
groupTitle += QString( " [%2 .. %3]" )
.arg( QString::number( filter->minValue() ) )
.arg( QString::number( filter->maxValue() ) );
}
groupTitle += " - [Disabled]";
}
else if ( selEnsembleParam.isText() )
else
{
groupTitle = filter->ensembleParameterName();
if ( !filter->isActive() )
{
groupTitle += " - [Disabled]";
}
else
{
groupTitle += " { ";
bool first = true;
for ( const auto& cat : filter->categories() )
{
if ( !first ) groupTitle += ", ";
groupTitle += cat;
first = false;
}
groupTitle += " }";
if ( groupTitle.size() > 45 )
{
groupTitle = groupTitle.left( 40 ) + "... }";
}
}
groupTitle += QString( " [%2 .. %3]" )
.arg( QString::number( filter->minValue() ) )
.arg( QString::number( filter->maxValue() ) );
}
caf::PdmUiGroup* filterGroup = group->addNewGroupWithKeyword( groupTitle,
QString( "EnsembleFilter_" ) +
filter->filterId() );
filter->defineUiOrdering( uiConfigName, *filterGroup );
}
else if ( selEnsembleParam.isText() )
{
groupTitle = filter->ensembleParameterName();
if ( !filter->isActive() )
{
groupTitle += " - [Disabled]";
}
else
{
groupTitle += " { ";
bool first = true;
for ( const auto& cat : filter->categories() )
{
if ( !first ) groupTitle += ", ";
groupTitle += cat;
first = false;
}
groupTitle += " }";
if ( groupTitle.size() > 45 )
{
groupTitle = groupTitle.left( 40 ) + "... }";
}
}
}
caf::PdmUiGroup* filterGroup = group->addNewGroupWithKeyword( groupTitle,
QString( "EnsembleFilter_" ) + filter->filterId() );
filter->defineUiOrdering( uiConfigName, *filterGroup );
}
uiOrdering.skipRemainingFields( true );