From 3c505652a3571f78e74883868bbb04831d4598ed Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 28 Nov 2023 13:12:52 +0100 Subject: [PATCH] QskIntervalF::width -> QskIntervalF::length --- playground/charts/StackedChart.cpp | 2 +- src/common/QskGraduation.cpp | 12 ++++++------ src/common/QskIntervalF.cpp | 2 +- src/common/QskIntervalF.h | 12 ++++++------ src/nodes/QskScaleRenderer.cpp | 2 +- src/nodes/QskTickmarksNode.cpp | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/playground/charts/StackedChart.cpp b/playground/charts/StackedChart.cpp index 91aedf7c..9d984985 100644 --- a/playground/charts/StackedChart.cpp +++ b/playground/charts/StackedChart.cpp @@ -66,7 +66,7 @@ QskIntervalF StackedChart::stackedInterval( int index ) const if ( index >= 0 && index < m_data->samples.size() ) { interval.setLowerBound( m_data->cumulatedValues[index] ); - interval.setWidth( m_data->samples[index].value() ); + interval.setLength( m_data->samples[index].value() ); } return interval; diff --git a/src/common/QskGraduation.cpp b/src/common/QskGraduation.cpp index 2ac1a433..e9680550 100644 --- a/src/common/QskGraduation.cpp +++ b/src/common/QskGraduation.cpp @@ -37,10 +37,10 @@ namespace Engine if ( !interval.isValid() ) return false; - if ( fuzzyCompare( value, interval.lowerBound(), interval.width() ) < 0 ) + if ( fuzzyCompare( value, interval.lowerBound(), interval.length() ) < 0 ) return false; - if ( fuzzyCompare( value, interval.upperBound(), interval.width() ) > 0 ) + if ( fuzzyCompare( value, interval.upperBound(), interval.length() ) > 0 ) return false; return true; @@ -94,7 +94,7 @@ namespace Engine QVector< qreal > buildMajorTicks( const QskIntervalF& interval, qreal stepSize ) { - int numTicks = qRound( interval.width() / stepSize ) + 1; + int numTicks = qRound( interval.length() / stepSize ) + 1; if ( numTicks > 10000 ) numTicks = 10000; @@ -187,13 +187,13 @@ QskTickmarks QskGraduation::divideInterval( const auto interval = QskIntervalF::normalized( x1, x2 ); - if ( interval.width() > std::numeric_limits< qreal >::max() ) + if ( interval.length() > std::numeric_limits< qreal >::max() ) { qWarning() << "QskGraduation::divideInterval: overflow"; return tickmarks; } - if ( interval.width() <= 0.0 || stepSize < 0.0 ) + if ( interval.length() <= 0.0 || stepSize < 0.0 ) return tickmarks; if ( stepSize == 0.0 ) @@ -201,7 +201,7 @@ QskTickmarks QskGraduation::divideInterval( if ( maxMajorSteps < 1 ) maxMajorSteps = 1; - stepSize = QskGraduation::stepSize( interval.width(), maxMajorSteps ); + stepSize = QskGraduation::stepSize( interval.length(), maxMajorSteps ); } if ( stepSize != 0.0 ) diff --git a/src/common/QskIntervalF.cpp b/src/common/QskIntervalF.cpp index fce9ce2f..5b31268b 100644 --- a/src/common/QskIntervalF.cpp +++ b/src/common/QskIntervalF.cpp @@ -255,7 +255,7 @@ QRectF QskIntervalF::toRect( const QskIntervalF& intervalX, const QskIntervalF& intervalY ) noexcept { return QRectF( intervalX.lowerBound(), intervalY.lowerBound(), - intervalX.width(), intervalY.width() ).normalized(); + intervalX.length(), intervalY.length() ).normalized(); } #ifndef QT_NO_DEBUG_STREAM diff --git a/src/common/QskIntervalF.h b/src/common/QskIntervalF.h index 54fb2963..72b7fb44 100644 --- a/src/common/QskIntervalF.h +++ b/src/common/QskIntervalF.h @@ -19,7 +19,7 @@ class QSK_EXPORT QskIntervalF Q_PROPERTY( qreal lowerBound READ lowerBound WRITE setLowerBound ) Q_PROPERTY( qreal upperBound READ upperBound WRITE setUpperBound ) - Q_PROPERTY( qreal width READ width ) + Q_PROPERTY( qreal length READ length ) public: constexpr QskIntervalF() noexcept = default; @@ -39,8 +39,8 @@ class QSK_EXPORT QskIntervalF void spanFromLowerBound( qreal ) noexcept; void spanFromUpperBound( qreal ) noexcept; - constexpr qreal width() const noexcept; - void setWidth( qreal ) noexcept; + constexpr qreal length() const noexcept; + void setLength( qreal ) noexcept; constexpr bool contains( qreal value ) const noexcept; constexpr bool contains( const QskIntervalF& ) const noexcept; @@ -135,14 +135,14 @@ inline constexpr qreal QskIntervalF::upperBound() const noexcept return m_upperBound; } -inline constexpr qreal QskIntervalF::width() const noexcept +inline constexpr qreal QskIntervalF::length() const noexcept { return ( m_upperBound > m_lowerBound ) ? ( m_upperBound - m_lowerBound ) : 0.0; } -inline void QskIntervalF::setWidth( qreal width ) noexcept +inline void QskIntervalF::setLength( qreal length ) noexcept { - m_upperBound = m_lowerBound + width; + m_upperBound = m_lowerBound + length; } inline constexpr bool QskIntervalF::isValid() const noexcept diff --git a/src/nodes/QskScaleRenderer.cpp b/src/nodes/QskScaleRenderer.cpp index 8b4c530f..1fe8c140 100644 --- a/src/nodes/QskScaleRenderer.cpp +++ b/src/nodes/QskScaleRenderer.cpp @@ -254,7 +254,7 @@ QSGNode* QskScaleRenderer::updateLabelsNode( const qreal length = ( m_data->orientation == Qt::Horizontal ) ? tickmarksRect.width() : tickmarksRect.height(); - const qreal ratio = length / m_data->boundaries.width(); + const qreal ratio = length / m_data->boundaries.length(); auto nextNode = node->firstChild(); diff --git a/src/nodes/QskTickmarksNode.cpp b/src/nodes/QskTickmarksNode.cpp index e4363f84..3757c94b 100644 --- a/src/nodes/QskTickmarksNode.cpp +++ b/src/nodes/QskTickmarksNode.cpp @@ -41,7 +41,7 @@ void QskTickmarksNode::update( auto vertexData = geometry()->vertexDataAsPoint2D(); const qreal min = boundaries.lowerBound(); - const qreal range = boundaries.width(); + const qreal range = boundaries.length(); using TM = QskTickmarks;