diff options
| -rw-r--r-- | src/graphs/WeightGraph.qml | 75 | ||||
| -rw-r--r-- | src/main.qml | 13 | ||||
| -rw-r--r-- | src/resources.qrc | 2 | ||||
| -rw-r--r-- | src/settings/UiSettingsPage.qml | 12 | ||||
| -rw-r--r-- | src/weight/WeightPreview.qml | 48 |
5 files changed, 150 insertions, 0 deletions
diff --git a/src/graphs/WeightGraph.qml b/src/graphs/WeightGraph.qml new file mode 100644 index 0000000..3e7b36c --- /dev/null +++ b/src/graphs/WeightGraph.qml @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2023 Arseniy Movshev <dodoradio@outlook.com> + * 2019 Florent Revest <revestflo@gmail.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +import QtQuick 2.15 +import org.asteroid.controls 1.0 + +import org.asteroid.health 1.0 +import org.asteroid.sensorlogd 1.0 + +Item { + id: graph + property date startTime: new Date() + property date endTime: new Date() + + onStartTimeChanged: weightGraph.loadGraphData(weightDataLoader.getDataFromTo(startTime,endTime)) + onEndTimeChanged: weightGraph.loadGraphData(weightDataLoader.getDataFromTo(startTime,endTime)) + + Component.onCompleted: { + weightGraph.loadGraphData(weightDataLoader.getDataFromTo(startTime,endTime)) + } + WeightDataLoader { id: weightDataLoader + } + VerticalLabels { // labels column + id: markerParent + width: parent.width/8 + startValue: 0 + endValue: weightGraph.maxValue + anchors { + left: parent.left + top: weightGraph.top + bottom: weightGraph.bottom + topMargin: weightGraph.lineWidth/2 + bottomMargin: anchors.topMargin + } + } + LineGraph { + id: weightGraph + anchors { + left: markerParent.right + right: parent.right + top: parent.top + bottom: labelsRow.top + } + relativeMode: false + lineWidth: 4 + } + TimeLabels { + id: labelsRow + height: Dims.w(5) + startTime: weightGraph.minTime / 1000 + endTime: weightGraph.maxTime / 1000 + anchors { + bottom: parent.bottom + left: weightGraph.left + right: weightGraph.right + rightMargin: weightGraph.lineWidth/2 + leftMargin: anchors.rightMargin + } + } +} diff --git a/src/main.qml b/src/main.qml index 46090a2..39f83a1 100644 --- a/src/main.qml +++ b/src/main.qml @@ -26,6 +26,7 @@ import "graphs" import "settings" import "stepCounter" import "heartrate" +import "weight" Application { id: app @@ -69,6 +70,13 @@ Application { visible: hrPreviewVisible.value } + Item { width: parent.width; height: parent.width*0.1; visible: weightPreviewVisible.value} + + WeightPreview { + width: parent.width + visible: weightPreviewVisible.value + } + ListItem { title: "Settings" iconName: "ios-settings-outline" @@ -91,6 +99,11 @@ Application { key: "/org/asteroidos/health/ui/heartrate/showpreview" defaultValue: true } + ConfigurationValue { + id: weightPreviewVisible + key: "/org/asteroidos/health/ui/weight/showpreview" + defaultValue: false + } Component { id: settingsPage RootSettingsPage { diff --git a/src/resources.qrc b/src/resources.qrc index fb35c71..001bb47 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -5,6 +5,7 @@ <file>stepCounter/StepsDetailPage.qml</file> <file>heartrate/HeartratePreview.qml</file> <file>heartrate/HeartrateDetailPage.qml</file> + <file>weight/WeightPreview.qml</file> <file>settings/RootSettingsPage.qml</file> <file>settings/LoggerSettingsPage.qml</file> <file>settings/UiSettingsPage.qml</file> @@ -13,5 +14,6 @@ <file>graphs/StepsLineGraph.qml</file> <file>graphs/TimeLabels.qml</file> <file>graphs/VerticalLabels.qml</file> + <file>graphs/WeightGraph.qml</file> </qresource> </RCC> diff --git a/src/settings/UiSettingsPage.qml b/src/settings/UiSettingsPage.qml index 2009ec6..c349db7 100644 --- a/src/settings/UiSettingsPage.qml +++ b/src/settings/UiSettingsPage.qml @@ -49,6 +49,13 @@ Item { checked: hrPreviewVisible.value onCheckedChanged: hrPreviewVisible.value = checked } + LabeledSwitch { + width: parent.width + height: width*0.25 + text: "Show weight preview" + checked: weightPreviewVisible.value + onCheckedChanged: weightPreviewVisible.value = checked + } } } @@ -62,4 +69,9 @@ Item { key: "/org/asteroidos/health/ui/heartrate/showpreview" defaultValue: true } + ConfigurationValue { + id: weightPreviewVisible + key: "/org/asteroidos/health/ui/weight/showpreview" + defaultValue: true + } } diff --git a/src/weight/WeightPreview.qml b/src/weight/WeightPreview.qml new file mode 100644 index 0000000..7c6d1a8 --- /dev/null +++ b/src/weight/WeightPreview.qml @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2023 Arseniy Movshev <dodoradio@outlook.com> + * 2019 Florent Revest <revestflo@gmail.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +import QtQuick 2.15 +import org.asteroid.controls 1.0 + +import org.asteroid.sensorlogd 1.0 + +import "../graphs" + +Column { + Label { + anchors { + left: parent.left + margins: app.width*0.1 + } + text: "Weight" + } + + Item { width: parent.width; height: parent.width*0.1} + + WeightGraph { + anchors.horizontalCenter: parent.horizontalCenter + width: parent.width*0.9 + height: app.height*2/3 + Component.onCompleted: { + var d = new Date() + endTime = d + d.setDate(d.getDate() - 30) + startTime = d + } + } +} |