summaryrefslogtreecommitdiff
path: root/qmlplugin/stepsDataLoader.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--qmlplugin/stepsDataLoader.cpp30
1 files changed, 28 insertions, 2 deletions
diff --git a/qmlplugin/stepsDataLoader.cpp b/qmlplugin/stepsDataLoader.cpp
index 44b15bb..50a0101 100644
--- a/qmlplugin/stepsDataLoader.cpp
+++ b/qmlplugin/stepsDataLoader.cpp
@@ -67,11 +67,15 @@ QVariant StepsDataLoader::getTodayData() {
}
QVariant StepsDataLoader::getDataForDate(QDate date) {
+ return QVariant::fromValue(getRawDataForDate(date));
+}
+
+QList<QPointF> StepsDataLoader::getRawDataForDate(QDate date) {
QList<QPointF> m_filedata;
QFile file(fileNameForDate(date, "stepCounter"));
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
qDebug() << "failed to open file";
- return QVariant::fromValue(m_filedata);
+ return m_filedata;
}
QTextStream inStream(&file);
QString line;
@@ -80,10 +84,32 @@ QVariant StepsDataLoader::getDataForDate(QDate date) {
QPointF point;
point.setX(line.split(":")[0].toInt());
point.setY(line.split(":")[1].toInt());
+ qDebug() << point;
m_filedata.append(point);
}
file.close();
- return QVariant::fromValue(m_filedata);
+ return m_filedata;
+}
+
+QVariant StepsDataLoader::getDataFromTo(QDate date1, QDate date2) {
+ QList<QPointF> filedata;
+ if (date1 > date2) {
+ QDate temp = date1;
+ date1 = date2;
+ date2 = temp;
+ }
+ for (QDate i = date1; i <= date2; i = i.addDays(1)) {
+ qDebug() << "currently loading " << i;
+ QList<QPointF> data = getRawDataForDate(i);
+ qDebug() << filedata.count();
+ if (filedata.count() == 0) {
+ filedata = data;
+ qDebug() << filedata.count();
+ } else {
+ filedata += data;
+ }
+ }
+ return QVariant::fromValue(filedata);
}
void StepsDataLoader::triggerDaemonRecording() {