168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename QskTickmarksMetrics to QskGraduationMetrics

This commit is contained in:
Rick Vogel 2023-11-09 18:10:58 +01:00
parent e8ebc0965d
commit 96ecae9aaf
10 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/mycontrols/main.cpp
View File

@ -21,12 +21,12 @@
#include <QskSkin.h>
#include <QskSkinlet.h>
#include <QskSGNode.h>
#include <QskTickmarksMetrics.h>
#include <QskGraduationMetrics.h>
#include <QskTickmarksNode.h>
#include <QskScaleTickmarks.h>
#include <QskTextLabel.h>
#include <QskAnimator.h>
#include <QskTickmarksMetrics.h>
#include <QskGraduationMetrics.h>
#include <QGuiApplication>
@ -127,7 +127,7 @@ class TickmarksSkinlet final : public QskSkinlet
tickmarks.setMediumTicks(medium);
tickmarks.setMinorTicks(minor);
const auto metric = q->tickmarksMetricsHint(Tickmarks::Ticks);
const auto metric = q->graduationMetricsHint(Tickmarks::Ticks);
tickmarksNode->update(
Qt::darkGray, rect, { -100, +100 }, tickmarks, 1, Qt::Horizontal, Qt::AlignBottom, metric );
@ -154,7 +154,7 @@ class Window : public QskWindow
{
(void) new QskTextLabel("Custom", layout);
auto* const tickmarks = new Tickmarks(layout);
tickmarks->setTickmarksMetricsHint(Tickmarks::Ticks, { 0.2, 0.5, 1.0 } );
tickmarks->setGraduationMetricsHint(Tickmarks::Ticks, { 0.2, 0.5, 1.0 } );
auto* const skinlet = new TickmarksSkinlet;
tickmarks->setSkinlet(skinlet);
skinlet->setOwnedBySkinnable(true);
@ -162,7 +162,7 @@ class Window : public QskWindow
{
(void) new QskTextLabel("Custom (Major only)", layout);
auto* const tickmarks = new Tickmarks(layout);
tickmarks->setTickmarksMetricsHint(Tickmarks::Ticks, { 0.0, 0.0, 1.0 } );
tickmarks->setGraduationMetricsHint(Tickmarks::Ticks, { 0.0, 0.0, 1.0 } );
auto* const skinlet = new TickmarksSkinlet;
tickmarks->setSkinlet(skinlet);
skinlet->setOwnedBySkinnable(true);
@ -170,7 +170,7 @@ class Window : public QskWindow
{
(void) new QskTextLabel("Custom (Major + Minor only)", layout);
auto* const tickmarks = new Tickmarks(layout);
tickmarks->setTickmarksMetricsHint(Tickmarks::Ticks, { 0.2, 0.0, 1.0 } );
tickmarks->setGraduationMetricsHint(Tickmarks::Ticks, { 0.2, 0.0, 1.0 } );
auto* const skinlet = new TickmarksSkinlet;
tickmarks->setSkinlet(skinlet);
skinlet->setOwnedBySkinnable(true);
@ -193,12 +193,12 @@ class Window : public QskWindow
void advance( qreal value ) override
{
const QskTickmarksMetrics metrics {
const QskGraduationMetrics metrics {
( 0.1 + 0.1 * qFastSin( value * 2 * M_PI ) ),
( 0.25 + 0.25 * qFastSin( value * 2 * M_PI ) ),
( 0.5 + 0.5 * qFastSin( value * 2 * M_PI ) )
};
tickmarks.setTickmarksMetricsHint(Tickmarks::Ticks, metrics);
tickmarks.setGraduationMetricsHint(Tickmarks::Ticks, metrics);
}
Tickmarks& tickmarks;

4
src/CMakeLists.txt
View File

@ -123,7 +123,7 @@ list(APPEND HEADERS
nodes/QskTextRenderer.h
nodes/QskTextureRenderer.h
nodes/QskTickmarksNode.h
nodes/QskTickmarksMetrics.h
nodes/QskGraduationMetrics.h
nodes/QskVertex.h
)
@ -155,7 +155,7 @@ list(APPEND SOURCES
nodes/QskTextRenderer.cpp
nodes/QskTextureRenderer.cpp
nodes/QskTickmarksNode.cpp
nodes/QskTickmarksMetrics.cpp
nodes/QskGraduationMetrics.cpp
nodes/QskVertex.cpp
)

10
src/controls/QskSkinnable.cpp
View File

@ -24,7 +24,7 @@
#include "QskBoxBorderColors.h"
#include "QskShadowMetrics.h"
#include "QskStippleMetrics.h"
#include "QskTickmarksMetrics.h"
#include "QskGraduationMetrics.h"
#include "QskBoxHints.h"
#include "QskGradient.h"
#include "QskTextOptions.h"
@ -767,21 +767,21 @@ QskGraphic QskSkinnable::symbolHint(
aspect | QskAspect::Symbol, status ).value< QskGraphic >();
}
bool QskSkinnable::setTickmarksMetricsHint( const QskAspect aspect, const QskTickmarksMetrics& metrics )
bool QskSkinnable::setGraduationMetricsHint( const QskAspect aspect, const QskGraduationMetrics& metrics )
{
return setSkinHint( aspect | QskAspect::Tickmarks,
QVariant::fromValue( metrics ) );
}
bool QskSkinnable::resetTickmarksMetricsHint( const QskAspect aspect )
bool QskSkinnable::resetGraduationMetricsHint( const QskAspect aspect )
{
return resetSkinHint( aspect | QskAspect::Tickmarks );
}
QskTickmarksMetrics QskSkinnable::tickmarksMetricsHint( const QskAspect aspect, QskSkinHintStatus* status) const
QskGraduationMetrics QskSkinnable::graduationMetricsHint( const QskAspect aspect, QskSkinHintStatus* status) const
{
return effectiveSkinHint(
aspect | QskAspect::Tickmarks, status ).value< QskTickmarksMetrics >();
aspect | QskAspect::Tickmarks, status ).value< QskGraduationMetrics >();
}

8
src/controls/QskSkinnable.h
View File

@ -32,7 +32,7 @@ class QskBoxBorderMetrics;
class QskBoxBorderColors;
class QskShadowMetrics;
class QskStippleMetrics;
class QskTickmarksMetrics;
class QskGraduationMetrics;
class QskTextOptions;
class QskBoxHints;
class QskGradient;
@ -258,9 +258,9 @@ class QSK_EXPORT QskSkinnable
bool resetSymbolHint( const QskAspect );
QskGraphic symbolHint( const QskAspect, QskSkinHintStatus* = nullptr ) const;
bool setTickmarksMetricsHint( const QskAspect, const QskTickmarksMetrics& );
bool resetTickmarksMetricsHint( const QskAspect );
QskTickmarksMetrics tickmarksMetricsHint( const QskAspect, QskSkinHintStatus* = nullptr ) const;
bool setGraduationMetricsHint( const QskAspect, const QskGraduationMetrics& );
bool resetGraduationMetricsHint( const QskAspect );
QskGraduationMetrics graduationMetricsHint( const QskAspect, QskSkinHintStatus* = nullptr ) const;
const QskSkinHintTable& hintTable() const;

4
src/controls/QskVariantAnimator.cpp
View File

@ -10,7 +10,7 @@
#include "QskBoxShapeMetrics.h"
#include "QskShadowMetrics.h"
#include "QskStippleMetrics.h"
#include "QskTickmarksMetrics.h"
#include "QskGraduationMetrics.h"
#include "QskColorFilter.h"
#include "QskGradient.h"
#include "QskMargins.h"
@ -50,7 +50,7 @@ static void qskRegisterInterpolator()
qRegisterAnimationInterpolator< QskShadowMetrics >( QskShadowMetrics::interpolate );
qRegisterAnimationInterpolator< QskStippleMetrics >( QskStippleMetrics::interpolate );
qRegisterAnimationInterpolator< QskArcMetrics >( QskArcMetrics::interpolate );
qRegisterAnimationInterpolator< QskTickmarksMetrics >( QskTickmarksMetrics::interpolate );
qRegisterAnimationInterpolator< QskGraduationMetrics >( QskGraduationMetrics::interpolate );
}
Q_CONSTRUCTOR_FUNCTION( qskRegisterInterpolator )

24
src/nodes/QskTickmarksMetrics.cpp → src/nodes/QskGraduationMetrics.cpp
View File

@ -1,27 +1,27 @@
#include "QskTickmarksMetrics.h"
#include "QskGraduationMetrics.h"
#include <qvariant.h>
static void qskRegisterTickmarksMetrics()
static void qskRegisterGraduationMetrics()
{
qRegisterMetaType< QskTickmarksMetrics >();
qRegisterMetaType< QskGraduationMetrics >();
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
QMetaType::registerEqualsComparator< QskTickmarksMetrics >();
QMetaType::registerEqualsComparator< QskGraduationMetrics >();
#endif
}
Q_CONSTRUCTOR_FUNCTION( qskRegisterTickmarksMetrics )
Q_CONSTRUCTOR_FUNCTION( qskRegisterGraduationMetrics )
static inline qreal qskInterpolated( qreal from, qreal to, qreal ratio )
{
return from + ( to - from ) * ratio;
}
QskTickmarksMetrics QskTickmarksMetrics::interpolated(
const QskTickmarksMetrics& to, const qreal ratio ) const noexcept
QskGraduationMetrics QskGraduationMetrics::interpolated(
const QskGraduationMetrics& to, const qreal ratio ) const noexcept
{
if ( ( *this == to ) ) // TODO QskTickmarksMetrics::sizeMode
if ( ( *this == to ) ) // TODO QskGraduationMetrics::sizeMode
{
return to;
}
@ -31,8 +31,8 @@ QskTickmarksMetrics QskTickmarksMetrics::interpolated(
qskInterpolated( m_majorRatio, to.m_majorRatio, ratio ) };
}
QVariant QskTickmarksMetrics::interpolate(
const QskTickmarksMetrics& from, const QskTickmarksMetrics& to, const qreal progress )
QVariant QskGraduationMetrics::interpolate(
const QskGraduationMetrics& from, const QskGraduationMetrics& to, const qreal progress )
{
return QVariant::fromValue( from.interpolated( to, progress ) );
}
@ -41,12 +41,12 @@ QVariant QskTickmarksMetrics::interpolate(
#include <qdebug.h>
QDebug operator<<( QDebug debug, const QskTickmarksMetrics& metrics )
QDebug operator<<( QDebug debug, const QskGraduationMetrics& metrics )
{
QDebugStateSaver saver( debug );
debug.nospace();
debug << "QskTickmarksMetrics";
debug << "QskGraduationMetrics";
debug << '(';
debug << "minor: ";
debug << metrics.minorRatio();

58
src/nodes/QskTickmarksMetrics.h → src/nodes/QskGraduationMetrics.h
View File

@ -10,7 +10,7 @@
#include <qmetatype.h>
class QSK_EXPORT QskTickmarksMetrics
class QSK_EXPORT QskGraduationMetrics
{
Q_GADGET
Q_PROPERTY( qreal majorRatio READ majorRatio WRITE setMajorRatio )
@ -18,16 +18,16 @@ class QSK_EXPORT QskTickmarksMetrics
Q_PROPERTY( qreal minorRatio READ minorRatio WRITE setMinorRatio )
public:
constexpr QskTickmarksMetrics() noexcept = default;
constexpr QskTickmarksMetrics( qreal minorRatio, qreal mediumRatio, qreal majorRatio ) noexcept;
constexpr QskTickmarksMetrics( const QskTickmarksMetrics& ) noexcept = default;
constexpr QskTickmarksMetrics( QskTickmarksMetrics&& ) noexcept = default;
constexpr QskGraduationMetrics() noexcept = default;
constexpr QskGraduationMetrics( qreal minorRatio, qreal mediumRatio, qreal majorRatio ) noexcept;
constexpr QskGraduationMetrics( const QskGraduationMetrics& ) noexcept = default;
constexpr QskGraduationMetrics( QskGraduationMetrics&& ) noexcept = default;
constexpr QskTickmarksMetrics& operator=( const QskTickmarksMetrics& ) noexcept = default;
constexpr QskTickmarksMetrics& operator=( QskTickmarksMetrics&& ) noexcept = default;
constexpr QskGraduationMetrics& operator=( const QskGraduationMetrics& ) noexcept = default;
constexpr QskGraduationMetrics& operator=( QskGraduationMetrics&& ) noexcept = default;
Q_REQUIRED_RESULT constexpr bool operator==( const QskTickmarksMetrics& rhs ) const noexcept;
Q_REQUIRED_RESULT constexpr bool operator!=( const QskTickmarksMetrics& rhs ) const noexcept;
Q_REQUIRED_RESULT constexpr bool operator==( const QskGraduationMetrics& rhs ) const noexcept;
Q_REQUIRED_RESULT constexpr bool operator!=( const QskGraduationMetrics& rhs ) const noexcept;
Q_REQUIRED_RESULT constexpr qreal majorRatio() const noexcept;
Q_REQUIRED_RESULT constexpr qreal mediumRatio() const noexcept;
@ -40,10 +40,10 @@ class QSK_EXPORT QskTickmarksMetrics
Q_REQUIRED_RESULT constexpr qreal ratio( int index ) const noexcept;
constexpr void setRatio( int index, qreal ratio ) noexcept;
Q_REQUIRED_RESULT QskTickmarksMetrics interpolated(
const QskTickmarksMetrics&, qreal progress ) const noexcept;
Q_REQUIRED_RESULT QskGraduationMetrics interpolated(
const QskGraduationMetrics&, qreal progress ) const noexcept;
Q_REQUIRED_RESULT static QVariant interpolate(
const QskTickmarksMetrics&, const QskTickmarksMetrics&, qreal progress );
const QskGraduationMetrics&, const QskGraduationMetrics&, qreal progress );
Q_REQUIRED_RESULT QskHashValue hash( QskHashValue seed = 0 ) const noexcept;
@ -53,7 +53,7 @@ class QSK_EXPORT QskTickmarksMetrics
qreal m_majorRatio = 0.0;
};
inline constexpr QskTickmarksMetrics::QskTickmarksMetrics(
inline constexpr QskGraduationMetrics::QskGraduationMetrics(
qreal minorRatio, qreal mediumRatio, qreal majorRatio ) noexcept
: m_minorRatio( qskConstrainedRatio( minorRatio ) )
, m_mediumRatio( qskConstrainedRatio( mediumRatio ) )
@ -61,51 +61,51 @@ inline constexpr QskTickmarksMetrics::QskTickmarksMetrics(
{
}
inline constexpr qreal QskTickmarksMetrics::majorRatio() const noexcept
inline constexpr qreal QskGraduationMetrics::majorRatio() const noexcept
{
return m_majorRatio;
}
inline constexpr qreal QskTickmarksMetrics::mediumRatio() const noexcept
inline constexpr qreal QskGraduationMetrics::mediumRatio() const noexcept
{
return m_mediumRatio;
}
inline constexpr qreal QskTickmarksMetrics::minorRatio() const noexcept
inline constexpr qreal QskGraduationMetrics::minorRatio() const noexcept
{
return m_minorRatio;
}
inline constexpr void QskTickmarksMetrics::setMajorRatio( qreal ratio ) noexcept
inline constexpr void QskGraduationMetrics::setMajorRatio( qreal ratio ) noexcept
{
m_majorRatio = qskConstrainedRatio( ratio );
}
inline constexpr void QskTickmarksMetrics::setMediumRatio( qreal ratio ) noexcept
inline constexpr void QskGraduationMetrics::setMediumRatio( qreal ratio ) noexcept
{
m_mediumRatio = qskConstrainedRatio( ratio );
}
inline constexpr void QskTickmarksMetrics::setMinorRatio( qreal ratio ) noexcept
inline constexpr void QskGraduationMetrics::setMinorRatio( qreal ratio ) noexcept
{
m_minorRatio = qskConstrainedRatio( ratio );
}
inline constexpr bool QskTickmarksMetrics::operator==(
const QskTickmarksMetrics& rhs ) const noexcept
inline constexpr bool QskGraduationMetrics::operator==(
const QskGraduationMetrics& rhs ) const noexcept
{
return qskFuzzyCompare( m_minorRatio, rhs.m_minorRatio ) &&
qskFuzzyCompare( m_mediumRatio, rhs.m_mediumRatio ) &&
qskFuzzyCompare( m_majorRatio, rhs.m_majorRatio );
}
inline constexpr bool QskTickmarksMetrics::operator!=(
const QskTickmarksMetrics& rhs ) const noexcept
inline constexpr bool QskGraduationMetrics::operator!=(
const QskGraduationMetrics& rhs ) const noexcept
{
return !( *this == rhs );
}
inline constexpr qreal QskTickmarksMetrics::ratio( const int index ) const noexcept
inline constexpr qreal QskGraduationMetrics::ratio( const int index ) const noexcept
{
switch ( index % 3 )
{
@ -118,7 +118,7 @@ inline constexpr qreal QskTickmarksMetrics::ratio( const int index ) const noexc
}
}
inline constexpr void QskTickmarksMetrics::setRatio( const int index, const qreal ratio ) noexcept
inline constexpr void QskGraduationMetrics::setRatio( const int index, const qreal ratio ) noexcept
{
switch ( index % 3 )
{
@ -134,7 +134,7 @@ inline constexpr void QskTickmarksMetrics::setRatio( const int index, const qrea
}
}
inline QskHashValue QskTickmarksMetrics::hash( const QskHashValue seed ) const noexcept
inline QskHashValue QskGraduationMetrics::hash( const QskHashValue seed ) const noexcept
{
auto hash = qHash( m_minorRatio, seed );
hash = qHash( m_mediumRatio, hash );
@ -145,11 +145,11 @@ inline QskHashValue QskTickmarksMetrics::hash( const QskHashValue seed ) const n
#ifndef QT_NO_DEBUG_STREAM
class QDebug;
QSK_EXPORT QDebug operator<<( QDebug, const QskTickmarksMetrics& );
QSK_EXPORT QDebug operator<<( QDebug, const QskGraduationMetrics& );
#endif
Q_DECLARE_TYPEINFO( QskTickmarksMetrics, Q_MOVABLE_TYPE );
Q_DECLARE_METATYPE( QskTickmarksMetrics )
Q_DECLARE_TYPEINFO( QskGraduationMetrics, Q_MOVABLE_TYPE );
Q_DECLARE_METATYPE( QskGraduationMetrics )
#endif

2
src/nodes/QskScaleRenderer.cpp
View File

@ -7,7 +7,7 @@
#include "QskScaleTickmarks.h"
#include "QskSkinlet.h"
#include "QskSGNode.h"
#include "QskTickmarksMetrics.h"
#include "QskGraduationMetrics.h"
#include "QskTickmarksNode.h"
#include "QskTextOptions.h"
#include "QskTextColors.h"

8
src/nodes/QskTickmarksNode.cpp
View File

@ -1,6 +1,6 @@
#include "QskTickmarksNode.h"
#include "QskScaleTickmarks.h"
#include "QskTickmarksMetrics.h"
#include "QskGraduationMetrics.h"
#include <QSGFlatColorMaterial>
#include <QSGGeometryNode>
@ -34,7 +34,7 @@ class QskTickmarksNodePrivate final : public QSGGeometryNodePrivate
QRectF rect;
int lineWidth = 0;
QskTickmarksMetrics metrics;
QskGraduationMetrics metrics;
QskHashValue hash = 0;
};
@ -55,11 +55,11 @@ QskTickmarksNode::~QskTickmarksNode()
void QskTickmarksNode::update(
const QColor& color, const QRectF& rect,
const QskIntervalF& boundaries, const QskScaleTickmarks& tickmarks,
int lineWidth, Qt::Orientation orientation, Qt::Alignment alignment, QskTickmarksMetrics metrics )
int lineWidth, Qt::Orientation orientation, Qt::Alignment alignment, QskGraduationMetrics metrics )
{
Q_D( QskTickmarksNode );
if ( metrics == QskTickmarksMetrics{} )
if ( metrics == QskGraduationMetrics{} )
{
metrics.setMinorRatio( qskTickFactor( QskScaleTickmarks::MinorTick ) );
metrics.setMediumRatio( qskTickFactor( QskScaleTickmarks::MediumTick ) );

4
src/nodes/QskTickmarksNode.h
View File

@ -17,7 +17,7 @@ class QskIntervalF;
class QskScaleTickmarks;
class QskTickmarksNodePrivate;
class QskTickmarksMetrics;
class QskGraduationMetrics;
class QSK_EXPORT QskTickmarksNode : public QSGGeometryNode
{
@ -27,7 +27,7 @@ class QSK_EXPORT QskTickmarksNode : public QSGGeometryNode
void update(const QColor&, const QRectF&, const QskIntervalF&,
const QskScaleTickmarks&, int tickLineWidth, Qt::Orientation,
Qt::Alignment, QskTickmarksMetrics metrics );
Qt::Alignment, QskGraduationMetrics metrics );
private:
Q_DECLARE_PRIVATE( QskTickmarksNode )