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

Drop 0 values from Live Oximetry recordings.. Pack data on the fly, otherwise graph plots will crap out..

Browse Source
This commit is contained in:
Mark Watkins 2011-12-02 17:38:44 +10:00
parent 19e9528c4b
commit ac3d6a17d9
1 changed files with 54 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
oximetry.cpp
View File

@ -164,52 +164,63 @@ void SerialOximeter::onReadyRead()
void SerialOximeter::addPulse(qint64 time, EventDataType pr) void SerialOximeter::addPulse(qint64 time, EventDataType pr)
{ {
static EventDataType lastpr=0;
EventDataType min=0,max=0; EventDataType min=0,max=0;
if (pr>0) { if (pr>0) {
if (pr<pulse->min()) if (lastpr==0) {
min=pr; if (pulse->count()==0)
if (pr>pulse->max()) pulse->setFirst(time);
max=pr; else {
qDebug() << "Shouldn't happen in addPulse()";
}
}
pulse->AddEvent(time,pr);
session->setCount(OXI_Pulse,session->count(OXI_Pulse)+1);
session->setLast(OXI_Pulse,time);
} else {
if (lastpr!=0) {
if (pulse->count() > 0) {
pulse->AddEvent(time,lastpr);
this->compactToEvent(pulse);
session->setLast(OXI_Pulse,time);
pulse=session->AddEventList(OXI_Pulse,EVL_Event);
}
}
} }
session->set_last(time);
pulse->AddEvent(time,pr); lastpr=pr;
session->setCount(OXI_Pulse,pulse->count()); // update the cache
if (min>0) {
pulse->setMin(min);
session->setMin(OXI_Pulse,min);
}
if (max>0) {
pulse->setMax(max);
session->setMax(OXI_Pulse,max);
}
//pulse->setLast(time);
session->setLast(OXI_Pulse,time);
session->set_last(lasttime);
emit(updatePulse(pr)); emit(updatePulse(pr));
} }
void SerialOximeter::addSpO2(qint64 time, EventDataType o2) void SerialOximeter::addSpO2(qint64 time, EventDataType o2)
{ {
static EventDataType lasto2=0;
EventDataType min=0,max=0; EventDataType min=0,max=0;
if (o2>0) { if (o2>0) {
if (o2<spo2->min()) if (lasto2==0) {
min=o2; if (spo2->count()==0)
if (o2>spo2->max()) spo2->setFirst(time);
max=o2; else {
qDebug() << "Shouldn't happen in addSpO2()";
}
}
spo2->AddEvent(time,o2);
session->setCount(OXI_SPO2,session->count(OXI_SPO2)+1);
session->setLast(OXI_SPO2,time);
} else {
if (lasto2!=0) {
if (spo2->count() > 0) {
spo2->AddEvent(time,lasto2);
this->compactToEvent(spo2);
session->setLast(OXI_SPO2,time);
spo2=session->AddEventList(OXI_SPO2,EVL_Event);
}
}
} }
spo2->AddEvent(time,o2); session->set_last(time);
session->setCount(OXI_SPO2,spo2->count()); // update the cache
if (min>0) { lasto2=o2;
spo2->setMin(min);
session->setMin(OXI_SPO2,min);
}
if (max>0) {
spo2->setMax(max);
session->setMax(OXI_SPO2,max);
}
session->setLast(OXI_SPO2,time);
session->set_last(lasttime);
//spo2->setLast(time);
emit(updateSpO2(o2)); emit(updateSpO2(o2));
} }
@ -236,16 +247,21 @@ void SerialOximeter::compactToEvent(EventList *el)
EventList nel(EVL_Waveform); EventList nel(EVL_Waveform);
EventDataType t,lastt=el->data(0); EventDataType t,lastt=el->data(0);
qint64 ti=el->time(0); qint64 ti=el->time(0);
for (quint32 i=0;i<el->count();i++) { nel.AddEvent(ti,lastt);
bool f;
for (quint32 i=1;i<el->count();i++) {
t=el->data(i); t=el->data(i);
f=false;
if (t!=lastt) { if (t!=lastt) {
nel.AddEvent(ti,lastt);
ti=el->time(i); ti=el->time(i);
nel.AddEvent(ti,t); nel.AddEvent(ti,t);
f=true;
} }
lastt=t; lastt=t;
} }
nel.AddEvent(el->last(),t); if (!f) {
nel.AddEvent(el->last(),t);
}
el->getData().clear(); el->getData().clear();
el->getTime().clear(); el->getTime().clear();