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

rename QskLevelingSensor class

This commit is contained in:
Vogel, Rick 2023-07-17 11:14:43 +02:00
parent 53b139820a
commit 0f452813ff
4 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/controls/LevelingSensor/QskLevelingSensor.cpp
View File

@ -31,23 +31,23 @@ namespace
} }
} }
QSK_SUBCONTROL(LevelingSensor, OuterDisk) QSK_SUBCONTROL(QskLevelingSensor, OuterDisk)
QSK_SUBCONTROL(LevelingSensor, Horizon) QSK_SUBCONTROL(QskLevelingSensor, Horizon)
QSK_SUBCONTROL(LevelingSensor, TickmarksX) QSK_SUBCONTROL(QskLevelingSensor, TickmarksX)
QSK_SUBCONTROL(LevelingSensor, TickmarksXLabels) QSK_SUBCONTROL(QskLevelingSensor, TickmarksXLabels)
QSK_SUBCONTROL(LevelingSensor, TickmarksY) QSK_SUBCONTROL(QskLevelingSensor, TickmarksY)
QSK_SUBCONTROL(LevelingSensor, TickmarksYLabels) QSK_SUBCONTROL(QskLevelingSensor, TickmarksYLabels)
QSK_SUBCONTROL(LevelingSensor, TickmarksZ) QSK_SUBCONTROL(QskLevelingSensor, TickmarksZ)
QSK_SUBCONTROL(LevelingSensor, TickmarksZLabels) QSK_SUBCONTROL(QskLevelingSensor, TickmarksZLabels)
#define RETURN_IF_FALSE(expr) if(!(expr)) return; #define RETURN_IF_FALSE(expr) if(!(expr)) return;
LevelingSensor::LevelingSensor(QQuickItem* const parent) QskLevelingSensor::QskLevelingSensor(QQuickItem* const parent)
: Inherited(parent) : Inherited(parent)
{ {
} }
void LevelingSensor::setRotation(const QVector3D& degree) void QskLevelingSensor::setRotation(const QVector3D& degree)
{ {
if (m_rotation != 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)); 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)); RETURN_IF_FALSE(isAxis(axis));
@ -82,7 +82,7 @@ void LevelingSensor::setTickmarks(const Qt::Axis axis, QskScaleTickmarks tickmar
update(); update();
} }
void LevelingSensor::setTickmarksLabels(const Qt::Axis axis, TickmarksLabels labels) void QskLevelingSensor::setTickmarksLabels(const Qt::Axis axis, TickmarksLabels labels)
{ {
RETURN_IF_FALSE(isAxis(axis)); RETURN_IF_FALSE(isAxis(axis));
@ -90,7 +90,7 @@ void LevelingSensor::setTickmarksLabels(const Qt::Axis axis, TickmarksLabels lab
update(); update();
} }
void LevelingSensor::setAngle(const QVector3D& degree) void QskLevelingSensor::setAngle(const QVector3D& degree)
{ {
if (compareExchange(m_angle, 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)); 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)) if (isAxis(axis))
{ {
@ -120,22 +120,22 @@ const QskScaleTickmarks& LevelingSensor::tickmarks(Qt::Axis axis) const
return invalid; return invalid;
} }
const LevelingSensor::TickmarksLabels& LevelingSensor::tickmarkLabels(Qt::Axis axis) const const QskLevelingSensor::TickmarksLabels& QskLevelingSensor::tickmarkLabels(Qt::Axis axis) const
{ {
if (isAxis(axis)) if (isAxis(axis))
{ {
return m_tickmarksLabels[axis]; return m_tickmarksLabels[axis];
} }
static const LevelingSensor::TickmarksLabels invalid; static const QskLevelingSensor::TickmarksLabels invalid;
return invalid; return invalid;
} }
const QVector3D& LevelingSensor::angle() const noexcept const QVector3D& QskLevelingSensor::angle() const noexcept
{ {
return m_angle; return m_angle;
} }
const QVector3D& LevelingSensor::rotation() const noexcept const QVector3D& QskLevelingSensor::rotation() const noexcept
{ {
return m_rotation; return m_rotation;
} }

4
src/controls/LevelingSensor/QskLevelingSensor.h
View File

@ -5,7 +5,7 @@
#include <QVector3D> #include <QVector3D>
#include <QskAspect.h> #include <QskAspect.h>
class QSK_EXPORT LevelingSensor : public QskControl class QSK_EXPORT QskLevelingSensor : public QskControl
{ {
Q_OBJECT Q_OBJECT
using Inherited = QskControl; using Inherited = QskControl;
@ -21,7 +21,7 @@ public:
TickmarksZLabels) TickmarksZLabels)
using Tickmarks = QskScaleTickmarks; using Tickmarks = QskScaleTickmarks;
using TickmarksLabels = QVector<QPair<qreal, QString>>; using TickmarksLabels = QVector<QPair<qreal, QString>>;
explicit LevelingSensor(QQuickItem* parent = nullptr); explicit QskLevelingSensor(QQuickItem* parent = nullptr);
public Q_SLOTS: public Q_SLOTS:
void setRotation(const QVector3D& degree); void setRotation(const QVector3D& degree);
void setRotation(Qt::Axis axis, float degree); void setRotation(Qt::Axis axis, float degree);

46
src/controls/LevelingSensor/QskLevelingSensorSkinlet.cpp
View File

@ -24,31 +24,31 @@
#include <QSGGeometryNode> #include <QSGGeometryNode>
#include <qmath.h> #include <qmath.h>
using Q = LevelingSensor; using Q = QskLevelingSensor;
using R = LevelingSensorSkinlet::NodeRole; using R = QskLevelingSensorSkinlet::NodeRole;
using namespace QskSGNode; using namespace QskSGNode;
float LevelingSensorSkinlet::outerRadius(const QskSkinnable* const skinnable) float QskLevelingSensorSkinlet::outerRadius(const QskSkinnable* const skinnable)
{ {
const auto* const sensor = static_cast<const Q*>(skinnable); const auto* const sensor = static_cast<const Q*>(skinnable);
const auto contentsRect = sensor->contentsRect(); const auto contentsRect = sensor->contentsRect();
return 0.5f * qMin(contentsRect.width(), contentsRect.height()); 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); const auto scale = skinnable->strutSizeHint(Q::Horizon);
return outerRadius(skinnable) * scale.width(); 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<const Q*>(skinnable); const auto* const sensor = static_cast<const Q*>(skinnable);
return sensor->contentsRect().center(); return sensor->contentsRect().center();
} }
LevelingSensorSkinlet::LevelingSensorSkinlet(QskSkin* skin) QskLevelingSensorSkinlet::QskLevelingSensorSkinlet(QskSkin* skin)
: Inherited(skin) : Inherited(skin)
{ {
setNodeRoles({ setNodeRoles({
@ -63,12 +63,12 @@ LevelingSensorSkinlet::LevelingSensorSkinlet(QskSkin* skin)
TickmarksZLabels, }); TickmarksZLabels, });
} }
template<LevelingSensorSkinlet::NodeRole> template<QskLevelingSensorSkinlet::NodeRole>
Q_REQUIRED_RESULT QRectF LevelingSensorSkinlet::subControlRect(const LevelingSensor* const sensor, Q_REQUIRED_RESULT QRectF QskLevelingSensorSkinlet::subControlRect(const QskLevelingSensor* const sensor,
const QRectF& contentsRect) const = delete; const QRectF& contentsRect) const = delete;
template<> template<>
Q_REQUIRED_RESULT QRectF LevelingSensorSkinlet::subControlRect<R::OuterDisk>(const LevelingSensor* const sensor, Q_REQUIRED_RESULT QRectF QskLevelingSensorSkinlet::subControlRect<R::OuterDisk>(const QskLevelingSensor* const sensor,
const QRectF& contentsRect) const const QRectF& contentsRect) const
{ {
const auto radius = outerRadius(sensor); const auto radius = outerRadius(sensor);
@ -81,7 +81,7 @@ Q_REQUIRED_RESULT QRectF LevelingSensorSkinlet::subControlRect<R::OuterDisk>(con
} }
template<> template<>
Q_REQUIRED_RESULT QRectF LevelingSensorSkinlet::subControlRect<R::Horizon>(const LevelingSensor* const sensor, Q_REQUIRED_RESULT QRectF QskLevelingSensorSkinlet::subControlRect<R::Horizon>(const QskLevelingSensor* const sensor,
const QRectF& contentsRect) const const QRectF& contentsRect) const
{ {
const auto scale = sensor->strutSizeHint(Q::Horizon); const auto scale = sensor->strutSizeHint(Q::Horizon);
@ -95,7 +95,7 @@ Q_REQUIRED_RESULT QRectF LevelingSensorSkinlet::subControlRect<R::Horizon>(const
}; };
} }
QRectF LevelingSensorSkinlet::subControlRect(const QskSkinnable* skinnable, QRectF QskLevelingSensorSkinlet::subControlRect(const QskSkinnable* skinnable,
const QRectF& contentsRect, QskAspect::Subcontrol subControl) const const QRectF& contentsRect, QskAspect::Subcontrol subControl) const
{ {
const auto* const sensor = static_cast<const Q*>(skinnable); const auto* const sensor = static_cast<const Q*>(skinnable);
@ -112,12 +112,12 @@ QRectF LevelingSensorSkinlet::subControlRect(const QskSkinnable* skinnable,
return Inherited::subControlRect(skinnable, contentsRect, subControl); return Inherited::subControlRect(skinnable, contentsRect, subControl);
} }
template<LevelingSensorSkinlet::NodeRole> template<QskLevelingSensorSkinlet::NodeRole>
QSGNode* LevelingSensorSkinlet::updateSubNode(const LevelingSensor* const sensor, QSGNode* QskLevelingSensorSkinlet::updateSubNode(const QskLevelingSensor* const sensor,
const quint8 nodeRole, QSGNode* const node) const = delete; const quint8 nodeRole, QSGNode* const node) const = delete;
template<> template<>
QSGNode* LevelingSensorSkinlet::updateSubNode<R::OuterDisk>(const LevelingSensor* const sensor, QSGNode* QskLevelingSensorSkinlet::updateSubNode<R::OuterDisk>(const QskLevelingSensor* const sensor,
const quint8 nodeRole, QSGNode* const node) const const quint8 nodeRole, QSGNode* const node) const
{ {
const auto subControl = Q::OuterDisk; const auto subControl = Q::OuterDisk;
@ -148,7 +148,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode<R::OuterDisk>(const LevelingSensor
} }
template<> template<>
QSGNode* LevelingSensorSkinlet::updateSubNode<R::Horizon>(const LevelingSensor* const sensor, QSGNode* QskLevelingSensorSkinlet::updateSubNode<R::Horizon>(const QskLevelingSensor* const sensor,
const quint8 nodeRole, QSGNode* const node) const const quint8 nodeRole, QSGNode* const node) const
{ {
const auto subControl = Q::Horizon; const auto subControl = Q::Horizon;
@ -188,7 +188,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode<R::Horizon>(const LevelingSensor*
} }
template<> template<>
QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksX>(const LevelingSensor* const sensor, QSGNode* QskLevelingSensorSkinlet::updateSubNode<R::TickmarksX>(const QskLevelingSensor* const sensor,
const quint8 nodeRole, QSGNode* const node) const const quint8 nodeRole, QSGNode* const node) const
{ {
const auto subControl = Q::TickmarksX; const auto subControl = Q::TickmarksX;
@ -228,7 +228,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksX>(const LevelingSenso
} }
template<> template<>
QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksY>(const LevelingSensor* const sensor, QSGNode* QskLevelingSensorSkinlet::updateSubNode<R::TickmarksY>(const QskLevelingSensor* const sensor,
const quint8 nodeRole, QSGNode* const node) const const quint8 nodeRole, QSGNode* const node) const
{ {
const auto subControl = Q::TickmarksY; const auto subControl = Q::TickmarksY;
@ -270,7 +270,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksY>(const LevelingSenso
} }
template<> template<>
QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksZ>(const LevelingSensor* const sensor, QSGNode* QskLevelingSensorSkinlet::updateSubNode<R::TickmarksZ>(const QskLevelingSensor* const sensor,
const quint8 nodeRole, QSGNode* const node) const const quint8 nodeRole, QSGNode* const node) const
{ {
const auto subControl = Q::TickmarksZ; const auto subControl = Q::TickmarksZ;
@ -296,7 +296,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksZ>(const LevelingSenso
} }
template<> template<>
QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksXLabels>(const LevelingSensor* const sensor, QSGNode* QskLevelingSensorSkinlet::updateSubNode<R::TickmarksXLabels>(const QskLevelingSensor* const sensor,
const quint8 nodeRole, QSGNode* const node) const const quint8 nodeRole, QSGNode* const node) const
{ {
const auto subControl = Q::TickmarksXLabels; const auto subControl = Q::TickmarksXLabels;
@ -321,7 +321,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksXLabels>(const Levelin
} }
template<> template<>
QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksYLabels>(const LevelingSensor* const sensor, QSGNode* QskLevelingSensorSkinlet::updateSubNode<R::TickmarksYLabels>(const QskLevelingSensor* const sensor,
const quint8 nodeRole, QSGNode* const node) const const quint8 nodeRole, QSGNode* const node) const
{ {
const auto subControl = Q::TickmarksYLabels; const auto subControl = Q::TickmarksYLabels;
@ -341,7 +341,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksYLabels>(const Levelin
} }
template<> template<>
QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksZLabels>(const LevelingSensor* const sensor, QSGNode* QskLevelingSensorSkinlet::updateSubNode<R::TickmarksZLabels>(const QskLevelingSensor* const sensor,
const quint8 nodeRole, QSGNode* const node) const const quint8 nodeRole, QSGNode* const node) const
{ {
const auto subControl = Q::TickmarksZLabels; const auto subControl = Q::TickmarksZLabels;
@ -358,7 +358,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode<R::TickmarksZLabels>(const Levelin
} }
template<> template<>
QSGNode* LevelingSensorSkinlet::updateSubNode<R::HorizonClip>(const LevelingSensor* const sensor, QSGNode* QskLevelingSensorSkinlet::updateSubNode<R::HorizonClip>(const QskLevelingSensor* const sensor,
const quint8 nodeRole, QSGNode* const node) const const quint8 nodeRole, QSGNode* const node) const
{ {
const auto cX = center(sensor).x(); const auto cX = center(sensor).x();
@ -370,7 +370,7 @@ QSGNode* LevelingSensorSkinlet::updateSubNode<R::HorizonClip>(const LevelingSens
return clipNode; return clipNode;
} }
QSGNode* LevelingSensorSkinlet::updateSubNode( QSGNode* QskLevelingSensorSkinlet::updateSubNode(
const QskSkinnable* const skinnable, const quint8 nodeRole, QSGNode* const node) const const QskSkinnable* const skinnable, const quint8 nodeRole, QSGNode* const node) const
{ {
const auto* const sensor = static_cast<const Q*>(skinnable); const auto* const sensor = static_cast<const Q*>(skinnable);

12
src/controls/LevelingSensor/QskLevelingSensorSkinlet.h
View File

@ -3,9 +3,9 @@
#include <QskSkinlet.h> #include <QskSkinlet.h>
#include <QSGNode> #include <QSGNode>
class LevelingSensor; class QskLevelingSensor;
class QSK_EXPORT LevelingSensorSkinlet : public QskSkinlet class QSK_EXPORT QskLevelingSensorSkinlet : public QskSkinlet
{ {
Q_GADGET Q_GADGET
@ -28,8 +28,8 @@ public:
RoleCount RoleCount
}; };
Q_INVOKABLE LevelingSensorSkinlet(QskSkin* skin = nullptr); Q_INVOKABLE QskLevelingSensorSkinlet(QskSkin* skin = nullptr);
~LevelingSensorSkinlet() override = default; ~QskLevelingSensorSkinlet() override = default;
static Q_REQUIRED_RESULT float outerRadius(const QskSkinnable* const skinnable); static Q_REQUIRED_RESULT float outerRadius(const QskSkinnable* const skinnable);
static Q_REQUIRED_RESULT float innerRadius(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; quint8 nodeRole, QSGNode* node) const override;
template<NodeRole> template<NodeRole>
Q_REQUIRED_RESULT QRectF subControlRect(const LevelingSensor* sensor, Q_REQUIRED_RESULT QRectF subControlRect(const QskLevelingSensor* sensor,
const QRectF& contentsRect) const; const QRectF& contentsRect) const;
template<NodeRole> template<NodeRole>
Q_REQUIRED_RESULT QSGNode* updateSubNode(const LevelingSensor* sensor, Q_REQUIRED_RESULT QSGNode* updateSubNode(const QskLevelingSensor* sensor,
quint8 nodeRole, QSGNode* node) const; quint8 nodeRole, QSGNode* node) const;
}; };