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

Oximetry Serial Import Fixes

Browse Source
This commit is contained in:
Mark Watkins 2011-12-01 08:56:31 +10:00
parent 7501b842eb
commit 8776290f47
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SleepLib/calcs.cpp
View File

@ -25,6 +25,7 @@ CalcRespRate::CalcRespRate(ChannelID id)
// Generate RespiratoryRate graph // Generate RespiratoryRate graph
int CalcRespRate::calculate(Session *session) int CalcRespRate::calculate(Session *session)
{ {
if (session->machine()->GetType()!=MT_CPAP) return 0;
if (session->eventlist.contains(CPAP_RespRate)) return 0; // already exists? if (session->eventlist.contains(CPAP_RespRate)) return 0; // already exists?
if (!session->eventlist.contains(CPAP_FlowRate)) return 0; //need flow waveform if (!session->eventlist.contains(CPAP_FlowRate)) return 0; //need flow waveform
@ -304,6 +305,7 @@ CalcAHIGraph::CalcAHIGraph(ChannelID id):
int CalcAHIGraph::calculate(Session *session) int CalcAHIGraph::calculate(Session *session)
{ {
if (session->machine()->GetType()!=MT_CPAP) return 0;
if (session->eventlist.contains(CPAP_AHI)) return 0; // abort if already there if (session->eventlist.contains(CPAP_AHI)) return 0; // abort if already there
const qint64 winsize=30000; // 30 second windows const qint64 winsize=30000; // 30 second windows
@ -331,6 +333,7 @@ int CalcAHIGraph::calculate(Session *session)
int calcLeaks(Session *session) int calcLeaks(Session *session)
{ {
if (session->machine()->GetType()!=MT_CPAP) return 0;
if (session->eventlist.contains(CPAP_Leak)) return 0; // abort if already there if (session->eventlist.contains(CPAP_Leak)) return 0; // abort if already there
if (!session->eventlist.contains(CPAP_LeakTotal)) return 0; // can't calculate without this.. if (!session->eventlist.contains(CPAP_LeakTotal)) return 0; // can't calculate without this..

29
oximetry.cpp
View File

@ -361,32 +361,31 @@ void CMS50Serial::on_import_process()
a=data.at(i++); a=data.at(i++);
pl=data.at(i++) ^ 0x80; pl=data.at(i++) ^ 0x80;
o2=data.at(i++); o2=data.at(i++);
if (pl==0) { if (pl!=0) {
if (lastpl!=pl) { if (lastpl!=pl) {
pulse->setLast(lasttime); if (lastpl==0) {
if (pulse->min()<plmin) plmin=pulse->min(); if (pulse && pulse->count()>0) {
if (pulse->max()>plmax) plmax=pulse->max(); }
plcnt+=pulse->count();
compactToEvent(pulse); // converts to waveform..
pulse=new EventList(EVL_Event); pulse=new EventList(EVL_Event);
session->eventlist[OXI_Pulse].push_back(pulse); session->eventlist[OXI_Pulse].push_back(pulse);
} }
} else {
pulse->AddEvent(lasttime,pl); pulse->AddEvent(lasttime,pl);
if (pl < plmin) plmin=pl;
if (pl > plmax) plmax=pl;
plcnt++;
} }
if (o2==0) { }
if (o2!=0) {
if (lasto2!=o2) { if (lasto2!=o2) {
spo2->setLast(lasttime); if (lasto2==0) {
if (spo2->min()<o2min) o2min=spo2->min();
if (spo2->max()>o2max) o2max=spo2->max();
o2cnt+=spo2->count();
compactToEvent(spo2); // convert to waveform
spo2=new EventList(EVL_Event); spo2=new EventList(EVL_Event);
session->eventlist[OXI_SPO2].push_back(spo2); session->eventlist[OXI_SPO2].push_back(spo2);
} }
} else {
spo2->AddEvent(lasttime,o2); spo2->AddEvent(lasttime,o2);
if (o2 < plmin) o2min=o2;
if (o2 > plmax) o2max=o2;
o2cnt++;
}
} }
lasttime+=1000; lasttime+=1000;