OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#5226 Ensemble Filter : Remove colors group from property editor

Browse Source
This commit is contained in:
Magne Sjaastad 2019-12-16 11:44:25 +01:00
parent 91e8b1a839
commit b6b5b014ad
1 changed files with 47 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp
View File

@ -142,71 +142,60 @@ void RimEnsembleCurveFilterCollection::fieldChangedByUi( const caf::PdmFieldHand
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEnsembleCurveFilterCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) void RimEnsembleCurveFilterCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{ {
RimEnsembleCurveSet* curveSet = nullptr; caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Filters" );
this->firstAncestorOrThisOfType( curveSet );
if ( curveSet ) group->add( &m_newFilterButton );
for ( auto& filter : m_filters )
{ {
// Show the color control group QString groupTitle;
curveSet->appendColorGroup( uiOrdering ); auto selEnsembleParam = filter->selectedEnsembleParameter();
} if ( selEnsembleParam.isNumeric() )
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Filters" );
group->add( &m_newFilterButton );
for ( auto& filter : m_filters )
{ {
QString groupTitle; groupTitle = filter->ensembleParameterName();
auto selEnsembleParam = filter->selectedEnsembleParameter();
if ( selEnsembleParam.isNumeric() ) if ( !filter->isActive() )
{ {
groupTitle = filter->ensembleParameterName(); groupTitle += " - [Disabled]";
if ( !filter->isActive() )
{
groupTitle += " - [Disabled]";
}
else
{
groupTitle += QString( " [%2 .. %3]" )
.arg( QString::number( filter->minValue() ) )
.arg( QString::number( filter->maxValue() ) );
}
} }
else if ( selEnsembleParam.isText() ) else
{ {
groupTitle = filter->ensembleParameterName(); groupTitle += QString( " [%2 .. %3]" )
.arg( QString::number( filter->minValue() ) )
if ( !filter->isActive() ) .arg( QString::number( filter->maxValue() ) );
{
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 );
} }
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 ); uiOrdering.skipRemainingFields( true );