diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index 52326791..d3742815 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -38,11 +38,7 @@ extern QProgressBar *qprogress; QHash ModelMap; -const quint16 CRC16_INIT_VALUE=0xffff; -const quint16 CRC16_XOR_VALUE=0x0000; - typedef quint16 crc_t; -//quint16 crctable[256]; static const crc_t crc_table[256] = { 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, @@ -1166,9 +1162,9 @@ bool PRS1Loader::OpenWaveforms(Session *session,QString filename) //EventList *FlowData=EventList(CPAP_FlowRate, EVL_Waveform,1,0,-128,128); //EventList *MaskData=EventList(CPAP_MaskPressure, EVL_Waveform,1,0,-128,128); - QString FlowRate="FlowRate"; - QString MaskPressure="MaskPressure"; - QString wc[2]={FlowRate,MaskPressure}; + //QString FlowRate=CPAP_FlowRate; + //QString MaskPressure="MaskPressure"; + QString wc[2]={CPAP_FlowRate,CPAP_MaskPressure}; do { timestamp=m_buffer[pos+0xb] | m_buffer[pos+0xc] << 8 | m_buffer[pos+0xd] << 16 | m_buffer[pos+0x0e] << 24; register unsigned char sum8=0; @@ -1221,10 +1217,10 @@ bool PRS1Loader::OpenWaveforms(Session *session,QString filename) else { a->AddWaveform(qint64(start)*1000L,(char *)waveform[i],wlength[i],qint64(wdur[i])*1000L); } - if (wc[i]==FlowRate) { + if (wc[i]==CPAP_FlowRate) { a->setMax(120); a->setMin(-120); - } else if (wc[i]==MaskPressure) { + } else if (wc[i]==CPAP_MaskPressure) { /* int v=ceil(a->max()/5); a->setMax(v*5); v=floor(a->min()/5); @@ -1275,15 +1271,211 @@ bool PRS1Loader::OpenWaveforms(Session *session,QString filename) else { a->AddWaveform(qint64(start)*1000L,(char *)waveform[i],wlength[i],qint64(wdur[i])*1000L); } - if (wc[i]==FlowRate) { + if (wc[i]==CPAP_FlowRate) { a->setMax(120); a->setMin(-120); - } else if (wc[i]==MaskPressure) { + } else if (wc[i]==CPAP_MaskPressure) { } session->updateLast(start+qint64(wdur[i])*1000L); } + // if (!session->eventlist.contains(CPAP_RespRate)) // only ASV machines have it.. + CalcRespiratoryRate(session); return true; } +// Generate RespiratoryRate graph +void PRS1Loader::CalcRespiratoryRate(Session *session) +{ + EventList *flow, *rr; + 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);//EVL_Waveform,1,0,0,0,60000); + ChannelID resp="RespRate"; + if (session->eventlist.contains(resp)) resp+="2"; + session->eventlist[resp].push_back(rr); + filterFlow(flow,rr); + } + } +} + +void PRS1Loader::filterFlow(EventList *in, EventList *out) +{ + int size=in->count(); + EventDataType *stage1=new EventDataType [size]; + EventDataType *stage2=new EventDataType [size]; + + QVector med; + med.reserve(8); + + EventDataType r; + int cnt; + + // Anti-Alias the flow waveform to get rid of jagged edges. + EventDataType c; + double avg; + int i; + + + /*i=2; + stage1[0]=in->data(0); + stage1[1]=in->data(1); + //stage1[2]=in->data(2); + for (;idata(i-2+k)); + } + qSort(med); + stage1[i]=med[3]; + } + stage1[i]=in->data(i); + i++; + stage1[i]=in->data(i); */ + + //i++; + //stage1[i]=in->data(i); + + stage2[0]=stage1[0]; + stage2[1]=stage1[1]; + stage2[2]=stage1[2]; + + i=3; + for (;idata(i-3+k); + cnt++; + } + c=r/float(cnt); + stage2[i]=c; + } + stage2[i]=in->data(i); + i++; + stage2[i]=in->data(i); + i++; + stage2[i]=in->data(i); + //i++; + //stage2[i]=in->data(i); + + float weight=0.6; + //stage2[0]=in->data(0); + stage1[0]=stage2[0]; + for (int i=1;idata(i); + stage1[i]=weight*stage2[i]+(1.0-weight)*stage1[i-1]; + } + + + qint64 time=in->first(); + qint64 u1=0,u2=0,len,l1=0,l2=0; + EventDataType lastc=0,thresh=0; + QVector breaths; + QVector breaths_start; + + for (i=0;ithresh) { + if (lastc<=thresh) { + u2=u1; + u1=time; + if (u2>0) { + len=abs(u2-u1); + //if (len>1500) { + breaths_start.push_back(time); + breaths.push_back(len); + //} + } + } + } else { + if (lastc>thresh) { + l2=l1; + l1=time; + if (l2>0) { + len=abs(l2-l1); + //if (len>1500) { + // breaths2_start.push_back(time); + // breaths2.push_back(len); + //} + } + } + + } + lastc=c; + time+=200; + } + + qint64 window=60000; + qint64 t1=in->first()-window/2; + qint64 t2=in->first()+window/2; + qint64 t; + EventDataType br,q; + int z=0; + int l; + + QVector breaths2; + QVector breaths2_start; + + int fir=0; + do { + br=0; + bool first=true; + bool cont=false; + for (int i=fir;i t2) break; + + if (first) { + first=false; + fir=i; + } + //q=1; + if (tt2) { + q=t2-t; + br+=(1.0/double(l))*double(q); + continue; + } else + br+=1.0; + } + if (cont) continue; + breaths2.push_back(br); + breaths2_start.push_back(t1+window/2); + //out->AddEvent(t,br); + //stage2[z++]=br; + + t1+=window/2.0; + t2+=window/2.0; + } while (t2last()); + + + for (int i=1;iAddEvent(t,br); + } + + delete [] stage2; + delete [] stage1; + +} void InitModelMap() { @@ -1305,3 +1497,5 @@ void PRS1Loader::Register() initialized=true; } + + diff --git a/SleepLib/loader_plugins/prs1_loader.h b/SleepLib/loader_plugins/prs1_loader.h index 7e0c94be..246dc411 100644 --- a/SleepLib/loader_plugins/prs1_loader.h +++ b/SleepLib/loader_plugins/prs1_loader.h @@ -59,9 +59,9 @@ protected: bool OpenWaveforms(Session *session,QString filename); bool Parse002(Session *session,unsigned char *buffer,int size,qint64 timestamp); bool Parse002ASV(Session *session,unsigned char *buffer,int size,qint64 timestamp); - + void CalcRespiratoryRate(Session *); + void filterFlow(EventList *in, EventList *out); unsigned char * m_buffer; }; - #endif // PRS1LOADER_H diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index 758c7718..a10ea367 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -806,13 +806,14 @@ void ResInitModelMap() RMS9ModelMap[36006]="ResMed S9 VPAP Auto"; RMS9ModelMap[36007]="ResMed S9 VPAP Adapt"; RMS9ModelMap[36008]="ResMed S9 VPAP ST"; -// S8 Series + /* S8 Series RMS9ModelMap[33007]="ResMed S8 Escape"; RMS9ModelMap[33039]="ResMed S8 Elite II"; RMS9ModelMap[33051]="ResMed S8 Escape II"; RMS9ModelMap[33064]="ResMed S8 Escape II AutoSet"; RMS9ModelMap[33064]="ResMed S8 Escape II AutoSet"; RMS9ModelMap[33129]="ResMed S8 AutoSet II"; + */ resmed_codes[CPAP_FlowRate].push_back("Flow"); resmed_codes[CPAP_MaskPressureHi].push_back("Mask Pres"); diff --git a/daily.cpp b/daily.cpp index 9db3c976..60c1f4a0 100644 --- a/daily.cpp +++ b/daily.cpp @@ -188,6 +188,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) PTB->AddLayer(AddCPAP(new gLineChart(CPAP_PTB,Qt::gray,square))); MP->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure,Qt::blue,false))); + RR->AddLayer(AddCPAP(new gLineChart("RespRate2",Qt::red,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))); @@ -465,7 +466,7 @@ void Daily::Load(QDate date) "" "" "" - "\n"; + "
\n"; QString tmp; //const int gwwidth=240; //const int gwheight=100; @@ -554,8 +555,8 @@ void Daily::Load(QDate date) if (cpap->machine->GetClass()!="PRS1") { cs="4 width='100%' align=center>"; } else cs="2 width='50%'>"; - html+="\n" + html+="\n" "\n"; if (cpap->machine->GetClass()=="ResMed") { html+="\n"; @@ -565,15 +566,15 @@ void Daily::Load(QDate date) "
" - "
"+tr("AHI")+""+QString().sprintf("%.2f",ahi)+"
" + "
"+tr("AHI")+""+QString().sprintf("%.2f",ahi)+"
 "+tr("Hypopnea")+""+QString().sprintf("%.2f",hi)+"
 "+tr("Unspecified Apnea")+""+QString().sprintf("%.2f",uai)+"
