diff --git a/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleFractureHistogramDataSource.cpp b/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleFractureHistogramDataSource.cpp index 4865ba4ffb..f2ab77eaa6 100644 --- a/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleFractureHistogramDataSource.cpp +++ b/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleFractureHistogramDataSource.cpp @@ -77,8 +77,7 @@ void RimEnsembleFractureHistogramDataSource ::defineUiOrdering( QString uiConfig { uiOrdering.add( &m_ensembleFractureStatistics ); uiOrdering.add( &m_property ); - uiOrdering.add( &m_numBins ); - appendBinningUiOrdering( uiOrdering ); + appendBinningUiOrdering( uiOrdering, &m_numBins ); uiOrdering.skipRemainingFields( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleParameterHistogramDataSource.cpp b/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleParameterHistogramDataSource.cpp index 65614786c9..aecd2ec13b 100644 --- a/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleParameterHistogramDataSource.cpp +++ b/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleParameterHistogramDataSource.cpp @@ -91,8 +91,7 @@ void RimEnsembleParameterHistogramDataSource ::defineUiOrdering( QString uiConfi { uiOrdering.add( &m_ensemble ); uiOrdering.add( &m_parameter ); - uiOrdering.add( &m_numBins ); - appendBinningUiOrdering( uiOrdering ); + appendBinningUiOrdering( uiOrdering, &m_numBins ); uiOrdering.skipRemainingFields( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleSummaryVectorHistogramDataSource.cpp b/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleSummaryVectorHistogramDataSource.cpp index 650ebc5a5b..e985607089 100644 --- a/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleSummaryVectorHistogramDataSource.cpp +++ b/ApplicationLibCode/ProjectDataModel/Histogram/RimEnsembleSummaryVectorHistogramDataSource.cpp @@ -136,8 +136,7 @@ void RimEnsembleSummaryVectorHistogramDataSource::defineUiOrdering( QString uiCo uiOrdering.add( &m_ensemble ); uiOrdering.add( &m_summaryAddressUiField ); uiOrdering.add( &m_timeStep ); - uiOrdering.add( &m_numBins ); - appendBinningUiOrdering( uiOrdering ); + appendBinningUiOrdering( uiOrdering, &m_numBins ); uiOrdering.skipRemainingFields( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.cpp b/ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.cpp index 4021f4746b..ea9b606a5d 100644 --- a/ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.cpp +++ b/ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.cpp @@ -130,8 +130,7 @@ void RimGridStatisticsHistogramDataSource ::defineUiOrdering( QString uiConfigNa m_property->uiOrdering( uiConfigName, *propertyGroup ); } - uiOrdering.add( &m_numBins ); - appendBinningUiOrdering( uiOrdering ); + appendBinningUiOrdering( uiOrdering, &m_numBins ); uiOrdering.skipRemainingFields( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.cpp b/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.cpp index 75f110aa9b..44c7ed84dc 100644 --- a/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.cpp +++ b/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.cpp @@ -104,15 +104,17 @@ void RimHistogramDataSource::fieldChangedByUi( const caf::PdmFieldHandle* change //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimHistogramDataSource::appendBinningUiOrdering( caf::PdmUiOrdering& uiOrdering ) +void RimHistogramDataSource::appendBinningUiOrdering( caf::PdmUiOrdering& uiOrdering, caf::PdmFieldHandle* numBinsField ) { - uiOrdering.add( &m_binningMode ); - uiOrdering.add( &m_binRangeMode ); + caf::PdmUiGroup* binsGroup = uiOrdering.addNewGroup( "Bins" ); + if ( numBinsField ) binsGroup->add( numBinsField ); + binsGroup->add( &m_binningMode ); + binsGroup->add( &m_binRangeMode ); if ( useUserDefinedBinRange() ) { - uiOrdering.add( &m_binRangeMin ); - uiOrdering.add( &m_binRangeMax ); - uiOrdering.add( &m_outOfRangeHandling ); + binsGroup->add( &m_binRangeMin ); + binsGroup->add( &m_binRangeMax ); + binsGroup->add( &m_outOfRangeHandling ); } } diff --git a/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.h b/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.h index ddf205b075..745d0e81e1 100644 --- a/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.h +++ b/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.h @@ -110,7 +110,7 @@ public: protected: void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; - void appendBinningUiOrdering( caf::PdmUiOrdering& uiOrdering ); + void appendBinningUiOrdering( caf::PdmUiOrdering& uiOrdering, caf::PdmFieldHandle* numBinsField ); std::pair binRange( double dataMin, double dataMax, double smallestPositiveValue ) const;