From bfde64fc36104db5780dcab78ba35bfe0d304181 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 19 Sep 2011 01:43:14 +1000 Subject: [PATCH] PRS1 Humid/Flex Settings Summary Chart --- Graphs/gSummaryChart.cpp | 10 ++++++++-- SleepLib/day.cpp | 13 ++++++++++++- SleepLib/day.h | 2 ++ SleepLib/loader_plugins/resmed_loader.cpp | 4 +--- SleepLib/session.h | 2 +- docs/template_overview.sht | 1 + overview.cpp | 14 ++++++++++++++ overview.h | 4 ++-- report.cpp | 3 +++ report.h | 4 ++-- 10 files changed, 46 insertions(+), 11 deletions(-) diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index d2d7751f..68e407cb 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -68,7 +68,7 @@ void SummaryChart::SetDay(Day * nullday) type=m_type[j]; for (int i=0;ichannelExists(code)) { // too many lookups happening here.. stop the crap.. + if (type==ST_HOURS || day->channelExists(code) || day->settingExists(code)) { // too many lookups happening here.. stop the crap.. m_days[dn]=day; switch(m_type[j]) { case ST_AVG: tmp=day->avg(code); break; @@ -81,6 +81,11 @@ void SummaryChart::SetDay(Day * nullday) case ST_CPH: tmp=day->cph(code); break; case ST_SPH: tmp=day->sph(code); break; case ST_HOURS: tmp=day->hours(); break; + case ST_SETMIN: tmp=day->settings_min(code); break; + case ST_SETMAX: tmp=day->settings_max(code); break; + case ST_SETAVG: tmp=day->settings_avg(code); break; + case ST_SETWAVG: tmp=day->settings_wavg(code); break; + case ST_SETSUM: tmp=day->settings_sum(code); break; default: break; } //if (tmp>0) { @@ -426,6 +431,7 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event) } else val=QString::number(d.value()[0],'f',2); z+="\r\n"+m_label+"="+val; + //z+="\r\nMode="+QString::number(day->settings_min("FlexSet"),'f',0); } else { QString a; @@ -442,7 +448,7 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event) default: break; } - if (day && day->channelExists(m_codes[i])) { + if (day && (day->channelExists(m_codes[i]) || day->settingExists(m_codes[i]))) { schema::Channel & chan=schema::channel[m_codes[i]]; val=QString::number(d.value()[i+1],'f',2); z+="\r\n"+chan.label()+" "+a+"="+val; diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp index 8cf01d77..3c35c9d4 100644 --- a/SleepLib/day.cpp +++ b/SleepLib/day.cpp @@ -332,9 +332,20 @@ int Day::count(ChannelID code) } return sum; } +bool Day::settingExists(ChannelID id) +{ + for (int j=0;j::iterator i=sessions[j]->settings.find(id); + if (i!=sessions[j]->settings.end()) { + return true; + } + } + return false; +} bool Day::channelExists(ChannelID id) { - return machine->hasChannel(id); + if (machine->hasChannel(id)) return true; + return false; } bool Day::channelHasData(ChannelID id) { diff --git a/SleepLib/day.h b/SleepLib/day.h index 6ff006d2..617535cc 100644 --- a/SleepLib/day.h +++ b/SleepLib/day.h @@ -69,6 +69,8 @@ public: QVector & getSessions() { return sessions; } bool channelExists(ChannelID id); bool channelHasData(ChannelID id); + bool settingExists(ChannelID id); + protected: QVector sessions; qint64 d_first,d_last; diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index 6b8a8ceb..7b33730c 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -400,9 +400,7 @@ int ResmedLoader::Open(QString & path,Profile *profile) EDFSignal *sig; if (mode==0) { - sess->settings["PAPMode"]=MODE_CPAP; - //m->registerChannel(CPAP_EPAP,false); - //m->registerChannel("IPAP",false); + sess->settings[CPAP_Mode]=MODE_CPAP; sig=stredf.lookup["Set Pressure"]; EventDataType pressure=sig->data[dn]*sig->gain; sess->settings[CPAP_Pressure]=pressure; diff --git a/SleepLib/session.h b/SleepLib/session.h index f81141e1..f80d60a6 100644 --- a/SleepLib/session.h +++ b/SleepLib/session.h @@ -19,7 +19,7 @@ class Machine; const quint32 magic=0xC73216AB; -enum SummaryType { ST_CNT, ST_SUM, ST_AVG, ST_WAVG, ST_90P, ST_MIN, ST_MAX, ST_CPH, ST_SPH, ST_FIRST, ST_LAST, ST_HOURS }; +enum SummaryType { ST_CNT, ST_SUM, ST_AVG, ST_WAVG, ST_90P, ST_MIN, ST_MAX, ST_CPH, ST_SPH, ST_FIRST, ST_LAST, ST_HOURS, ST_SETMIN, ST_SETAVG, ST_SETMAX, ST_SETWAVG, ST_SETSUM }; class Session { diff --git a/docs/template_overview.sht b/docs/template_overview.sht index 4c87aa69..ca2ca676 100644 --- a/docs/template_overview.sht +++ b/docs/template_overview.sht @@ -45,6 +45,7 @@ {{graph.Usage}} {{graph.Leaks}} {{graph.Pressure}} +{{graph.Settings}} {{graph.%PB}} diff --git a/overview.cpp b/overview.cpp index 7f72d6c8..8cdd3c56 100644 --- a/overview.cpp +++ b/overview.cpp @@ -54,6 +54,7 @@ Overview::Overview(QWidget *parent,Profile * _profile,gGraphView * shared) : AHI=new gGraph(GraphView,"AHI",default_height,0); UC=new gGraph(GraphView,"Usage",default_height,0); PR=new gGraph(GraphView,"Pressure",default_height,0); + SET=new gGraph(GraphView,"Settings",default_height,0); LK=new gGraph(GraphView,"Leaks",default_height,0); uc=new SummaryChart(profile,"Hours",GT_BAR); @@ -78,6 +79,18 @@ Overview::Overview(QWidget *parent,Profile * _profile,gGraphView * shared) : AHI->AddLayer(bc); AHI->AddLayer(new gXGrid()); + set=new SummaryChart(profile,"",GT_LINE); + //set->addSlice("SysOneResistSet",QColor("grey"),ST_SETAVG); + set->addSlice("HumidSet",QColor("blue"),ST_SETAVG); + set->addSlice("FlexSet",QColor("red"),ST_SETAVG); + //set->addSlice("PAPMode",QColor("red"),ST_SETAVG); + SET->forceMaxY(6); + SET->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); + gx=new gXAxis(); + gx->setUtcFix(true); + SET->AddLayer(gx,LayerBottom,0,gXAxis::Margin); + SET->AddLayer(set); + SET->AddLayer(new gXGrid()); pr=new SummaryChart(profile,"cmH2O",GT_LINE); PR->forceMinY(4.0); @@ -132,6 +145,7 @@ Overview::Overview(QWidget *parent,Profile * _profile,gGraphView * shared) : ui->dateStart->calendarWidget()->setWeekdayTextFormat(Qt::Sunday, format); ui->dateEnd->calendarWidget()->setWeekdayTextFormat(Qt::Saturday, format); ui->dateEnd->calendarWidget()->setWeekdayTextFormat(Qt::Sunday, format); + connect(ui->dateStart->calendarWidget(),SIGNAL(currentPageChanged(int,int)),SLOT(on_dateStart_currentPageChanged(int,int))); connect(ui->dateEnd->calendarWidget(),SIGNAL(currentPageChanged(int,int)),SLOT(on_dateEnd_currentPageChanged(int,int))); report=NULL; diff --git a/overview.h b/overview.h index bcc5d675..c06c109f 100644 --- a/overview.h +++ b/overview.h @@ -33,8 +33,8 @@ public: //void UpdateGraphs(); void ResetGraphLayout(); - gGraph *AHI,*UC,*PR,*LK,*NPB; - SummaryChart *bc,*uc,*pr,*lk,*npb; + gGraph *AHI,*UC,*PR,*LK,*NPB,*SET; + SummaryChart *bc,*uc,*pr,*lk,*npb,*set; public slots: void on_printButton_clicked(); diff --git a/report.cpp b/report.cpp index bc264cfb..6b183e2f 100644 --- a/report.cpp +++ b/report.cpp @@ -47,6 +47,9 @@ Report::Report(QWidget *parent, Profile * _profile, gGraphView * shared, Overvie graphs["%PB"]=NPB=new gGraph(GraphView,"% in PB",graph_print_height,0); NPB->AddLayer(m_overview->npb); + graphs["Settings"]=SET=new gGraph(GraphView,"Settings",graph_print_height,0); + SET->AddLayer(m_overview->set); + for (QHash::iterator g=graphs.begin();g!=graphs.end();g++) { gGraph *gr=g.value(); diff --git a/report.h b/report.h index e261decf..661975e8 100644 --- a/report.h +++ b/report.h @@ -36,8 +36,8 @@ private: Overview * m_overview; gGraphView * shared; gGraphView * GraphView; - gGraph *AHI,*UC,*PR,*LK,*NPB; - SummaryChart *bc,*uc,*pr,*lk,*npb; + gGraph *AHI,*UC,*PR,*LK,*NPB,*SET; + SummaryChart *bc,*uc,*pr,*lk,*npb,*set; QHash locals; QHash graphs;