Histogram: Use new plot for "Create Grid Statistics in 3d view".

ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.cpp

@@ -20,6 +20,7 @@
 
 #include "Histogram/RimHistogramPlot.h"
 #include "RimEclipseCase.h"
+#include "RimEclipseCellColors.h"
 #include "RimEclipseResultDefinition.h"
 #include "RimEclipseView.h"
 #include "RimHistogramCalculator.h"
@@ -284,3 +285,29 @@ void RimGridStatisticsHistogramDataSource::cellFilterViewUpdated()
 {
     dataSourceChanged.send();
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimGridStatisticsHistogramDataSource::loadDataAndUpdate()
+{
+    dataSourceChanged.send();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimGridStatisticsHistogramDataSource::setPropertiesFromView( RimEclipseView* view )
+{
+    CAF_ASSERT( view );
+
+    m_case = view->ownerCase();
+
+    RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>( m_case.value() );
+    if ( eclipseCase ) m_property->setEclipseCase( eclipseCase );
+
+    const RimEclipseResultDefinition* resDef = dynamic_cast<const RimEclipseResultDefinition*>( view->cellResult() );
+    if ( resDef ) m_property->simpleCopy( resDef );
+
+    dataSourceChanged.send();
+}

ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.h

@@ -28,6 +28,7 @@ class RimSummaryEnsemble;
 class RimCase;
 class RimGridView;
 class RimEclipseResultDefinition;
+class RimEclipseView;
 
 //==================================================================================================
 ///
@@ -52,6 +53,10 @@ public:
 
     void cellFilterViewUpdated();
 
+    void loadDataAndUpdate();
+
+    void setPropertiesFromView( RimEclipseView* view );
+
 protected:
     QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
     void                          defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;

ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp

@@ -162,7 +162,6 @@
 
 #ifdef USE_QTCHARTS
 #include "RimEnsembleFractureStatisticsPlotCollection.h"
-#include "RimGridStatisticsPlotCollection.h"
 #endif
 
 #include "RiuMainWindow.h"
@@ -658,10 +657,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
             menuBuilder << "RicCreateSaturationPressurePlotsFeature";
         }
 #ifdef USE_QTCHARTS
-        else if ( dynamic_cast<RimGridStatisticsPlotCollection*>( firstUiItem ) )
-        {
-            menuBuilder << "RicCreateGridStatisticsPlotFeature";
-        }
         else if ( dynamic_cast<RimEnsembleFractureStatisticsPlotCollection*>( firstUiItem ) )
         {
             menuBuilder << "RicCreateEnsembleFractureStatisticsPlotFeature";
@@ -871,9 +866,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
         }
         else if ( dynamic_cast<Rim3dOverlayInfoConfig*>( firstUiItem ) )
         {
-#ifdef USE_QTCHARTS
             menuBuilder << "RicCreateGridStatisticsPlotFeature";
-#endif
             menuBuilder << "RicShowGridStatisticsFeature";
         }
         else if ( dynamic_cast<RimValveTemplateCollection*>( firstUiItem ) )

ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp

@@ -20,6 +20,7 @@
 
 #include "RimEclipseResultDefinition.h"
 
+#include "Histogram/RimGridStatisticsHistogramDataSource.h"
 #include "RiaLogging.h"
 #include "RiaQDateTimeTools.h"
 
@@ -36,6 +37,7 @@
 #include "ContourMap/RimContourMapProjection.h"
 #include "ContourMap/RimEclipseContourMapProjection.h"
 #include "ContourMap/RimEclipseContourMapView.h"
+#include "Histogram/RimGridStatisticsHistogramDataSource.h"
 #include "Rim3dView.h"
 #include "Rim3dWellLogCurve.h"
 #include "RimCellEdgeColors.h"
@@ -61,10 +63,6 @@
 #include "RimWellLogExtractionCurve.h"
 #include "RimWellLogTrack.h"
 
-#ifdef USE_QTCHARTS
-#include "RimGridStatisticsPlot.h"
-#endif
-
 #include "cafPdmFieldScriptingCapability.h"
 #include "cafPdmUiToolButtonEditor.h"
 #include "cafPdmUiTreeSelectionEditor.h"
@@ -598,13 +596,12 @@ void RimEclipseResultDefinition::loadDataAndUpdate()
         rim3dWellLogCurve->updateCurveIn3dView();
     }
 
-#ifdef USE_QTCHARTS
-    RimGridStatisticsPlot* gridStatisticsPlot = firstAncestorOrThisOfType<RimGridStatisticsPlot>();
-    if ( gridStatisticsPlot )
+    RimGridStatisticsHistogramDataSource* gridStatisticsHistogramDataSource =
+        firstAncestorOrThisOfType<RimGridStatisticsHistogramDataSource>();
+    if ( gridStatisticsHistogramDataSource )
     {
-        gridStatisticsPlot->loadDataAndUpdate();
+        gridStatisticsHistogramDataSource->loadDataAndUpdate();
     }
-#endif
 }
 
 //--------------------------------------------------------------------------------------------------