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

#6630 Use MAX_COLUMN_SPAN instead of the magic number -1 for LayoutOption in RimPlotDataFilterItem

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-09-30 14:27:49 +02:00
committed by Magne Sjaastad
parent 914d7d6a11
commit a86e19202b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp
View File

@@ -324,16 +324,16 @@ void RimPlotDataFilterItem::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
uiOrdering.add( &m_filterTarget, {true, -1, 1} );
if ( m_filterTarget() == ENSEMBLE_CASE )
{
uiOrdering.add( &m_filterEnsembleParameter, {true, -1, 1} );
uiOrdering.add( &m_filterEnsembleParameter, {true, caf::PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN, 1} );
}
else
{
uiOrdering.add( &m_filterQuantityUiField, {true, -1, 1} );
uiOrdering.add( &m_filterQuantityUiField, {true, caf::PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN, 1} );
// uiOrdering.add( &m_filterQuantitySelectButton, {false, 1, 0} );
}
if ( m_filterTarget() != ENSEMBLE_CASE )
{
uiOrdering.add( &m_consideredTimestepsType, {true, -1, 1} );
uiOrdering.add( &m_consideredTimestepsType, {true, caf::PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN, 1} );
if ( m_consideredTimestepsType == SELECT_TIMESTEPS || m_consideredTimestepsType == SELECT_TIMESTEP_RANGE )
{
uiOrdering.add( &m_explicitlySelectedTimeSteps );
@@ -356,8 +356,8 @@ void RimPlotDataFilterItem::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
if ( m_filterOperation() == RANGE )
{
uiOrdering.add( &m_max, {true, -1, 1} );
uiOrdering.add( &m_min, {true, -1, 1} );
uiOrdering.add( &m_max, {true, caf::PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN, 1} );
uiOrdering.add( &m_min, {true, caf::PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN, 1} );
}
else if ( m_filterOperation == TOP_N || m_filterOperation == BOTTOM_N )
{