aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArseniy Movshev <dodoradio@outlook.com>2023-06-10 21:35:13 +0100
committerArseniy Movshev <dodoradio@outlook.com>2023-06-29 00:59:44 +0100
commitcfffcd7d13fed20b666cad020d5501d80fa8d8b1 (patch)
tree7ccf1c8547508d80d532ddbcbcbb15dbe07de2e7
parentd5f695da5c7fd112d72e0df3f2ec72371c3d3adc (diff)
Add graph here
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/cpp/hrGraph.cpp134
-rw-r--r--src/cpp/hrGraph.h87
-rw-r--r--src/graphs/HrGraph.qml4
-rw-r--r--src/main.cpp4
-rw-r--r--src/resources.qrc1
6 files changed, 230 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f6a79d1..881c3ba 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(asteroid-health main.cpp resources.qrc)
+add_library(asteroid-health main.cpp cpp/hrGraph.cpp cpp/hrGraph.h resources.qrc)
set_target_properties(asteroid-health PROPERTIES PREFIX "")
target_link_libraries(asteroid-health PUBLIC
diff --git a/src/cpp/hrGraph.cpp b/src/cpp/hrGraph.cpp
new file mode 100644
index 0000000..fa264c6
--- /dev/null
+++ b/src/cpp/hrGraph.cpp
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2023 Arseniy Movshev <dodoradio@outlook.com>
+ * 2017 Florent Revest <revestflo@gmail.com>
+ * All rights reserved.
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the author nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "hrGraph.h"
+
+#include <QPainter>
+#include <QDate>
+#include <QFile>
+#include <QVector>
+#include <QSettings>
+#include <QStandardPaths>
+#include <QPointF>
+
+HrGraph::HrGraph()
+{
+ setFlag(ItemHasContents, true);
+ setAntialiasing(true);
+ setRenderTarget(QQuickPaintedItem::FramebufferObject);
+}
+
+void HrGraph::paint(QPainter *painter)
+{
+ if (!m_fileLoadStatus) {
+ return;
+ }
+ int j = m_filedata.count();
+ QPointF points[j];
+ if (!graphRelative) {
+ minHrValue = 0;
+ }
+ float valueDelta = maxHrValue - minHrValue;
+ float timeDelta = maxTime - minTime;
+ float calculatedValue = 0;
+ float calculatedTimeSeconds = 0;
+ for(int i = 0; i < j; i++) {
+ calculatedTimeSeconds = (m_filedata[i].x() - minTime)/timeDelta;
+ calculatedValue = 1 - (m_filedata[i].y() - minHrValue)/valueDelta;
+ points[i] = QPointF(m_lineWidth + calculatedTimeSeconds*(width()-2*m_lineWidth), m_lineWidth + calculatedValue*(height()-2*m_lineWidth)); //these +2 -1 are here to make sure that the graph fits within the drawn area, as it will be clipped by qt if it doesn't.
+ }
+ QPen pen;
+ pen.setCapStyle(Qt::RoundCap);
+ pen.setJoinStyle(Qt::RoundJoin);
+ pen.setWidthF(m_lineWidth);
+ pen.setColor(m_color);
+ painter->setRenderHints(QPainter::Antialiasing);
+ painter->setPen(pen);
+ painter->drawPolyline(points,j);
+}
+
+void HrGraph::loadGraphData(QVariant fileDataInput) {
+ qDebug() << "loadGraphData called";
+ QList<QVariant> fileDataAsList = fileDataInput.toList();
+ int j = fileDataAsList.count();
+ minTime = fileDataAsList[0].toPoint().x();
+ maxTime = fileDataAsList[j-1].toPoint().x();
+ minHrValue = fileDataAsList[0].toPoint().y();
+ maxHrValue = minHrValue;
+ m_filedata.clear();
+ for(int i = 0; i < j; i++) {
+ m_filedata.append(fileDataAsList[i].toPoint());
+ if (minHrValue > m_filedata[i].y()) minHrValue = m_filedata[i].y();
+ if (maxHrValue < m_filedata[i].y()) maxHrValue = m_filedata[i].y();
+ }
+ update();
+}
+
+void HrGraph::setLineColor(QColor color) {
+ m_color = color;
+ update();
+}
+
+QColor HrGraph::lineColor() {
+ return m_color;
+}
+
+void HrGraph::setLineWidth(float width) {
+ m_lineWidth = width;
+ update();
+}
+
+float HrGraph::lineWidth() {
+ return m_lineWidth;
+}
+
+int HrGraph::getMaxHrValue() {
+ return maxHrValue;
+}
+
+int HrGraph::getMinHrValue() {
+ return minHrValue;
+}
+
+QDateTime HrGraph::getMaxTime() {
+ return QDateTime::fromSecsSinceEpoch(maxTime);
+}
+
+QDateTime HrGraph::getMinTime() {
+ return QDateTime::fromSecsSinceEpoch(minTime);
+}
+
+bool HrGraph::relative() {
+ return graphRelative;
+}
+
+void HrGraph::setRelative(bool newRelative) {
+ graphRelative = newRelative;
+}
diff --git a/src/cpp/hrGraph.h b/src/cpp/hrGraph.h
new file mode 100644
index 0000000..63d2f17
--- /dev/null
+++ b/src/cpp/hrGraph.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2017 Florent Revest <revestflo@gmail.com>
+ * All rights reserved.
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the author nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef HRGRAPH_H
+#define HRGRAPH_H
+
+#include <QQuickPaintedItem>
+#include <QPixmap>
+#include <QDateTime>
+#include <QVector>
+#include <QPointF>
+
+class HrGraph : public QQuickPaintedItem
+{
+ Q_OBJECT
+
+ Q_PROPERTY(float lineWidth READ lineWidth WRITE setLineWidth)
+ Q_PROPERTY(QColor lineColor READ lineColor WRITE setLineColor NOTIFY lineColorChanged)
+ Q_PROPERTY(int maxValue READ getMaxHrValue NOTIFY loadingDone)
+ Q_PROPERTY(int minValue READ getMinHrValue NOTIFY loadingDone)
+ Q_PROPERTY(QDateTime maxTime READ getMaxTime NOTIFY loadingDone)
+ Q_PROPERTY(QDateTime minTime READ getMinTime NOTIFY loadingDone)
+ Q_PROPERTY(bool relativeMode READ relative WRITE setRelative)
+
+public:
+ Q_INVOKABLE void loadGraphData(QVariant fileDataInput);
+ HrGraph();
+ void paint(QPainter *painter) override;
+
+signals:
+ void loadingDone();
+ void lineColorChanged();
+
+public slots:
+ float lineWidth();
+ void setLineWidth(float width);
+ QColor lineColor();
+ void setLineColor(QColor color);
+ int getMaxHrValue();
+ int getMinHrValue();
+ QDateTime getMaxTime();
+ QDateTime getMinTime();
+ bool relative();
+ void setRelative(bool newRelative);
+
+private:
+ void updateBasePixmap();
+
+ float m_lineWidth = 0;
+ QColor m_color = QColor(255,255,255);
+ QPixmap m_pixmap;
+ QList<QPointF> m_filedata;
+ bool m_fileLoadStatus;
+ int minHrValue = 0;
+ int maxHrValue = 0;
+ int minTime;
+ int maxTime;
+ bool graphRelative;
+};
+
+#endif // ICON_H
diff --git a/src/graphs/HrGraph.qml b/src/graphs/HrGraph.qml
index 5a2be8b..0973969 100644
--- a/src/graphs/HrGraph.qml
+++ b/src/graphs/HrGraph.qml
@@ -19,6 +19,7 @@
import QtQuick 2.15
import org.asteroid.controls 1.0
+import org.asteroid.health 1.0
import org.asteroid.sensorlogd 1.0
Item {
@@ -41,7 +42,8 @@ Item {
labelsRepeater.model = labelsArr.length
}
Component.onCompleted: { // I am so so sorry about this code.
- loadGraphData(hrDataLoader.getTodayData())
+ console.log(typeof hrDataLoader.getTodayData())
+ hrGraph.loadGraphData(hrDataLoader.getTodayData())
console.log("minValue", hrGraph.minValue, "maxValue",hrGraph.maxValue)
//values divisions
valueDivisionsInterval = (valuesDelta) >= 50 ? 10 : 5
diff --git a/src/main.cpp b/src/main.cpp
index 6683ae7..48fa468 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,9 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <QtQml>
#include <asteroidapp.h>
+#include "cpp/hrGraph.h"
+
int main(int argc, char *argv[])
{
+ qmlRegisterType<HrGraph>("org.asteroid.health", 1, 0, "HeartrateGraph");
return AsteroidApp::main(argc, argv);
}
diff --git a/src/resources.qrc b/src/resources.qrc
index eb135ca..1515184 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -3,5 +3,6 @@
<file>main.qml</file>
<file>SettingsPage.qml</file>
<file>graphs/BarGraph.qml</file>
+ <file>graphs/HrGraph.qml</file>
</qresource>
</RCC>