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

Channel XML loader fix, oximeter graph min/max fixes, oximeter SPO2/Pulse flagging calcs

Browse Source
This commit is contained in:
Mark Watkins 2011-11-28 14:05:09 +10:00
parent 7dd271ca64
commit 2a6c8b5ac7
12 changed files with 284 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Graphs/gGraphView.cpp
View File

@ -1600,9 +1600,8 @@ void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
{
int m,t;
if (rec_miny!=rec_maxy) {
miny=rec_miny;
maxy=rec_maxy;
return;
if (miny>rec_miny) miny=rec_miny;
if (maxy<rec_maxy) maxy=rec_maxy;
}
if (maxy==miny) {
m=ceil(maxy/2.0);
@ -1616,7 +1615,7 @@ void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
miny=t;
return;
} else
if (maxy>500) {
/*if (maxy>500) {
m=ceil(maxy/100.0);
maxy=m*100;
//m=floor(miny/100.0);
@ -1638,12 +1637,11 @@ void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
//m=floor(miny/10.0);
//if(m<0) m--;
//miny=m*10;
} else if (maxy>=5) {
if (maxy==miny) {
int i=maxy;
}
m=ceil(maxy/5.0)+1;
maxy=m*5;
} else */
if (maxy>=5) {
m=ceil(maxy/5.0);
t=m*5;
maxy=t;
m=floor(miny/5.0);
miny=m*5;
} else {
@ -2041,9 +2039,6 @@ void gGraphView::paintGL()
//#endif
//threaded=false;
for (int i=0;i<m_graphs.size();i++) {
if (m_graphs[i]->title()=="Pulse") {
int i=4;
}
if (m_graphs[i]->isEmpty()) continue;
if (!m_graphs[i]->visible()) continue;
numgraphs++;

101
SleepLib/calcs.cpp
View File

@ -3,6 +3,7 @@
Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net>
License: GPL
*/
#include <cmath>
#include "calcs.h"
#include "profiles.h"
@ -275,3 +276,103 @@ int CalcAHIGraph::calculate(Session *session)
return AHI->count();
}
int calcPulseChange(Session *session)
{
if (session->eventlist.contains(OXI_PulseChange)) return 0;
QHash<ChannelID,QVector<EventList *> >::iterator it=session->eventlist.find(OXI_Pulse);
if (it==session->eventlist.end()) return 0;
EventDataType val,val2,change,tmp;
qint64 time,time2;
bool ok;
qint64 window=PROFILE["PulseChangeTime"].toDouble(&ok);
if (!ok) {
PROFILE["PulseChangeTime"]=8;
window=8000;
} else window*=1000;
change=PROFILE["PulseChangeBPM"].toDouble(&ok);
if (!ok) {
PROFILE["PulseChangeTime"]=5;
change=5;
}
EventList *pc=new EventList(EVL_Waveform);
for (int e=0;e<it.value().size();e++) {
EventList & el=*(it.value()[e]);
for (unsigned i=0;i<el.count();i++) {
val=el.data(i);
time=el.time(i);
for (unsigned j=i;j<el.count();j++) { // scan ahead in the window
time2=el.time(j);
if (time2 > time+window) break;
val2=el.data(j);
tmp=fabs(val2-val);
if (tmp > change) {
pc->AddEvent(time2,tmp);
}
}
}
}
if (pc->count()==0) {
delete pc;
return 0;
}
session->eventlist[OXI_PulseChange].push_back(pc);
return pc->count();
}
int calcSPO2Drop(Session *session)
{
if (session->eventlist.contains(OXI_SPO2Drop)) return 0;
QHash<ChannelID,QVector<EventList *> >::iterator it=session->eventlist.find(OXI_SPO2);
if (it==session->eventlist.end()) return 0;
EventDataType val,val2,change,tmp;
qint64 time,time2;
bool ok;
qint64 window=PROFILE["SPO2DropTime"].toDouble(&ok);
if (!ok) {
PROFILE["SPO2DropTime"]=4;
window=4000;
} else window*=1000;
change=PROFILE["SPO2DropPercentage"].toDouble(&ok);
if (!ok) {
PROFILE["SPO2DropPercentage"]=4;
change=4;
}
EventList *pc=new EventList(EVL_Waveform);
for (int e=0;e<it.value().size();e++) {
EventList & el=*(it.value()[e]);
for (unsigned i=0;i<el.count();i++) {
val=el.data(i);
time=el.time(i);
for (unsigned j=i;j<el.count();j++) { // scan ahead in the window
time2=el.time(j);
if (time2 > time+window) break;
val2=el.data(j);
if (val2<val) {
tmp=val2-val;
if (tmp > change) {
pc->AddEvent(time2,tmp);
}
}
}
}
}
if (pc->count()==0) {
delete pc;
return 0;
}
session->eventlist[OXI_SPO2Drop].push_back(pc);
return pc->count();
}

3
SleepLib/calcs.h
View File

@ -36,6 +36,9 @@ public:
protected:
};
int calcPulseChange(Session *session);
int calcSPO2Drop(Session *session);
EventDataType calcAHI(Session *session,qint64 start=0, qint64 end=0);
#endif // CALCS_H

1
SleepLib/day.cpp
View File

@ -5,6 +5,7 @@
*/
#include "day.h"
#include "profiles.h"
Day::Day(Machine *m)
:machine(m)

6
SleepLib/schema.cpp
View File

@ -133,7 +133,7 @@ bool ChannelList::Load(QString filename)
group=node.toElement().attribute("name");
//qDebug() << "Group Name" << group;
// Why do I have to skip the first node here? (shows up empty)
n=node.firstChild().nextSibling();
n=node.firstChildElement();
while (!n.isNull()) {
line=n.lineNumber();
@ -174,6 +174,9 @@ bool ChannelList::Load(QString filename)
name=e.attribute("name","");
details=e.attribute("details","");
label=e.attribute("label","");
if (name=="Pulse") {
int i=5;
}
if (name.isEmpty() || details.isEmpty() || label.isEmpty()) {
qWarning() << "Missing name,details or label attribute in" << filename << "line" << line;
@ -216,6 +219,7 @@ bool ChannelList::Load(QString filename)
chan=new Channel(id,type,scope,name,details,label,unit,datatype,color,linkid);
channels[id]=chan;
names[name]=chan;
qDebug() << "Channel" << id << name << label;
groups[group][name]=chan;
if (linkid>0) {
if (channels.contains(linkid)) {

6
daily.cpp
View File

@ -111,6 +111,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
//SF->AddLayer(AddCPAP(evseg),LayerRight,100);
gFlagsGroup *fg=new gFlagsGroup();
SF->AddLayer(AddCPAP(fg));
fg->AddLayer((new gFlagsLine(CPAP_CSR,QColor("light green"),"CSR",false,FT_Span)));
fg->AddLayer((new gFlagsLine(CPAP_ClearAirway,QColor("purple"),"CA",false)));
fg->AddLayer((new gFlagsLine(CPAP_Obstructive,QColor("#40c0ff"),"OA",true)));
@ -122,10 +123,11 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
fg->AddLayer((new gFlagsLine(CPAP_FlowLimit,QColor("black"),"FL")));
fg->AddLayer((new gFlagsLine(CPAP_RERA,QColor("gold"),"RE")));
fg->AddLayer((new gFlagsLine(CPAP_VSnore,QColor("red"),"VS")));
fg->AddLayer(AddOXI(new gFlagsLine(OXI_SPO2Drop,QColor("red"),"O2")));
fg->AddLayer(AddOXI(new gFlagsLine(OXI_PulseChange,QColor("blue"),"PC")));
//fg->AddLayer(AddCPAP(new gFlagsLine(flags[8],QColor("dark green"),"U0E")));
//fg->AddLayer(AddCPAP(new gFlagsLine(flags[10],QColor("red"),"VS2"));
SF->setBlockZoom(true);
SF->AddLayer(AddCPAP(fg));
SF->AddLayer(new gShadowArea());
SF->AddLayer(new gYSpacer(),LayerLeft,gYAxis::Margin);
//SF->AddLayer(new gFooBar(),LayerBottom,0,1);
@ -156,7 +158,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
FRW->AddLayer(AddCPAP(los));
gGraph *graphs[]={ PRD, LEAK, AHI, SNORE, PTB, MP, RR, MV, TV, FLG, IE, TI, TE, TgMV, SPO2, PLETHY, PULSE,INTPULSE, INTSPO2 };
gGraph *graphs[]={ PRD, LEAK, AHI, SNORE, PTB, MP, RR, MV, TV, FLG, IE, TI, TE, TgMV, SPO2, PLETHY, PULSE, INTPULSE, INTSPO2 };
int ng=sizeof(graphs)/sizeof(gGraph*);
for (int i=0;i<ng;i++){
graphs[i]->AddLayer(new gXGrid());

4
mainwindow.cpp
View File

@ -115,6 +115,10 @@ MainWindow::MainWindow(QWidget *parent) :
if (!PROFILE.Exists("CombineCloserSessions")) PROFILE["CombineCloserSessions"]=0;
if (!PROFILE.Exists("DaySplitTime")) PROFILE["DaySplitTime"]=QTime(12,0,0,0);
if (!PROFILE.Exists("EventWindowSize")) PROFILE["EventWindowSize"]=4;
if (!PROFILE.Exists("SPO2DropPercentage")) PROFILE["PulseChangeDuration"]=4;
if (!PROFILE.Exists("SPO2DropDuration")) PROFILE["PulseChangeDuration"]=5;
if (!PROFILE.Exists("PulseChangeBPM")) PROFILE["PulseChangeDuration"]=5;
if (!PROFILE.Exists("PulseChangeDuration")) PROFILE["PulseChangeDuration"]=8;
//ui->actionUse_AntiAliasing->setChecked(PROFILE["UseAntiAliasing"].toBool());
ui->action_Link_Graph_Groups->setChecked(PROFILE["LinkGroups"].toBool());

7
overview.cpp
View File

@ -87,6 +87,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
LK=createGraph("Leaks");
SES=createGraph("Sessions");
NPB=createGraph("% in PB");
RR=createGraph("Resp. Rate");
uc=new SummaryChart("Hours",GT_BAR);
uc->addSlice("",QColor("green"),ST_HOURS);
@ -112,6 +113,12 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
SET->setRecMaxY(5);
SET->AddLayer(set);
rr=new SummaryChart("bpm",GT_LINE);
rr->addSlice(CPAP_RespRate,QColor("light blue"),ST_MIN);
rr->addSlice(CPAP_RespRate,QColor("light green"),ST_90P);
rr->addSlice(CPAP_RespRate,QColor("blue"),ST_WAVG);
RR->AddLayer(rr);
pr=new SummaryChart("cmH2O",GT_LINE);
//PR->setRecMinY(4.0);
//PR->setRecMaxY(12.0);

4
overview.h
View File

@ -36,8 +36,8 @@ public:
gGraph * createGraph(QString name);
gGraph *AHI,*UC,*PR,*LK,*NPB,*SET,*SES;
SummaryChart *bc,*uc,*pr,*lk,*npb,*set,*ses;
gGraph *AHI,*UC,*PR,*LK,*NPB,*SET,*SES,*RR;
SummaryChart *bc,*uc,*pr,*lk,*npb,*set,*ses,*rr;
QVector<SummaryChart *> OverviewCharts;
public slots:

41
oximetry.cpp
View File

@ -9,10 +9,12 @@
#include "qextserialport/qextserialenumerator.h"
#include "SleepLib/loader_plugins/cms50_loader.h"
#include "SleepLib/event.h"
#include "SleepLib/calcs.h"
#include "Graphs/gXAxis.h"
#include "Graphs/gSummaryChart.h"
#include "Graphs/gLineChart.h"
#include "Graphs/gYAxis.h"
#include "Graphs/gLineOverlay.h"
extern QLabel * qstatus2;
@ -320,6 +322,9 @@ void SerialOximeter::stopLive()
{
Close();
compactAll();
calcSPO2Drop(session);
calcPulseChange(session);
emit(liveStopped(session));
}
@ -611,16 +616,25 @@ Oximetry::Oximetry(QWidget *parent,gGraphView * shared) :
pulse=new gLineChart(OXI_Pulse,Qt::red,true);
pulse->SetDay(day);
//pulse->SetDay(day);
spo2=new gLineChart(OXI_SPO2,Qt::blue,true);
spo2->SetDay(day);
//spo2->SetDay(day);
PLETHY->AddLayer(plethy);
PULSE->AddLayer(pulse);
SPO2->AddLayer(spo2);
gLineOverlayBar *go;
PULSE->AddLayer(go=new gLineOverlayBar(OXI_PulseChange,QColor("blue"),"PD",FT_Dot));
//go->SetDay(day);
SPO2->AddLayer(go=new gLineOverlayBar(OXI_SPO2Drop,QColor("red"),"O2",FT_Dot));
PULSE->setDay(day);
SPO2->setDay(day);
//go->SetDay(day);
GraphView->setEmptyText("No Oximetry Data");
GraphView->updateGL();
@ -706,6 +720,7 @@ void Oximetry::on_RunButton_toggled(bool checked)
disconnect(oximeter,SIGNAL(updateSpO2(float)),this,SLOT(onSpO2Changed(float)));
ui->saveButton->setEnabled(true);
//CONTROL->setVisible(true);
} else {
if (oximeter->getSession() && oximeter->getSession()->IsChanged()) {
@ -719,6 +734,12 @@ void Oximetry::on_RunButton_toggled(bool checked)
return;
}
} // else it's already saved.
PLETHY->setRecMinY(0);
PLETHY->setRecMaxY(128);
PULSE->setRecMinY(60);
PULSE->setRecMaxY(100);
SPO2->setRecMinY(90);
SPO2->setRecMaxY(100);
if (!oximeter->startLive()) {
QMessageBox::warning(this,"Error","Something is wrong with the device connection.",QMessageBox::Ok);
@ -743,11 +764,11 @@ void Oximetry::on_RunButton_toggled(bool checked)
PULSE->SetMinX(f);
SPO2->SetMinX(f);
PLETHY->setForceMinY(0);
/*PLETHY->setForceMinY(0);
PLETHY->setForceMaxY(128);
PULSE->setForceMinY(30);
PULSE->setForceMaxY(180);
SPO2->setForceMinY(50);
SPO2->setForceMinY(50);*/
SPO2->setForceMaxY(100);
connect(oximeter,SIGNAL(dataChanged()),this,SLOT(onDataChanged()));
@ -877,6 +898,9 @@ void Oximetry::on_import_complete(Session * session)
qDebug() << "Oximetry import complete";
import_finished();
calcSPO2Drop(session);
calcPulseChange(session);
PLETHY->setVisible(false);
CONTROL->setVisible(false);
@ -901,15 +925,10 @@ void Oximetry::on_import_complete(Session * session)
PULSE->SetMaxX(l);
SPO2->SetMaxX(l);
PLETHY->setForceMinY(0);
PLETHY->setForceMaxY(128);
PULSE->setForceMinY(30);
PULSE->setForceMaxY(180);
SPO2->setForceMinY(50);
SPO2->setForceMaxY(100);
PULSE->setDay(day);
SPO2->setDay(day);
for (int i=0;i<GraphView->size();i++) {
(*GraphView)[i]->SetXBounds(f,l);
}

20
preferencesdialog.cpp
View File

@ -56,6 +56,21 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
//i=ui->timeZoneCombo->findText((*profile)["TimeZone"].toString());
//ui->timeZoneCombo->setCurrentIndex(i);
bool ok;
double v;
v=(*profile)["SPO2DropPercentage"].toDouble(&ok);
if (!ok) v=4;
ui->spo2Drop->setValue(v);
v=(*profile)["SPO2DropDuration"].toDouble(&ok);
if (!ok) v=5;
ui->spo2DropTime->setValue(v);
v=(*profile)["PulseChangeBPM"].toDouble(&ok);
if (!ok) v=5;
ui->pulseChange->setValue(v);
v=(*profile)["PulseChangeDuration"].toDouble(&ok);
if (!ok) v=5;
ui->pulseChangeTime->setValue(v);
QTime t=(*profile)["DaySplitTime"].toTime();
ui->timeEdit->setTime(t);
int val;
@ -234,6 +249,11 @@ void PreferencesDialog::Save()
(*profile)["SyncOximetry"]=ui->oximetrySync->isChecked();
(*profile)["OximeterType"]=ui->oximetryType->currentText();
(*profile)["SPO2DropPercentage"]=ui->spo2Drop->value();
(*profile)["SPO2DropDuration"]=ui->spo2DropTime->value();
(*profile)["PulseChangeBPM"]=ui->pulseChange->value();
(*profile)["PulseChangeDuration"]=ui->pulseChangeTime->value();
PREF["SkipLoginScreen"]=ui->skipLoginScreen->isChecked();
if (ui->squareWavePlots->isChecked() != (*profile)["SquareWavePlots"].toBool()) {

114
preferencesdialog.ui
View File

@ -861,7 +861,10 @@ p, li { white-space: pre-wrap; }
<attribute name="title">
<string>&amp;Oximetry</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_6">
<layout class="QHBoxLayout" name="horizontalLayout_12">
<property name="margin">
<number>2</number>
</property>
<item>
<widget class="QGroupBox" name="oximetryGroupBox">
<property name="title">
@ -884,19 +887,6 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="oximetryType">
<property name="sizePolicy">
@ -917,7 +907,7 @@ p, li { white-space: pre-wrap; }
</item>
</widget>
</item>
<item row="1" column="1">
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="oximetrySync">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -930,11 +920,105 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Flag changes in oximetry stats</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="label_24">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>SPO2</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="spo2Drop">
<property name="suffix">
<string>%</string>
</property>
<property name="decimals">
<number>0</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_25">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Pulse</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="pulseChange">
<property name="suffix">
<string> bpm</string>
</property>
<property name="decimals">
<number>0</number>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QDoubleSpinBox" name="spo2DropTime">
<property name="suffix">
<string>s</string>
</property>
<property name="decimals">
<number>0</number>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QDoubleSpinBox" name="pulseChangeTime">
<property name="suffix">
<string>s</string>
</property>
<property name="decimals">
<number>0</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser">
<property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
</size>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;