mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-13 08:52:14 -05:00
Rename to improve readability
This commit is contained in:
1 parent
6b76aad162
commit
aea804b161
16 files changed
+35
-35
No files matched your search
@@ -165,7 +165,7 @@ void RimWellDistributionPlot::updateLegend()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimWellDistributionPlot::updateZoomInParentPlot()
|
void RimWellDistributionPlot::updatePlotWidgetFromAxisRanges()
|
||||||
{
|
{
|
||||||
// cvf::Trace::show("RimWellDistributionPlot::updateZoomInParentPlot()");
|
// cvf::Trace::show("RimWellDistributionPlot::updateZoomInParentPlot()");
|
||||||
}
|
}
|
||||||
@@ -173,7 +173,7 @@ void RimWellDistributionPlot::updateZoomInParentPlot()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimWellDistributionPlot::updateZoomFromParentPlot()
|
void RimWellDistributionPlot::updateAxisRangesFromPlotWidget()
|
||||||
{
|
{
|
||||||
// cvf::Trace::show("RimWellDistributionPlot::updateZoomFromParentPlot()");
|
// cvf::Trace::show("RimWellDistributionPlot::updateZoomFromParentPlot()");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,8 +54,8 @@ public:
|
|||||||
void setAutoScaleYEnabled( bool enabled ) override;
|
void setAutoScaleYEnabled( bool enabled ) override;
|
||||||
void updateAxes() override;
|
void updateAxes() override;
|
||||||
void updateLegend() override;
|
void updateLegend() override;
|
||||||
void updateZoomInParentPlot() override;
|
void updatePlotWidgetFromAxisRanges() override;
|
||||||
void updateZoomFromParentPlot() override;
|
void updateAxisRangesFromPlotWidget() override;
|
||||||
QString asciiDataForPlotExport() const override;
|
QString asciiDataForPlotExport() const override;
|
||||||
void reattachAllCurves() override;
|
void reattachAllCurves() override;
|
||||||
void detachAllCurves() override;
|
void detachAllCurves() override;
|
||||||
|
|||||||
@@ -395,7 +395,7 @@ void RimWellDistributionPlotCollection::updatePlots()
|
|||||||
for ( RimPlot* plot : m_plots() )
|
for ( RimPlot* plot : m_plots() )
|
||||||
{
|
{
|
||||||
plot->loadDataAndUpdate();
|
plot->loadDataAndUpdate();
|
||||||
plot->updateZoomInParentPlot();
|
plot->updatePlotWidgetFromAxisRanges();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ void RimGridCrossPlot::zoomAll()
|
|||||||
setAutoScaleXEnabled( true );
|
setAutoScaleXEnabled( true );
|
||||||
setAutoScaleYEnabled( true );
|
setAutoScaleYEnabled( true );
|
||||||
|
|
||||||
updateZoomInParentPlot();
|
updatePlotWidgetFromAxisRanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@@ -215,7 +215,7 @@ void RimGridCrossPlot::reattachAllCurves()
|
|||||||
}
|
}
|
||||||
updateCurveNamesAndPlotTitle();
|
updateCurveNamesAndPlotTitle();
|
||||||
updateLegend();
|
updateLegend();
|
||||||
updateZoomInParentPlot();
|
updatePlotWidgetFromAxisRanges();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -454,7 +454,7 @@ void RimGridCrossPlot::onPlotZoomed()
|
|||||||
{
|
{
|
||||||
setAutoScaleXEnabled( false );
|
setAutoScaleXEnabled( false );
|
||||||
setAutoScaleYEnabled( false );
|
setAutoScaleYEnabled( false );
|
||||||
updateZoomFromParentPlot();
|
updateAxisRangesFromPlotWidget();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@@ -766,14 +766,14 @@ void RimGridCrossPlot::updateLegend()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimGridCrossPlot::updateZoomInParentPlot()
|
void RimGridCrossPlot::updatePlotWidgetFromAxisRanges()
|
||||||
{
|
{
|
||||||
if ( m_plotWidget )
|
if ( m_plotWidget )
|
||||||
{
|
{
|
||||||
updateAxisInQwt( RiaDefines::PlotAxis::PLOT_AXIS_LEFT );
|
updateAxisInQwt( RiaDefines::PlotAxis::PLOT_AXIS_LEFT );
|
||||||
updateAxisInQwt( RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM );
|
updateAxisInQwt( RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM );
|
||||||
m_plotWidget->qwtPlot()->updateAxes();
|
m_plotWidget->qwtPlot()->updateAxes();
|
||||||
updateZoomFromParentPlot();
|
updateAxisRangesFromPlotWidget();
|
||||||
m_plotWidget->scheduleReplot();
|
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_LEFT );
|
||||||
updateAxisFromQwt( RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM );
|
updateAxisFromQwt( RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM );
|
||||||
|
|||||||
@@ -100,8 +100,8 @@ public:
|
|||||||
|
|
||||||
void updateLegend() override;
|
void updateLegend() override;
|
||||||
|
|
||||||
void updateZoomInParentPlot() override;
|
void updatePlotWidgetFromAxisRanges() override;
|
||||||
void updateZoomFromParentPlot() override;
|
void updateAxisRangesFromPlotWidget() override;
|
||||||
|
|
||||||
void setAutoScaleXEnabled( bool enabled ) override;
|
void setAutoScaleXEnabled( bool enabled ) override;
|
||||||
void setAutoScaleYEnabled( bool enabled ) override;
|
void setAutoScaleYEnabled( bool enabled ) override;
|
||||||
|
|||||||
@@ -341,7 +341,7 @@ void RimDepthTrackPlot::updateZoom()
|
|||||||
for ( RimPlot* plot : plots() )
|
for ( RimPlot* plot : plots() )
|
||||||
{
|
{
|
||||||
static_cast<RimWellLogTrack*>( plot )->setVisibleDepthRange( m_minVisibleDepth(), m_maxVisibleDepth() );
|
static_cast<RimWellLogTrack*>( plot )->setVisibleDepthRange( m_minVisibleDepth(), m_maxVisibleDepth() );
|
||||||
plot->updateZoomInParentPlot();
|
plot->updatePlotWidgetFromAxisRanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( m_viewer )
|
if ( m_viewer )
|
||||||
|
|||||||
@@ -368,7 +368,7 @@ void RimGridTimeHistoryCurve::updateZoomInParentPlot()
|
|||||||
{
|
{
|
||||||
auto plot = firstAncestorOrThisOfType<RimSummaryPlot>();
|
auto plot = firstAncestorOrThisOfType<RimSummaryPlot>();
|
||||||
|
|
||||||
plot->updateZoomInParentPlot();
|
plot->updatePlotWidgetFromAxisRanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -851,7 +851,7 @@ void RimMultiPlot::updateZoom()
|
|||||||
{
|
{
|
||||||
for ( RimPlot* plot : plots() )
|
for ( RimPlot* plot : plots() )
|
||||||
{
|
{
|
||||||
plot->updateZoomInParentPlot();
|
plot->updatePlotWidgetFromAxisRanges();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -252,14 +252,14 @@ void RimPlot::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::ve
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimPlot::updateZoomInParentPlot()
|
void RimPlot::updatePlotWidgetFromAxisRanges()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimPlot::updateZoomFromParentPlot()
|
void RimPlot::updateAxisRangesFromPlotWidget()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -96,8 +96,8 @@ public:
|
|||||||
|
|
||||||
virtual RiuPlotWidget* plotWidget() = 0;
|
virtual RiuPlotWidget* plotWidget() = 0;
|
||||||
|
|
||||||
virtual void updateZoomInParentPlot();
|
virtual void updatePlotWidgetFromAxisRanges();
|
||||||
virtual void updateZoomFromParentPlot();
|
virtual void updateAxisRangesFromPlotWidget();
|
||||||
|
|
||||||
virtual caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const;
|
virtual caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const;
|
||||||
virtual void handleDroppedObjects( const std::vector<caf::PdmObjectHandle*>& objects );
|
virtual void handleDroppedObjects( const std::vector<caf::PdmObjectHandle*>& objects );
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ void RimAsciiDataCurve::updateZoomInParentPlot()
|
|||||||
{
|
{
|
||||||
auto plot = firstAncestorOrThisOfType<RimSummaryPlot>();
|
auto plot = firstAncestorOrThisOfType<RimSummaryPlot>();
|
||||||
|
|
||||||
plot->updateZoomInParentPlot();
|
plot->updatePlotWidgetFromAxisRanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -597,7 +597,7 @@ void RimSummaryCurve::updateZoomInParentPlot()
|
|||||||
{
|
{
|
||||||
auto plot = firstAncestorOrThisOfTypeAsserted<RimSummaryPlot>();
|
auto plot = firstAncestorOrThisOfTypeAsserted<RimSummaryPlot>();
|
||||||
|
|
||||||
plot->updateZoomInParentPlot();
|
plot->updatePlotWidgetFromAxisRanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -236,7 +236,7 @@ void RimSummaryPlot::updateAxes()
|
|||||||
updateNumericalAxis( RiaDefines::PlotAxis::PLOT_AXIS_TOP );
|
updateNumericalAxis( RiaDefines::PlotAxis::PLOT_AXIS_TOP );
|
||||||
updateTimeAxis( timeAxisProperties() );
|
updateTimeAxis( timeAxisProperties() );
|
||||||
|
|
||||||
updateZoomInParentPlot();
|
updatePlotWidgetFromAxisRanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@@ -1442,7 +1442,7 @@ void RimSummaryPlot::zoomAll()
|
|||||||
{
|
{
|
||||||
setAutoScaleXEnabled( true );
|
setAutoScaleXEnabled( true );
|
||||||
setAutoScaleYEnabled( true );
|
setAutoScaleYEnabled( true );
|
||||||
updateZoomInParentPlot();
|
updatePlotWidgetFromAxisRanges();
|
||||||
|
|
||||||
axisChanged.send( this );
|
axisChanged.send( this );
|
||||||
}
|
}
|
||||||
@@ -1929,7 +1929,7 @@ void RimSummaryPlot::onLoadDataAndUpdate()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimSummaryPlot::updateZoomInParentPlot()
|
void RimSummaryPlot::updatePlotWidgetFromAxisRanges()
|
||||||
{
|
{
|
||||||
if ( !plotWidget() ) return;
|
if ( !plotWidget() ) return;
|
||||||
|
|
||||||
@@ -1939,7 +1939,7 @@ void RimSummaryPlot::updateZoomInParentPlot()
|
|||||||
}
|
}
|
||||||
|
|
||||||
plotWidget()->updateAxes();
|
plotWidget()->updateAxes();
|
||||||
updateZoomFromParentPlot();
|
updateAxisRangesFromPlotWidget();
|
||||||
plotWidget()->updateZoomDependentCurveProperties();
|
plotWidget()->updateZoomDependentCurveProperties();
|
||||||
|
|
||||||
// Must create and set new custom tickmarks for time axis after zoom update
|
// 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;
|
if ( !plotWidget() ) return;
|
||||||
|
|
||||||
@@ -2641,7 +2641,7 @@ void RimSummaryPlot::onPlotZoomed()
|
|||||||
|
|
||||||
plotZoomedByUser.send();
|
plotZoomedByUser.send();
|
||||||
|
|
||||||
updateZoomFromParentPlot();
|
updateAxisRangesFromPlotWidget();
|
||||||
|
|
||||||
timeAxisSettingsChanged( nullptr );
|
timeAxisSettingsChanged( nullptr );
|
||||||
|
|
||||||
|
|||||||
@@ -184,8 +184,8 @@ public:
|
|||||||
void setAutoScaleYEnabled( bool enabled ) override;
|
void setAutoScaleYEnabled( bool enabled ) override;
|
||||||
RiuPlotWidget* plotWidget() override;
|
RiuPlotWidget* plotWidget() override;
|
||||||
void zoomAll() override;
|
void zoomAll() override;
|
||||||
void updateZoomInParentPlot() override;
|
void updatePlotWidgetFromAxisRanges() override;
|
||||||
void updateZoomFromParentPlot() override;
|
void updateAxisRangesFromPlotWidget() override;
|
||||||
|
|
||||||
caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const override;
|
caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const override;
|
||||||
|
|
||||||
|
|||||||
@@ -1076,7 +1076,7 @@ QString RimWellLogTrack::asciiDataForPlotExport() const
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimWellLogTrack::updateZoomFromParentPlot()
|
void RimWellLogTrack::updateAxisRangesFromPlotWidget()
|
||||||
{
|
{
|
||||||
auto [xIntervalMin, xIntervalMax] = m_plotWidget->axisRange( valueAxis() );
|
auto [xIntervalMin, xIntervalMax] = m_plotWidget->axisRange( valueAxis() );
|
||||||
auto [depthIntervalMin, depthIntervalMax] = m_plotWidget->axisRange( depthAxis() );
|
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();
|
updatePropertyValueZoom();
|
||||||
updateDepthZoom();
|
updateDepthZoom();
|
||||||
@@ -3381,7 +3381,7 @@ void RimWellLogTrack::doUpdateLayout()
|
|||||||
void RimWellLogTrack::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& referringObjects )
|
void RimWellLogTrack::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& referringObjects )
|
||||||
{
|
{
|
||||||
setAutoScalePropertyValuesEnabled( true );
|
setAutoScalePropertyValuesEnabled( true );
|
||||||
updateZoomInParentPlot();
|
updatePlotWidgetFromAxisRanges();
|
||||||
RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow();
|
RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow();
|
||||||
mainPlotWindow->updateWellLogPlotToolBar();
|
mainPlotWindow->updateWellLogPlotToolBar();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -153,8 +153,8 @@ public:
|
|||||||
void setVisiblePropertyValueRange( double minValue, double maxValue );
|
void setVisiblePropertyValueRange( double minValue, double maxValue );
|
||||||
void setVisibleDepthRange( double minValue, double maxValue );
|
void setVisibleDepthRange( double minValue, double maxValue );
|
||||||
|
|
||||||
void updateZoomInParentPlot() override;
|
void updatePlotWidgetFromAxisRanges() override;
|
||||||
void updateZoomFromParentPlot() override;
|
void updateAxisRangesFromPlotWidget() override;
|
||||||
|
|
||||||
void updateParentPlotZoom();
|
void updateParentPlotZoom();
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user