"; if (cpap->machine->GetClass()=="PRS1") { - html+="" - "\n" - "\n" + html+=""; } else if (cpap->machine->GetClass()=="Intellipap") { html+="
 "+tr("RERA")+""+QString().sprintf("%.2f",rei)+"
 "+tr("FlowLimit")+""+a.sprintf("%.2f",fli)+"
" + "\n" + "\n" "\n" "\n" "
 "+tr("RERA")+""+QString().sprintf("%.2f",rei)+"
 "+tr("Flow Limit")+""+a.sprintf("%.2f",fli)+"
 "+tr("Vsnore")+""+QString().sprintf("%.2f",vsi)+"
 "+tr("PB/CSR")+""+QString().sprintf("%.2f",csr)+"%
" - "\n" + "\n" "\n" "\n" "\n" diff --git a/docs/index.html b/docs/index.html index 288fc79d..cd3ba6ac 100644 --- a/docs/index.html +++ b/docs/index.html @@ -18,7 +18,7 @@ p,a,td,body { font-size: 14px }
  • ResMed S9 models
  • DeVilbiss Intellipap models (*new)
    • Oximetry -
  • Contec CMS50 Oximeters (rather poorly still I'm afraid)
    • +
  • Contec CMS50 Oximeters (*improved)

    • I don't recommend using this built in "web browser" to do any major surfing in, it will work, but it's mainly meant as a help browser. (It doesn't support SSL encryption.)

    "+tr("NRI")+""+QString().sprintf("%.2f",nri)+"
    "+tr("NRI")+""+QString().sprintf("%.2f",nri)+"
    "+tr("Leak Idx")+""+a.sprintf("%.2f",lki)+"
    "+tr("Vibratory Snore")+""+QString().sprintf("%.2f",vsi)+"
    "+tr("Exhalation Puff")+""+QString().sprintf("%.2f",exp)+"%