chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 03:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comment and whitespace cleanup in Dreem, Viatom, and Zeo loaders.

Browse Source
This commit is contained in:
sawinglogz 2020-01-30 13:17:51 -05:00
parent 156215b729
commit 62880d1a00
3 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oscar/SleepLib/loader_plugins/dreem_loader.cpp
View File

@ -48,6 +48,7 @@ int DreemLoader::OpenFile(const QString & filename)
} }
int count = 0; int count = 0;
Session* sess; Session* sess;
// TODO: add progress bar support, perhaps move shared logic into shared parent class with Zeo loader
while ((sess = readNextSession()) != nullptr) { while ((sess = readNextSession()) != nullptr) {
sess->SetChanged(true); sess->SetChanged(true);
mach->AddSession(sess); mach->AddSession(sess);

3
oscar/SleepLib/loader_plugins/viatom_loader.h
View File

@ -1,6 +1,7 @@
/* SleepLib Viatom Loader Header /* SleepLib Viatom Loader Header
* *
* Copyright (c) 2019 The OSCAR Team (written by dave madden <dhm@mersenne.com>) * Copyright (c) 2019-2020 The OSCAR Team
* (Initial importer written by dave madden <dhm@mersenne.com>)
* *
* This file is subject to the terms and conditions of the GNU General Public * 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 * License. See the file COPYING in the main directory of the source code

33
oscar/SleepLib/loader_plugins/zeo_loader.cpp
View File

@ -89,6 +89,7 @@ int ZEOLoader::OpenFile(const QString & filename)
} }
int count = 0; int count = 0;
Session* sess; Session* sess;
// TODO: add progress bar support, perhaps move shared logic into shared parent class with Dreem loader
while ((sess = readNextSession()) != nullptr) { while ((sess = readNextSession()) != nullptr) {
sess->SetChanged(true); sess->SetChanged(true);
mach->AddSession(sess); mach->AddSession(sess);
@ -157,22 +158,15 @@ Session* ZEOLoader::readNextSession()
QDateTime start_of_night, end_of_night, rise_time; QDateTime start_of_night, end_of_night, rise_time;
SessionID sid; SessionID sid;
//const qint64 WindowSize=30000;
qint64 st, tt; qint64 st, tt;
int stage; int stage;
int ZQ, TimeToZ, TimeInWake, TimeInREM, TimeInLight, TimeInDeep, Awakenings; int ZQ, TimeToZ, TimeInWake, TimeInREM, TimeInLight, TimeInDeep, Awakenings;
//int AlarmReason, SnoozeTime, WakeTone, WakeWindow, AlarmType, TotalZ;
int MorningFeel; int MorningFeel;
QString FirmwareVersion, MyZeoVersion; QString FirmwareVersion, MyZeoVersion;
QDateTime FirstAlarmRing, LastAlarmRing, FirstSnoozeTime, LastSnoozeTime, SetAlarmTime; QDateTime FirstAlarmRing, LastAlarmRing, FirstSnoozeTime, LastSnoozeTime, SetAlarmTime;
QStringList SG, DSG; QStringList SG, DSG;
bool ok;
QHash<QString,QString> row; QHash<QString,QString> row;
while (csv->readRow(row)) { while (csv->readRow(row)) {
invalid_fields = false; invalid_fields = false;
@ -186,46 +180,21 @@ Session* ZEOLoader::readNextSession()
} }
ZQ = readInt(row["ZQ"]); ZQ = readInt(row["ZQ"]);
// TotalZ = linecomp[idxTotalZ].toInt(&ok);
// if (!ok) { dodgy = true; }
TimeToZ = readInt(row["Time to Z"]); TimeToZ = readInt(row["Time to Z"]);
TimeInWake = readInt(row["Time in Wake"]); TimeInWake = readInt(row["Time in Wake"]);
TimeInREM = readInt(row["Time in REM"]); TimeInREM = readInt(row["Time in REM"]);
TimeInLight = readInt(row["Time in Light"]); TimeInLight = readInt(row["Time in Light"]);
TimeInDeep = readInt(row["Time in Deep"]); TimeInDeep = readInt(row["Time in Deep"]);
Awakenings = readInt(row["Awakenings"]); Awakenings = readInt(row["Awakenings"]);
end_of_night = readDateTime(row["End of Night"]); end_of_night = readDateTime(row["End of Night"]);
rise_time = readDateTime(row["Rise Time"]); 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); FirstAlarmRing = readDateTime(row["First Alarm Ring"], false);
LastAlarmRing = readDateTime(row["Last Alarm Ring"], false); LastAlarmRing = readDateTime(row["Last Alarm Ring"], false);
FirstSnoozeTime = readDateTime(row["First Snooze Time"], false); FirstSnoozeTime = readDateTime(row["First Snooze Time"], false);
LastSnoozeTime = readDateTime(row["Last Snooze Time"], false); LastSnoozeTime = readDateTime(row["Last Snooze Time"], false);
SetAlarmTime = readDateTime(row["Set Alarm Time"], false); SetAlarmTime = readDateTime(row["Set Alarm Time"], false);
MorningFeel = readInt(row["Morning Feel"], false); MorningFeel = readInt(row["Morning Feel"], false);
FirmwareVersion = row["Firmware Version"]; FirmwareVersion = row["Firmware Version"];
MyZeoVersion = row["My ZEO Version"]; MyZeoVersion = row["My ZEO Version"];
if (invalid_fields) { if (invalid_fields) {