From 0f452813ff6b730251e3e23ae6728dd234dc7cae Mon Sep 17 00:00:00 2001 From: "Vogel, Rick" Date: Mon, 17 Jul 2023 11:14:43 +0200 Subject: [PATCH] rename QskLevelingSensor class --- .../LevelingSensor/QskLevelingSensor.cpp | 40 ++++++++-------- .../LevelingSensor/QskLevelingSensor.h | 4 +- .../QskLevelingSensorSkinlet.cpp | 46 +++++++++---------- .../LevelingSensor/QskLevelingSensorSkinlet.h | 12 ++--- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/controls/LevelingSensor/QskLevelingSensor.cpp b/src/controls/LevelingSensor/QskLevelingSensor.cpp index cfe28825..a04b84af 100644 --- a/src/controls/LevelingSensor/QskLevelingSensor.cpp +++ b/src/controls/LevelingSensor/QskLevelingSensor.cpp @@ -31,23 +31,23 @@ namespace } } -QSK_SUBCONTROL(LevelingSensor, OuterDisk) -QSK_SUBCONTROL(LevelingSensor, Horizon) -QSK_SUBCONTROL(LevelingSensor, TickmarksX) -QSK_SUBCONTROL(LevelingSensor, TickmarksXLabels) -QSK_SUBCONTROL(LevelingSensor, TickmarksY) -QSK_SUBCONTROL(LevelingSensor, TickmarksYLabels) -QSK_SUBCONTROL(LevelingSensor, TickmarksZ) -QSK_SUBCONTROL(LevelingSensor, TickmarksZLabels) +QSK_SUBCONTROL(QskLevelingSensor, OuterDisk) +QSK_SUBCONTROL(QskLevelingSensor, Horizon) +QSK_SUBCONTROL(QskLevelingSensor, TickmarksX) +QSK_SUBCONTROL(QskLevelingSensor, TickmarksXLabels) +QSK_SUBCONTROL(QskLevelingSensor, TickmarksY) +QSK_SUBCONTROL(QskLevelingSensor, TickmarksYLabels) +QSK_SUBCONTROL(QskLevelingSensor, TickmarksZ) +QSK_SUBCONTROL(QskLevelingSensor, TickmarksZLabels) #define RETURN_IF_FALSE(expr) if(!(expr)) return; -LevelingSensor::LevelingSensor(QQuickItem* const parent) +QskLevelingSensor::QskLevelingSensor(QQuickItem* const parent) : Inherited(parent) { } -void LevelingSensor::setRotation(const QVector3D& degree) +void QskLevelingSensor::setRotation(const QVector3D& degree) { if (m_rotation != degree) { @@ -57,7 +57,7 @@ void LevelingSensor::setRotation(const QVector3D& degree) } } -void LevelingSensor::setRotation(const Qt::Axis axis, const float degree) +void QskLevelingSensor::setRotation(const Qt::Axis axis, const float degree) { RETURN_IF_FALSE(isAxis(axis)); @@ -74,7 +74,7 @@ void LevelingSensor::setRotation(const Qt::Axis axis, const float degree) } } -void LevelingSensor::setTickmarks(const Qt::Axis axis, QskScaleTickmarks tickmarks) +void QskLevelingSensor::setTickmarks(const Qt::Axis axis, QskScaleTickmarks tickmarks) { RETURN_IF_FALSE(isAxis(axis)); @@ -82,7 +82,7 @@ void LevelingSensor::setTickmarks(const Qt::Axis axis, QskScaleTickmarks tickmar update(); } -void LevelingSensor::setTickmarksLabels(const Qt::Axis axis, TickmarksLabels labels) +void QskLevelingSensor::setTickmarksLabels(const Qt::Axis axis, TickmarksLabels labels) { RETURN_IF_FALSE(isAxis(axis)); @@ -90,7 +90,7 @@ void LevelingSensor::setTickmarksLabels(const Qt::Axis axis, TickmarksLabels lab update(); } -void LevelingSensor::setAngle(const QVector3D& degree) +void QskLevelingSensor::setAngle(const QVector3D& degree) { if (compareExchange(m_angle, degree)) { @@ -99,7 +99,7 @@ void LevelingSensor::setAngle(const QVector3D& degree) } } -void LevelingSensor::setAngle(const Qt::Axis axis, const float degree) +void QskLevelingSensor::setAngle(const Qt::Axis axis, const float degree) { RETURN_IF_FALSE(isAxis(axis)); @@ -110,7 +110,7 @@ void LevelingSensor::setAngle(const Qt::Axis axis, const float degree) } } -const QskScaleTickmarks& LevelingSensor::tickmarks(Qt::Axis axis) const +const QskScaleTickmarks& QskLevelingSensor::tickmarks(Qt::Axis axis) const { if (isAxis(axis)) { @@ -120,22 +120,22 @@ const QskScaleTickmarks& LevelingSensor::tickmarks(Qt::Axis axis) const return invalid; } -const LevelingSensor::TickmarksLabels& LevelingSensor::tickmarkLabels(Qt::Axis axis) const +const QskLevelingSensor::TickmarksLabels& QskLevelingSensor::tickmarkLabels(Qt::Axis axis) const { if (isAxis(axis)) { return m_tickmarksLabels[axis]; } - static const LevelingSensor::TickmarksLabels invalid; + static const QskLevelingSensor::TickmarksLabels invalid; return invalid; } -const QVector3D& LevelingSensor::angle() const noexcept +const QVector3D& QskLevelingSensor::angle() const noexcept { return m_angle; } -const QVector3D& LevelingSensor::rotation() const noexcept +const QVector3D& QskLevelingSensor::rotation() const noexcept { return m_rotation; } diff --git a/src/controls/LevelingSensor/QskLevelingSensor.h b/src/controls/LevelingSensor/QskLevelingSensor.h index b27229bc..2b514246 100644 --- a/src/controls/LevelingSensor/QskLevelingSensor.h +++ b/src/controls/LevelingSensor/QskLevelingSensor.h @@ -5,7 +5,7 @@ #include #include -class QSK_EXPORT LevelingSensor : public QskControl +class QSK_EXPORT QskLevelingSensor : public QskControl { Q_OBJECT using Inherited = QskControl; @@ -21,7 +21,7 @@ public: TickmarksZLabels) using Tickmarks = QskScaleTickmarks; using TickmarksLabels = QVector>; - explicit LevelingSensor(QQuickItem* parent = nullptr); + explicit QskLevelingSensor(QQuickItem* parent = nullptr); public Q_SLOTS: void setRotation(const QVector3D& degree); void setRotation(Qt::Axis axis, float degree); diff --git a/src/controls/LevelingSensor/QskLevelingSensorSkinlet.cpp b/src/controls/LevelingSensor/QskLevelingSensorSkinlet.cpp index 6328be43..5e70632f 100644 --- a/src/controls/LevelingSensor/QskLevelingSensorSkinlet.cpp +++ b/src/controls/LevelingSensor/QskLevelingSensorSkinlet.cpp @@ -24,31 +24,31 @@ #include #include -using Q = LevelingSensor; -using R = LevelingSensorSkinlet::NodeRole; +using Q = QskLevelingSensor; +using R = QskLevelingSensorSkinlet::NodeRole; using namespace QskSGNode; -float LevelingSensorSkinlet::outerRadius(const QskSkinnable* const skinnable) +float QskLevelingSensorSkinlet::outerRadius(const QskSkinnable* const skinnable) { const auto* const sensor = static_cast(skinnable); const auto contentsRect = sensor->contentsRect(); return 0.5f * qMin(contentsRect.width(), contentsRect.height()); } -float LevelingSensorSkinlet::innerRadius(const QskSkinnable* const skinnable) +float QskLevelingSensorSkinlet::innerRadius(const QskSkinnable* const skinnable) { const auto scale = skinnable->strutSizeHint(Q::Horizon); return outerRadius(skinnable) * scale.width(); } -QPointF LevelingSensorSkinlet::center(const QskSkinnable* const skinnable) +QPointF QskLevelingSensorSkinlet::center(const QskSkinnable* const skinnable) { const auto* const sensor = static_cast(skinnable); return sensor->contentsRect().center(); } -LevelingSensorSkinlet::LevelingSensorSkinlet(QskSkin* skin) +QskLevelingSensorSkinlet::QskLevelingSensorSkinlet(QskSkin* skin) : Inherited(skin) { setNodeRoles({ @@ -63,12 +63,12 @@ LevelingSensorSkinlet::LevelingSensorSkinlet(QskSkin* skin) TickmarksZLabels, }); } -template -Q_REQUIRED_RESULT QRectF LevelingSensorSkinlet::subControlRect(const LevelingSensor* const sensor, +template +Q_REQUIRED_RESULT QRectF QskLevelingSensorSkinlet::subControlRect(const QskLevelingSensor* const sensor, const QRectF& contentsRect) const = delete; template<> -Q_REQUIRED_RESULT QRectF LevelingSensorSkinlet::subControlRect(const LevelingSensor* const sensor, +Q_REQUIRED_RESULT QRectF QskLevelingSensorSkinlet::subControlRect(const QskLevelingSensor* const sensor, const QRectF& contentsRect) const { const auto radius = outerRadius(sensor); @@ -81,7 +81,7 @@ Q_REQUIRED_RESULT QRectF LevelingSensorSkinlet::subControlRect(con } template<> -Q_REQUIRED_RESULT QRectF LevelingSensorSkinlet::subControlRect(const LevelingSensor* const sensor, +Q_REQUIRED_RESULT QRectF QskLevelingSensorSkinlet::subControlRect(const QskLevelingSensor* const sensor, const QRectF& contentsRect) const { const auto scale = sensor->strutSizeHint(Q::Horizon); @@ -95,7 +95,7 @@ Q_REQUIRED_RESULT QRectF LevelingSensorSkinlet::subControlRect(const }; } -QRectF LevelingSensorSkinlet::subControlRect(const QskSkinnable* skinnable, +QRectF QskLevelingSensorSkinlet::subControlRect(const QskSkinnable* skinnable, const QRectF& contentsRect, QskAspect::Subcontrol subControl) const { const auto* const sensor = static_cast(skinnable); @@ -112,12 +112,12 @@ QRectF LevelingSensorSkinlet::subControlRect(const QskSkinnable* skinnable, return Inherited::subControlRect(skinnable, contentsRect, subControl); } -template -QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* const sensor, +template +QSGNode* QskLevelingSensorSkinlet::updateSubNode(const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node) const = delete; template<> -QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* const sensor, +QSGNode* QskLevelingSensorSkinlet::updateSubNode(const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node) const { const auto subControl = Q::OuterDisk; @@ -148,7 +148,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor } template<> -QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* const sensor, +QSGNode* QskLevelingSensorSkinlet::updateSubNode(const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node) const { const auto subControl = Q::Horizon; @@ -188,7 +188,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* } template<> -QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* const sensor, +QSGNode* QskLevelingSensorSkinlet::updateSubNode(const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node) const { const auto subControl = Q::TickmarksX; @@ -228,7 +228,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSenso } template<> -QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* const sensor, +QSGNode* QskLevelingSensorSkinlet::updateSubNode(const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node) const { const auto subControl = Q::TickmarksY; @@ -270,7 +270,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSenso } template<> -QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* const sensor, +QSGNode* QskLevelingSensorSkinlet::updateSubNode(const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node) const { const auto subControl = Q::TickmarksZ; @@ -296,7 +296,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSenso } template<> -QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* const sensor, +QSGNode* QskLevelingSensorSkinlet::updateSubNode(const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node) const { const auto subControl = Q::TickmarksXLabels; @@ -321,7 +321,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode(const Levelin } template<> -QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* const sensor, +QSGNode* QskLevelingSensorSkinlet::updateSubNode(const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node) const { const auto subControl = Q::TickmarksYLabels; @@ -341,7 +341,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode(const Levelin } template<> -QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* const sensor, +QSGNode* QskLevelingSensorSkinlet::updateSubNode(const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node) const { const auto subControl = Q::TickmarksZLabels; @@ -358,7 +358,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode(const Levelin } template<> -QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* const sensor, +QSGNode* QskLevelingSensorSkinlet::updateSubNode(const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node) const { const auto cX = center(sensor).x(); @@ -370,7 +370,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSens return clipNode; } -QSGNode* LevelingSensorSkinlet::updateSubNode( +QSGNode* QskLevelingSensorSkinlet::updateSubNode( const QskSkinnable* const skinnable, const quint8 nodeRole, QSGNode* const node) const { const auto* const sensor = static_cast(skinnable); diff --git a/src/controls/LevelingSensor/QskLevelingSensorSkinlet.h b/src/controls/LevelingSensor/QskLevelingSensorSkinlet.h index 0deb2b8e..625f31f4 100644 --- a/src/controls/LevelingSensor/QskLevelingSensorSkinlet.h +++ b/src/controls/LevelingSensor/QskLevelingSensorSkinlet.h @@ -3,9 +3,9 @@ #include #include -class LevelingSensor; +class QskLevelingSensor; -class QSK_EXPORT LevelingSensorSkinlet : public QskSkinlet +class QSK_EXPORT QskLevelingSensorSkinlet : public QskSkinlet { Q_GADGET @@ -28,8 +28,8 @@ public: RoleCount }; - Q_INVOKABLE LevelingSensorSkinlet(QskSkin* skin = nullptr); - ~LevelingSensorSkinlet() override = default; + Q_INVOKABLE QskLevelingSensorSkinlet(QskSkin* skin = nullptr); + ~QskLevelingSensorSkinlet() override = default; static Q_REQUIRED_RESULT float outerRadius(const QskSkinnable* const skinnable); static Q_REQUIRED_RESULT float innerRadius(const QskSkinnable* const skinnable); @@ -44,10 +44,10 @@ protected: quint8 nodeRole, QSGNode* node) const override; template - Q_REQUIRED_RESULT QRectF subControlRect(const LevelingSensor* sensor, + Q_REQUIRED_RESULT QRectF subControlRect(const QskLevelingSensor* sensor, const QRectF& contentsRect) const; template - Q_REQUIRED_RESULT QSGNode* updateSubNode(const LevelingSensor* sensor, + Q_REQUIRED_RESULT QSGNode* updateSubNode(const QskLevelingSensor* sensor, quint8 nodeRole, QSGNode* node) const; };