diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index 7c512ad0..dd68d362 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -41,6 +41,9 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry) EventDataType miny,maxy; double minx,maxx; miny=w.min_y, maxy=w.max_y, maxx=w.max_x, minx=w.min_x; + if (miny<0) { + miny=-MAX(fabs(miny),fabs(maxy)); + } int m; if (maxy>500) { diff --git a/Graphs/gSegmentChart.cpp b/Graphs/gSegmentChart.cpp index b82e57b3..9842998c 100644 --- a/Graphs/gSegmentChart.cpp +++ b/Graphs/gSegmentChart.cpp @@ -217,63 +217,67 @@ void gTAPGraph::SetDay(Day *d) gLayer::SetDay(d); m_total=0; if (!m_day) return; - QVector tap; - const int max_value=2600; - tap.resize(max_value); + QMap tap; EventStoreType data=0,lastval=0; - qint64 time=0,lasttime=0,lastlasttime=0; + qint64 time=0,lasttime=0,firsttime=0; bool first=true; bool rfirst=true; + bool changed; EventDataType gain=1,offset=0; for (QVector::iterator s=m_day->begin();s!=m_day->end();s++) { if ((*s)->eventlist.find(m_code)==(*s)->eventlist.end()) continue; for (int q=0;q<(*s)->eventlist[m_code].size();q++) { EventList &el=*(*s)->eventlist[m_code][q]; - lasttime=el.time(0); - first=true; - - for (int i=0;imax_value) { - qWarning() << "max_value is too small in gTAPGraph::SetDay()"; - break; - } - time=el.time(i); - if (rfirst) { - gain=el.gain(); - offset=el.offset(); - rfirst=false; - } - if (first) { - first=false; - } else { - if (lastval!=data) { - int v=(time-lasttime)/1000; - tap[lastval]+=v; - } - } - lastlasttime=lasttime; - lasttime=time; - lastval=data; + firsttime=lasttime=el.time(0); + lastval=el.raw(0); + if (rfirst) { + gain=el.gain(); + offset=el.offset(); + rfirst=false; } - if (lastval!=data){ + first=true; + changed=false; + EventStoreType lastlastval; + for (int i=1;i0) { - val=float(i)*gain+offset; - m_values.push_back(tap[i]); - m_total+=tap[i]; - m_names.push_back(QString::number(val,'f',2)); - } + for (QMap::iterator i=tap.begin();i!=tap.end();i++) { + val=float(i.key())*gain+offset; + + m_values.push_back(i.value()/1000L); + m_total+=i.value()/1000L; + m_names.push_back(QString::number(val,'f',2)); } } diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp index c7f21353..bc01d96b 100644 --- a/Graphs/gYAxis.cpp +++ b/Graphs/gYAxis.cpp @@ -31,6 +31,9 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry) double miny=w.min_y; double maxy=w.max_y; + if (miny<0) { + miny=-MAX(fabs(miny),fabs(maxy)); + } double dy=maxy-miny; if (dy<=0) { //miny=miny; @@ -38,6 +41,7 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry) dy=1; } + int m; if (maxy>500) { m=ceil(maxy/100.0); @@ -91,9 +95,14 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry) double mxy=MAX(fabs(maxy),fabs(miny)); - double mny=MIN(fabs(maxy),fabs(miny)); - if (miny<0) mny=-mny; - if (maxy<0) mxy=-mxy; + double mny=miny; + if (miny<0) { + mny=-mxy; + } else { + } + //double mny=MIN(fabs(maxy),fabs(miny)); + //if (miny<0) mny=-mny; + //if (maxy<0) mxy=-mxy; //mny=miny; //mxy=maxy; @@ -170,7 +179,7 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry) vertarray[vertcnt++]=h; if (m_show_major_lines && (i > miny)) { - majorvertarray[majorvertcnt++]=start_px+1; + majorvertarray[majorvertcnt++]=start_px; majorvertarray[majorvertcnt++]=h; majorvertarray[majorvertcnt++]=start_px+width; majorvertarray[majorvertcnt++]=h; diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp index 7918f1e2..4fc6a843 100644 --- a/SleepLib/day.cpp +++ b/SleepLib/day.cpp @@ -183,15 +183,21 @@ EventDataType Day::sum(ChannelID code) EventDataType Day::wavg(ChannelID code) { double s0=0,s1=0,s2=0; + qint64 d; for (QVector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); - if (sess.eventlist.find(code)!=sess.eventlist.end()) { - s0=sess.hours(); - s1+=sess.wavg(code)*s0; - s2+=s0; + if (sess.eventlist.contains(code)) { + d=sess.last(code)-sess.first(code); + s0=double(d)/1000.0; + if (s0>0) { + s1+=sess.wavg(code)*s0; + s2+=s0; + } } } - if (s2==0) return 0; + if (s2==0) + return 0; + return (s1/s2); } // Total session time in milliseconds @@ -297,6 +303,15 @@ int Day::count(ChannelID code) } return sum; } +bool Day::channelExists(ChannelID id) +{ + for (int i=0;ichannelExists(id)) + return true; + } + return false; +} + void Day::OpenEvents() { QVector::iterator s; diff --git a/SleepLib/day.h b/SleepLib/day.h index 5526ced7..5af22261 100644 --- a/SleepLib/day.h +++ b/SleepLib/day.h @@ -65,7 +65,7 @@ public: void OpenEvents(); QVector & getSessions() { return sessions; } - + bool channelExists(ChannelID id); protected: QVector sessions; qint64 d_first,d_last; diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index 2046427c..a02d7410 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -360,10 +360,10 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile) sess->setAvg(CPAP_Pressure,(sess->avg(CPAP_EPAP)+sess->avg(CPAP_IPAP))/2.0); sess->setWavg(CPAP_Pressure,(sess->wavg(CPAP_EPAP)+sess->wavg(CPAP_IPAP))/2.0); sess->setMin(CPAP_Pressure,sess->min(CPAP_EPAP)); - sess->setMax(CPAP_Pressure,sess->min(CPAP_IPAP)); - sess->set90p(CPAP_Pressure,sess->min(CPAP_IPAP)); + sess->setMax(CPAP_Pressure,sess->max(CPAP_IPAP)); + sess->set90p(CPAP_Pressure,sess->p90(CPAP_IPAP)); sess->p90(CPAP_EPAP); - sess->p90(CPAP_IPAP); + //sess->p90(CPAP_IPAP); } else { sess->avg(CPAP_Pressure); sess->wavg(CPAP_Pressure); diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index eb69ebae..acdbca71 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -563,6 +563,7 @@ bool ResmedLoader::LoadBRP(Session *sess,EDFParser &edf) long recs=edf.edfsignals[s]->nr*edf.GetNumDataRecords(); ChannelID code; if (edf.edfsignals[s]->label=="Flow") { + es.gain*=60; code=CPAP_FlowRate; } else if (edf.edfsignals[s]->label=="Mask Pres") { code=CPAP_MaskPressure; @@ -583,8 +584,8 @@ bool ResmedLoader::LoadBRP(Session *sess,EDFParser &edf) v=floor(a->min()/1); a->setMin(v*1); */ } else if (code==CPAP_FlowRate) { - a->setMax(1); - a->setMin(-1); + //a->setMax(1); + //a->setMin(-1); } sess->setMin(code,a->min()); sess->setMax(code,a->max()); diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index 31dca4d5..e40c8fe0 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -692,7 +692,6 @@ EventDataType Session::wavg(ChannelID id) return 0; QVector & evec=jj.value(); - bool first=true; qint64 lasttime=0,time,td; EventStoreType val,lastval=0; @@ -701,26 +700,20 @@ EventDataType Session::wavg(ChannelID id) EventDataType gain=evec[0]->gain(); for (int i=0;icount();j++) { + lastval=evec[i]->raw(0); + lasttime=evec[i]->time(0); + for (int j=1;jcount();j++) { val=evec[i]->raw(j); time=evec[i]->time(j); - if (first) { - first=false; - } else { - td=(time-lasttime); - if (vtime.contains(lastval)) { - vtime[lastval]+=td; - } else vtime[lastval]=td; - } + td=(time-lasttime); + if (vtime.contains(lastval)) { + vtime[lastval]+=td; + } else vtime[lastval]=td; lasttime=time; lastval=val; } } - /*td=last()-lasttime; - if (vtime.contains(lastval)) { - vtime[lastval]+=td; - } else vtime[lastval]=td; */ qint64 s0=0,s1=0,s2=0; // 32bit may all be thats needed here.. for (QHash::iterator i=vtime.begin(); i!=vtime.end(); i++) { @@ -728,8 +721,14 @@ EventDataType Session::wavg(ChannelID id) s1+=i.key()*s0; s2+=s0; } - double j=double(s1)/double(s_last-s_first); + double j=double(s1)/double(s2); EventDataType v=j*gain; + if (v>32768*gain) { + v=0; + } + if (v<-(32768*gain)) { + v=0; + } m_wavg[id]=v; return v; } diff --git a/daily.cpp b/daily.cpp index e9438ba9..3fc63c2c 100644 --- a/daily.cpp +++ b/daily.cpp @@ -755,54 +755,44 @@ void Daily::Load(QDate date) } html+="" "\n" - "\n"; + "\n"; - if (mode==MODE_BIPAP) { - html+="\n" - "\n"; +/* if (mode==MODE_BIPAP) { + html+="\n" + "\n"; } else if (mode==MODE_APAP) { - html+=("\n"); //cpap->summary_weighted_avg(CPAP_PressurePercentValue) + html+=("\n"); //cpap->summary_weighted_avg(CPAP_PressurePercentValue) } else if (mode==MODE_CPAP) { - html+=("\n"); - } + html+=("\n"); + }*/ + //html+=("\n"); - html+=(""); - - if (mode==MODE_APAP) { - html+=""); - - // html+=wxT("\n"); - } else if (mode==MODE_BIPAP) { - html+=(""); - - html+=(""); - - html+=(""); + html+=(""); + ChannelID chans[]={CPAP_Pressure,CPAP_EPAP,CPAP_IPAP,CPAP_PressureSupport,CPAP_PatientTriggeredBreaths, CPAP_MinuteVentilation,CPAP_RespiratoryRate,CPAP_FlowLimitGraph,CPAP_Leak,CPAP_Snore,CPAP_TidalVolume,CPAP_Pulse,CPAP_SPO2}; + int numchans=sizeof(chans)/sizeof(ChannelID); + for (int i=0;ichannelExists(code)) { + html+=""; + } } - html+=""); - html+=""); - +*/ } else { - html+=""; - html+="\n"; + html+=""; + html+="\n"; } // Instead of doing this, check whether any data exists.. @@ -820,13 +810,17 @@ void Daily::Load(QDate date) if (oxi) { html+=""; + html+=""; html+=""; + html+=""; //html+=wxT("\n"); @@ -838,39 +832,39 @@ void Daily::Load(QDate date) } if (cpap) { - if (mode==MODE_BIPAP) { - if (pref["EnableGraphSnapshots"].toBool()) { - { - html+=("\n"); - TAP_EAP->setFixedSize(gwwidth,30); - QPixmap pixmap=TAP_EAP->renderPixmap(gwwidth,30,false); - QByteArray byteArray; - QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray - buffer.open(QIODevice::WriteOnly); - pixmap.save(&buffer, "PNG"); - html+="\n"; - } - { - html+=("\n"); - TAP_IAP->setFixedSize(gwwidth,30); - QPixmap pixmap=TAP_IAP->renderPixmap(gwwidth,30,false); - QByteArray byteArray; - QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray - buffer.open(QIODevice::WriteOnly); - pixmap.save(&buffer, "PNG"); - html+="\n"; - } + html+="
"+tr("90% EPAP ")+QString().sprintf("%.2f",eap90)+tr("cmH2O")+"
"+tr("90% IPAP ")+QString().sprintf("%.2f",iap90)+tr("cmH2O")+"
"+tr("90%  EPAP ")+QString().sprintf("%.2f",eap90)+tr("cmH2O")+"
"+tr("90%  IPAP ")+QString().sprintf("%.2f",iap90)+tr("cmH2O")+"
")+tr("90% Pressure ")+QString().sprintf("%.2f",p90)+("
")+tr("90%  Auto Pressure ")+QString().sprintf("%.2f",p90)+("
")+tr("Pressure ")+QString().sprintf("%.2f",cpap->max(CPAP_Pressure))+("
")+tr("CPAP Pressure ")+QString().sprintf("%.2f",cpap->max(CPAP_Pressure))+("
 
MinAvgMax
"+tr("Pressure:")+""+a.sprintf("%.2f",cpap->min(CPAP_Pressure)); - html+=(" ")+a.sprintf("%.2f",cpap->wavg(CPAP_Pressure)); - html+=("")+a.sprintf("%.2f",cpap->max(CPAP_Pressure))+("
")+_("90% Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),p90)+wxT("
"+tr("EPAP:")+"")+a.sprintf("%.2f",cpap->min(CPAP_EPAP)); - html+=(" ")+a.sprintf("%.2f",cpap->wavg(CPAP_EPAP)); - html+=("")+a.sprintf("%.2f",cpap->max(CPAP_EPAP))+("
"+tr("IPAP:")+"")+a.sprintf("%.2f",cpap->min(CPAP_IPAP)); - html+=("")+a.sprintf("%.2f",cpap->wavg(CPAP_IPAP)); - html+=("")+a.sprintf("%.2f",cpap->max(CPAP_IPAP))+("
"+tr("PS:")+"")+a.sprintf("%.2f",cpap->min(CPAP_PressureSupport)); - html+=("")+a.sprintf("%.2f",cpap->wavg(CPAP_PressureSupport)); - html+=("")+a.sprintf("%.2f",cpap->max(CPAP_PressureSupport))+("
MinAvg90%Max
"+channel[code].label(); + html+=""+a.sprintf("%.2f",cpap->min(code)); + html+=""+a.sprintf("%.2f",cpap->wavg(code)); + html+=""+a.sprintf("%.2f",cpap->p90(code)); + html+=""+a.sprintf("%.2f",cpap->max(code)); + html+="
"+tr("Leak:"); - html+=""+a.sprintf("%.2f",cpap->min(CPAP_Leak)); - html+=""+a.sprintf("%.2f",cpap->wavg(CPAP_Leak)); - html+=""+a.sprintf("%.2f",cpap->max(CPAP_Leak))+("
"+tr("Snore:"); + /*html+="
"+tr("Snore:"); html+=""+a.sprintf("%.2f",cpap->min(CPAP_Snore)); html+=""+a.sprintf("%.2f",cpap->avg(CPAP_Snore)); html+=""+a.sprintf("%.2f",cpap->max(CPAP_Snore))+("
"+tr("No CPAP data available")+"
 
"+tr("No CPAP data available")+"
 
"+tr("Pulse:"); html+=""+a.sprintf("%.2fbpm",oxi->min(OXI_Pulse)); - html+=""+a.sprintf("%.2fbpm",oxi->avg(OXI_Pulse)); - html+=""+a.sprintf("%.2fbpm",oxi->max(OXI_Pulse))+"
"+a.sprintf("%.2fbpm",oxi->wavg(OXI_Pulse)); + html+=""+a.sprintf("%.2fbpm",oxi->p90(OXI_Pulse)); + html+=""+a.sprintf("%.2fbpm",oxi->max(OXI_Pulse)); + html+="
"+tr("SpO2:"); html+=""+a.sprintf("%.2f%%",oxi->min(OXI_SPO2)); - html+=""+a.sprintf("%.2f%%",oxi->avg(OXI_SPO2)); - html+=""+a.sprintf("%.2f%%",oxi->max(OXI_SPO2))+"
"+a.sprintf("%.2f%%",oxi->wavg(OXI_SPO2)); + html+=""+a.sprintf("%.2f%%",oxi->p90(OXI_SPO2)); + html+=""+a.sprintf("%.2f%%",oxi->max(OXI_SPO2)); + html+="
 
")+tr("Time@EPAP")+("
")+tr("Time@IPAP")+("
" + "\n"; + if (pref["EnableGraphSnapshots"].toBool()) { + if (cpap->channelExists(CPAP_Pressure)) { + html+=("\n"); + TAP->setFixedSize(gwwidth,30); + QPixmap pixmap=TAP->renderPixmap(gwwidth,30,false); + QByteArray byteArray; + QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray + buffer.open(QIODevice::WriteOnly); + pixmap.save(&buffer, "PNG"); + html+="\n"; } - } else if (mode==MODE_APAP) { - if (pref["EnableGraphSnapshots"].toBool()) { - html+=("\n"); - TAP->setFixedSize(gwwidth,30); - QPixmap pixmap=TAP->renderPixmap(gwwidth,30,false); - QByteArray byteArray; - QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray - buffer.open(QIODevice::WriteOnly); - pixmap.save(&buffer, "PNG"); - html+="\n"; + if (cpap->channelExists(CPAP_EPAP)) { + //html+="\n"; + html+=("\n"); + TAP_EAP->setFixedSize(gwwidth,30); + QPixmap pixmap=TAP_EAP->renderPixmap(gwwidth,30,false); + QByteArray byteArray; + QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray + buffer.open(QIODevice::WriteOnly); + pixmap.save(&buffer, "PNG"); + html+="\n"; + } + if (cpap->channelExists(CPAP_IPAP)) { + html+=("\n"); + TAP_IAP->setFixedSize(gwwidth,30); + QPixmap pixmap=TAP_IAP->renderPixmap(gwwidth,30,false); + QByteArray byteArray; + QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray + buffer.open(QIODevice::WriteOnly); + pixmap.save(&buffer, "PNG"); + html+="\n"; } } html+="
")+tr("Time@Pressure")+("
")+tr("Time@Pressure")+("
")+tr("Time@EPAP")+("
")+tr("Time@IPAP")+("
"; diff --git a/daily.ui b/daily.ui index 7c076f03..405b805d 100644 --- a/daily.ui +++ b/daily.ui @@ -34,7 +34,7 @@ - 265 + 300 16777215 @@ -56,7 +56,7 @@ - 265 + 300 180 @@ -85,7 +85,7 @@ - 265 + 300 16777215