diff options
| -rw-r--r-- | qmlplugin/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qmlplugin/barometerDataLoader.cpp | 90 | ||||
| -rw-r--r-- | qmlplugin/barometerDataLoader.h | 38 | ||||
| -rw-r--r-- | qmlplugin/sensorlogdqmlplugin.cpp | 2 |
4 files changed, 132 insertions, 0 deletions
diff --git a/qmlplugin/CMakeLists.txt b/qmlplugin/CMakeLists.txt index 7fe0ac9..dfa7f28 100644 --- a/qmlplugin/CMakeLists.txt +++ b/qmlplugin/CMakeLists.txt @@ -8,6 +8,8 @@ add_library( hrDataLoader.h weightDataLoader.cpp weightDataLoader.h + barometerDataLoader.cpp + barometerDataLoader.h loggerSettings.cpp loggerSettings.h ../common.cpp diff --git a/qmlplugin/barometerDataLoader.cpp b/qmlplugin/barometerDataLoader.cpp new file mode 100644 index 0000000..ff27b93 --- /dev/null +++ b/qmlplugin/barometerDataLoader.cpp @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2023 Arseniy Movshev <dodoradio@outlook.com> + * This file is part of sensorlogd, a sensor logger for the AsteroidOS smartwatch OS. + * + * sensorlogd 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. + * sensorlogd 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 <https://www.gnu.org/licenses/>. + */ + +#include <QDebug> +#include <QFile> +#include <QTextStream> +#include <QDate> +#include <QSettings> +#include <QDBusInterface> +#include <QPointF> +#include <QFileSystemWatcher> + +#include "barometerDataLoader.h" +#include "../common.h" + +BarometerDataLoader::BarometerDataLoader() : QObject() +{ + m_iface = new QDBusInterface("org.asteroid.sensorlogd.logger","/org/asteroid/sensorlogd/logger","", QDBusConnection::sessionBus(), this); + if (!m_iface->isValid()) { + qDebug()<<"interface is not valid"; + } else { + qDebug()<<"interface is valid"; + } + m_fileWatcher = new QFileSystemWatcher(); + m_fileWatcher->addPath(sensorDirPath("barometer-compensated")); + QObject::connect(m_fileWatcher,SIGNAL(directoryChanged(const QString)),this,SIGNAL(dataChanged())); + QObject::connect(m_fileWatcher,SIGNAL(fileChanged(const QString)),this,SIGNAL(dataChanged())); +} + +QVariant BarometerDataLoader::getTodayData() { + return getDataForDate(QDate::currentDate()); +} + +QVariant BarometerDataLoader::getDataForDate(QDate date) { + return QVariant::fromValue(getRawDataForDate(date)); +} + +QList<QPointF> BarometerDataLoader::getRawDataForDate(QDate date) { + QList<QPointF> m_filedata; + QString path = fileNameForDate(date, "barometer-compensated"); + QFile file(path); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { + qDebug() << "failed to open file"; + return m_filedata; + } + if (!m_fileWatcher->files().contains(path)) { + m_fileWatcher->addPath(path); + } + QTextStream inStream(&file); + QString line; + while (!inStream.atEnd()) { + line = inStream.readLine(); + QPointF point; + point.setX(line.split(":")[0].toInt()); + point.setY(line.split(":")[1].toInt()); + m_filedata.append(point); + } + file.close(); + return m_filedata; +} + +QVariant BarometerDataLoader::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); + if (filedata.count() == 0) { + filedata = data; + } else { + filedata += data; + } + } + return QVariant::fromValue(filedata); +} + +void BarometerDataLoader::triggerDaemonRecording() { + m_iface->call("triggerRecording"); +} diff --git a/qmlplugin/barometerDataLoader.h b/qmlplugin/barometerDataLoader.h new file mode 100644 index 0000000..82508d8 --- /dev/null +++ b/qmlplugin/barometerDataLoader.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2023 Arseniy Movshev <dodoradio@outlook.com> + * This file is part of sensorlogd, a sensor logger for the AsteroidOS smartwatch OS. + * + * sensorlogd 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. + * sensorlogd 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 <https://www.gnu.org/licenses/>. + */ + +#ifndef BAROMETERDATALOADER_H +#define BAROMETERDATALOADER_H + +#include <QObject> +#include <QDBusInterface> +#include <QPointF> +#include <QDate> +#include <QFileSystemWatcher> + +class BarometerDataLoader : public QObject +{ + Q_OBJECT + +public: + explicit BarometerDataLoader(); + Q_INVOKABLE QVariant getDataForDate(QDate date); + Q_INVOKABLE QVariant getTodayData(); + Q_INVOKABLE void triggerDaemonRecording(); + Q_INVOKABLE QVariant getDataFromTo(QDate date1, QDate date2); + QList<QPointF> getRawDataForDate(QDate date); +signals: + void dataChanged(); +private: + QDBusInterface *m_iface; + QFileSystemWatcher *m_fileWatcher; +}; + +#endif // BAROMETERDATALOADER_H diff --git a/qmlplugin/sensorlogdqmlplugin.cpp b/qmlplugin/sensorlogdqmlplugin.cpp index 8b04b56..87147b0 100644 --- a/qmlplugin/sensorlogdqmlplugin.cpp +++ b/qmlplugin/sensorlogdqmlplugin.cpp @@ -13,6 +13,7 @@ #include "stepsDataLoader.h" #include "hrDataLoader.h" #include "weightDataLoader.h" +#include "barometerDataLoader.h" #include <QtQml> LogdPlugin::LogdPlugin(QObject* parent) @@ -26,5 +27,6 @@ void LogdPlugin::registerTypes(const char* uri) qmlRegisterType<StepsDataLoader>(uri, 1, 0, "StepsDataLoader"); qmlRegisterType<HrDataLoader>(uri, 1, 0, "HrDataLoader"); qmlRegisterType<WeightDataLoader>(uri, 1, 0, "WeightDataLoader"); + qmlRegisterType<BarometerDataLoader>(uri, 1, 0, "BarometerDataLoader"); qmlRegisterType<LoggerSettings>(uri, 1, 0, "LoggerSettings"); } |