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

PRS1 session length bug fix

Browse Source
This commit is contained in:
Mark Watkins 2011-07-21 12:17:43 +10:00
parent 58bcf5a700
commit 17bde8879c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -420,7 +420,9 @@ bool PRS1Loader::OpenSummary(Session *session,QString filename)
ext=header[6]; ext=header[6];
htype=header[3]; // 00 = normal // 01=waveform // could be a bool? htype=header[3]; // 00 = normal // 01=waveform // could be a bool?
version=header[4]; version=header[4];
if (sequence==127) {
int i=0;
}
sequence=sequence; sequence=sequence;
version=version; // don't need it here? version=version; // don't need it here?
@ -456,7 +458,6 @@ bool PRS1Loader::OpenSummary(Session *session,QString filename)
session->set_first(date); session->set_first(date);
//session->set_last(date);
double max; double max;
session->summary[CPAP_PressureMin]=(double)buffer[0x03]/10.0; session->summary[CPAP_PressureMin]=(double)buffer[0x03]/10.0;
session->summary[CPAP_PressureMax]=max=(double)buffer[0x04]/10.0; session->summary[CPAP_PressureMax]=max=(double)buffer[0x04]/10.0;
@ -492,9 +493,7 @@ bool PRS1Loader::OpenSummary(Session *session,QString filename)
session->summary[PRS1_MaskAlert]=(buffer[offset+0x0c]&0x08)==0x08; session->summary[PRS1_MaskAlert]=(buffer[offset+0x0c]&0x08)==0x08;
session->summary[PRS1_ShowAHI]=(buffer[offset+0x0c]&0x04)==0x04; session->summary[PRS1_ShowAHI]=(buffer[offset+0x0c]&0x04)==0x04;
unsigned char * b=&buffer[offset+0x14]; unsigned duration=buffer[offset+0x14] | (buffer[0x15] << 8);
quint16 bb=*(quint16*)b;
unsigned duration=bb;// | (buffer[0x15] << 8);
session->summary[CPAP_Duration]=(int)duration; session->summary[CPAP_Duration]=(int)duration;
//qDebug() << "ID: " << session->session() << " " << duration; //qDebug() << "ID: " << session->session() << " " << duration;
//float hours=float(duration)/3600.0; //float hours=float(duration)/3600.0;
@ -513,14 +512,14 @@ bool PRS1Loader::OpenSummary(Session *session,QString filename)
if (max==0) { if (max==0) {
session->summary[CPAP_PressureAverage]=session->summary[CPAP_PressureMin]; session->summary[CPAP_PressureAverage]=session->summary[CPAP_PressureMin];
} }
if (size==0x4d) { /*/if (size==0x4d) {
session->summary[CPAP_Obstructive]=(int)buffer[offset+0x1C] | (buffer[offset+0x1D] << 8); session->summary[CPAP_Obstructive]=(int)buffer[offset+0x1C] | (buffer[offset+0x1D] << 8);
session->summary[CPAP_ClearAirway]=(int)buffer[offset+0x20] | (buffer[offset+0x21] << 8); session->summary[CPAP_ClearAirway]=(int)buffer[offset+0x20] | (buffer[offset+0x21] << 8);
session->summary[CPAP_Hypopnea]=(int)buffer[offset+0x2A] | (buffer[offset+0x2B] << 8); session->summary[CPAP_Hypopnea]=(int)buffer[offset+0x2A] | (buffer[offset+0x2B] << 8);
session->summary[CPAP_RERA]=(int)buffer[offset+0x2E] | (buffer[offset+0x2F] << 8); session->summary[CPAP_RERA]=(int)buffer[offset+0x2E] | (buffer[offset+0x2F] << 8);
session->summary[CPAP_FlowLimit]=(int)buffer[offset+0x30] | (buffer[offset+0x31] << 8); session->summary[CPAP_FlowLimit]=(int)buffer[offset+0x30] | (buffer[offset+0x31] << 8);
} }*/
return true; return true;
} }

2
SleepLib/session.cpp
View File

@ -206,7 +206,7 @@ void Session::AddEvent(Event * e)
void Session::AddWaveform(Waveform *w) void Session::AddWaveform(Waveform *w)
{ {
waveforms[w->code()].push_back(w); waveforms[w->code()].push_back(w);
if (!s_last) { if (s_last) {
if (w->start()<s_first) s_first=w->start(); if (w->start()<s_first) s_first=w->start();
if (w->end()>s_last) s_last=w->end(); if (w->end()>s_last) s_last=w->end();
} else { } else {