From 728885a6c87dbc73011f58450075f843a15f867c Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 8 Mar 2022 08:42:21 +0100 Subject: [PATCH] Janitor : Fix invalid rename introduce by horizontal/vertical depth log plots Fix deprecated --- ApplicationExeCode/CMakeLists.txt | 6 ------ ApplicationLibCode/CMakeLists.txt | 6 ------ ApplicationLibCode/Commands/CMakeLists.txt | 6 ------ .../RicNewStimPlanModelPlotFeature.cpp | 2 +- .../RicNewWellBoreStabilityPlotFeature.cpp | 2 +- .../AnalysisPlots/RimAnalysisPlot.h | 4 ++-- .../RimAbstractCorrelationPlot.h | 4 ++-- .../Flow/RimWellDistributionPlot.cpp | 4 ++-- .../Flow/RimWellDistributionPlot.h | 4 ++-- .../GridCrossPlots/RimGridCrossPlot.cpp | 12 ++++++------ .../GridCrossPlots/RimGridCrossPlot.h | 4 ++-- .../ProjectDataModel/RimDepthTrackPlot.cpp | 14 +++++++------- .../ProjectDataModel/RimDepthTrackPlot.h | 4 ++-- .../ProjectDataModel/RimMultiPlot.cpp | 4 ++-- ApplicationLibCode/ProjectDataModel/RimPlot.h | 6 +++--- .../ProjectDataModel/RimVfpPlot.cpp | 4 ++-- ApplicationLibCode/ProjectDataModel/RimVfpPlot.h | 4 ++-- .../ProjectDataModel/Summary/RimSummaryPlot.cpp | 12 ++++++------ .../ProjectDataModel/Summary/RimSummaryPlot.h | 4 ++-- .../ProjectDataModel/WellLog/RimWellLogCurve.cpp | 2 +- .../ProjectDataModel/WellLog/RimWellLogTrack.cpp | 16 ++++++++++++++++ .../ProjectDataModel/WellLog/RimWellLogTrack.h | 7 +++++-- .../UserInterface/RiuWellLogPlot.cpp | 2 +- 23 files changed, 67 insertions(+), 66 deletions(-) diff --git a/ApplicationExeCode/CMakeLists.txt b/ApplicationExeCode/CMakeLists.txt index 17db20b730..b27051c6ad 100644 --- a/ApplicationExeCode/CMakeLists.txt +++ b/ApplicationExeCode/CMakeLists.txt @@ -210,12 +210,6 @@ if(MSVC) set(BUILD_FLAGS_FOR_MSVC "/wd4190 /wd4100 /wd4127 /wd4245 /wd4005") - if(Qt5Core_VERSION_STRING GREATER_EQUAL 5.10) - # Disable warning for deprecated functions in newer versions of Qt - # https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996?view=msvc-160 - set(BUILD_FLAGS_FOR_MSVC "${BUILD_FLAGS_FOR_MSVC} /wd4996") - endif() - if(CMAKE_CXX_COMPILER_VERSION LESS_EQUAL 19.14) # The following warning is generated over 800 times from a qwt header only # using VS2015 Disabling temporarily warning C4505 'function' : unreferenced diff --git a/ApplicationLibCode/CMakeLists.txt b/ApplicationLibCode/CMakeLists.txt index 586d91e4b1..6a270494c6 100644 --- a/ApplicationLibCode/CMakeLists.txt +++ b/ApplicationLibCode/CMakeLists.txt @@ -390,12 +390,6 @@ if(MSVC) set(BUILD_FLAGS_FOR_MSVC "/wd4190 /wd4100 /wd4127 /wd4245 /wd4005 /wd4251") - if(Qt5Core_VERSION_STRING GREATER_EQUAL 5.10) - # Disable warning for deprecated functions in newer versions of Qt - # https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996?view=msvc-160 - set(BUILD_FLAGS_FOR_MSVC "${BUILD_FLAGS_FOR_MSVC} /wd4996") - endif() - if(CMAKE_CXX_COMPILER_VERSION LESS_EQUAL 19.14) # The following warning is generated over 800 times from a qwt header only # using VS2015 Disabling temporarily warning C4505 'function' : unreferenced diff --git a/ApplicationLibCode/Commands/CMakeLists.txt b/ApplicationLibCode/Commands/CMakeLists.txt index fdc96a1fbc..238341ac98 100644 --- a/ApplicationLibCode/Commands/CMakeLists.txt +++ b/ApplicationLibCode/Commands/CMakeLists.txt @@ -110,12 +110,6 @@ if(MSVC) set(BUILD_FLAGS_FOR_MSVC "/wd4190 /wd4100 /wd4127 /wd4245 /wd4005 /wd4573") - if(Qt5Core_VERSION_STRING GREATER_EQUAL 5.10) - # Disable warning for deprecated functions in newer versions of Qt - # https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996?view=msvc-160 - set(BUILD_FLAGS_FOR_MSVC "${BUILD_FLAGS_FOR_MSVC} /wd4996") - endif() - if(CMAKE_CXX_COMPILER_VERSION LESS_EQUAL 19.14) # The following warning is generated over 800 times from a qwt header only # using VS2015 Disabling temporarily warning C4505 'function' : unreferenced diff --git a/ApplicationLibCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.cpp b/ApplicationLibCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.cpp index 184768440d..32f59360fe 100644 --- a/ApplicationLibCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.cpp +++ b/ApplicationLibCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.cpp @@ -172,7 +172,7 @@ RimStimPlanModelPlot* RicNewStimPlanModelPlotFeature::createPlot( RimStimPlanMod plot->setLegendsVisible( true ); plot->setLegendsHorizontal( false ); plot->setDepthType( RiaDefines::DepthTypeEnum::TRUE_VERTICAL_DEPTH ); - plot->setAutoScaleDepthEnabled( true ); + plot->setAutoScaleDepthValuesEnabled( true ); } RiuPlotMainWindowTools::selectAsCurrentItem( plot ); diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp index 7891b7fe54..0fa87faedf 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp +++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp @@ -114,7 +114,7 @@ RimWellBoreStabilityPlot* plot->setLegendsVisible( true ); plot->setLegendsHorizontal( true ); plot->setDepthType( RiaDefines::DepthTypeEnum::TRUE_VERTICAL_DEPTH_RKB ); - plot->setAutoScaleDepthEnabled( true ); + plot->setAutoScaleDepthValuesEnabled( true ); RicNewWellLogPlotFeatureImpl::updateAfterCreation( plot ); } diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h index f104e69bb4..53a70a0636 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h @@ -136,8 +136,8 @@ private: void reattachAllCurves() override {} void updateAxes() override; void onAxisSelected( int axis, bool toggle ) override; - void setAutoScalePropertyValuesEnabled( bool enabled ) override {} - void setAutoScaleDepthValuesEnabled( bool enabled ) override {} + void setAutoScaleXEnabled( bool enabled ) override {} + void setAutoScaleYEnabled( bool enabled ) override {} void updateLegend() override{}; QString asciiDataForPlotExport() const override { return ""; } diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.h b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.h index f764d7f118..f134284d07 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.h +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.h @@ -107,8 +107,8 @@ protected: RiuPlotWidget* doCreatePlotViewWidget( QWidget* mainWindowParent = nullptr ) override; void reattachAllCurves() override {} - void setAutoScalePropertyValuesEnabled( bool enabled ) override {} - void setAutoScaleDepthValuesEnabled( bool enabled ) override {} + void setAutoScaleXEnabled( bool enabled ) override {} + void setAutoScaleYEnabled( bool enabled ) override {} void updateLegend() override; QString asciiDataForPlotExport() const override { return ""; } diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp index 71f9872698..b7d01acf39 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp @@ -127,7 +127,7 @@ RiuPlotWidget* RimWellDistributionPlot::plotWidget() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellDistributionPlot::setAutoScalePropertyValuesEnabled( bool /*enabled*/ ) +void RimWellDistributionPlot::setAutoScaleXEnabled( bool /*enabled*/ ) { // cvf::Trace::show("RimWellDistributionPlot::setAutoScaleXEnabled()"); } @@ -135,7 +135,7 @@ void RimWellDistributionPlot::setAutoScalePropertyValuesEnabled( bool /*enabled* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellDistributionPlot::setAutoScaleDepthValuesEnabled( bool /*enabled*/ ) +void RimWellDistributionPlot::setAutoScaleYEnabled( bool /*enabled*/ ) { // cvf::Trace::show("RimWellDistributionPlot::setAutoScaleYEnabled()"); } diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h index 879ccb39f3..1949837277 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h @@ -50,8 +50,8 @@ public: // RimPlot implementations RiuPlotWidget* plotWidget() override; - void setAutoScalePropertyValuesEnabled( bool enabled ) override; - void setAutoScaleDepthValuesEnabled( bool enabled ) override; + void setAutoScaleXEnabled( bool enabled ) override; + void setAutoScaleYEnabled( bool enabled ) override; void updateAxes() override; void updateLegend() override; void updateZoomInParentPlot() override; diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp index 9103c6c967..87821173b8 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp @@ -183,8 +183,8 @@ QImage RimGridCrossPlot::snapshotWindowContent() //-------------------------------------------------------------------------------------------------- void RimGridCrossPlot::zoomAll() { - setAutoScalePropertyValuesEnabled( true ); - setAutoScaleDepthValuesEnabled( true ); + setAutoScaleXEnabled( true ); + setAutoScaleYEnabled( true ); updateZoomInParentPlot(); } @@ -338,7 +338,7 @@ void RimGridCrossPlot::detachAllCurves() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimGridCrossPlot::setAutoScalePropertyValuesEnabled( bool enabled ) +void RimGridCrossPlot::setAutoScaleXEnabled( bool enabled ) { m_xAxisProperties->setAutoZoom( enabled ); } @@ -346,7 +346,7 @@ void RimGridCrossPlot::setAutoScalePropertyValuesEnabled( bool enabled ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimGridCrossPlot::setAutoScaleDepthValuesEnabled( bool enabled ) +void RimGridCrossPlot::setAutoScaleYEnabled( bool enabled ) { m_yAxisProperties->setAutoZoom( enabled ); } @@ -457,8 +457,8 @@ void RimGridCrossPlot::axisLogarithmicChanged( const caf::SignalEmitter* emitter //-------------------------------------------------------------------------------------------------- void RimGridCrossPlot::onPlotZoomed() { - setAutoScalePropertyValuesEnabled( false ); - setAutoScaleDepthValuesEnabled( false ); + setAutoScaleXEnabled( false ); + setAutoScaleYEnabled( false ); updateZoomFromParentPlot(); } diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h index f50d2c0d09..36d460f79d 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h @@ -102,8 +102,8 @@ public: void updateZoomInParentPlot() override; void updateZoomFromParentPlot() override; - void setAutoScalePropertyValuesEnabled( bool enabled ) override; - void setAutoScaleDepthValuesEnabled( bool enabled ) override; + void setAutoScaleXEnabled( bool enabled ) override; + void setAutoScaleYEnabled( bool enabled ) override; caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const override; void onAxisSelected( int axis, bool toggle ) override; diff --git a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp index 9d76dfbed4..0f1d993e06 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp @@ -363,7 +363,7 @@ void RimDepthTrackPlot::setDepthAxisRange( double minimumDepth, double maximumDe m_minVisibleDepth.uiCapability()->updateConnectedEditors(); m_maxVisibleDepth.uiCapability()->updateConnectedEditors(); - setAutoScaleDepthEnabled( false ); + setAutoScaleDepthValuesEnabled( false ); updateZoom(); } @@ -1057,7 +1057,7 @@ caf::PdmFieldHandle* RimDepthTrackPlot::userDescriptionField() void RimDepthTrackPlot::insertPlot( RimPlot* plot, size_t index ) { auto wellLogTrack = dynamic_cast( plot ); - CVF_ASSERT( plot && !wellLogTrack && "Only type RimWellLogTrack is supported in RimDepthTrackPlot" ); + CVF_ASSERT( wellLogTrack && "Only type RimWellLogTrack is supported in RimDepthTrackPlot" ); if ( wellLogTrack ) { @@ -1211,9 +1211,9 @@ RiuPlotAxis RimDepthTrackPlot::valueAxis() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimDepthTrackPlot::setAutoScaleXEnabled( bool enabled ) +void RimDepthTrackPlot::setAutoScalePropertyValuesEnabled( bool enabled ) { - for ( RimPlot* plot : plots() ) + for ( auto plot : m_plots.childObjects() ) { plot->setAutoScalePropertyValuesEnabled( enabled ); } @@ -1222,7 +1222,7 @@ void RimDepthTrackPlot::setAutoScaleXEnabled( bool enabled ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimDepthTrackPlot::setAutoScaleDepthEnabled( bool enabled ) +void RimDepthTrackPlot::setAutoScaleDepthValuesEnabled( bool enabled ) { m_isAutoScaleDepthEnabled = enabled; m_isAutoScaleDepthEnabled.uiCapability()->updateConnectedEditors(); @@ -1233,8 +1233,8 @@ void RimDepthTrackPlot::setAutoScaleDepthEnabled( bool enabled ) //-------------------------------------------------------------------------------------------------- void RimDepthTrackPlot::zoomAll() { - setAutoScaleXEnabled( true ); - setAutoScaleDepthEnabled( true ); + setAutoScalePropertyValuesEnabled( true ); + setAutoScaleDepthValuesEnabled( true ); updateZoom(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.h b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.h index 8d7a667d42..dd83cd65aa 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.h +++ b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.h @@ -108,8 +108,8 @@ public: RiuPlotAxis depthAxis() const; RiuPlotAxis valueAxis() const; - void setAutoScaleXEnabled( bool enabled ); - void setAutoScaleDepthEnabled( bool enabled ); + void setAutoScalePropertyValuesEnabled( bool enabled ); + void setAutoScaleDepthValuesEnabled( bool enabled ); void zoomAll() override; void updateZoom(); diff --git a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp index fba50a9191..1f753607b6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp @@ -406,7 +406,7 @@ void RimMultiPlot::setAutoScaleXEnabled( bool enabled ) { for ( RimPlot* plot : plots() ) { - plot->setAutoScalePropertyValuesEnabled( enabled ); + plot->setAutoScaleXEnabled( enabled ); } } @@ -417,7 +417,7 @@ void RimMultiPlot::setAutoScaleYEnabled( bool enabled ) { for ( RimPlot* plot : plots() ) { - plot->setAutoScaleDepthValuesEnabled( enabled ); + plot->setAutoScaleYEnabled( enabled ); } } diff --git a/ApplicationLibCode/ProjectDataModel/RimPlot.h b/ApplicationLibCode/ProjectDataModel/RimPlot.h index d792075e98..5f84ce8d9b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlot.h +++ b/ApplicationLibCode/ProjectDataModel/RimPlot.h @@ -71,9 +71,9 @@ public: void updateAfterInsertingIntoMultiPlot(); // Pure virtual interface methods - virtual void setAutoScalePropertyValuesEnabled( bool enabled ) = 0; - virtual void setAutoScaleDepthValuesEnabled( bool enabled ) = 0; - virtual void updateAxes() = 0; + virtual void setAutoScaleXEnabled( bool enabled ) = 0; + virtual void setAutoScaleYEnabled( bool enabled ) = 0; + virtual void updateAxes() = 0; virtual void updateLegend() = 0; diff --git a/ApplicationLibCode/ProjectDataModel/RimVfpPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimVfpPlot.cpp index 78f5d39043..9c92736097 100644 --- a/ApplicationLibCode/ProjectDataModel/RimVfpPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimVfpPlot.cpp @@ -175,14 +175,14 @@ RiuPlotWidget* RimVfpPlot::plotWidget() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimVfpPlot::setAutoScalePropertyValuesEnabled( bool /*enabled*/ ) +void RimVfpPlot::setAutoScaleXEnabled( bool /*enabled*/ ) { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimVfpPlot::setAutoScaleDepthValuesEnabled( bool /*enabled*/ ) +void RimVfpPlot::setAutoScaleYEnabled( bool /*enabled*/ ) { } diff --git a/ApplicationLibCode/ProjectDataModel/RimVfpPlot.h b/ApplicationLibCode/ProjectDataModel/RimVfpPlot.h index 991391e107..ca832c04b7 100644 --- a/ApplicationLibCode/ProjectDataModel/RimVfpPlot.h +++ b/ApplicationLibCode/ProjectDataModel/RimVfpPlot.h @@ -48,8 +48,8 @@ public: // RimPlot implementations RiuPlotWidget* plotWidget() override; - void setAutoScalePropertyValuesEnabled( bool enabled ) override; - void setAutoScaleDepthValuesEnabled( bool enabled ) override; + void setAutoScaleXEnabled( bool enabled ) override; + void setAutoScaleYEnabled( bool enabled ) override; void updateAxes() override; void updateLegend() override; QString asciiDataForPlotExport() const override; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 40679a1773..8425275d13 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -1130,8 +1130,8 @@ void RimSummaryPlot::removeAllTimeAnnotations() //-------------------------------------------------------------------------------------------------- void RimSummaryPlot::zoomAll() { - setAutoScalePropertyValuesEnabled( true ); - setAutoScaleDepthValuesEnabled( true ); + setAutoScaleXEnabled( true ); + setAutoScaleYEnabled( true ); updateZoomInParentPlot(); } @@ -2016,8 +2016,8 @@ void RimSummaryPlot::addNewEnsembleCurveY( const RifEclipseSummaryAddress& addre //-------------------------------------------------------------------------------------------------- void RimSummaryPlot::onPlotZoomed() { - setAutoScalePropertyValuesEnabled( false ); - setAutoScaleDepthValuesEnabled( false ); + setAutoScaleXEnabled( false ); + setAutoScaleYEnabled( false ); updateZoomFromParentPlot(); } @@ -2400,7 +2400,7 @@ std::vector RimSummaryPlot::fieldsToShowInToolbar() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSummaryPlot::setAutoScalePropertyValuesEnabled( bool enabled ) +void RimSummaryPlot::setAutoScaleXEnabled( bool enabled ) { for ( auto ap : m_axisProperties ) { @@ -2415,7 +2415,7 @@ void RimSummaryPlot::setAutoScalePropertyValuesEnabled( bool enabled ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSummaryPlot::setAutoScaleDepthValuesEnabled( bool enabled ) +void RimSummaryPlot::setAutoScaleYEnabled( bool enabled ) { for ( auto ap : m_axisProperties ) { diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h index 8e91e95ed5..d76de226b5 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h @@ -163,8 +163,8 @@ public: virtual RimSummaryPlotSourceStepping* sourceSteppingObjectForKeyEventHandling() const; virtual std::vector fieldsToShowInToolbar(); - void setAutoScalePropertyValuesEnabled( bool enabled ) override; - void setAutoScaleDepthValuesEnabled( bool enabled ) override; + void setAutoScaleXEnabled( bool enabled ) override; + void setAutoScaleYEnabled( bool enabled ) override; RiuPlotWidget* plotWidget() override; void zoomAll() override; void updateZoomInParentPlot() override; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurve.cpp index dc1dc71753..ccb9058a01 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurve.cpp @@ -314,7 +314,7 @@ void RimWellLogCurve::updateZoomInParentPlot() } if ( updateDepthZoom ) { - wellLogPlot->setAutoScaleDepthEnabled( true ); + wellLogPlot->setAutoScaleDepthValuesEnabled( true ); } wellLogPlot->updateZoom(); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp index f31b700f00..9ef9f96384 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp @@ -1355,6 +1355,22 @@ void RimWellLogTrack::setAndUpdateSimWellFormationNamesData( RimCase* rimCase, c } } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimWellLogTrack::setAutoScaleXEnabled( bool enabled ) +{ + CAF_ASSERT( "A well log track can be both vertical and horizontal, use setAutoScalePropertyValuesEnabled " ); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimWellLogTrack::setAutoScaleYEnabled( bool enabled ) +{ + CAF_ASSERT( "A well log track can be both vertical and horizontal, use setAutoScaleDepthValuesEnabled " ); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h index d22fca5172..0eaa609bed 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h @@ -139,8 +139,11 @@ public: bool useBranchDetection ); void setAndUpdateSimWellFormationNamesData( RimCase* rimCase, const QString& simWellName ); - void setAutoScalePropertyValuesEnabled( bool enabled ) override; - void setAutoScaleDepthValuesEnabled( bool enabled ) override; + [[deprecated( "Use setAutoScalePropertyValuesEnabled() instead." )]] void setAutoScaleXEnabled( bool enabled ) override; + [[deprecated( "Use setAutoScaleDepthValuesEnabled() instead." )]] void setAutoScaleYEnabled( bool enabled ) override; + + void setAutoScalePropertyValuesEnabled( bool enabled ); + void setAutoScaleDepthValuesEnabled( bool enabled ); void setAutoScalePropertyValuesIfNecessary(); void availablePropertyValueRange( double* minX, double* maxX ); diff --git a/ApplicationLibCode/UserInterface/RiuWellLogPlot.cpp b/ApplicationLibCode/UserInterface/RiuWellLogPlot.cpp index c5aa4667bf..d5c648ed1b 100644 --- a/ApplicationLibCode/UserInterface/RiuWellLogPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuWellLogPlot.cpp @@ -145,7 +145,7 @@ void RiuWellLogPlot::slotSetMinDepth( int value ) double delta = value - minimumDepth; depthTrackPlot()->setDepthAxisRange( minimumDepth + delta, maximumDepth + delta ); - depthTrackPlot()->setAutoScaleDepthEnabled( false ); + depthTrackPlot()->setAutoScaleDepthValuesEnabled( false ); } //--------------------------------------------------------------------------------------------------