Janitor : Fix invalid rename introduce by horizontal/vertical depth log plots

Fix deprecated
2025-02-25 18:55:39 -06:00 · 2022-03-08 08:42:21 +01:00
parent 6700c21086
commit 728885a6c8
23 changed files with 67 additions and 66 deletions
--- 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
--- 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
--- 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
--- 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 );
--- 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 );
    }
--- 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 ""; }
--- 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 ""; }
--- 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()");
 }
--- 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;
--- 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();
 }

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

--- 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<RimWellLogTrack*>( 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();
 }

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

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

--- 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*/ )
 {
 }

--- 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;
--- 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<caf::PdmFieldHandle*> 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 )
    {
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h
@@ -163,8 +163,8 @@ public:
    virtual RimSummaryPlotSourceStepping*     sourceSteppingObjectForKeyEventHandling() const;
    virtual std::vector<caf::PdmFieldHandle*> 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;
--- 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();
        }
--- 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 " );
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
--- 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 );
--- 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 );
 }

 //--------------------------------------------------------------------------------------------------