QskScaleTickmarks -> QskTickmarks

examples/iotdashboard/LightDisplaySkinlet.cpp

@@ -10,7 +10,7 @@
 
 #include <QskArcMetrics.h>
 #include <QskTextOptions.h>
-#include <QskScaleTickmarks.h>
+#include <QskTickmarks.h>
 #include <QskBoxShadowNode.h>
 #include <QskSGNode.h>
 
@@ -156,7 +156,7 @@ QSGNode* LightDisplaySkinlet::updateSubNode(
             const auto ticksRect = display->subControlRect( LightDisplay::Tickmarks );
             const auto arcMetrics = display->arcMetricsHint( LightDisplay::Tickmarks );
 
-            QskScaleTickmarks tickmarks;
+            QskTickmarks tickmarks;
             tickmarks.setMajorTicks( { 0, 22.5, 45, 67.5, 90, 112.5, 135, 157.5, 180 } );
 
             const auto tickLineWidth = display->metric( LightDisplay::Tickmarks );

examples/iotdashboard/nodes/RadialTickmarksNode.cpp

@@ -5,7 +5,7 @@
 
 #include "RadialTickmarksNode.h"
 
-#include <QskScaleTickmarks.h>
+#include <QskTickmarks.h>
 #include <QskArcMetrics.h>
 #include <QtMath>
 
@@ -24,7 +24,7 @@ RadialTickmarksNode::~RadialTickmarksNode()
 }
 
 void RadialTickmarksNode::update( const QColor& color, const QRectF& rect,
-    const QskArcMetrics& arcMetrics, const QskScaleTickmarks& tickmarks, int lineWidth )
+    const QskArcMetrics& arcMetrics, const QskTickmarks& tickmarks, int lineWidth )
 {
     if( lineWidth != m_lineWidth )
     {
@@ -48,7 +48,7 @@ void RadialTickmarksNode::update( const QColor& color, const QRectF& rect,
         const auto radius = 0.5 * rect.width();
         const auto needleRadius = radius - arcMetrics.thickness();
 
-        using TM = QskScaleTickmarks;
+        using TM = QskTickmarks;
 
         for( int i = TM::MinorTick; i <= TM::MajorTick; i++ )
         {

examples/iotdashboard/nodes/RadialTickmarksNode.h

@@ -11,7 +11,7 @@
 #include <QSGFlatColorMaterial>
 
 class QskArcMetrics;
-class QskScaleTickmarks;
+class QskTickmarks;
 
 class RadialTickmarksNode : public QSGGeometryNode
 {
@@ -20,7 +20,7 @@ class RadialTickmarksNode : public QSGGeometryNode
     ~RadialTickmarksNode() override;
 
     void update( const QColor&, const QRectF&,
-        const QskArcMetrics&, const QskScaleTickmarks&, int lineWidth );
+        const QskArcMetrics&, const QskTickmarks&, int lineWidth );
 
   private:
     QSGGeometry m_geometry;

src/CMakeLists.txt

@@ -29,13 +29,13 @@ list(APPEND HEADERS
     common/QskPlacementPolicy.h
     common/QskPlatform.h
     common/QskRgbValue.h
-    common/QskScaleTickmarks.h
     common/QskShadowMetrics.h
     common/QskSizePolicy.h
     common/QskStateCombination.h
     common/QskStippleMetrics.h
     common/QskTextColors.h
     common/QskTextOptions.h
+    common/QskTickmarks.h
 )
 
 list(APPEND SOURCES
@@ -61,12 +61,12 @@ list(APPEND SOURCES
     common/QskPlatform.cpp
     common/QskPlacementPolicy.cpp
     common/QskRgbValue.cpp
-    common/QskScaleTickmarks.cpp
     common/QskShadowMetrics.cpp
     common/QskSizePolicy.cpp
     common/QskStippleMetrics.cpp
     common/QskTextColors.cpp
     common/QskTextOptions.cpp
+    common/QskTickmarks.cpp
 )
 
 list(APPEND HEADERS

src/common/QskGraduation.cpp

@@ -6,7 +6,7 @@
 #include "QskGraduation.h"
 #include "QskFunctions.h"
 #include "QskIntervalF.h"
-#include "QskScaleTickmarks.h"
+#include "QskTickmarks.h"
 
 #include <QDebug>
 #include <QtMath>
@@ -222,10 +222,10 @@ namespace Engine
         }
     }
 
-    QskScaleTickmarks buildTicks(
+    QskTickmarks buildTicks(
         const QskIntervalF& interval, qreal stepSize, int maxMinorSteps )
     {
-        using T = QskScaleTickmarks;
+        using T = QskTickmarks;
 
         const auto boundingInterval = align( interval, stepSize );
 
@@ -252,7 +252,7 @@ namespace Engine
             }
         }
 
-        QskScaleTickmarks tickmarks;
+        QskTickmarks tickmarks;
         tickmarks.setMinorTicks( ticks[T::MinorTick] );
         tickmarks.setMediumTicks( ticks[T::MediumTick] );
         tickmarks.setMajorTicks( ticks[T::MajorTick] );
@@ -262,10 +262,10 @@ namespace Engine
 
 }
 
-QskScaleTickmarks QskGraduation::divideInterval(
+QskTickmarks QskGraduation::divideInterval(
     qreal x1, qreal x2, int maxMajorSteps, int maxMinorSteps, qreal stepSize)
 {
-    QskScaleTickmarks tickmarks;
+    QskTickmarks tickmarks;
 
     const auto interval = QskIntervalF::normalized( x1, x2 );
 

src/common/QskGraduation.h

@@ -9,7 +9,7 @@
 #include <QskGlobal.h>
 #include <qmetatype.h>
 
-class QskScaleTickmarks;
+class QskTickmarks;
 
 namespace QskGraduation
 {
@@ -26,7 +26,7 @@ namespace QskGraduation
     Q_DECLARE_FLAGS( Attributes, Attribute )
     Q_DECLARE_OPERATORS_FOR_FLAGS( Attributes )
 
-    QskScaleTickmarks divideInterval( qreal x1, qreal x2,
+    QskTickmarks divideInterval( qreal x1, qreal x2,
         int maxMajorSteps, int maxMinorSteps, qreal stepSize = 0.0 );
 
     void calculate( Attributes, int maxNumSteps,

src/common/QskGraduationMetrics.h

@@ -6,7 +6,7 @@
 #ifndef QSK_GRADUATION_METRICS_H
 #define QSK_GRADUATION_METRICS_H
 
-#include "QskScaleTickmarks.h"
+#include "QskTickmarks.h"
 #include "QskFunctions.h"
 #include <algorithm>
 #include <qmetatype.h>
@@ -19,7 +19,7 @@ class QSK_EXPORT QskGraduationMetrics
     Q_PROPERTY( qreal minorTickLength READ minorTickLength WRITE setMinorTickLength )
 
   public:
-    using TickType = QskScaleTickmarks::TickType;
+    using TickType = QskTickmarks::TickType;
 
     constexpr QskGraduationMetrics() noexcept = default;
     constexpr QskGraduationMetrics( qreal minorTickLength,
@@ -71,32 +71,32 @@ inline constexpr QskGraduationMetrics::QskGraduationMetrics(
 
 inline constexpr qreal QskGraduationMetrics::majorTickLength() const noexcept
 {
-    return tickLength( QskScaleTickmarks::MajorTick );
+    return tickLength( QskTickmarks::MajorTick );
 }
 
 inline constexpr qreal QskGraduationMetrics::mediumTickLength() const noexcept
 {
-    return tickLength( QskScaleTickmarks::MediumTick );
+    return tickLength( QskTickmarks::MediumTick );
 }
 
 inline constexpr qreal QskGraduationMetrics::minorTickLength() const noexcept
 {
-    return tickLength( QskScaleTickmarks::MinorTick );
+    return tickLength( QskTickmarks::MinorTick );
 }
 
 inline constexpr void QskGraduationMetrics::setMajorTickLength( qreal length ) noexcept
 {
-    setTickLength( QskScaleTickmarks::MajorTick, length );
+    setTickLength( QskTickmarks::MajorTick, length );
 }
 
 inline constexpr void QskGraduationMetrics::setMediumTickLength( qreal length ) noexcept
 {
-    setTickLength( QskScaleTickmarks::MediumTick, length );
+    setTickLength( QskTickmarks::MediumTick, length );
 }
 
 inline constexpr void QskGraduationMetrics::setMinorTickLength( qreal length ) noexcept
 {
-    setTickLength( QskScaleTickmarks::MinorTick, length );
+    setTickLength( QskTickmarks::MinorTick, length );
 }
 
 inline constexpr bool QskGraduationMetrics::operator==(
@@ -114,7 +114,7 @@ inline constexpr bool QskGraduationMetrics::operator!=(
 }
 
 inline constexpr qreal QskGraduationMetrics::tickLength(
-    const QskScaleTickmarks::TickType type ) const noexcept
+    const QskTickmarks::TickType type ) const noexcept
 {
     return m_tickLengths[ type ];
 }

src/common/QskTickmarks.cpp

@@ -3,29 +3,29 @@
  *           SPDX-License-Identifier: BSD-3-Clause
  *****************************************************************************/
 
-#include "QskScaleTickmarks.h"
+#include "QskTickmarks.h"
 #include <algorithm>
 
 static void qskRegisterTickmarks()
 {
-    qRegisterMetaType< QskScaleTickmarks >();
+    qRegisterMetaType< QskTickmarks >();
 
 #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
-    QMetaType::registerEqualsComparator< QskScaleTickmarks >();
+    QMetaType::registerEqualsComparator< QskTickmarks >();
 #endif
 }
 
 Q_CONSTRUCTOR_FUNCTION( qskRegisterTickmarks )
 
-QskScaleTickmarks::QskScaleTickmarks()
+QskTickmarks::QskTickmarks()
 {
 }
 
-QskScaleTickmarks::~QskScaleTickmarks()
+QskTickmarks::~QskTickmarks()
 {
 }
 
-int QskScaleTickmarks::tickCount() const noexcept
+int QskTickmarks::tickCount() const noexcept
 {
     const auto count = m_ticks[ MajorTick ].count()
         + m_ticks[ MediumTick ].count()
@@ -35,41 +35,41 @@ int QskScaleTickmarks::tickCount() const noexcept
 }
 
 
-int QskScaleTickmarks::tickCount( TickType type ) const noexcept
+int QskTickmarks::tickCount( TickType type ) const noexcept
 {
     return static_cast< int >( m_ticks[ type ].count() );
 }
 
-QVector< qreal > QskScaleTickmarks::ticks( TickType type ) const noexcept
+QVector< qreal > QskTickmarks::ticks( TickType type ) const noexcept
 {
     return m_ticks[ type ];
 }
 
-void QskScaleTickmarks::setTicks(TickType type, const QVector< qreal >& ticks )
+void QskTickmarks::setTicks(TickType type, const QVector< qreal >& ticks )
 {
     m_ticks[ type ] = ticks;
 }
 
-qreal QskScaleTickmarks::tickAt( TickType type, int index ) const
+qreal QskTickmarks::tickAt( TickType type, int index ) const
 {
     return m_ticks[ type ].at( index );
 }
 
-void QskScaleTickmarks::reset()
+void QskTickmarks::reset()
 {
     m_ticks[ 0 ].clear();
     m_ticks[ 1 ].clear();
     m_ticks[ 2 ].clear();
 }
 
-void QskScaleTickmarks::invert()
+void QskTickmarks::invert()
 {
     std::reverse( m_ticks[ 0 ].begin(), m_ticks[ 0 ].end() );
     std::reverse( m_ticks[ 1 ].begin(), m_ticks[ 1 ].end() );
     std::reverse( m_ticks[ 2 ].begin(), m_ticks[ 2 ].end() );
 }
 
-QskHashValue QskScaleTickmarks::hash( QskHashValue seed ) const noexcept
+QskHashValue QskTickmarks::hash( QskHashValue seed ) const noexcept
 {
     seed = qHash( m_ticks[0], seed );
     seed = qHash( m_ticks[1], seed );
@@ -78,7 +78,7 @@ QskHashValue QskScaleTickmarks::hash( QskHashValue seed ) const noexcept
     return seed;
 }
 
-bool QskScaleTickmarks::operator==( const QskScaleTickmarks& other ) const noexcept
+bool QskTickmarks::operator==( const QskTickmarks& other ) const noexcept
 {
     return ( m_ticks[ 0 ] == other.m_ticks[ 0 ] )
         && ( m_ticks[ 1 ] == other.m_ticks[ 1 ] )
@@ -89,7 +89,7 @@ bool QskScaleTickmarks::operator==( const QskScaleTickmarks& other ) const noexc
 
 #include <qdebug.h>
 
-QDebug operator<<( QDebug debug, const QskScaleTickmarks& tickmarks )
+QDebug operator<<( QDebug debug, const QskTickmarks& tickmarks )
 {
     debug << tickmarks.majorTicks()
         << tickmarks.mediumTicks() << tickmarks.minorTicks();
@@ -99,4 +99,4 @@ QDebug operator<<( QDebug debug, const QskScaleTickmarks& tickmarks )
 
 #endif
 
-#include "moc_QskScaleTickmarks.cpp"
+#include "moc_QskTickmarks.cpp"

src/common/QskTickmarks.h

@@ -3,13 +3,13 @@
  *           SPDX-License-Identifier: BSD-3-Clause
  *****************************************************************************/
 
-#ifndef QSK_SCALE_TICKMARKS_H
+#ifndef QSK_TICKMARKS_H
-#define QSK_SCALE_TICKMARKS_H
+#define QSK_TICKMARKS_H
 
 #include <QskIntervalF.h>
 #include <QVector>
 
-class QSK_EXPORT QskScaleTickmarks
+class QSK_EXPORT QskTickmarks
 {
     Q_GADGET
 
@@ -27,11 +27,11 @@ class QSK_EXPORT QskScaleTickmarks
 
     Q_ENUM( TickType )
 
-    QskScaleTickmarks();
+    QskTickmarks();
-    ~QskScaleTickmarks();
+    ~QskTickmarks();
 
-    bool operator==( const QskScaleTickmarks& ) const noexcept;
+    bool operator==( const QskTickmarks& ) const noexcept;
-    bool operator!=( const QskScaleTickmarks& ) const noexcept;
+    bool operator!=( const QskTickmarks& ) const noexcept;
 
     int tickCount() const noexcept;
     Q_INVOKABLE int tickCount( TickType ) const noexcept;
@@ -59,47 +59,47 @@ class QSK_EXPORT QskScaleTickmarks
     QVector< qreal > m_ticks[ 3 ];
 };
 
-inline void QskScaleTickmarks::setMinorTicks( const QVector< qreal >& ticks )
+inline void QskTickmarks::setMinorTicks( const QVector< qreal >& ticks )
 {
     setTicks( MinorTick, ticks );
 }
 
-inline QVector< qreal > QskScaleTickmarks::minorTicks() const noexcept
+inline QVector< qreal > QskTickmarks::minorTicks() const noexcept
 {
     return ticks( MinorTick );
 }
 
-inline void QskScaleTickmarks::setMediumTicks( const QVector< qreal >& ticks )
+inline void QskTickmarks::setMediumTicks( const QVector< qreal >& ticks )
 {
     setTicks( MediumTick, ticks );
 }
 
-inline QVector< qreal > QskScaleTickmarks::mediumTicks() const noexcept
+inline QVector< qreal > QskTickmarks::mediumTicks() const noexcept
 {
     return ticks( MediumTick );
 }
 
-inline void QskScaleTickmarks::setMajorTicks( const QVector< qreal >& ticks )
+inline void QskTickmarks::setMajorTicks( const QVector< qreal >& ticks )
 {
     setTicks( MajorTick, ticks );
 }
 
-inline QVector< qreal > QskScaleTickmarks::majorTicks() const noexcept
+inline QVector< qreal > QskTickmarks::majorTicks() const noexcept
 {
     return ticks( MajorTick );
 }
 
-inline bool QskScaleTickmarks::operator!=(
+inline bool QskTickmarks::operator!=(
-    const QskScaleTickmarks& other ) const noexcept
+    const QskTickmarks& other ) const noexcept
 {
     return !( *this == other );
 }
 
-Q_DECLARE_METATYPE( QskScaleTickmarks )
+Q_DECLARE_METATYPE( QskTickmarks )
 
 #ifndef QT_NO_DEBUG_STREAM
 
-QSK_EXPORT QDebug operator<<( QDebug, const QskScaleTickmarks& );
+QSK_EXPORT QDebug operator<<( QDebug, const QskTickmarks& );
 
 #endif
 

src/nodes/QskScaleRenderer.cpp

@@ -4,7 +4,7 @@
  *****************************************************************************/
 
 #include "QskScaleRenderer.h"
-#include "QskScaleTickmarks.h"
+#include "QskTickmarks.h"
 #include "QskSkinlet.h"
 #include "QskSGNode.h"
 #include "QskGraduationMetrics.h"
@@ -52,7 +52,7 @@ class QskScaleRenderer::PrivateData
 {
   public:
     QskIntervalF boundaries;
-    QskScaleTickmarks tickmarks;
+    QskTickmarks tickmarks;
 
     QColor tickColor = Qt::black;
     qreal tickWidth = 1.0;
@@ -110,12 +110,12 @@ QskIntervalF QskScaleRenderer::boundaries() const
     return m_data->boundaries;
 }
 
-void QskScaleRenderer::setTickmarks( const QskScaleTickmarks& tickmarks )
+void QskScaleRenderer::setTickmarks( const QskTickmarks& tickmarks )
 {
     m_data->tickmarks = tickmarks;
 }
 
-const QskScaleTickmarks& QskScaleRenderer::tickmarks() const
+const QskTickmarks& QskScaleRenderer::tickmarks() const
 {
     return m_data->tickmarks;
 }

src/nodes/QskScaleRenderer.h

@@ -16,7 +16,7 @@
 
 class QskSkinnable;
 class QskIntervalF;
-class QskScaleTickmarks;
+class QskTickmarks;
 class QskTextColors;
 class QskColorFilter;
 
@@ -41,8 +41,8 @@ class QSK_EXPORT QskScaleRenderer
     void setBoundaries( const QskIntervalF& );
     QskIntervalF boundaries() const;
 
-    void setTickmarks( const QskScaleTickmarks& );
+    void setTickmarks( const QskTickmarks& );
-    const QskScaleTickmarks& tickmarks() const;
+    const QskTickmarks& tickmarks() const;
 
     void setTickColor( const QColor& );
     QColor tickColor() const;

src/nodes/QskTickmarksNode.cpp

@@ -4,7 +4,7 @@
  *****************************************************************************/
 
 #include "QskTickmarksNode.h"
-#include "QskScaleTickmarks.h"
+#include "QskTickmarks.h"
 #include "QskGraduationMetrics.h"
 
 #include <qrect.h>
@@ -20,7 +20,7 @@ QskTickmarksNode::~QskTickmarksNode()
 
 void QskTickmarksNode::update(
     const QColor& color, const QRectF& rect,
-    const QskIntervalF& boundaries, const QskScaleTickmarks& tickmarks,
+    const QskIntervalF& boundaries, const QskTickmarks& tickmarks,
     int lineWidth, Qt::Orientation orientation, Qt::Alignment alignment,
     const QskGraduationMetrics& graduationMetrics )
 {
@@ -43,7 +43,7 @@ void QskTickmarksNode::update(
         const qreal min = boundaries.lowerBound();
         const qreal range = boundaries.width();
 
-        using TM = QskScaleTickmarks;
+        using TM = QskTickmarks;
 
         for( int i = TM::MinorTick; i <= TM::MajorTick; i++ )
         {

src/nodes/QskTickmarksNode.h

@@ -9,7 +9,7 @@
 #include "QskBasicLinesNode.h"
 
 class QskIntervalF;
-class QskScaleTickmarks;
+class QskTickmarks;
 class QskGraduationMetrics;
 class QRectF;
 
@@ -20,7 +20,7 @@ class QSK_EXPORT QskTickmarksNode : public QskBasicLinesNode
     ~QskTickmarksNode() override;
 
     void update(const QColor&, const QRectF&, const QskIntervalF&,
-        const QskScaleTickmarks&, int tickLineWidth, Qt::Orientation,
+        const QskTickmarks&, int tickLineWidth, Qt::Orientation,
         Qt::Alignment, const QskGraduationMetrics& );
 
   private: