From 7e73a4a0bd6053ac4253b07416a379f666ae281f Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Mon, 3 May 2021 14:56:12 +0200 Subject: [PATCH] #7609 Avoid by-passing parent in class hierachy. --- .../RimEnsembleFractureStatisticsPlot.cpp | 6 +++--- .../ProjectDataModel/RimGridStatisticsPlot.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlot.cpp index 971b089763..8d6a554531 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlot.cpp @@ -83,7 +83,7 @@ void RimEnsembleFractureStatisticsPlot::fieldChangedByUi( const caf::PdmFieldHan const QVariant& oldValue, const QVariant& newValue ) { - RimPlotWindow::fieldChangedByUi( changedField, oldValue, newValue ); + RimStatisticsPlot::fieldChangedByUi( changedField, oldValue, newValue ); loadDataAndUpdate(); updateConnectedEditors(); } @@ -97,7 +97,7 @@ void RimEnsembleFractureStatisticsPlot::defineUiOrdering( QString uiConfigName, uiOrdering.add( &m_property ); caf::PdmUiGroup* plotLayoutGroup = uiOrdering.addNewGroup( "Plot Layout" ); - RimPlotWindow::uiOrderingForPlotLayout( uiConfigName, *plotLayoutGroup ); + RimStatisticsPlot::uiOrderingForPlotLayout( uiConfigName, *plotLayoutGroup ); uiOrdering.skipRemainingFields( true ); } @@ -109,7 +109,7 @@ QList RimEnsembleFractureStatisticsPlot::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) { - QList options = RimPlotWindow::calculateValueOptions( fieldNeedingOptions, useOptionsOnly ); + QList options = RimStatisticsPlot::calculateValueOptions( fieldNeedingOptions, useOptionsOnly ); if ( fieldNeedingOptions == &m_ensembleFractureStatistics ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp index 227df3fcbf..0711917875 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp @@ -106,7 +106,7 @@ void RimGridStatisticsPlot::fieldChangedByUi( const caf::PdmFieldHandle* changed const QVariant& oldValue, const QVariant& newValue ) { - RimPlotWindow::fieldChangedByUi( changedField, oldValue, newValue ); + RimStatisticsPlot::fieldChangedByUi( changedField, oldValue, newValue ); if ( changedField == &m_case ) { @@ -141,7 +141,7 @@ void RimGridStatisticsPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOr } caf::PdmUiGroup* plotLayoutGroup = uiOrdering.addNewGroup( "Plot Layout" ); - RimPlotWindow::uiOrderingForPlotLayout( uiConfigName, *plotLayoutGroup ); + RimStatisticsPlot::uiOrderingForPlotLayout( uiConfigName, *plotLayoutGroup ); uiOrdering.skipRemainingFields( true ); } @@ -152,7 +152,7 @@ void RimGridStatisticsPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOr QList RimGridStatisticsPlot::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) { - QList options = RimPlotWindow::calculateValueOptions( fieldNeedingOptions, useOptionsOnly ); + QList options = RimStatisticsPlot::calculateValueOptions( fieldNeedingOptions, useOptionsOnly ); if ( fieldNeedingOptions == &m_case ) { @@ -191,7 +191,7 @@ QList //-------------------------------------------------------------------------------------------------- void RimGridStatisticsPlot::initAfterRead() { - RimPlotWindow::initAfterRead(); + RimStatisticsPlot::initAfterRead(); RimEclipseCase* eclipseCase = dynamic_cast( m_case() ); if ( eclipseCase )