OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename to improve readability

Browse Source
This commit is contained in:
Magne Sjaastad
2024-05-02 11:26:52 +02:00
parent 6b76aad162
commit aea804b161
16 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp
View File

@@ -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()");
}

4
ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h
View File

@@ -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;

2
ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp
View File

@@ -395,7 +395,7 @@ void RimWellDistributionPlotCollection::updatePlots()
for ( RimPlot* plot : m_plots() )
{
plot->loadDataAndUpdate();
plot->updateZoomInParentPlot();
plot->updatePlotWidgetFromAxisRanges();
}
}
}

12
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp
View File

@@ -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 );

4
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h
View File

@@ -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;

2
ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp
View File

@@ -341,7 +341,7 @@ void RimDepthTrackPlot::updateZoom()
for ( RimPlot* plot : plots() )
{
static_cast<RimWellLogTrack*>( plot )->setVisibleDepthRange( m_minVisibleDepth(), m_maxVisibleDepth() );
plot->updateZoomInParentPlot();
plot->updatePlotWidgetFromAxisRanges();
}
if ( m_viewer )

2
ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
View File

@@ -368,7 +368,7 @@ void RimGridTimeHistoryCurve::updateZoomInParentPlot()
{
auto plot = firstAncestorOrThisOfType<RimSummaryPlot>();
plot->updateZoomInParentPlot();
plot->updatePlotWidgetFromAxisRanges();
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp
View File

@@ -851,7 +851,7 @@ void RimMultiPlot::updateZoom()
{
for ( RimPlot* plot : plots() )
{
plot->updateZoomInParentPlot();
plot->updatePlotWidgetFromAxisRanges();
}
}

4
ApplicationLibCode/ProjectDataModel/RimPlot.cpp
View File

@@ -252,14 +252,14 @@ void RimPlot::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::ve
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPlot::updateZoomInParentPlot()
void RimPlot::updatePlotWidgetFromAxisRanges()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPlot::updateZoomFromParentPlot()
void RimPlot::updateAxisRangesFromPlotWidget()
{
}

4
ApplicationLibCode/ProjectDataModel/RimPlot.h
View File

@@ -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<caf::PdmObjectHandle*>& objects );

2
ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp
View File

@@ -118,7 +118,7 @@ void RimAsciiDataCurve::updateZoomInParentPlot()
{
auto plot = firstAncestorOrThisOfType<RimSummaryPlot>();
plot->updateZoomInParentPlot();
plot->updatePlotWidgetFromAxisRanges();
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -597,7 +597,7 @@ void RimSummaryCurve::updateZoomInParentPlot()
{
auto plot = firstAncestorOrThisOfTypeAsserted<RimSummaryPlot>();
plot->updateZoomInParentPlot();
plot->updatePlotWidgetFromAxisRanges();
}
//--------------------------------------------------------------------------------------------------

12
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -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 );

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@@ -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;

6
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp
View File

@@ -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<caf::PdmObjectHandle*>& referringObjects )
{
setAutoScalePropertyValuesEnabled( true );
updateZoomInParentPlot();
updatePlotWidgetFromAxisRanges();
RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow();
mainPlotWindow->updateWellLogPlotToolBar();
}

4
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h
View File

@@ -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();