From da300be2aa8cada0969d68c22c036aec73c8ec2e Mon Sep 17 00:00:00 2001 From: Arseniy Movshev Date: Sun, 2 Jul 2023 11:21:12 +0100 Subject: Make the main preview page more modular this splits off the graphs for different sensors into separate files which should make maintenance a bit easier --- src/main.qml | 74 +++++------------------------------------------------------- 1 file changed, 6 insertions(+), 68 deletions(-) (limited to 'src/main.qml') diff --git a/src/main.qml b/src/main.qml index f44160f..491d246 100644 --- a/src/main.qml +++ b/src/main.qml @@ -23,6 +23,8 @@ import org.asteroid.sensorlogd 1.0 import "graphs" import "settings" +import "stepCounter" +import "heartrate" Application { id: app @@ -36,7 +38,6 @@ Application { id: loggerSettings } - LayerStack { id: pageStack anchors.fill: parent @@ -55,79 +56,16 @@ Application { Column { id: contentColumn anchors.fill: parent - Item { width: parent.width; height: parent.width*0.2} - Label { - width: parent.width*0.8 - anchors.horizontalCenter: parent.horizontalCenter - text: stepsDataLoader.getTodayTotal() ? "You've walked " + stepsDataLoader.todayTotal + " steps today, keep it up!" : "You haven't yet logged any steps today" - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignHCenter + StepCounterPreview { + width: parent.width } Item { width: parent.width; height: parent.width*0.1} - Label { - anchors { - left: parent.left - margins: app.width*0.1 - } - text: "Steps" - } - - BarGraph { - id: stepsGraph - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width*0.85 - height: app.width*3/5 - StepsDataLoader { - id: stepsDataLoader - Component.onCompleted: { - triggerDaemonRecording() - stepsGraph.loadData() - } - } - function loadData() { - var currDate = new Date() - currDate.setDate(currDate.getDate() - 7) - for (var i = 0; i < 7; i++) { - currDate.setDate(currDate.getDate() + 1) - console.log(currDate) - var currvalue = stepsDataLoader.getTotalForDate(currDate) - if (currvalue > 0 || valuesArr.length > 0) { - if (currvalue > maxValue) { - maxValue = currvalue - } - valuesArr.push(currvalue) - labelsArr.push(weekday[currDate.getDay()]) - } - } - - //this code figures out graph scaling - var powTen = Math.floor(Math.log10(maxValue)) - divisionsInterval = Math.pow(10,powTen) - console.log(Math.floor(maxValue/divisionsInterval)) - maxValue = divisionsInterval*Math.floor(maxValue/divisionsInterval) + (divisionsInterval/5)*Math.ceil((maxValue%divisionsInterval)/(divisionsInterval/5)) - divisionsCount = Math.floor(maxValue/divisionsInterval) + 1 - console.log(maxValue,divisionsInterval,divisionsCount) - dataLoadingDone() - } - indicatorLineHeight: loggerSettings.stepGoalEnabled ? loggerSettings.stepGoalTarget : 0 - } - - Item { width: parent.width; height: parent.width*0.1} - Label { - anchors { - left: parent.left - margins: app.width*0.1 - } - text: "Heartrate" - } - HrGraph { - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width*0.9 - height: app.height*2/3 + HeartratePreview { + width: parent.width } ListItem { -- cgit v1.2.3-54-g00ecf