From e8aada80c5198324f61d36a0a336e76b0d30a66b Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Sun, 17 Sep 2023 15:00:34 +0200 Subject: [PATCH] Rename to plotAxis() --- .../RicNewPlotAxisPropertiesFeature.cpp | 2 +- .../GridCrossPlots/RimGridCrossPlot.cpp | 6 +-- .../RimPlotAxisProperties.cpp | 4 +- .../ProjectDataModel/RimPlotAxisProperties.h | 2 +- .../RimPlotAxisPropertiesInterface.h | 2 +- .../Summary/RimEnsembleCurveSet.cpp | 2 +- .../Summary/RimSummaryCurve.cpp | 2 +- .../Summary/RimSummaryMultiPlot.cpp | 24 ++++----- .../Summary/RimSummaryPlot.cpp | 54 +++++++++---------- .../Summary/RimSummaryPlotAxisFormatter.cpp | 10 ++-- .../Summary/RimSummaryTimeAxisProperties.cpp | 2 +- .../Summary/RimSummaryTimeAxisProperties.h | 2 +- .../UserInterface/RiuSummaryQwtPlot.cpp | 2 +- 13 files changed, 57 insertions(+), 57 deletions(-) diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewPlotAxisPropertiesFeature.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewPlotAxisPropertiesFeature.cpp index 1e00a9f2b2..6ec4e5e413 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewPlotAxisPropertiesFeature.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewPlotAxisPropertiesFeature.cpp @@ -49,7 +49,7 @@ void RicNewPlotAxisPropertiesFeature::onActionTriggered( bool isChecked ) if ( !summaryPlot ) return; RimPlotAxisProperties* newPlotAxisProperties = summaryPlot->addNewAxisProperties( RiaDefines::PlotAxis::PLOT_AXIS_LEFT, "New Axis" ); - summaryPlot->plotWidget()->ensureAxisIsCreated( newPlotAxisProperties->plotAxisType() ); + summaryPlot->plotWidget()->ensureAxisIsCreated( newPlotAxisProperties->plotAxis() ); newPlotAxisProperties->setNameForUnusedAxis(); summaryPlot->updateConnectedEditors(); diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp index 2ae1f7e921..a127e8c328 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp @@ -641,8 +641,8 @@ void RimGridCrossPlot::swapAxes() QString tmpName = xAxisProperties->objectName(); QString tmpTitle = xAxisProperties->axisTitleText(); - RiuPlotAxis tmpAxis = xAxisProperties->plotAxisType(); - xAxisProperties->setNameAndAxis( yAxisProperties->objectName(), yAxisProperties->axisTitleText(), yAxisProperties->plotAxisType().axis() ); + RiuPlotAxis tmpAxis = xAxisProperties->plotAxis(); + xAxisProperties->setNameAndAxis( yAxisProperties->objectName(), yAxisProperties->axisTitleText(), yAxisProperties->plotAxis().axis() ); yAxisProperties->setNameAndAxis( tmpName, tmpTitle, tmpAxis.axis() ); m_xAxisProperties.removeChild( xAxisProperties ); @@ -855,7 +855,7 @@ void RimGridCrossPlot::updateAxisInQwt( RiaDefines::PlotAxis axisType ) axisParameterString = yAxisParameterString(); } - RiuPlotAxis axis = axisProperties->plotAxisType(); + RiuPlotAxis axis = axisProperties->plotAxis(); if ( axisProperties->isActive() ) { m_plotWidget->enableAxis( axis, true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp index b4ec8e965b..6aeb196346 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp @@ -327,7 +327,7 @@ const QString RimPlotAxisProperties::axisTitleText() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuPlotAxis RimPlotAxisProperties::plotAxisType() const +RiuPlotAxis RimPlotAxisProperties::plotAxis() const { return RiuPlotAxis( m_plotAxis.value(), m_plotAxisIndex ); } @@ -712,7 +712,7 @@ void RimPlotAxisProperties::fieldChangedByUi( const caf::PdmFieldHandle* changed else if ( changedField == &m_plotAxis ) { RiuPlotAxis oldPlotAxis = RiuPlotAxis( (RiaDefines::PlotAxis)oldValue.toInt(), m_plotAxisIndex ); - axisPositionChanged.send( this, oldPlotAxis, plotAxisType() ); + axisPositionChanged.send( this, oldPlotAxis, plotAxis() ); } else { diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h index fb96a8a04d..dc9acacd7a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h +++ b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h @@ -73,7 +73,7 @@ public: const QString objectName() const override; const QString axisTitleText() const override; - RiuPlotAxis plotAxisType() const override; + RiuPlotAxis plotAxis() const override; bool useAutoTitle() const; void setShowDescription( bool enable ); diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.h b/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.h index 2abbd3e1f1..51c818ee47 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.h +++ b/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.h @@ -56,7 +56,7 @@ public: virtual std::vector annotations() const = 0; virtual void appendAnnotation( RimPlotAxisAnnotation* annotation ) = 0; virtual void removeAllAnnotations() = 0; - virtual RiuPlotAxis plotAxisType() const = 0; + virtual RiuPlotAxis plotAxis() const = 0; virtual double visibleRangeMin() const = 0; virtual double visibleRangeMax() const = 0; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp index e5a8a1ff92..7e7bf9b58a 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp @@ -2211,7 +2211,7 @@ int statisticsCurveSymbolSize( RiuPlotCurveSymbol::PointSymbolEnum symbol ) RiuPlotAxis RimEnsembleCurveSet::axisY() const { if ( m_plotAxisProperties ) - return m_plotAxisProperties->plotAxisType(); + return m_plotAxisProperties->plotAxis(); else return RiuPlotAxis::defaultLeft(); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index ee58b359cc..0643130dd3 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -441,7 +441,7 @@ void RimSummaryCurve::setLeftOrRightAxisY( RiuPlotAxis plotAxis ) RiuPlotAxis RimSummaryCurve::axisY() const { if ( m_plotAxisProperties ) - return m_plotAxisProperties->plotAxisType(); + return m_plotAxisProperties->plotAxis(); else return RiuPlotAxis::defaultLeft(); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp index aad1d86a3d..6168eed3ee 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp @@ -1084,7 +1084,7 @@ void RimSummaryMultiPlot::computeAggregatedAxisRange() { for ( auto curve : plot->summaryCurves() ) { - if ( curve->axisY() == axis->plotAxisType() ) + if ( curve->axisY() == axis->plotAxis() ) { std::vector summaryCases = summaryCasesForCurve( curve, m_axisRangeAggregation() ); std::vector addresses = addressesForCurve( curve, m_axisRangeAggregation() ); @@ -1093,14 +1093,14 @@ void RimSummaryMultiPlot::computeAggregatedAxisRange() auto [minimum, maximum] = findMinMaxForAddressesInSummaryCases( addresses, summaryCases, onlyPositiveValues ); - if ( axisRanges.count( axis->plotAxisType() ) == 0 ) + if ( axisRanges.count( axis->plotAxis() ) == 0 ) { - axisRanges[axis->plotAxisType()] = std::make_pair( minimum, maximum ); + axisRanges[axis->plotAxis()] = std::make_pair( minimum, maximum ); } else { - auto& [currentMin, currentMax] = axisRanges[axis->plotAxisType()]; - axisRanges[axis->plotAxisType()] = std::make_pair( std::min( currentMin, minimum ), std::max( currentMax, maximum ) ); + auto& [currentMin, currentMax] = axisRanges[axis->plotAxis()]; + axisRanges[axis->plotAxis()] = std::make_pair( std::min( currentMin, minimum ), std::max( currentMax, maximum ) ); } } } @@ -1109,7 +1109,7 @@ void RimSummaryMultiPlot::computeAggregatedAxisRange() { if ( !curveSet->summaryCaseCollection() ) continue; - if ( curveSet->axisY() == axis->plotAxisType() ) + if ( curveSet->axisY() == axis->plotAxis() ) { double minimum( std::numeric_limits::infinity() ); double maximum( -std::numeric_limits::infinity() ); @@ -1132,14 +1132,14 @@ void RimSummaryMultiPlot::computeAggregatedAxisRange() } } - if ( axisRanges.count( axis->plotAxisType() ) == 0 ) + if ( axisRanges.count( axis->plotAxis() ) == 0 ) { - axisRanges[axis->plotAxisType()] = std::make_pair( minimum, maximum ); + axisRanges[axis->plotAxis()] = std::make_pair( minimum, maximum ); } else { - auto& [currentMin, currentMax] = axisRanges[axis->plotAxisType()]; - axisRanges[axis->plotAxisType()] = std::make_pair( std::min( currentMin, minimum ), std::max( currentMax, maximum ) ); + auto& [currentMin, currentMax] = axisRanges[axis->plotAxis()]; + axisRanges[axis->plotAxis()] = std::make_pair( std::min( currentMin, minimum ), std::max( currentMax, maximum ) ); } } } @@ -1148,8 +1148,8 @@ void RimSummaryMultiPlot::computeAggregatedAxisRange() // set all plots to use the global min/max values for each category for ( auto axis : plot->plotYAxes() ) { - auto [minVal, maxVal] = axisRanges[axis->plotAxisType()]; - if ( RiaDefines::isVertical( axis->plotAxisType().axis() ) && !std::isinf( minVal ) && !std::isinf( maxVal ) ) + auto [minVal, maxVal] = axisRanges[axis->plotAxis()]; + if ( RiaDefines::isVertical( axis->plotAxis().axis() ) && !std::isinf( minVal ) && !std::isinf( maxVal ) ) { axis->setAutoZoom( false ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index a05c865b53..7e8dc7081b 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -643,7 +643,7 @@ void RimSummaryPlot::copyAxisPropertiesFromOther( const RimSummaryPlot& sourceSu { QString data = ap->writeObjectToXmlString(); - auto axisProperty = axisPropertiesForPlotAxis( ap->plotAxisType() ); + auto axisProperty = axisPropertiesForPlotAxis( ap->plotAxis() ); if ( axisProperty ) { axisProperty->readObjectFromXmlString( data, caf::PdmDefaultObjectFactory::instance() ); @@ -658,11 +658,11 @@ void RimSummaryPlot::copyAxisPropertiesFromOther( RiaDefines::PlotAxis plotAxisT { for ( auto ap : sourceSummaryPlot.plotAxes() ) { - if ( ap->plotAxisType().axis() != plotAxisType ) continue; + if ( ap->plotAxis().axis() != plotAxisType ) continue; QString data = ap->writeObjectToXmlString(); - axisPropertiesForPlotAxis( ap->plotAxisType() )->readObjectFromXmlString( data, caf::PdmDefaultObjectFactory::instance() ); + axisPropertiesForPlotAxis( ap->plotAxis() )->readObjectFromXmlString( data, caf::PdmDefaultObjectFactory::instance() ); } } @@ -908,7 +908,7 @@ void RimSummaryPlot::updateNumericalAxis( RiaDefines::PlotAxis plotAxis ) for ( RimPlotAxisPropertiesInterface* axisProperties : m_axisPropertiesArray ) { - RiuPlotAxis riuPlotAxis = axisProperties->plotAxisType(); + RiuPlotAxis riuPlotAxis = axisProperties->plotAxis(); if ( riuPlotAxis.axis() == plotAxis ) { auto* axisProps = dynamic_cast( axisProperties ); @@ -1054,7 +1054,7 @@ void RimSummaryPlot::updateZoomForNumericalAxis( RimPlotAxisProperties* axisProp { if ( !axisProperties ) return; - const auto plotAxis = axisProperties->plotAxisType(); + const auto plotAxis = axisProperties->plotAxis(); if ( axisProperties->isAutoZoom() ) { if ( axisProperties->isLogarithmicScaleEnabled() ) @@ -1086,16 +1086,16 @@ void RimSummaryPlot::updateZoomForNumericalAxis( RimPlotAxisProperties* axisProp std::swap( min, max ); } - plotWidget()->setAxisScale( axisProperties->plotAxisType(), min, max ); + plotWidget()->setAxisScale( axisProperties->plotAxis(), min, max ); } else if ( ( plotAxis.axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT || plotAxis.axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) && isOnlyWaterCutCurvesVisible( plotAxis ) ) { - plotWidget()->setAxisScale( axisProperties->plotAxisType(), 0.0, 1.0 ); + plotWidget()->setAxisScale( axisProperties->plotAxis(), 0.0, 1.0 ); } else { - plotWidget()->setAxisAutoScale( axisProperties->plotAxisType(), true ); + plotWidget()->setAxisAutoScale( axisProperties->plotAxis(), true ); } } else @@ -1103,10 +1103,10 @@ void RimSummaryPlot::updateZoomForNumericalAxis( RimPlotAxisProperties* axisProp double min = axisProperties->visibleRangeMin(); double max = axisProperties->visibleRangeMax(); if ( axisProperties->isAxisInverted() ) std::swap( min, max ); - plotWidget()->setAxisScale( axisProperties->plotAxisType(), min, max ); + plotWidget()->setAxisScale( axisProperties->plotAxis(), min, max ); } - plotWidget()->setAxisInverted( axisProperties->plotAxisType(), axisProperties->isAxisInverted() ); + plotWidget()->setAxisInverted( axisProperties->plotAxis(), axisProperties->isAxisInverted() ); } //-------------------------------------------------------------------------------------------------- @@ -1118,13 +1118,13 @@ void RimSummaryPlot::updateZoomForTimeAxis( RimSummaryTimeAxisProperties* timeAx if ( timeAxisProperties->isAutoZoom() ) { - plotWidget()->setAxisAutoScale( timeAxisProperties->plotAxisType(), true ); + plotWidget()->setAxisAutoScale( timeAxisProperties->plotAxis(), true ); } else { double min = timeAxisProperties->visibleRangeMin(); double max = timeAxisProperties->visibleRangeMax(); - plotWidget()->setAxisScale( timeAxisProperties->plotAxisType(), min, max ); + plotWidget()->setAxisScale( timeAxisProperties->plotAxis(), min, max ); } } @@ -1284,7 +1284,7 @@ RimPlotAxisPropertiesInterface* RimSummaryPlot::axisPropertiesForPlotAxis( RiuPl { for ( RimPlotAxisPropertiesInterface* axisProperties : m_axisPropertiesArray ) { - if ( axisProperties->plotAxisType() == plotAxis ) return axisProperties; + if ( axisProperties->plotAxis() == plotAxis ) return axisProperties; } return nullptr; @@ -1708,10 +1708,10 @@ bool RimSummaryPlot::updateStackedCurveDataForRelevantAxes() bool anyStackedCurvesPresent = false; for ( RimPlotAxisPropertiesInterface* axisProperties : m_axisPropertiesArray ) { - if ( axisProperties->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT || - axisProperties->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) + if ( axisProperties->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT || + axisProperties->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) { - anyStackedCurvesPresent |= updateStackedCurveDataForAxis( axisProperties->plotAxisType() ); + anyStackedCurvesPresent |= updateStackedCurveDataForAxis( axisProperties->plotAxis() ); } } @@ -1913,7 +1913,7 @@ void RimSummaryPlot::updateZoomFromParentPlot() { if ( !axisProperties ) continue; - auto [axisMin, axisMax] = plotWidget()->axisRange( axisProperties->plotAxisType() ); + auto [axisMin, axisMax] = plotWidget()->axisRange( axisProperties->plotAxis() ); if ( axisProperties->isAxisInverted() ) std::swap( axisMin, axisMax ); if ( auto propertyAxis = dynamic_cast( axisProperties ) ) @@ -2672,7 +2672,7 @@ RiuPlotWidget* RimSummaryPlot::doCreatePlotViewWidget( QWidget* mainWindowParent for ( const auto& axisProperties : m_axisPropertiesArray ) { - plotWidget()->ensureAxisIsCreated( axisProperties->plotAxisType() ); + plotWidget()->ensureAxisIsCreated( axisProperties->plotAxis() ); } for ( RimGridTimeHistoryCurve* curve : m_gridTimeHistoryCurves ) @@ -2980,8 +2980,8 @@ void RimSummaryPlot::setAutoScaleXEnabled( bool enabled ) { for ( const auto& ap : m_axisPropertiesArray ) { - if ( ap->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_TOP || - ap->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ) + if ( ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_TOP || + ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ) { ap->setAutoZoom( enabled ); } @@ -2995,8 +2995,8 @@ void RimSummaryPlot::setAutoScaleYEnabled( bool enabled ) { for ( const auto& ap : m_axisPropertiesArray ) { - if ( ap->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT || - ap->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) + if ( ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT || + ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) { ap->setAutoZoom( enabled ); } @@ -3115,8 +3115,8 @@ void RimSummaryPlot::assignPlotAxis( RimSummaryCurve* destinationCurve ) { for ( RimPlotAxisPropertiesInterface* axisProperties : m_axisPropertiesArray ) { - if ( axisProperties->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT || - axisProperties->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) + if ( axisProperties->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT || + axisProperties->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) { destinationCurve->setLeftOrRightAxisY( c->axisY() ); @@ -3149,9 +3149,9 @@ void RimSummaryPlot::assignPlotAxis( RimSummaryCurve* destinationCurve ) size_t axisCountRight = 0; for ( const auto& ap : m_axisPropertiesArray ) { - if ( ap->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT ) + if ( ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT ) axisCountLeft++; - else if ( ap->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) + else if ( ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) axisCountRight++; } @@ -3206,7 +3206,7 @@ void RimSummaryPlot::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::set usedPlotAxis; for ( const auto& axisProperties : m_axisPropertiesArray ) { - usedPlotAxis.insert( axisProperties->plotAxisType() ); + usedPlotAxis.insert( axisProperties->plotAxis() ); } plotWidget()->pruneAxes( usedPlotAxis ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp index 6f0ec0f1a1..1dc6c042e7 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp @@ -119,7 +119,7 @@ void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuPlotWidget* plot { if ( !plotWidget ) return; - RiuPlotAxis axis = m_axisProperties->plotAxisType(); + RiuPlotAxis axis = m_axisProperties->plotAxis(); { QString axisTitle = m_axisProperties->customTitle(); if ( m_axisProperties->useAutoTitle() ) axisTitle = autoAxisTitle(); @@ -254,12 +254,12 @@ QString RimSummaryPlotAxisFormatter::autoAxisTitle() const RifEclipseSummaryAddress sumAddress; std::string unitText; - if ( m_axisProperties->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ) + if ( m_axisProperties->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ) { sumAddress = rimCurve->summaryAddressX(); unitText = rimCurve->unitNameX(); } - else if ( rimCurve->axisY() == m_axisProperties->plotAxisType() ) + else if ( rimCurve->axisY() == m_axisProperties->plotAxis() ) { sumAddress = rimCurve->summaryAddressY(); unitText = rimCurve->unitNameY(); @@ -370,11 +370,11 @@ QString RimSummaryPlotAxisFormatter::createAxisObjectName() const { RifEclipseSummaryAddress sumAddress; - if ( m_axisProperties->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ) + if ( m_axisProperties->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ) { sumAddress = rimCurve->summaryAddressX(); } - else if ( rimCurve->axisY() == m_axisProperties->plotAxisType() ) + else if ( rimCurve->axisY() == m_axisProperties->plotAxis() ) { sumAddress = rimCurve->summaryAddressY(); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp index f95b5b97aa..0ea047dce7 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp @@ -164,7 +164,7 @@ RimPlotAxisPropertiesInterface::AxisTitlePositionType RimSummaryTimeAxisProperti //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuPlotAxis RimSummaryTimeAxisProperties::plotAxisType() const +RiuPlotAxis RimSummaryTimeAxisProperties::plotAxis() const { return RiuPlotAxis::defaultBottom(); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h index d6976c031e..c8268f5026 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h @@ -85,7 +85,7 @@ public: caf::PdmField title; caf::PdmField showTitle; - RiuPlotAxis plotAxisType() const override; + RiuPlotAxis plotAxis() const override; AxisTitlePositionType titlePosition() const override; int titleFontSize() const override; int valuesFontSize() const override; diff --git a/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.cpp b/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.cpp index 282c3ec29b..dfea11f16c 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.cpp @@ -143,7 +143,7 @@ void RiuSummaryQwtPlot::useTimeBasedTimeAxis() void RiuSummaryQwtPlot::updateAnnotationObjects( RimPlotAxisPropertiesInterface* axisProperties ) { RiaDefines::Orientation orientation = RiaDefines::Orientation::HORIZONTAL; - if ( axisProperties->plotAxisType().axis() == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ) + if ( axisProperties->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ) { orientation = RiaDefines::Orientation::VERTICAL; }