From 0ad517562135a71730063497bb0160b743656a38 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 28 Dec 2011 13:17:20 +1000 Subject: [PATCH] Show TotalLeaks in Statistics where Unintentional not available, Fix non-existant plots (for Pat-Trig-Breaths on machines without it) showing in Overview, add rera & FL to stats where available --- Graphs/gLineChart.cpp | 1 + Graphs/gSummaryChart.cpp | 6 ++++ SleepLib/day.cpp | 6 +++- SleepLib/machine_common.h | 1 + SleepLib/schema.cpp | 6 ++-- SleepLib/session.cpp | 6 ++++ docs/channels.xml | 4 +-- mainwindow.cpp | 69 ++++++++++++++++++++++++++++++--------- 8 files changed, 78 insertions(+), 21 deletions(-) diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index d2dd0f62..cdad5beb 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -60,6 +60,7 @@ void gLineChart::SetDay(Day *d) ChannelID code=m_codes[j]; for (int i=0;isize();i++) { Session *sess=d->getSessions()[i]; + if (!sess->channelExists(code)) continue; tmp=sess->Min(code); if (min > tmp) min=tmp; diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index 2448725b..86c812de 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -130,6 +130,9 @@ void SummaryChart::SetDay(Day * nullday) if (day->machine_type()!=m_machinetype) continue; //m_values[dn][j+1]=0; + if (code==CPAP_PTB) { + int i=5; + } bool hascode=//day->channelHasData(code) || type==ST_HOURS || type==ST_SESSIONS || @@ -137,6 +140,9 @@ void SummaryChart::SetDay(Day * nullday) day->hasData(code,type); if (hascode) { + if (code==CPAP_PTB) { + int i=5; + } m_days[dn]=day; switch(m_type[j]) { case ST_AVG: tmp=day->avg(code); break; diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp index f41b9335..985c5747 100644 --- a/SleepLib/day.cpp +++ b/SleepLib/day.cpp @@ -306,7 +306,11 @@ EventDataType Day::Min(ChannelID code) EventDataType tmp; bool first=true; for (QVector::iterator s=sessions.begin();s!=sessions.end();s++) { - if (!(*s)->m_min.contains(code)) continue; + if (code==CPAP_PTB) { + int i=5; + } + if (!(*s)->m_min.contains(code)) + continue; //if ((*s)->eventlist.find(code)==(*s)->eventlist.end()) continue; tmp=(*s)->Min(code); if (first) { diff --git a/SleepLib/machine_common.h b/SleepLib/machine_common.h index f7e43928..6af49cfa 100644 --- a/SleepLib/machine_common.h +++ b/SleepLib/machine_common.h @@ -64,6 +64,7 @@ enum PRTypes//:short PR_UNKNOWN=0,PR_NONE,PR_CFLEX,PR_CFLEXPLUS,PR_AFLEX,PR_BIFLEX,PR_EPR,PR_SMARTFLEX }; + //extern map DefaultMCShortNames; //extern map DefaultMCLongNames; //extern map PressureReliefNames; diff --git a/SleepLib/schema.cpp b/SleepLib/schema.cpp index 0a3c7d75..26482e5a 100644 --- a/SleepLib/schema.cpp +++ b/SleepLib/schema.cpp @@ -19,7 +19,7 @@ namespace schema { ChannelList channel; Channel EmptyChannel; -Channel SessionEnabledChannel; +Channel *SessionEnabledChannel; QHash ChanTypes; QHash DataTypes; @@ -33,8 +33,10 @@ void init() schema_initialized=true; EmptyChannel=Channel(0,DATA,DAY,"Empty","Empty Channel","",""); - SessionEnabledChannel=Channel(1,DATA,DAY,"Enabled","Session Enabled","",""); + SessionEnabledChannel=new Channel(1,DATA,DAY,"Enabled","Session Enabled","",""); + channel.channels[1]=SessionEnabledChannel; + channel.names["Enabled"]=SessionEnabledChannel; SESSION_ENABLED=1; ChanTypes["data"]=DATA; //Types["waveform"]=WAVEFORM; diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index a1fccaa2..7ecdbf19 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -601,6 +601,9 @@ void Session::UpdateSummaries() for (c=eventlist.begin();c!=eventlist.end();c++) { id=c.key(); + if (id==CPAP_PTB) { + int i=5; + } if (schema::channel[id].type()==schema::DATA) { //sum(id); // avg calculates this and cnt. if (c.value().size()>0) { @@ -652,6 +655,9 @@ bool Session::SearchEvent(ChannelID code, qint64 time, qint64 dist) EventDataType Session::Min(ChannelID id) { + if (id==CPAP_PTB){ + int i=5; + } QHash::iterator i=m_min.find(id); if (i!=m_min.end()) return i.value(); diff --git a/docs/channels.xml b/docs/channels.xml index ddff66c3..88839684 100644 --- a/docs/channels.xml +++ b/docs/channels.xml @@ -187,8 +187,8 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!! diff --git a/mainwindow.cpp b/mainwindow.cpp index 844d0d20..00ebaf1c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -422,6 +422,8 @@ struct RXChange per2=copy.per2; highlight=copy.highlight; weighted=copy.weighted; + prelief=copy.prelief; + prelset=copy.prelset; } QDate first; QDate last; @@ -433,6 +435,8 @@ struct RXChange EventDataType per1; EventDataType per2; EventDataType weighted; + PRTypes prelief; + short prelset; short highlight; }; @@ -533,10 +537,7 @@ void MainWindow::on_summaryButton_clicked() if (cpap6month cpap_machines=PROFILE.GetMachines(MT_CPAP); QList oximeters=PROFILE.GetMachines(MT_OXIMETER); QList mach; @@ -552,6 +553,11 @@ void MainWindow::on_summaryButton_clicked() return; } int cpapdays=PROFILE.countDays(MT_CPAP,firstcpap,lastcpap); + int cpapweekdays=PROFILE.countDays(MT_CPAP,cpapweek,lastcpap); + int cpapmonthdays=PROFILE.countDays(MT_CPAP,cpapmonth,lastcpap); + int cpapyeardays=PROFILE.countDays(MT_CPAP,cpapyear,lastcpap); + int cpap6monthdays=PROFILE.countDays(MT_CPAP,cpap6month,lastcpap); + CPAPMode cpapmode=(CPAPMode)p_profile->calcSettingsMax(CPAP_Mode,MT_CPAP,firstcpap,lastcpap); float percentile=0.95; @@ -590,6 +596,28 @@ void MainWindow::on_summaryButton_clicked() .arg(calcAHI(cpap6month,lastcpap),0,'f',3) .arg(calcAHI(cpapyear,lastcpap),0,'f',3); + if (PROFILE.calcCount(CPAP_RERA,MT_CPAP,cpapyear,lastcpap)) { + html+=QString("%1%2%3%4%5%6") + .arg(tr("RERA Index")) + .arg(PROFILE.calcCount(CPAP_RERA,MT_CPAP,lastcpap,lastcpap)/PROFILE.calcHours(MT_CPAP,lastcpap,lastcpap),0,'f',3) + .arg(PROFILE.calcCount(CPAP_RERA,MT_CPAP,cpapweek,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapweek,lastcpap),0,'f',3) + .arg(PROFILE.calcCount(CPAP_RERA,MT_CPAP,cpapmonth,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapmonth,lastcpap),0,'f',3) + .arg(PROFILE.calcCount(CPAP_RERA,MT_CPAP,cpap6month,lastcpap)/PROFILE.calcHours(MT_CPAP,cpap6month,lastcpap),0,'f',3) + .arg(PROFILE.calcCount(CPAP_RERA,MT_CPAP,cpapyear,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapyear,lastcpap),0,'f',3); + } + + if (PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,cpapyear,lastcpap)) { + html+=QString("%1%2%3%4%5%6") + .arg(tr("Flow Limit Index")) + .arg(PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,lastcpap,lastcpap)/PROFILE.calcHours(MT_CPAP,lastcpap,lastcpap),0,'f',3) + .arg(PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,cpapweek,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapweek,lastcpap),0,'f',3) + .arg(PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,cpapmonth,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapmonth,lastcpap),0,'f',3) + .arg(PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,cpap6month,lastcpap)/PROFILE.calcHours(MT_CPAP,cpap6month,lastcpap),0,'f',3) + .arg(PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,cpapyear,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapyear,lastcpap),0,'f',3); + } + + + html+=QString("%1%2%3%4%5%6") .arg(tr("Hours per Night")) .arg(formatTime(p_profile->calcHours(MT_CPAP))) @@ -654,20 +682,25 @@ void MainWindow::on_summaryButton_clicked() //html+="TODO: 90% pressure.. Any point showing if this is all CPAP?"; + ChannelID leak; + if (p_profile->calcCount(CPAP_LeakTotal,MT_CPAP,cpapyear,lastcpap)>0) { + leak=CPAP_LeakTotal; + } else leak=CPAP_Leak; + html+=QString("%1%2%3%4%5%6") - .arg(tr("Average Leaks")) - .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP),0,'f',3) - .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpapweek,lastcpap),0,'f',3) - .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpapmonth,lastcpap),0,'f',3) - .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpap6month,lastcpap),0,'f',3) - .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpapyear,lastcpap),0,'f',3); + .arg(tr("Average %1").arg(schema::channel[leak].label())) + .arg(p_profile->calcWavg(leak,MT_CPAP),0,'f',3) + .arg(p_profile->calcWavg(leak,MT_CPAP,cpapweek,lastcpap),0,'f',3) + .arg(p_profile->calcWavg(leak,MT_CPAP,cpapmonth,lastcpap),0,'f',3) + .arg(p_profile->calcWavg(leak,MT_CPAP,cpap6month,lastcpap),0,'f',3) + .arg(p_profile->calcWavg(leak,MT_CPAP,cpapyear,lastcpap),0,'f',3); html+=QString("%1%2%3%4%5%6") - .arg(tr("Median Leaks")) - .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP),0,'f',3) - .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpapweek,lastcpap),0,'f',3) - .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpapmonth,lastcpap),0,'f',3) - .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpap6month,lastcpap),0,'f',3) - .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpapyear,lastcpap),0,'f',3); + .arg(tr("%1% %2").arg(percentile*100.0f,0,'f',0).arg(schema::channel[leak].label())) + .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP),0,'f',3) + .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP,cpapweek,lastcpap),0,'f',3) + .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP,cpapmonth,lastcpap),0,'f',3) + .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP,cpap6month,lastcpap),0,'f',3) + .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP,cpapyear,lastcpap),0,'f',3); html+="Note, AHI calcs here are different to overview calcs.. Overview shows a average of the dialy AHI's, this shows combined counts divide by combined hours"; } } @@ -755,6 +788,8 @@ void MainWindow::on_summaryButton_clicked() QDate first,last=lastcpap; CPAPMode mode,cmode=MODE_UNKNOWN; EventDataType cmin=0,cmax=0,min,max; + PRTypes prelief=PR_UNKNOWN; + short prelset=0; QDate date=lastcpap; Day * day; bool lastchanged=false; @@ -800,6 +835,8 @@ void MainWindow::on_summaryButton_clicked() rx.mode=cmode; rx.min=cmin; rx.max=cmax; + rx.prelief=prelief; + rx.prelset=prelset; if (modecalcPercentile(CPAP_Pressure,percentile,MT_CPAP,first,last); rx.per2=0;