From 6913da8e69de364055a1a44fff06b1caab2ce1fa Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 7 Aug 2014 02:12:55 +1000 Subject: [PATCH] Added % of night in LargeLeak overview chart --- sleepyhead/Graphs/gGraphView.cpp | 1 + sleepyhead/Graphs/gGraphView.h | 1 + sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp | 6 +++++- sleepyhead/daily.cpp | 3 ++- sleepyhead/docs/channels.xml | 4 ++-- sleepyhead/overview.cpp | 8 ++++++-- sleepyhead/overview.h | 4 ++-- 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp index 25a1c515..0119f880 100644 --- a/sleepyhead/Graphs/gGraphView.cpp +++ b/sleepyhead/Graphs/gGraphView.cpp @@ -161,6 +161,7 @@ void gToolTip::timerDone() { m_visible = false; m_graphview->redraw(); + m_graphview->resetMouse(); } #ifdef ENABLE_THREADED_DRAWING diff --git a/sleepyhead/Graphs/gGraphView.h b/sleepyhead/Graphs/gGraphView.h index 477f3c75..93716262 100644 --- a/sleepyhead/Graphs/gGraphView.h +++ b/sleepyhead/Graphs/gGraphView.h @@ -383,6 +383,7 @@ class gGraphView inline QPoint currentMousePos() const { return m_mouse; } void dumpInfo(); + void resetMouse() { m_mouse = QPoint(0,0); } // for profiling purposes, a count of lines drawn in a single frame int lines_drawn_this_frame; diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp index 92828a59..a951c393 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp @@ -874,6 +874,7 @@ bool PRS1Import::ParseF0Events() EventList *FL = session->AddEventList(CPAP_FlowLimit, EVL_Event); EventList *VS = session->AddEventList(CPAP_VSnore, EVL_Event); EventList *VS2 = session->AddEventList(CPAP_VSnore2, EVL_Event); + EventList *T1 = session->AddEventList(CPAP_Test1, EVL_Event, 0.1); Code[12] = session->AddEventList(PRS1_0B, EVL_Event); Code[17] = session->AddEventList(PRS1_0E, EVL_Event); @@ -1054,12 +1055,15 @@ bool PRS1Import::ParseF0Events() } if ((event->family == 0) && (event->familyVersion >= 4)) { + data[0] = buffer[pos]; + pos++; } break; case 0x0e: // Unknown + data[0] = ((char *)buffer)[pos++]; data[1] = buffer[pos++]; //(buffer[pos+1] << 8) | buffer[pos]; //data[0]/=10.0; @@ -1074,7 +1078,7 @@ bool PRS1Import::ParseF0Events() //session->AddEvent(new Event(t,CPAP_CSR, data, 2)); break; - case 0x10: // Unknown, Large Leak + case 0x10: // Large Leak data[0] = buffer[pos + 1] << 8 | buffer[pos]; pos += 2; data[1] = buffer[pos++]; diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index d97446ef..71a39d75 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -153,7 +153,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) ChannelID cpapcodes[] = { CPAP_FlowRate, CPAP_MaskPressure, CPAP_Pressure, CPAP_Leak, CPAP_Snore, CPAP_RespRate, CPAP_TidalVolume, CPAP_MinuteVent, CPAP_FLG, CPAP_PTB, CPAP_RespEvent, CPAP_Ti, CPAP_Te, - CPAP_IE, ZEO_SleepStage, POS_Inclination, POS_Orientation + CPAP_IE, ZEO_SleepStage, POS_Inclination, POS_Orientation, CPAP_Test1 }; int cpapsize = sizeof(cpapcodes) / sizeof(ChannelID); @@ -338,6 +338,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) graphlist[schema::channel[CPAP_Snore].code()]->AddLayer(AddCPAP(new gLineChart(CPAP_Snore, COLOR_Snore, true))); graphlist[schema::channel[CPAP_PTB].code()]->AddLayer(AddCPAP(new gLineChart(CPAP_PTB, COLOR_PTB, square))); + graphlist[schema::channel[CPAP_Test1].code()]->AddLayer(AddCPAP(new gLineChart(CPAP_Test1, COLOR_PTB, false))); gLineChart *lc = nullptr; diff --git a/sleepyhead/docs/channels.xml b/sleepyhead/docs/channels.xml index b02f53db..19922600 100644 --- a/sleepyhead/docs/channels.xml +++ b/sleepyhead/docs/channels.xml @@ -11,8 +11,8 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!! - - + + diff --git a/sleepyhead/overview.cpp b/sleepyhead/overview.cpp index 871d204f..308f9641 100644 --- a/sleepyhead/overview.cpp +++ b/sleepyhead/overview.cpp @@ -135,7 +135,8 @@ Overview::Overview(QWidget *parent, gGraphView *shared) : SET = createGraph("Settings", STR_TR_Settings, STR_TR_Settings); LK = createGraph("Leaks", STR_TR_Leaks, STR_TR_UnintentionalLeaks + "\n(" + STR_UNIT_LPM + ")"); TOTLK = createGraph("TotalLeaks", STR_TR_TotalLeaks, STR_TR_TotalLeaks + "\n(" + STR_UNIT_LPM + ")"); - NPB = createGraph("TimeInPB", tr("% in PB"), tr("Periodic\nBreathing\n(% of night)")); + NPB = createGraph("TimeInPB", tr("% in %1").arg(schema::channel[CPAP_CSR].label()), tr("%1\n(% of night)").arg(schema::channel[CPAP_LargeLeak].description())); + NLL = createGraph("TimeInLL", tr("% in %1").arg(schema::channel[CPAP_LargeLeak].label()), tr("Large Leaks\n(% of night)")); if (ahicode == CPAP_RDI) { AHIHR = createGraph(STR_GRAPH_PeakAHI, tr("Peak RDI"), tr("Peak RDI\nShows RDI Clusters\n(RDI/hr)")); @@ -296,7 +297,10 @@ Overview::Overview(QWidget *parent, gGraphView *shared) : TOTLK->AddLayer(totlk); NPB->AddLayer(npb = new SummaryChart(tr("% PB"), GT_POINTS)); - npb->addSlice(CPAP_CSR, COLOR_DarkGreen, ST_SPH); + npb->addSlice(CPAP_CSR, schema::channel[CPAP_CSR].defaultColor(), ST_SPH); + + NLL->AddLayer(nll = new SummaryChart(tr("% %1").arg(schema::channel[CPAP_LargeLeak].fullname()), GT_POINTS)); + nll->addSlice(CPAP_LargeLeak, schema::channel[CPAP_LargeLeak].defaultColor(), ST_SPH); // <--- The code to the previous marker is crap GraphView->LoadSettings("Overview"); //no trans diff --git a/sleepyhead/overview.h b/sleepyhead/overview.h index 1fba1082..f30ea517 100644 --- a/sleepyhead/overview.h +++ b/sleepyhead/overview.h @@ -63,12 +63,12 @@ class Overview : public QWidget \param QString name The title of the graph \param QString units The units of measurements to show in the popup */ gGraph *createGraph(QString code, QString name, QString units = "", YTickerType yttype = YT_Number); - gGraph *AHI, *AHIHR, *UC, *FL, *SA, *US, *PR, *LK, *NPB, *SET, *SES, *RR, *MV, *TV, *PTB, *PULSE, *SPO2, + gGraph *AHI, *AHIHR, *UC, *FL, *SA, *US, *PR, *LK, *NPB, *SET, *SES, *RR, *MV, *TV, *PTB, *PULSE, *SPO2, *NLL, // gGraph *AHI, *AHIHR, *UC, *FL, *US, *PR, *LK, *NPB, *SET, *SES, *RR, *MV, *TV, *PTB, *PULSE, *SPO2, *WEIGHT, *ZOMBIE, *BMI, *TGMV, *TOTLK; SummaryChart *bc, *uc, *fl, *sa, *us, *pr, *lk, *npb, *set, *ses, *rr, *mv, *tv, *ptb, *pulse, *spo2, // SummaryChart *bc, *uc, *fl, *us, *pr, *lk, *npb, *set, *ses, *rr, *mv, *tv, *ptb, *pulse, *spo2, - *weight, *zombie, *bmi, *ahihr, *tgmv, *totlk; + *weight, *zombie, *bmi, *ahihr, *tgmv, *totlk, *nll; //! \breif List of SummaryCharts shown on the overview page QVector OverviewCharts;