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

Basic S10 import capability

Browse Source
This commit is contained in:
Mark Watkins 2014-08-24 15:00:51 +10:00
parent 333349e2f7
commit 35778aa1df
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
View File

@ -216,6 +216,9 @@ QString CMS50F37Loader::getModel()
QApplication::processEvents(); QApplication::processEvents();
} while (model.isEmpty() && (time.elapsed() < TIMEOUT)); } while (model.isEmpty() && (time.elapsed() < TIMEOUT));
QThread::msleep(100);
QApplication::processEvents();
if (model.startsWith("CMS50I")) { if (model.startsWith("CMS50I")) {
duration_divisor = 4; duration_divisor = 4;
} else { } else {

29
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -142,7 +142,13 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles)
qDebug() << "Parsing" << *it << date << str.GetNumDataRecords() << str.GetNumSignals(); qDebug() << "Parsing" << *it << date << str.GetNumDataRecords() << str.GetNumSignals();
EDFSignal *maskon = str.lookupLabel("Mask On"); EDFSignal *maskon = str.lookupLabel("Mask On");
if (!maskon) {
maskon = str.lookupLabel("MaskOn");
}
EDFSignal *maskoff = str.lookupLabel("Mask Off"); EDFSignal *maskoff = str.lookupLabel("Mask Off");
if (!maskoff) {
maskoff = str.lookupLabel("MaskOff");
}
EDFSignal *sig = nullptr; EDFSignal *sig = nullptr;
quint32 laston = 0; quint32 laston = 0;
@ -1123,7 +1129,7 @@ EDFduration getEDFDuration(QString filename)
start = qMin(st2, start); start = qMin(st2, start);
if (end < start) end = qMax(st2, start)+1; // This alone should really cover the EVE.EDF condition if (end < start) end = qMax(st2, start)+10; // This alone should really cover the EVE.EDF condition
// if (ext == "EVE") { // if (ext == "EVE") {
// // This is an unavoidable kludge, because there genuinely is no duration given for EVE files. // // This is an unavoidable kludge, because there genuinely is no duration given for EVE files.
@ -1203,6 +1209,13 @@ int ResmedLoader::scanFiles(Machine * mach, QString datalog_path)
if (filename.length() == 4) { if (filename.length() == 4) {
filename.toInt(&ok); filename.toInt(&ok);
if (ok) {
dirs.push_back(fi.canonicalFilePath());
}
} else if (filename.length() == 8) {
// S10 stores sessions per day folders
filename.toInt(&ok);
if (ok) { if (ok) {
dirs.push_back(fi.canonicalFilePath()); dirs.push_back(fi.canonicalFilePath());
} }
@ -1805,7 +1818,7 @@ bool ResmedLoader::LoadEVE(Session *sess, const QString & path)
double tt; double tt;
// Notes: Event records have useless duration record. // Notes: Event records have useless duration record.
sess->updateFirst(edf.startdate); // sess->updateFirst(edf.startdate);
EventList *OA = nullptr, *HY = nullptr, *CA = nullptr, *UA = nullptr; EventList *OA = nullptr, *HY = nullptr, *CA = nullptr, *UA = nullptr;
@ -2461,6 +2474,18 @@ void ResInitModelMap()
resmed_codes[CPAP_Snore].push_back("Snore.2s"); resmed_codes[CPAP_Snore].push_back("Snore.2s");
resmed_codes[CPAP_FLG].push_back("FlowLim.2s"); resmed_codes[CPAP_FLG].push_back("FlowLim.2s");
//S.AS.StartPress
resmed_codes[CPAP_PressureMin].push_back("S.AS.MinPress");
resmed_codes[CPAP_PressureMax].push_back("S.AS.MaxPress");
resmed_codes[RMS9_SetPressure].push_back("S.C.Press");
resmed_codes[RMS9_EPRLevel].push_back("S.EPR.Level");
} }

2
sleepyhead/SleepLib/loader_plugins/resmed_loader.h
View File

@ -374,7 +374,7 @@ class ResmedLoader : public CPAPLoader
bool LoadPLD(Session *sess, const QString & path); bool LoadPLD(Session *sess, const QString & path);
virtual MachineInfo newInfo() { virtual MachineInfo newInfo() {
return MachineInfo(MT_CPAP, 0, resmed_class_name, QObject::tr("ResMed"), QString(), QString(), QString(), QObject::tr("S9"), QDateTime::currentDateTime(), resmed_data_version); return MachineInfo(MT_CPAP, 0, resmed_class_name, QObject::tr("ResMed"), QString(), QString(), QString(), QObject::tr("ResMed"), QDateTime::currentDateTime(), resmed_data_version);
} }
virtual void initChannels(); virtual void initChannels();