#7750 Histogram Plot: Group bin settings in a 'Bins' property group

Move Number of Bins and the new binning fields into a shared UI group created by
RimHistogramDataSource::appendBinningUiOrdering().

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

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

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

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

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

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<double, double> binRange( double dataMin, double dataMax, double smallestPositiveValue ) const;