diff --git a/ApplicationLibCode/Commands/RicCreateGridStatisticsPlotFeature.cpp b/ApplicationLibCode/Commands/RicCreateGridStatisticsPlotFeature.cpp index 503a587d32..7b5facaa98 100644 --- a/ApplicationLibCode/Commands/RicCreateGridStatisticsPlotFeature.cpp +++ b/ApplicationLibCode/Commands/RicCreateGridStatisticsPlotFeature.cpp @@ -20,14 +20,11 @@ #include "RiaGuiApplication.h" +#include "RicHistogramPlotTools.h" + +#include "Histogram/RimGridStatisticsHistogramDataSource.h" #include "RimEclipseResultDefinition.h" #include "RimEclipseView.h" -#include "RimGridStatisticsPlot.h" -#include "RimGridStatisticsPlotCollection.h" -#include "RimMainPlotCollection.h" - -#include "RiuPlotMainWindow.h" -#include "RiuPlotMainWindowTools.h" #include @@ -38,22 +35,15 @@ CAF_CMD_SOURCE_INIT( RicCreateGridStatisticsPlotFeature, "RicCreateGridStatistic //-------------------------------------------------------------------------------------------------- void RicCreateGridStatisticsPlotFeature::onActionTriggered( bool isChecked ) { - RimGridStatisticsPlotCollection* collection = RimMainPlotCollection::current()->gridStatisticsPlotCollection(); + auto multiplot = RicHistogramPlotTools::addNewHistogramMultiplot(); + auto histogramPlot = RicHistogramPlotTools::addNewHistogramPlot( multiplot ); - RimGridStatisticsPlot* plot = new RimGridStatisticsPlot(); + auto dataSource = new RimGridStatisticsHistogramDataSource(); + RicHistogramPlotTools::createHistogramCurve( histogramPlot, dataSource ); RimEclipseView* activeView = dynamic_cast( RiaApplication::instance()->activeGridView() ); - if ( activeView ) plot->setPropertiesFromView( activeView ); - - plot->zoomAll(); - plot->updateConnectedEditors(); - plot->setAsPlotMdiWindow(); - plot->loadDataAndUpdate(); - - collection->addGridStatisticsPlot( plot ); - collection->updateAllRequiredEditors(); + if ( activeView ) dataSource->setPropertiesFromView( activeView ); RiaGuiApplication::instance()->getOrCreateAndShowMainPlotWindow(); - RiuPlotMainWindowTools::onObjectAppended( plot ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.cpp b/ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.cpp index 4411b8c0fa..9c39d6eb89 100644 --- a/ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.cpp +++ b/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( m_case.value() ); + if ( eclipseCase ) m_property->setEclipseCase( eclipseCase ); + + const RimEclipseResultDefinition* resDef = dynamic_cast( view->cellResult() ); + if ( resDef ) m_property->simpleCopy( resDef ); + + dataSourceChanged.send(); +} diff --git a/ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.h b/ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.h index 4b4482cbe5..4f398b1b63 100644 --- a/ApplicationLibCode/ProjectDataModel/Histogram/RimGridStatisticsHistogramDataSource.h +++ b/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 calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; diff --git a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp index b0c622449c..94d843a01b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/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( firstUiItem ) ) - { - menuBuilder << "RicCreateGridStatisticsPlotFeature"; - } else if ( dynamic_cast( firstUiItem ) ) { menuBuilder << "RicCreateEnsembleFractureStatisticsPlotFeature"; @@ -871,9 +866,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() } else if ( dynamic_cast( firstUiItem ) ) { -#ifdef USE_QTCHARTS menuBuilder << "RicCreateGridStatisticsPlotFeature"; -#endif menuBuilder << "RicShowGridStatisticsFeature"; } else if ( dynamic_cast( firstUiItem ) ) diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 583eb496a0..928a20ddb8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/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(); - if ( gridStatisticsPlot ) + RimGridStatisticsHistogramDataSource* gridStatisticsHistogramDataSource = + firstAncestorOrThisOfType(); + if ( gridStatisticsHistogramDataSource ) { - gridStatisticsPlot->loadDataAndUpdate(); + gridStatisticsHistogramDataSource->loadDataAndUpdate(); } -#endif } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/UserInterface/RiuViewerCommands.cpp b/ApplicationLibCode/UserInterface/RiuViewerCommands.cpp index 2467203028..dda44232f6 100644 --- a/ApplicationLibCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationLibCode/UserInterface/RiuViewerCommands.cpp @@ -618,9 +618,7 @@ void RiuViewerCommands::displayContextMenu( QMouseEvent* event ) menuBuilder.subMenuEnd(); menuBuilder.addSeparator(); -#ifdef USE_QTCHARTS menuBuilder << "RicCreateGridStatisticsPlotFeature"; -#endif menuBuilder << "RicShowGridStatisticsFeature"; menuBuilder << "RicCopyGridStatisticsToClipboardFeature"; menuBuilder << "RicSelectColorResult";