Release RC_2

* Enables custom color selection for statistics curves
* Bump to RC_2

ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp

@@ -1209,6 +1209,8 @@ void RimEnsembleCurveSet::childFieldChangedByUi( const caf::PdmFieldHandle* chan
     }
     if ( changedChildField == &m_statistics )
     {
+        computeRealizationColor();
+
         if ( auto summaryPlot = firstAncestorOrThisOfType<RimSummaryPlot>() )
         {
             summaryPlot->loadDataAndUpdate();
@@ -1267,10 +1269,6 @@ void RimEnsembleCurveSet::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde
     }
 
     caf::PdmUiGroup* statGroup = uiOrdering.addNewGroup( "Statistics" );
-
-    bool showStatisticsColor = m_statisticsUseCustomAppearance() == RimCurveAppearanceDefines::AppearanceMode::CUSTOM;
-    m_statistics->showColorField( showStatisticsColor );
-
     m_statistics->defaultUiOrdering( isXAxisSummaryVector(), *statGroup );
 
     bool enableIncomplete = true;
@@ -1367,7 +1365,7 @@ void RimEnsembleCurveSet::computeRealizationColor()
 
         m_colorForRealizations = RiaColorTools::fromQColorTo3f( blendedColor );
 
-        if ( m_statisticsUseCustomAppearance() == RimCurveAppearanceDefines::AppearanceMode::DEFAULT )
+        if ( !m_statistics->customColor() )
         {
             setStatisticsColor( m_mainEnsembleColor );
         }

ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp

@@ -62,6 +62,7 @@ RimEnsembleStatistics::RimEnsembleStatistics( RimEnsembleCurveSetInterface* pare
     CAF_PDM_InitField( &m_warningLabel, "WarningLabel", QString( "Warning: Ensemble time range mismatch" ), "" );
 
     CAF_PDM_InitField( &m_color, "Color", RiaColorTools::textColor3f(), "Color" );
+    CAF_PDM_InitField( &m_customColor, "CustomColorColor", false, "Custom Color" );
 
     m_warningLabel.xmlCapability()->disableIO();
     m_warningLabel.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
@@ -73,8 +74,6 @@ RimEnsembleStatistics::RimEnsembleStatistics( RimEnsembleCurveSetInterface* pare
         m_showStatisticsCurveLegends = true;
     }
 
-    m_showColorField = true;
-
     setNotifyAllFieldsInMultiFieldChangedEvents( true );
 }
 
@@ -182,6 +181,14 @@ void RimEnsembleStatistics::setColor( const cvf::Color3f& color )
     m_color = color;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RimEnsembleStatistics::customColor() const
+{
+    return m_customColor();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -238,14 +245,6 @@ void RimEnsembleStatistics::disableMeanCurve( bool disable )
     m_showMeanCurve.uiCapability()->setUiReadOnly( disable );
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RimEnsembleStatistics::showColorField( bool show )
-{
-    m_showColorField = show;
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -268,7 +267,8 @@ void RimEnsembleStatistics::defaultUiOrdering( bool showCrossPlotGroup, caf::Pdm
         crossPlotGroup->add( &m_crossPlotCurvesStatisticsRealizationCountThresholdPerBin );
     }
 
-    if ( m_showColorField ) uiOrdering.add( &m_color );
+    uiOrdering.add( &m_customColor );
+    if ( m_customColor() ) uiOrdering.add( &m_color );
 
     auto group = uiOrdering.addNewGroup( "Curves" );
     if ( !curveSet->hasMeanData() ) group->add( &m_warningLabel );

ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.h

@@ -52,6 +52,7 @@ public:
 
     cvf::Color3f color() const { return m_color; }
     void         setColor( const cvf::Color3f& color );
+    bool         customColor() const;
 
     bool includeIncompleteCurves() const;
 
@@ -63,8 +64,6 @@ public:
     void disableP90Curve( bool disable );
     void disableMeanCurve( bool disable );
 
-    void showColorField( bool show );
-
     void defaultUiOrdering( bool showCrossPlotGroup, caf::PdmUiOrdering& uiOrdering );
 
 private:
@@ -87,6 +86,7 @@ private:
     caf::PdmField<bool>           m_showMeanCurve;
     caf::PdmField<bool>           m_showCurveLabels;
     caf::PdmField<bool>           m_includeIncompleteCurves;
+    caf::PdmField<bool>           m_customColor;
 
     // Ensemble cross plot settings
     caf::PdmField<int> m_crossPlotCurvesBinCount;
@@ -94,6 +94,5 @@ private:
 
     caf::PdmField<QString> m_warningLabel;
 
-    bool                        m_showColorField;
     caf::PdmField<cvf::Color3f> m_color;
 };

ResInsightVersion.cmake

@@ -5,7 +5,7 @@ set(RESINSIGHT_PATCH_VERSION 0)
 
 # Opional text with no restrictions
 #set(RESINSIGHT_VERSION_TEXT "-dev")
-set(RESINSIGHT_VERSION_TEXT "-RC_1")
+set(RESINSIGHT_VERSION_TEXT "-RC_2")
 
 # Optional text
 # Must be unique and increasing within one combination of major/minor/patch version