diff --git a/src/common/QskScaleTickmarks.cpp b/src/common/QskScaleTickmarks.cpp index 89764980..5a9a2cba 100644 --- a/src/common/QskScaleTickmarks.cpp +++ b/src/common/QskScaleTickmarks.cpp @@ -6,13 +6,13 @@ #include "QskScaleTickmarks.h" #include -int QskScaleTickmarks::tickCount() const noexcept +static void qskRegisterTickmarks() { - return m_ticks[ MajorTick ].count() - + m_ticks[ MediumTick ].count() - + m_ticks[ MinorTick ].count(); + qRegisterMetaType< QskScaleTickmarks >(); } +Q_CONSTRUCTOR_FUNCTION( qskRegisterTickmarks ) + QskScaleTickmarks::QskScaleTickmarks() { } @@ -21,6 +21,14 @@ QskScaleTickmarks::~QskScaleTickmarks() { } +int QskScaleTickmarks::tickCount() const noexcept +{ + return m_ticks[ MajorTick ].count() + + m_ticks[ MediumTick ].count() + + m_ticks[ MinorTick ].count(); +} + + int QskScaleTickmarks::tickCount( TickType type ) const noexcept { return m_ticks[ type ].count(); @@ -66,4 +74,18 @@ bool QskScaleTickmarks::operator==( const QskScaleTickmarks& other ) const noexc && ( m_ticks[ 2 ] == other.m_ticks[ 2 ] ); } +#ifndef QT_NO_DEBUG_STREAM + +#include + +QDebug operator<<( QDebug debug, const QskScaleTickmarks& tickmarks ) +{ + debug << tickmarks.majorTicks() + << tickmarks.mediumTicks() << tickmarks.minorTicks(); + + return debug; +} + +#endif + #include "moc_QskScaleTickmarks.cpp" diff --git a/src/common/QskScaleTickmarks.h b/src/common/QskScaleTickmarks.h index 94075356..edb8102c 100644 --- a/src/common/QskScaleTickmarks.h +++ b/src/common/QskScaleTickmarks.h @@ -93,4 +93,12 @@ inline bool QskScaleTickmarks::operator!=( return !( *this == other ); } +Q_DECLARE_METATYPE( QskScaleTickmarks ) + +#ifndef QT_NO_DEBUG_STREAM + +QSK_EXPORT QDebug operator<<( QDebug, const QskScaleTickmarks& ); + +#endif + #endif