From 62880d1a0093b473d4dad7dd0f039cc4912b6ad4 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Thu, 30 Jan 2020 13:17:51 -0500 Subject: [PATCH] Comment and whitespace cleanup in Dreem, Viatom, and Zeo loaders. --- .../SleepLib/loader_plugins/dreem_loader.cpp | 1 + oscar/SleepLib/loader_plugins/viatom_loader.h | 3 +- oscar/SleepLib/loader_plugins/zeo_loader.cpp | 33 +------------------ 3 files changed, 4 insertions(+), 33 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/dreem_loader.cpp b/oscar/SleepLib/loader_plugins/dreem_loader.cpp index ecda42e7..793b31ff 100644 --- a/oscar/SleepLib/loader_plugins/dreem_loader.cpp +++ b/oscar/SleepLib/loader_plugins/dreem_loader.cpp @@ -48,6 +48,7 @@ int DreemLoader::OpenFile(const QString & filename) } int count = 0; Session* sess; + // TODO: add progress bar support, perhaps move shared logic into shared parent class with Zeo loader while ((sess = readNextSession()) != nullptr) { sess->SetChanged(true); mach->AddSession(sess); diff --git a/oscar/SleepLib/loader_plugins/viatom_loader.h b/oscar/SleepLib/loader_plugins/viatom_loader.h index c58fa8df..a919cb64 100644 --- a/oscar/SleepLib/loader_plugins/viatom_loader.h +++ b/oscar/SleepLib/loader_plugins/viatom_loader.h @@ -1,6 +1,7 @@ /* SleepLib Viatom Loader Header * - * Copyright (c) 2019 The OSCAR Team (written by dave madden ) + * Copyright (c) 2019-2020 The OSCAR Team + * (Initial importer written by dave madden ) * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the source code diff --git a/oscar/SleepLib/loader_plugins/zeo_loader.cpp b/oscar/SleepLib/loader_plugins/zeo_loader.cpp index faed74b7..4a355a51 100644 --- a/oscar/SleepLib/loader_plugins/zeo_loader.cpp +++ b/oscar/SleepLib/loader_plugins/zeo_loader.cpp @@ -89,6 +89,7 @@ int ZEOLoader::OpenFile(const QString & filename) } int count = 0; Session* sess; + // TODO: add progress bar support, perhaps move shared logic into shared parent class with Dreem loader while ((sess = readNextSession()) != nullptr) { sess->SetChanged(true); mach->AddSession(sess); @@ -157,22 +158,15 @@ Session* ZEOLoader::readNextSession() QDateTime start_of_night, end_of_night, rise_time; SessionID sid; - //const qint64 WindowSize=30000; qint64 st, tt; int stage; int ZQ, TimeToZ, TimeInWake, TimeInREM, TimeInLight, TimeInDeep, Awakenings; - - //int AlarmReason, SnoozeTime, WakeTone, WakeWindow, AlarmType, TotalZ; int MorningFeel; QString FirmwareVersion, MyZeoVersion; - QDateTime FirstAlarmRing, LastAlarmRing, FirstSnoozeTime, LastSnoozeTime, SetAlarmTime; - QStringList SG, DSG; - bool ok; - QHash row; while (csv->readRow(row)) { invalid_fields = false; @@ -186,46 +180,21 @@ Session* ZEOLoader::readNextSession() } ZQ = readInt(row["ZQ"]); - -// TotalZ = linecomp[idxTotalZ].toInt(&ok); -// if (!ok) { dodgy = true; } - TimeToZ = readInt(row["Time to Z"]); - TimeInWake = readInt(row["Time in Wake"]); - TimeInREM = readInt(row["Time in REM"]); - TimeInLight = readInt(row["Time in Light"]); - TimeInDeep = readInt(row["Time in Deep"]); - Awakenings = readInt(row["Awakenings"]); - end_of_night = readDateTime(row["End of Night"]); - rise_time = readDateTime(row["Rise Time"]); - -// AlarmReason = linecomp[idxAlarmReason].toInt(&ok); -// SnoozeTime = linecomp[idxSnoozeTime].toInt(&ok); -// WakeTone = linecomp[idxWakeTone].toInt(&ok); -// WakeWindow = linecomp[idxWakeWindow].toInt(&ok); -// AlarmType = linecomp[idxAlarmType].toInt(&ok); - FirstAlarmRing = readDateTime(row["First Alarm Ring"], false); - LastAlarmRing = readDateTime(row["Last Alarm Ring"], false); - FirstSnoozeTime = readDateTime(row["First Snooze Time"], false); - LastSnoozeTime = readDateTime(row["Last Snooze Time"], false); - SetAlarmTime = readDateTime(row["Set Alarm Time"], false); - MorningFeel = readInt(row["Morning Feel"], false); - FirmwareVersion = row["Firmware Version"]; - MyZeoVersion = row["My ZEO Version"]; if (invalid_fields) {