From b4f24c34573c20316e0a893cd6a3e235fd44e402 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 16 May 2014 05:45:46 +1000 Subject: [PATCH] Added Leak Redline threshold display and preference settings --- sleepyhead/Graphs/gGraphView.cpp | 2 +- sleepyhead/Graphs/gLineChart.cpp | 10 +++ sleepyhead/Graphs/gLineChart.h | 6 ++ sleepyhead/Graphs/gYAxis.cpp | 4 +- sleepyhead/SleepLib/profiles.h | 14 +++- sleepyhead/daily.cpp | 21 ++++- sleepyhead/daily.h | 2 + sleepyhead/preferencesdialog.cpp | 6 ++ sleepyhead/preferencesdialog.ui | 133 +++++++++++++++++++------------ 9 files changed, 136 insertions(+), 62 deletions(-) diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp index 698bae50..92a3b007 100644 --- a/sleepyhead/Graphs/gGraphView.cpp +++ b/sleepyhead/Graphs/gGraphView.cpp @@ -314,7 +314,7 @@ void gGraphView::closeEvent(QCloseEvent * event) gGraphView::~gGraphView() { - doneCurrent(); + doneCurrent(); // Fix for QTBUG-35363 #ifdef ENABLE_THREADED_DRAWING diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp index 90684774..0a8d7998 100644 --- a/sleepyhead/Graphs/gLineChart.cpp +++ b/sleepyhead/Graphs/gLineChart.cpp @@ -29,6 +29,7 @@ gLineChart::gLineChart(ChannelID code, QColor col, bool square_plot, bool disabl m_line_color = col; m_report_empty = false; lines.reserve(50000); + m_threshold = 0.0; } gLineChart::~gLineChart() { @@ -252,6 +253,15 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion ®ion) painter.setClipping(true); painter.setRenderHint(QPainter::Antialiasing, true); + if (m_threshold > 0) { + painter.setPen(m_threshold_color); + int xst = left + 1; + int yst = top + height + 1; + + EventDataType y=yst - ((m_threshold - miny) * ymult); + painter.drawLine(xst, y, xst+width, y); + } + for (int gi = 0; gi < m_codes.size(); gi++) { ChannelID code = m_codes[gi]; diff --git a/sleepyhead/Graphs/gLineChart.h b/sleepyhead/Graphs/gLineChart.h index 96d1d39d..3cceb2a3 100644 --- a/sleepyhead/Graphs/gLineChart.h +++ b/sleepyhead/Graphs/gLineChart.h @@ -78,6 +78,9 @@ class gLineChart: public Layer //! \brief Enable or Disable the subplot identified by code. void setPlotEnabled(ChannelID code, bool b) { m_enabled[code] = b; } + void setThreshold(EventDataType value) { m_threshold = value; } + void setThresholdColor(QColor color) { m_threshold_color = color; } + protected: bool m_report_empty; bool m_square_plot; @@ -98,6 +101,9 @@ class gLineChart: public Layer QHash m_enabled; QVector lines; + + float m_threshold; + QColor m_threshold_color; }; #endif // GLINECHART_H diff --git a/sleepyhead/Graphs/gYAxis.cpp b/sleepyhead/Graphs/gYAxis.cpp index 637905ec..15889388 100644 --- a/sleepyhead/Graphs/gYAxis.cpp +++ b/sleepyhead/Graphs/gYAxis.cpp @@ -37,7 +37,7 @@ gXGrid::~gXGrid() void gXGrid::paint(QPainter &painter, gGraph &w, const QRegion ®ion) { int left = region.boundingRect().left(); - int top = region.boundingRect().top(); + int top = region.boundingRect().top()+1; int width = region.boundingRect().width(); int height = region.boundingRect().height(); @@ -161,7 +161,7 @@ gYAxis::~gYAxis() void gYAxis::paint(QPainter &painter, gGraph &w, const QRegion ®ion) { int left = region.boundingRect().left(); - int top = region.boundingRect().top(); + int top = region.boundingRect().top()+1; int width = region.boundingRect().width(); int height = region.boundingRect().height(); diff --git a/sleepyhead/SleepLib/profiles.h b/sleepyhead/SleepLib/profiles.h index b01126a7..416dd3e2 100644 --- a/sleepyhead/SleepLib/profiles.h +++ b/sleepyhead/SleepLib/profiles.h @@ -222,6 +222,8 @@ const QString STR_CS_UserEventDuplicates = "UserEventDuplicates"; const QString STR_CS_AHIWindow = "AHIWindow"; const QString STR_CS_AHIReset = "AHIReset"; const QString STR_CS_ClockDrift = "ClockDrift"; +const QString STR_CS_LeakRedline = "LeakRedline"; +const QString STR_CS_ShowLeakRedline = "ShowLeakRedline"; // ImportSettings Strings const QString STR_IS_DaySplitTime = "DaySplitTime"; @@ -270,15 +272,15 @@ class ProfileSettings : m_profile(profile) { } - void setPref(QString name, QVariant value) { + inline void setPref(QString name, QVariant value) { (*m_profile)[name] = value; } - void initPref(QString name, QVariant value) { + inline void initPref(QString name, QVariant value) { m_profile->init(name, value); } - QVariant getPref(QString name) const { + inline QVariant getPref(QString name) const { return (*m_profile)[name]; } @@ -456,6 +458,8 @@ class CPAPSettings : public ProfileSettings initPref(STR_CS_UserEventFlagging, false); initPref(STR_CS_AHIWindow, 60.0); initPref(STR_CS_AHIReset, false); + initPref(STR_CS_LeakRedline, 24.0); + initPref(STR_CS_ShowLeakRedline, true); initPref(STR_CS_ClockDrift, (int)0); m_clock_drift = getPref(STR_CS_ClockDrift).toInt(); @@ -481,6 +485,8 @@ class CPAPSettings : public ProfileSettings bool AHIReset() const { return getPref(STR_CS_AHIReset).toBool(); } bool userEventFlagging() const { return getPref(STR_CS_UserEventFlagging).toBool(); } int clockDrift() const { return m_clock_drift; } + EventDataType leakRedline() const { return getPref(STR_CS_LeakRedline).toFloat(); } + bool showLeakRedline() const { return getPref(STR_CS_ShowLeakRedline).toBool(); } //Setters void setMode(CPAPMode mode) { setPref(STR_CS_PrescribedMode, (int)mode); } @@ -506,6 +512,8 @@ class CPAPSettings : public ProfileSettings void setClockDrift(int seconds) { setPref(STR_CS_ClockDrift, m_clock_drift = (int)seconds); } + void setLeakRedline(EventDataType value) { setPref(STR_CS_LeakRedline, value); } + void setShowLeakRedline(bool reset) { setPref(STR_CS_ShowLeakRedline, reset); } public: int m_clock_drift; diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index 9b5b3fae..2b71d1e8 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -300,10 +300,15 @@ Daily::Daily(QWidget *parent,gGraphView * shared) AHI->AddLayer(AddCPAP(new gLineChart(CPAP_AHI, COLOR_AHI, square))); } - gLineChart *lc=new gLineChart(CPAP_LeakTotal, COLOR_LeakTotal, square); - lc->addPlot(CPAP_Leak, COLOR_Leak, square); - lc->addPlot(CPAP_MaxLeak, COLOR_MaxLeak, square); - graphlist[schema::channel[CPAP_Leak].label()]->AddLayer(AddCPAP(lc)); + // this is class wide because the leak redline can be reset in preferences.. + // Better way would be having a search for linechart layers in graphlist[...] + leakchart=new gLineChart(CPAP_LeakTotal, COLOR_LeakTotal, square); + leakchart->addPlot(CPAP_Leak, COLOR_Leak, square); + leakchart->addPlot(CPAP_MaxLeak, COLOR_MaxLeak, square); + leakchart->setThresholdColor(Qt::red); + leakchart->setThreshold(PROFILE.cpap->leakRedline()); + + graphlist[schema::channel[CPAP_Leak].label()]->AddLayer(AddCPAP(leakchart)); //LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak, COLOR_Leak,square))); //LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_MaxLeak, COLOR_MaxLeak,square))); graphlist[schema::channel[CPAP_Snore].label()]->AddLayer(AddCPAP(new gLineChart(CPAP_Snore, COLOR_Snore, true))); @@ -311,6 +316,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) graphlist[schema::channel[CPAP_PTB].label()]->AddLayer(AddCPAP(new gLineChart(CPAP_PTB, COLOR_PTB, square))); + gLineChart *lc = nullptr; graphlist[schema::channel[CPAP_MaskPressure].label()]->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure, COLOR_MaskPressure, false))); graphlist[schema::channel[CPAP_RespRate].label()]->AddLayer(AddCPAP(lc=new gLineChart(CPAP_RespRate, COLOR_RespRate, square))); @@ -1760,6 +1766,13 @@ void Daily::UpdateOXIGraphs(Day *day) void Daily::RedrawGraphs() { + // setting this here, because it needs to be done when preferences change + if (PROFILE.cpap->showLeakRedline()) { + leakchart->setThreshold(PROFILE.cpap->leakRedline()); + } else { + leakchart->setThreshold(0); // switch it off + } + GraphView->redraw(); } diff --git a/sleepyhead/daily.h b/sleepyhead/daily.h index 676eb0d8..c40ccfa3 100644 --- a/sleepyhead/daily.h +++ b/sleepyhead/daily.h @@ -343,6 +343,8 @@ private: MyWebView * webView; Day * lastcpapday; + gLineChart *leakchart; + bool ZombieMeterMoved; bool BookmarksChanged; }; diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index 1923d0c7..c529fe26 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -110,6 +110,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : //i=ui->timeZoneCombo->findText((*profile)["TimeZone"].toString()); //ui->timeZoneCombo->setCurrentIndex(i); + ui->showLeakRedline->setChecked(profile->cpap->showLeakRedline()); + ui->leakRedlineSpinbox->setValue(profile->cpap->leakRedline()); + ui->spo2Drop->setValue(profile->oxi->spO2DropPercentage()); ui->spo2DropTime->setValue(profile->oxi->spO2DropDuration()); ui->pulseChange->setValue(profile->oxi->pulseChangeBPM()); @@ -402,6 +405,9 @@ bool PreferencesDialog::Save() profile->cpap->setMaskDescription(ui->maskDescription->text()); profile->appearance->setAnimations(ui->animationsAndTransitionsCheckbox->isChecked()); + profile->cpap->setShowLeakRedline(ui->showLeakRedline->isChecked()); + profile->cpap->setLeakRedline(ui->leakRedlineSpinbox->value()); + profile->cpap->setShowComplianceInfo(ui->complianceGroupbox->isChecked()); profile->cpap->setComplianceHours(ui->complianceHours->value()); diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui index d237c7ac..d6664837 100644 --- a/sleepyhead/preferencesdialog.ui +++ b/sleepyhead/preferencesdialog.ui @@ -51,7 +51,7 @@ - 6 + 1 @@ -643,23 +643,7 @@ p, li { white-space: pre-wrap; } - - - - - 75 - true - - - - Shows Respiratory Disturbance Index instead of Apnea/Hypopnea Index (RDI=AHI + RERA) - - - Use RDI instead of AHI (PRS1 only) - - - - + Don't show any compliance information @@ -734,7 +718,69 @@ p, li { white-space: pre-wrap; } - + + + + + 75 + true + + + + CPAP Clock Drift + + + + + + + + 75 + true + + + + Shows Respiratory Disturbance Index instead of Apnea/Hypopnea Index (RDI=AHI + RERA) + + + Use RDI instead of AHI (PRS1 only) + + + + + + + Don't touch this unless you know your CPAP clock is out. +Try to sync it to your PC's clock (which should be synced to a timeserver) + + + seconds + + + -7200 + + + 7200 + + + 0 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + Enable/disable experimental event flagging enhancements. @@ -870,7 +916,7 @@ p, li { white-space: pre-wrap; } - + AHI/Hour Graph Settings @@ -943,49 +989,32 @@ Defaults to 60 minutes.. Highly recommend it's left at this value. - - - - Qt::Vertical + + + + User definable threshold considered large leak - - - 20 - 40 - + + L/min - + + 1 + + - - + + 75 true - - CPAP Clock Drift - - - - - - Don't touch this unless you know your CPAP clock is out. -Try to sync it to your PC's clock (which should be synced to a timeserver) + Whether to show the leak redline in the leak graph - - seconds - - - -7200 - - - 7200 - - - 0 + + Show Leak Redline