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

Merge branch 'master' into prs1-add-parsed-settings

Browse Source
This commit is contained in:
sawinglogz 2020-03-26 10:48:21 -04:00
commit eef582e6a4
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/SleepLib/loader_plugins/resmed_EDFinfo.h
View File

@ -15,7 +15,7 @@
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
#include "SleepLib/loader_plugins/edfparser.h" #include "SleepLib/loader_plugins/edfparser.h"
enum EDFType { EDF_UNKNOWN, EDF_BRP, EDF_PLD, EDF_SAD, EDF_EVE, EDF_CSL }; enum EDFType { EDF_UNKNOWN, EDF_BRP, EDF_PLD, EDF_SAD, EDF_EVE, EDF_CSL, EDF_AEV };
EDFType lookupEDFType(const QString & filename); EDFType lookupEDFType(const QString & filename);

35
oscar/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -331,8 +331,8 @@ int ResmedLoader::Open(const QString & dirpath)
if ( ! parseIdentTGT(path, & info, idmap) ) if ( ! parseIdentTGT(path, & info, idmap) )
return -1; return -1;
#ifdef DEBUG_IDENT
qDebug() << "Info:" << info.series << info.model << info.modelnumber << info.serial; qDebug() << "Info:" << info.series << info.model << info.modelnumber << info.serial;
#ifdef DEBUG_IDENT
qDebug() << "IdMap size:" << idmap.size(); qDebug() << "IdMap size:" << idmap.size();
foreach ( QString st , idmap.keys() ) { foreach ( QString st , idmap.keys() ) {
qDebug() << "Key" << st << "Value" << idmap[st]; qDebug() << "Key" << st << "Value" << idmap[st];
@ -1559,22 +1559,23 @@ QHash<QString, QString> parseIdentLine( const QString line, MachineInfo * info)
} else if (key == "PNA") { // Product Name } else if (key == "PNA") { // Product Name
value.replace("_"," "); value.replace("_"," ");
// if (value.contains(STR_ResMed_S9)) {
// value.replace(STR_ResMed_S9, "");
// info->series = STR_ResMed_S9;
// } else if (value.contains(STR_ResMed_AirSense10)) {
if (value.contains(STR_ResMed_AirSense10)) { if (value.contains(STR_ResMed_AirSense10)) {
value.replace(STR_ResMed_AirSense10, ""); // value.replace(STR_ResMed_AirSense10, "");
info->series = STR_ResMed_AirSense10; info->series = STR_ResMed_AirSense10;
} else if (value.contains(STR_ResMed_AirCurve10)) { } else if (value.contains(STR_ResMed_AirCurve10)) {
value.replace(STR_ResMed_AirCurve10, ""); // value.replace(STR_ResMed_AirCurve10, "");
info->series = STR_ResMed_AirCurve10; info->series = STR_ResMed_AirCurve10;
} else { } else { // it will be a Series 9, and might not contain (STR_ResMed_S9))
value.replace("("," "); // might sometimes have a double space...
value.replace(")","");
if ( ! value.startsWith(STR_ResMed_S9)) {
value.replace(STR_ResMed_S9, ""); value.replace(STR_ResMed_S9, "");
info->series = STR_ResMed_S9; value.insert(0, " "); // There's proablely a better way than this
value.insert(0, STR_ResMed_S9); // two step way to put "S9 " at the start
}
info->series = STR_ResMed_S9;
// value.replace(STR_ResMed_S9, "");
} }
// value.replace("(","");
// value.replace(")","");
// if (value.contains("Adapt", Qt::CaseInsensitive)) { // if (value.contains("Adapt", Qt::CaseInsensitive)) {
// if (!value.contains("VPAP")) { // if (!value.contains("VPAP")) {
// value.replace("Adapt", QObject::tr("VPAP Adapt")); // value.replace("Adapt", QObject::tr("VPAP Adapt"));
@ -1603,6 +1604,8 @@ EDFType lookupEDFType(const QString & filename)
return EDF_SAD; return EDF_SAD;
} else if (text == "CSL") { } else if (text == "CSL") {
return EDF_CSL; return EDF_CSL;
} else if (text == "AEV") {
return EDF_AEV;
} else return EDF_UNKNOWN; } else return EDF_UNKNOWN;
} }
@ -2083,8 +2086,10 @@ void ResDayTask::run()
if (ovr.filemap.size() == 0) if (ovr.filemap.size() == 0)
continue; continue;
Session * sess = new Session(mach, ovr.start); Session * sess = new Session(mach, ovr.start);
sess->set_first(quint64(ovr.start)*1000L); // Do not set the session times according to Mask on/off times
sess->set_last(quint64(ovr.end)*1000L); // The LoadXXX edf routines will update them with recording start and durations
// sess->set_first(quint64(ovr.start)*1000L);
// sess->set_last(quint64(ovr.end)*1000L);
ovr.sess = sess; ovr.sess = sess;
for (auto mit=ovr.filemap.begin(), mend=ovr.filemap.end(); mit != mend; ++mit) { for (auto mit=ovr.filemap.begin(), mend=ovr.filemap.end(); mit != mend; ++mit) {
@ -2107,6 +2112,7 @@ void ResDayTask::run()
break; break;
case EDF_EVE: case EDF_EVE:
case EDF_CSL: case EDF_CSL:
case EDF_AEV: // this is in the 36039 - must figure out what to do with it
break; break;
default: default:
qWarning() << "Unrecognized file type for" << filename; qWarning() << "Unrecognized file type for" << filename;
@ -2720,7 +2726,10 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate); a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate);
a->AddWaveform(edf.startdate, es.dataArray, recs, duration); a->AddWaveform(edf.startdate, es.dataArray, recs, duration);
// a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0); // a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (es.label == "Va") { // Signal used in 36039... What to do with it???
a = nullptr; // We'll skip it for now
} else if (es.label == "") { // What the hell resmed?? } else if (es.label == "") { // What the hell resmed??
// these empty lables should be changed in resmed_EDFInfo to something unique
if (emptycnt == 0) { if (emptycnt == 0) {
code = RMS9_E01; code = RMS9_E01;
// ToTimeDelta(sess, edf, es, code, recs, duration); // ToTimeDelta(sess, edf, es, code, recs, duration);