diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp index 7a63e0c8c3..005e2f657f 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp @@ -203,15 +203,6 @@ void RimWellDistributionPlot::detachAllCurves() // cvf::Trace::show("RimWellDistributionPlot::detachAllCurves()"); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -caf::PdmObject* RimWellDistributionPlot::findPdmObjectFromPlotCurve( const RiuPlotCurve* /*curve*/ ) const -{ - // cvf::Trace::show("RimWellDistributionPlot::findPdmObjectFromQwtCurve()"); - return nullptr; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h index 463ff8bd8a..6bcc6b6613 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.h @@ -49,18 +49,17 @@ public: RiaDefines::PhaseType phase() const; // RimPlot implementations - RiuPlotWidget* plotWidget() override; - void setAutoScaleXEnabled( bool enabled ) override; - void setAutoScaleYEnabled( bool enabled ) override; - void updateAxes() override; - void updateLegend() override; - void updatePlotWidgetFromAxisRanges() override; - void updateAxisRangesFromPlotWidget() override; - QString asciiDataForPlotExport() const override; - void reattachAllCurves() override; - void detachAllCurves() override; - caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const override; - void onAxisSelected( RiuPlotAxis axis, bool toggle ) override; + RiuPlotWidget* plotWidget() override; + void setAutoScaleXEnabled( bool enabled ) override; + void setAutoScaleYEnabled( bool enabled ) override; + void updateAxes() override; + void updateLegend() override; + void updatePlotWidgetFromAxisRanges() override; + void updateAxisRangesFromPlotWidget() override; + QString asciiDataForPlotExport() const override; + void reattachAllCurves() override; + void detachAllCurves() override; + void onAxisSelected( RiuPlotAxis axis, bool toggle ) override; // RimPlotWindow implementations QString description() const override; diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp index 96a5d3c709..81e3dd0d71 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp @@ -340,24 +340,6 @@ void RimGridCrossPlot::setAutoScaleYEnabled( bool enabled ) m_yAxisProperties->setAutoZoom( enabled ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -caf::PdmObject* RimGridCrossPlot::findPdmObjectFromPlotCurve( const RiuPlotCurve* plotCurve ) const -{ - for ( auto dataSet : m_crossPlotDataSets ) - { - for ( auto curve : dataSet->curves() ) - { - if ( curve->isSameCurve( plotCurve ) ) - { - return curve; - } - } - } - return nullptr; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h index 78415a6417..131c3cb368 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h @@ -102,10 +102,9 @@ public: void updatePlotWidgetFromAxisRanges() override; void updateAxisRangesFromPlotWidget() override; - void setAutoScaleXEnabled( bool enabled ) override; - void setAutoScaleYEnabled( bool enabled ) override; - caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const override; - void onAxisSelected( RiuPlotAxis axis, bool toggle ) override; + void setAutoScaleXEnabled( bool enabled ) override; + void setAutoScaleYEnabled( bool enabled ) override; + void onAxisSelected( RiuPlotAxis axis, bool toggle ) override; bool isDeletable() const override; bool isCurveHighlightSupported() const override; diff --git a/ApplicationLibCode/ProjectDataModel/RimPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimPlot.cpp index c352604e8b..b65ab2ea2e 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlot.cpp @@ -263,14 +263,6 @@ void RimPlot::updateAxisRangesFromPlotWidget() { } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -caf::PdmObject* RimPlot::findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const -{ - return nullptr; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimPlot.h b/ApplicationLibCode/ProjectDataModel/RimPlot.h index 19ce220fa9..250d06ec6b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlot.h +++ b/ApplicationLibCode/ProjectDataModel/RimPlot.h @@ -99,8 +99,7 @@ public: virtual void updatePlotWidgetFromAxisRanges(); virtual void updateAxisRangesFromPlotWidget(); - virtual caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const; - virtual void handleDroppedObjects( const std::vector& objects ); + virtual void handleDroppedObjects( const std::vector& objects ); virtual std::vector visibleCurvesForLegend(); virtual bool isCurveHighlightSupported() const; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index f84b9f1791..5b8d8d3cfa 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -368,51 +368,6 @@ QString RimSummaryPlot::asciiDataForSummaryPlotExport( RiaDefines::DateTimePerio return text; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -caf::PdmObject* RimSummaryPlot::findPdmObjectFromPlotCurve( const RiuPlotCurve* plotCurve ) const -{ - for ( RimGridTimeHistoryCurve* curve : m_gridTimeHistoryCurves ) - { - if ( curve->isSameCurve( plotCurve ) ) - { - return curve; - } - } - - for ( RimAsciiDataCurve* curve : m_asciiDataCurves ) - { - if ( curve->isSameCurve( plotCurve ) ) - { - return curve; - } - } - - if ( m_summaryCurveCollection ) - { - RimSummaryCurve* foundCurve = m_summaryCurveCollection->findRimCurveFromPlotCurve( plotCurve ); - - if ( foundCurve ) - { - m_summaryCurveCollection->setCurrentSummaryCurve( foundCurve ); - - return foundCurve; - } - } - - if ( m_ensembleCurveSetCollection ) - { - RimSummaryCurve* foundCurve = m_ensembleCurveSetCollection->findRimCurveFromPlotCurve( plotCurve ); - - if ( foundCurve ) - { - return foundCurve; - } - } - return nullptr; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h index c5b9b845ba..2c8962f73e 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h @@ -185,8 +185,6 @@ public: void updatePlotWidgetFromAxisRanges() override; void updateAxisRangesFromPlotWidget() override; - caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const override; - void onAxisSelected( RiuPlotAxis axis, bool toggle ) override; static constexpr int precision() diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp index 2dc922f73d..f9eb46b2f6 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp @@ -1994,22 +1994,6 @@ void RimWellLogTrack::zoomAll() if ( plot ) plot->zoomAll(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -caf::PdmObject* RimWellLogTrack::findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const -{ - for ( size_t idx = 0; idx < m_curves.size(); idx++ ) - { - if ( m_curves[idx]->isSameCurve( curve ) ) - { - return m_curves[idx]; - } - } - - return nullptr; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h index 4ab1a6009e..b8ec4c4ae4 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h @@ -188,8 +188,6 @@ public: RimWellPath* wellPathAttributeSource() const; - caf::PdmObject* findPdmObjectFromPlotCurve( const RiuPlotCurve* curve ) const override; - void setLogarithmicScale( bool enable ); bool isLogarithmicScale() const;