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

Ignoring empty ResMed sessions

Browse Source
This commit is contained in:
Mark Watkins 2011-07-03 13:38:55 +10:00
parent d75e8fcebd
commit ea7add7a9e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -78,7 +78,7 @@ bool EDFParser::Parse()
// break; // break;
//serialnumber+=recordingident[i]; //serialnumber+=recordingident[i];
//} //}
QDateTime startDate=QDateTime::fromString(QString::fromAscii(header.datetime,16),"dd.MM.yyHH.mm.ss"); QDateTime startDate=QDateTime::fromString(QString::fromAscii(header.datetime,16),"dd.MM.yyHH.mm.ss").toUTC();
QDate d2=startDate.date(); QDate d2=startDate.date();
if (d2.year()<2000) { if (d2.year()<2000) {
d2.setYMD(d2.year()+100,d2.month(),d2.day()); d2.setYMD(d2.year()+100,d2.month(),d2.day());
@ -107,7 +107,8 @@ bool EDFParser::Parse()
return false; return false;
enddate=startdate+dur_data_record*qint64(num_data_records); enddate=startdate+dur_data_record*qint64(num_data_records);
if (dur_data_record==0)
return false;
// this could be loaded quicker by transducer_type[signal] etc.. // this could be loaded quicker by transducer_type[signal] etc..

7
SleepLib/machine.cpp
View File

@ -226,7 +226,7 @@ Session *Machine::SessionExists(SessionID session)
} }
Day *Machine::AddSession(Session *s,Profile *p) Day *Machine::AddSession(Session *s,Profile *p)
{ {
double span; double span=0;
assert(s!=NULL); assert(s!=NULL);
assert(p!=NULL); assert(p!=NULL);
@ -251,6 +251,7 @@ Day *Machine::AddSession(Session *s,Profile *p)
// less than n hours since last session yesterday? // less than n hours since last session yesterday?
if (span < hours_since_last_session) { if (span < hours_since_last_session) {
previous=true; previous=true;
} else {
} }
} }
@ -263,6 +264,7 @@ Day *Machine::AddSession(Session *s,Profile *p)
// Bedtime was late last night. // Bedtime was late last night.
if (span < hours_since_midnight) { if (span < hours_since_midnight) {
previous=true; previous=true;
} }
} }
@ -286,7 +288,8 @@ Day *Machine::AddSession(Session *s,Profile *p)
//qDebug("Adding Profile Day %s",dstr.toAscii().data()); //qDebug("Adding Profile Day %s",dstr.toAscii().data());
day[date]=new Day(this); day[date]=new Day(this);
// Add this Day record to profile // Add this Day record to profile
QDateTime d=QDateTime::fromMSecsSinceEpoch(date); QDateTime d=QDateTime::fromMSecsSinceEpoch(date).toUTC();
qDebug() << "New day: " << d.toString("yyyy-MM-dd HH:mm:ss");
p->AddDay(d.date(),day[date],m_type); p->AddDay(d.date(),day[date],m_type);
} }