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

Deduplicate Viatom 2s files to their true 4s resolution.

Browse Source
This commit is contained in:
sawinglogz 2020-01-25 14:50:45 -05:00
parent 61333aff07
commit 2f7b39f808
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
oscar/SleepLib/loader_plugins/viatom_loader.cpp
View File

@ -110,7 +110,6 @@ Session* ViatomLoader::ParseFile(const QString & filename)
QList<ViatomFile::Record> records = v.ReadData(); QList<ViatomFile::Record> records = v.ReadData();
quint64 step = v.duration() / records.size() * 1000L; quint64 step = v.duration() / records.size() * 1000L;
//CHECK_VALUES(step, 2000, 4000); // TODO: once ReadData deduplicates the records, there will only be 4000
EventList *ev_hr = sess->AddEventList(OXI_Pulse, EVL_Waveform, 1.0, 0.0, 0.0, 0.0, step); EventList *ev_hr = sess->AddEventList(OXI_Pulse, EVL_Waveform, 1.0, 0.0, 0.0, 0.0, step);
EventList *ev_o2 = sess->AddEventList(OXI_SPO2, EVL_Waveform, 1.0, 0.0, 0.0, 0.0, step); EventList *ev_o2 = sess->AddEventList(OXI_SPO2, EVL_Waveform, 1.0, 0.0, 0.0, 0.0, step);
EventList *ev_mv = sess->AddEventList(POS_Motion, EVL_Waveform, 1.0, 0.0, 0.0, 0.0, step); EventList *ev_mv = sess->AddEventList(POS_Motion, EVL_Waveform, 1.0, 0.0, 0.0, 0.0, step);
@ -308,21 +307,33 @@ QList<ViatomFile::Record> ViatomFile::ReadData()
records.append(rec); records.append(rec);
} while (!in.atEnd()); } while (!in.atEnd());
// TODO: deduplicate the samples // It turns out 2s files are actually just double-reported samples!
/* It turns out 2s files are actually just double-reported samples!
if (m_resolution == 2000) { if (m_resolution == 2000) {
QList<ViatomFile::Record> dedup;
bool all_are_duplicated = true;
CHECK_VALUE(records.size() % 2, 0); CHECK_VALUE(records.size() % 2, 0);
for (int i = 0; i < records.size(); i += 2) { for (int i = 0; i < records.size(); i += 2) {
auto & a = records.at(i); auto & a = records.at(i);
auto & b = records.at(i+1); auto & b = records.at(i+1);
CHECK_VALUE(a.spo2, b.spo2); if (a.spo2 != b.spo2
CHECK_VALUE(a.hr, b.hr); || a.hr != b.hr
CHECK_VALUE(a._unk1, b._unk1); || a._unk1 != b._unk1
CHECK_VALUE(a.motion, b.motion); || a.motion != b.motion
CHECK_VALUE(a._unk2, b._unk2); || a._unk2 != b._unk2) {
all_are_duplicated = false;
break;
}
dedup.append(a);
}
CHECK_VALUE(all_are_duplicated, true);
if (all_are_duplicated) {
// Return the deduplicated list.
records = dedup;
} }
} }
*/ CHECK_VALUE(duration() / records.size(), 4); // We've only seen 4s true resolution so far.
return records; return records;
} }