From b5146e3da171a5881b4395adbf58679681c58509 Mon Sep 17 00:00:00 2001
From: jotpio <jopio@hotmail.de>
Date: Wed, 8 May 2019 15:04:38 +0200
Subject: [PATCH] adds pixel position to tracked elements adds coordinate unit
setter to tracked elements
---
Src/Utility/TrackedComponents/TrackedElement.cpp | 15 +++++++++++++--
Src/Utility/TrackedComponents/TrackedElement.h | 11 ++++++++---
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/Src/Utility/TrackedComponents/TrackedElement.cpp b/Src/Utility/TrackedComponents/TrackedElement.cpp
index 9d7d35f..6124bcb 100644
--- a/Src/Utility/TrackedComponents/TrackedElement.cpp
+++ b/Src/Utility/TrackedComponents/TrackedElement.cpp
@@ -11,8 +11,11 @@ TrackedElement::TrackedElement(QObject *parent, QString name, int id) :
{
_x = 0;
_y = 0;
+ _xpx = 0;
+ _xpx = 0;
_valid = false;
_fixed = false;
+ _coordU = "px";
}
QString TrackedElement::getName()
@@ -41,6 +44,14 @@ void TrackedElement::setY(float val) {
_y = val;
};
+void TrackedElement::setXpx(float val) {
+ _xpx = val;
+};
+
+void TrackedElement::setYpx(float val) {
+ _ypx = val;
+};
+
float TrackedElement::getX() {
return _x;
}
@@ -50,11 +61,11 @@ float TrackedElement::getY() {
}
float TrackedElement::getXpx() {
- return _x;
+ return _xpx;
}
float TrackedElement::getYpx() {
- return _y;
+ return _ypx;
}
void TrackedElement::operate()
diff --git a/Src/Utility/TrackedComponents/TrackedElement.h b/Src/Utility/TrackedComponents/TrackedElement.h
index f08f99b..21edb05 100644
--- a/Src/Utility/TrackedComponents/TrackedElement.h
+++ b/Src/Utility/TrackedComponents/TrackedElement.h
@@ -22,14 +22,16 @@ public:
virtual ~TrackedElement() {};
virtual QString getName();
- virtual QString getCoordinateUnit() override { return "px"; };
+ virtual QString getCoordinateUnit() override { return _coordU; };
+
+ virtual void setCoordinateUnit(QString unit) override { _coordU = unit; };
virtual void setX(float val) override;
virtual void setY(float val) override;
virtual void setW(float w) override {};
virtual void setH(float h) override {};
- virtual void setXpx(float val) override {};
- virtual void setYpx(float val) override {};
+ virtual void setXpx(float val) override;
+ virtual void setYpx(float val) override;
virtual void setWpx(float w) override {};
virtual void setHpx(float h) override {};
virtual void setRad(float r) override {};
@@ -99,8 +101,11 @@ private:
QString _timeString; /**< timestamp a formatted as string */
float _x;
float _y;
+ float _xpx;
+ float _ypx;
int _id;
bool _valid;
bool _fixed;
+ QString _coordU;
};
--
GitLab