From aea804b16160cdfc9bec92835054279966752df6 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 2 May 2024 11:26:52 +0200 Subject: [PATCH] Rename to improve readability --- .../Flow/RimWellDistributionPlot.cpp | 4 ++-- .../ProjectDataModel/Flow/RimWellDistributionPlot.h | 4 ++-- .../Flow/RimWellDistributionPlotCollection.cpp | 2 +- .../GridCrossPlots/RimGridCrossPlot.cpp | 12 ++++++------ .../GridCrossPlots/RimGridCrossPlot.h | 4 ++-- .../ProjectDataModel/RimDepthTrackPlot.cpp | 2 +- .../ProjectDataModel/RimGridTimeHistoryCurve.cpp | 2 +- ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp | 2 +- ApplicationLibCode/ProjectDataModel/RimPlot.cpp | 4 ++-- ApplicationLibCode/ProjectDataModel/RimPlot.h | 4 ++-- .../ProjectDataModel/Summary/RimAsciiDataCurve.cpp | 2 +- .../ProjectDataModel/Summary/RimSummaryCurve.cpp | 2 +- .../ProjectDataModel/Summary/RimSummaryPlot.cpp | 12 ++++++------ .../ProjectDataModel/Summary/RimSummaryPlot.h | 4 ++-- .../ProjectDataModel/WellLog/RimWellLogTrack.cpp | 6 +++--- .../ProjectDataModel/WellLog/RimWellLogTrack.h | 4 ++-- 16 files changed, 35 insertions(+), 35 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp index 6060151728..7a63e0c8c3 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp @@ -165,7 +165,7 @@ void RimWellDistributionPlot::updateLegend() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellDistributionPlot::updateZoomInParentPlot() +void RimWellDistributionPlot::updatePlotWidgetFromAxisRanges() { // cvf::Trace::show("RimWellDistributionPlot::updateZoomInParentPlot()"); } @@ -173,7 +173,7 @@ void RimWellDistributionPlot::updateZoomInParentPlot() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellDistributionPlot::updateZoomFromParentPlot() +void RimWellDistributionPlot::updateAxisRangesFromPlotWidget() { // cvf::Trace::show("RimWellDistributionPlot::updateZoomFromParentPlot()"); } diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h index 5637b1410b..463ff8bd8a 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h @@ -54,8 +54,8 @@ public: void setAutoScaleYEnabled( bool enabled ) override; void updateAxes() override; void updateLegend() override; - void updateZoomInParentPlot() override; - void updateZoomFromParentPlot() override; + void updatePlotWidgetFromAxisRanges() override; + void updateAxisRangesFromPlotWidget() override; QString asciiDataForPlotExport() const override; void reattachAllCurves() override; void detachAllCurves() override; diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp index 365c13fc44..b47fa6fdc4 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp @@ -395,7 +395,7 @@ void RimWellDistributionPlotCollection::updatePlots() for ( RimPlot* plot : m_plots() ) { plot->loadDataAndUpdate(); - plot->updateZoomInParentPlot(); + plot->updatePlotWidgetFromAxisRanges(); } } } diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp index 7154c02f8a..690acba998 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp @@ -182,7 +182,7 @@ void RimGridCrossPlot::zoomAll() setAutoScaleXEnabled( true ); setAutoScaleYEnabled( true ); - updateZoomInParentPlot(); + updatePlotWidgetFromAxisRanges(); } //-------------------------------------------------------------------------------------------------- @@ -215,7 +215,7 @@ void RimGridCrossPlot::reattachAllCurves() } updateCurveNamesAndPlotTitle(); updateLegend(); - updateZoomInParentPlot(); + updatePlotWidgetFromAxisRanges(); } } @@ -454,7 +454,7 @@ void RimGridCrossPlot::onPlotZoomed() { setAutoScaleXEnabled( false ); setAutoScaleYEnabled( false ); - updateZoomFromParentPlot(); + updateAxisRangesFromPlotWidget(); } //-------------------------------------------------------------------------------------------------- @@ -766,14 +766,14 @@ void RimGridCrossPlot::updateLegend() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimGridCrossPlot::updateZoomInParentPlot() +void RimGridCrossPlot::updatePlotWidgetFromAxisRanges() { if ( m_plotWidget ) { updateAxisInQwt( RiaDefines::PlotAxis::PLOT_AXIS_LEFT ); updateAxisInQwt( RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ); m_plotWidget->qwtPlot()->updateAxes(); - updateZoomFromParentPlot(); + updateAxisRangesFromPlotWidget(); m_plotWidget->scheduleReplot(); } } @@ -781,7 +781,7 @@ void RimGridCrossPlot::updateZoomInParentPlot() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimGridCrossPlot::updateZoomFromParentPlot() +void RimGridCrossPlot::updateAxisRangesFromPlotWidget() { updateAxisFromQwt( RiaDefines::PlotAxis::PLOT_AXIS_LEFT ); updateAxisFromQwt( RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ); diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h index ab28be59e8..57a4b8f519 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h @@ -100,8 +100,8 @@ public: void updateLegend() override; - void updateZoomInParentPlot() override; - void updateZoomFromParentPlot() override; + void updatePlotWidgetFromAxisRanges() override; + void updateAxisRangesFromPlotWidget() override; void setAutoScaleXEnabled( bool enabled ) override; void setAutoScaleYEnabled( bool enabled ) override; diff --git a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp index d65dca2134..9a0f59a664 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp @@ -341,7 +341,7 @@ void RimDepthTrackPlot::updateZoom() for ( RimPlot* plot : plots() ) { static_cast( plot )->setVisibleDepthRange( m_minVisibleDepth(), m_maxVisibleDepth() ); - plot->updateZoomInParentPlot(); + plot->updatePlotWidgetFromAxisRanges(); } if ( m_viewer ) diff --git a/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp index 8377899de8..030f63e3ec 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp @@ -368,7 +368,7 @@ void RimGridTimeHistoryCurve::updateZoomInParentPlot() { auto plot = firstAncestorOrThisOfType(); - plot->updateZoomInParentPlot(); + plot->updatePlotWidgetFromAxisRanges(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp index 2949f0c5f2..1d8c982032 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp @@ -851,7 +851,7 @@ void RimMultiPlot::updateZoom() { for ( RimPlot* plot : plots() ) { - plot->updateZoomInParentPlot(); + plot->updatePlotWidgetFromAxisRanges(); } } diff --git a/ApplicationLibCode/ProjectDataModel/RimPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimPlot.cpp index 5c7759ba29..c352604e8b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlot.cpp @@ -252,14 +252,14 @@ void RimPlot::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::ve //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimPlot::updateZoomInParentPlot() +void RimPlot::updatePlotWidgetFromAxisRanges() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimPlot::updateZoomFromParentPlot() +void RimPlot::updateAxisRangesFromPlotWidget() { } diff --git a/ApplicationLibCode/ProjectDataModel/RimPlot.h b/ApplicationLibCode/ProjectDataModel/RimPlot.h index bae31df97e..19ce220fa9 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlot.h +++ b/ApplicationLibCode/ProjectDataModel/RimPlot.h @@ -96,8 +96,8 @@ public: virtual RiuPlotWidget* plotWidget() = 0; - virtual void updateZoomInParentPlot(); - virtual void updateZoomFromParentPlot(); + virtual void updatePlotWidgetFromAxisRanges(); + virtual void updateAxisRangesFromPlotWidget(); virtual caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const; virtual void handleDroppedObjects( const std::vector& objects ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp index 98257caf97..472756fd5f 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp @@ -118,7 +118,7 @@ void RimAsciiDataCurve::updateZoomInParentPlot() { auto plot = firstAncestorOrThisOfType(); - plot->updateZoomInParentPlot(); + plot->updatePlotWidgetFromAxisRanges(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 1521504979..dcac98d73d 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -597,7 +597,7 @@ void RimSummaryCurve::updateZoomInParentPlot() { auto plot = firstAncestorOrThisOfTypeAsserted(); - plot->updateZoomInParentPlot(); + plot->updatePlotWidgetFromAxisRanges(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 73623f3d3d..0e76314dd0 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -236,7 +236,7 @@ void RimSummaryPlot::updateAxes() updateNumericalAxis( RiaDefines::PlotAxis::PLOT_AXIS_TOP ); updateTimeAxis( timeAxisProperties() ); - updateZoomInParentPlot(); + updatePlotWidgetFromAxisRanges(); } //-------------------------------------------------------------------------------------------------- @@ -1442,7 +1442,7 @@ void RimSummaryPlot::zoomAll() { setAutoScaleXEnabled( true ); setAutoScaleYEnabled( true ); - updateZoomInParentPlot(); + updatePlotWidgetFromAxisRanges(); axisChanged.send( this ); } @@ -1929,7 +1929,7 @@ void RimSummaryPlot::onLoadDataAndUpdate() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSummaryPlot::updateZoomInParentPlot() +void RimSummaryPlot::updatePlotWidgetFromAxisRanges() { if ( !plotWidget() ) return; @@ -1939,7 +1939,7 @@ void RimSummaryPlot::updateZoomInParentPlot() } plotWidget()->updateAxes(); - updateZoomFromParentPlot(); + updateAxisRangesFromPlotWidget(); plotWidget()->updateZoomDependentCurveProperties(); // Must create and set new custom tickmarks for time axis after zoom update @@ -1960,7 +1960,7 @@ void RimSummaryPlot::updateZoomInParentPlot() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSummaryPlot::updateZoomFromParentPlot() +void RimSummaryPlot::updateAxisRangesFromPlotWidget() { if ( !plotWidget() ) return; @@ -2641,7 +2641,7 @@ void RimSummaryPlot::onPlotZoomed() plotZoomedByUser.send(); - updateZoomFromParentPlot(); + updateAxisRangesFromPlotWidget(); timeAxisSettingsChanged( nullptr ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h index a54133b8cf..5c340e22e0 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h @@ -184,8 +184,8 @@ public: void setAutoScaleYEnabled( bool enabled ) override; RiuPlotWidget* plotWidget() override; void zoomAll() override; - void updateZoomInParentPlot() override; - void updateZoomFromParentPlot() override; + void updatePlotWidgetFromAxisRanges() override; + void updateAxisRangesFromPlotWidget() override; caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const override; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp index 1ff066b7e7..6b60209760 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp @@ -1076,7 +1076,7 @@ QString RimWellLogTrack::asciiDataForPlotExport() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellLogTrack::updateZoomFromParentPlot() +void RimWellLogTrack::updateAxisRangesFromPlotWidget() { auto [xIntervalMin, xIntervalMax] = m_plotWidget->axisRange( valueAxis() ); auto [depthIntervalMin, depthIntervalMax] = m_plotWidget->axisRange( depthAxis() ); @@ -1789,7 +1789,7 @@ void RimWellLogTrack::setVisibleDepthRange( double minValue, double maxValue ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellLogTrack::updateZoomInParentPlot() +void RimWellLogTrack::updatePlotWidgetFromAxisRanges() { updatePropertyValueZoom(); updateDepthZoom(); @@ -3381,7 +3381,7 @@ void RimWellLogTrack::doUpdateLayout() void RimWellLogTrack::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector& referringObjects ) { setAutoScalePropertyValuesEnabled( true ); - updateZoomInParentPlot(); + updatePlotWidgetFromAxisRanges(); RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow(); mainPlotWindow->updateWellLogPlotToolBar(); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h index 2290d1525e..4ab1a6009e 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h @@ -153,8 +153,8 @@ public: void setVisiblePropertyValueRange( double minValue, double maxValue ); void setVisibleDepthRange( double minValue, double maxValue ); - void updateZoomInParentPlot() override; - void updateZoomFromParentPlot() override; + void updatePlotWidgetFromAxisRanges() override; + void updateAxisRangesFromPlotWidget() override; void updateParentPlotZoom();