From 69dde95b81258d25f592aa3e0960d0079a2cc4c9 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 1 Dec 2011 01:19:31 +1000 Subject: [PATCH] Initial TidalVolume & MinuteVent calculations for PRS1 machines. (Need to reimport.) Also added overview counterparts --- SleepLib/calcs.cpp | 84 ++++++++++++++++++++++++++++++++++++---------- SleepLib/calcs.h | 2 +- daily.cpp | 3 +- overview.cpp | 24 ++++++++++++- overview.h | 4 +-- 5 files changed, 95 insertions(+), 22 deletions(-) diff --git a/SleepLib/calcs.cpp b/SleepLib/calcs.cpp index 9c14bf0d..38fb5585 100644 --- a/SleepLib/calcs.cpp +++ b/SleepLib/calcs.cpp @@ -29,21 +29,31 @@ int CalcRespRate::calculate(Session *session) if (!session->eventlist.contains(CPAP_FlowRate)) return 0; //need flow waveform - EventList *flow, *rr; + EventList *flow, *rr, *tv=NULL, *mv=NULL; + if (!session->eventlist.contains(CPAP_TidalVolume)) { + tv=new EventList(EVL_Event); + session->eventlist[CPAP_TidalVolume].push_back(tv); + } + if (!session->eventlist.contains(CPAP_MinuteVent)) { + mv=new EventList(EVL_Event); + session->eventlist[CPAP_MinuteVent].push_back(mv); + } int cnt=0; for (int ws=0; ws < session->eventlist[CPAP_FlowRate].size(); ws++) { flow=session->eventlist[CPAP_FlowRate][ws]; if (flow->count() > 5) { rr=new EventList(EVL_Event); session->eventlist[CPAP_RespRate].push_back(rr); - cnt+=filterFlow(flow,rr,flow->rate()); + + cnt+=filterFlow(flow,rr,tv,mv,flow->rate()); } } return cnt; } -int CalcRespRate::filterFlow(EventList *in, EventList *out, double rate) +int CalcRespRate::filterFlow(EventList *in, EventList *out, EventList *tv, EventList *mv, double rate) { + int size=in->count(); EventDataType *stage1=new EventDataType [size]; EventDataType *stage2=new EventDataType [size]; @@ -51,7 +61,7 @@ int CalcRespRate::filterFlow(EventList *in, EventList *out, double rate) QVector med; med.reserve(8); - EventDataType r; + EventDataType r,tmp; int cnt; EventDataType c; @@ -115,9 +125,12 @@ int CalcRespRate::filterFlow(EventList *in, EventList *out, double rate) qint64 time=in->first(); qint64 u1=0,u2=0,len,l1=0,l2=0; + int z1=0,z2=0; EventDataType lastc=0,thresh=0; QVector breaths; + QVector TV; QVector breaths_start; + int lasti=0; for (i=0;i0) { + z2=i; len=abs(u2-u1); - //if (len>1500) { - breaths_start.push_back(time); - breaths.push_back(len); - //} + if (tv) { // && z1>0) { // Tidal Volume Calculations + EventDataType t=0; + for (int g=z1;g0) { + z1=i; len=abs(l2-l1); - //if (len>1500) { - // breaths2_start.push_back(time); - // breaths2.push_back(len); - //} + if (tv) { + // Average the other half of the breath to increase accuracy. + EventDataType t=0; + for (int g=z2;g=0) { + // TV[ts]=(TV[ts]+t)/2.0; + } + } } } @@ -162,11 +191,17 @@ int CalcRespRate::filterFlow(EventList *in, EventList *out, double rate) QVector breaths2; QVector breaths2_start; - int fir=0; + QVector TV2; + QVector TV2_start; + + int fir=0,fir2=0; + EventDataType T,L; do { br=0; bool first=true; bool cont=false; + T=0; + L=0; for (int i=fir;iAddEvent(t,br); //stage2[z++]=br; @@ -205,16 +245,26 @@ int CalcRespRate::filterFlow(EventList *in, EventList *out, double rate) t2+=window/2.0; } while (t2last()); - - for (int i=1;iAddEvent(t,br); + + //t=TV2_start[i]; + med.clear(); + for (int j=0;j<5;j++) { + med.push_back(TV2[i+j-2]); + } + qSort(med); + tmp=med[3]; + tv->AddEvent(t,tmp); + + mv->AddEvent(t,(tmp*br)/1000.0); } delete [] stage2; diff --git a/SleepLib/calcs.h b/SleepLib/calcs.h index a941beb5..9838e9e0 100644 --- a/SleepLib/calcs.h +++ b/SleepLib/calcs.h @@ -25,7 +25,7 @@ public: CalcRespRate(ChannelID id=CPAP_RespRate); virtual int calculate(Session *session); protected: - int filterFlow(EventList *in, EventList *out,double rate); + int filterFlow(EventList *in, EventList *out,EventList *tv, EventList *mv, double rate); }; class CalcAHIGraph:public Calculation diff --git a/daily.cpp b/daily.cpp index dcc63675..2e39c399 100644 --- a/daily.cpp +++ b/daily.cpp @@ -201,7 +201,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) MP->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure,Qt::blue,false))); RR->AddLayer(AddCPAP(new gLineChart(CPAP_RespRate,Qt::darkMagenta,square))); MV->AddLayer(AddCPAP(new gLineChart(CPAP_MinuteVent,Qt::darkCyan,square))); - TV->AddLayer(AddCPAP(new gLineChart(CPAP_TidalVolume,Qt::magenta,square))); + TV->AddLayer(AddCPAP(new gLineChart(CPAP_TidalVolume,Qt::yellow,square))); + TV->AddLayer(AddCPAP(new gLineChart("TidalVolume2",Qt::magenta,square))); FLG->AddLayer(AddCPAP(new gLineChart(CPAP_FLG,Qt::darkBlue,true))); //RE->AddLayer(AddCPAP(new gLineChart(CPAP_RespiratoryEvent,Qt::magenta,true))); IE->AddLayer(AddCPAP(new gLineChart(CPAP_IE,Qt::darkRed,square))); diff --git a/overview.cpp b/overview.cpp index f367de86..58120322 100644 --- a/overview.cpp +++ b/overview.cpp @@ -98,6 +98,9 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : SES=createGraph("Sessions"); NPB=createGraph("% in PB"); RR=createGraph("Resp. Rate"); + TV=createGraph("Tidal Volume"); + MV=createGraph("Minute Vent."); + PTB=createGraph("Pat. Trig. Br."); uc=new SummaryChart("Hours",GT_BAR); uc->addSlice("",QColor("green"),ST_HOURS); @@ -128,12 +131,31 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : SET->setRecMaxY(5); SET->AddLayer(set); - rr=new SummaryChart("bpm",GT_LINE); + rr=new SummaryChart("breaths/min",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); + tv=new SummaryChart("L/b",GT_LINE); + tv->addSlice(CPAP_TidalVolume,QColor("light blue"),ST_MIN); + tv->addSlice(CPAP_TidalVolume,QColor("light green"),ST_90P); + tv->addSlice(CPAP_TidalVolume,QColor("blue"),ST_WAVG); + TV->AddLayer(tv); + + mv=new SummaryChart("L/m",GT_LINE); + mv->addSlice(CPAP_MinuteVent,QColor("light blue"),ST_MIN); + mv->addSlice(CPAP_MinuteVent,QColor("light green"),ST_90P); + mv->addSlice(CPAP_MinuteVent,QColor("blue"),ST_WAVG); + MV->AddLayer(mv); + + + ptb=new SummaryChart("%PTB",GT_LINE); + ptb->addSlice(CPAP_PTB,QColor("yellow"),ST_MIN); + ptb->addSlice(CPAP_PTB,QColor("light gray"),ST_90P); + ptb->addSlice(CPAP_PTB,QColor("orange"),ST_WAVG); + PTB->AddLayer(ptb); + pr=new SummaryChart("cmH2O",GT_LINE); //PR->setRecMinY(4.0); //PR->setRecMaxY(12.0); diff --git a/overview.h b/overview.h index ede5a964..17100b83 100644 --- a/overview.h +++ b/overview.h @@ -36,8 +36,8 @@ public: gGraph * createGraph(QString name); - gGraph *AHI,*UC, *US, *PR,*LK,*NPB,*SET,*SES,*RR; - SummaryChart *bc,*uc, *us, *pr,*lk,*npb,*set,*ses,*rr; + gGraph *AHI,*UC, *US, *PR,*LK,*NPB,*SET,*SES,*RR,*MV,*TV,*PTB; + SummaryChart *bc,*uc, *us, *pr,*lk,*npb,*set,*ses,*rr,*mv,*tv,*ptb; QVector OverviewCharts; public slots: