From ad43791fc799b39abc6a70dcb156aaac7083be99 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 16 May 2014 07:48:53 +1000 Subject: [PATCH] Added upper and lower threshold capabilities --- sleepyhead/Graphs/gLineChart.cpp | 28 ++++++++++++++++++---------- sleepyhead/Graphs/gLineChart.h | 6 ------ sleepyhead/SleepLib/profiles.cpp | 4 ++-- sleepyhead/SleepLib/schema.cpp | 6 +++++- sleepyhead/SleepLib/schema.h | 19 ++++++++++++++++++- sleepyhead/daily.cpp | 15 ++++++++++----- sleepyhead/daily.h | 2 ++ sleepyhead/statistics.cpp | 19 ++++++++++++++++++- sleepyhead/statistics.h | 2 +- 9 files changed, 74 insertions(+), 27 deletions(-) diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp index fddf80c4..ecb5ccb5 100644 --- a/sleepyhead/Graphs/gLineChart.cpp +++ b/sleepyhead/Graphs/gLineChart.cpp @@ -29,7 +29,6 @@ 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() { @@ -253,18 +252,27 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion ®ion) painter.setClipping(true); painter.setRenderHint(QPainter::Antialiasing, true); - if (m_threshold > 0) { - m_threshold_color.setAlpha(80); - 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]; + schema::Channel &chan = schema::channel[code]; + + if (chan.upperThreshold() > 0) { + QColor color = chan.upperThresholdColor(); + color.setAlpha(100); + painter.setPen(color); + + EventDataType y=top + height + 1 - ((chan.upperThreshold() - miny) * ymult); + painter.drawLine(left + 1, y, left + 1 + width, y); + } + if (chan.lowerThreshold() > 0) { + QColor color = chan.lowerThresholdColor(); + color.setAlpha(100); + painter.setPen(color); + + EventDataType y=top + height + 1 - ((chan.lowerThreshold() - miny) * ymult); + painter.drawLine(left+1, y, left + 1 + width, y); + } lines.clear(); diff --git a/sleepyhead/Graphs/gLineChart.h b/sleepyhead/Graphs/gLineChart.h index 3cceb2a3..96d1d39d 100644 --- a/sleepyhead/Graphs/gLineChart.h +++ b/sleepyhead/Graphs/gLineChart.h @@ -78,9 +78,6 @@ 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; @@ -101,9 +98,6 @@ class gLineChart: public Layer QHash m_enabled; QVector lines; - - float m_threshold; - QColor m_threshold_color; }; #endif // GLINECHART_H diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp index 77299bab..2cef0cd2 100644 --- a/sleepyhead/SleepLib/profiles.cpp +++ b/sleepyhead/SleepLib/profiles.cpp @@ -776,7 +776,7 @@ EventDataType Profile::calcAboveThreshold(ChannelID code, EventDataType threshol return 0; } - double val = 0; + EventDataType val = 0; do { Day *day = GetGoodDay(date, mt); @@ -808,7 +808,7 @@ EventDataType Profile::calcBelowThreshold(ChannelID code, EventDataType threshol return 0; } - double val = 0; + EventDataType val = 0; do { Day *day = GetGoodDay(date, mt); diff --git a/sleepyhead/SleepLib/schema.cpp b/sleepyhead/SleepLib/schema.cpp index 806b2ca1..b7360602 100644 --- a/sleepyhead/SleepLib/schema.cpp +++ b/sleepyhead/SleepLib/schema.cpp @@ -486,7 +486,11 @@ Channel::Channel(ChannelID id, ChanType type, ScopeType scope, QString code, QSt m_unit(unit), m_datatype(datatype), m_defaultcolor(color), - m_link(link) + m_link(link), + m_upperThreshold(0), + m_lowerThreshold(0), + m_upperThresholdColor(Qt::red), + m_lowerThresholdColor(Qt::green) { } bool Channel::isNull() diff --git a/sleepyhead/SleepLib/schema.h b/sleepyhead/SleepLib/schema.h index 76af9ae2..f25757cc 100644 --- a/sleepyhead/SleepLib/schema.h +++ b/sleepyhead/SleepLib/schema.h @@ -52,7 +52,7 @@ extern Channel EmptyChannel; class Channel { public: - Channel() { m_id = 0; } + Channel() { m_id = 0; m_upperThreshold = 0; m_lowerThreshold = 0;} Channel(ChannelID id, ChanType type, ScopeType scope, QString code, QString fullname, QString description, QString label, QString unit, DataType datatype = DEFAULT, QColor = Qt::black, int link = 0); @@ -66,11 +66,23 @@ class Channel const QString &description() { return m_description; } const QString &label() { return m_label; } const QString &units() { return m_unit; } + + inline const EventDataType &upperThreshold() { return m_upperThreshold; } + inline const EventDataType &lowerThreshold() { return m_lowerThreshold; } + inline QColor &upperThresholdColor() { return m_upperThresholdColor; } + inline QColor &lowerThresholdColor() { return m_lowerThresholdColor; } + const int &linkid() { return m_link; } + void setLabel(QString label) { m_label = label; } void setUnit(QString unit) { m_unit = unit; } void setDescription(QString desc) { m_description = desc; } + void setUpperThreshold(EventDataType value) { m_upperThreshold = value; } + void setUpperThresholdColor(QColor color) { m_upperThresholdColor = color; } + void setLowerThreshold(EventDataType value) { m_lowerThreshold = value; } + void setLowerThresholdColor(QColor color) { m_lowerThresholdColor = color; } + QString option(int i) { if (m_options.contains(i)) { return m_options[i]; @@ -98,6 +110,11 @@ class Channel QColor m_defaultcolor; int m_link; + + EventDataType m_upperThreshold; + EventDataType m_lowerThreshold; + QColor m_upperThresholdColor; + QColor m_lowerThresholdColor; }; /*! \class ChannelList diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index 2d65bced..8f8c28db 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -302,11 +302,11 @@ Daily::Daily(QWidget *parent,gGraphView * shared) // 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); + gLineChart *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()); + schema::channel[CPAP_Leak].setUpperThresholdColor(Qt::red); + schema::channel[CPAP_Leak].setLowerThresholdColor(Qt::green); graphlist[schema::channel[CPAP_Leak].label()]->AddLayer(AddCPAP(leakchart)); //LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak, COLOR_Leak,square))); @@ -427,6 +427,11 @@ Daily::~Daily() delete icon_off; } +void Daily::showEvent(QShowEvent *) +{ + RedrawGraphs(); +} + void Daily::closeEvent(QCloseEvent *event) { disconnect(webView,SIGNAL(linkClicked(QUrl)),this,SLOT(Link_clicked(QUrl))); @@ -1777,9 +1782,9 @@ void Daily::RedrawGraphs() { // setting this here, because it needs to be done when preferences change if (PROFILE.cpap->showLeakRedline()) { - leakchart->setThreshold(PROFILE.cpap->leakRedline()); + schema::channel[CPAP_Leak].setUpperThreshold(PROFILE.cpap->leakRedline()); } else { - leakchart->setThreshold(0); // switch it off + schema::channel[CPAP_Leak].setUpperThreshold(0); // switch it off } GraphView->redraw(); diff --git a/sleepyhead/daily.h b/sleepyhead/daily.h index c40ccfa3..bc384a73 100644 --- a/sleepyhead/daily.h +++ b/sleepyhead/daily.h @@ -80,6 +80,8 @@ public: explicit Daily(QWidget *parent, gGraphView *shared); ~Daily(); void closeEvent(QCloseEvent *); + void showEvent(QShowEvent *); + /*! \fn ReloadGraphs() \brief Reload all graph information from disk and updates the view. diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp index 4bf0fd66..d8c4d4a5 100644 --- a/sleepyhead/statistics.cpp +++ b/sleepyhead/statistics.cpp @@ -51,6 +51,7 @@ Statistics::Statistics(QObject *parent) : rows.push_back(StatisticsRow(tr("Leak Statistics"), SC_SUBHEADING, MT_CPAP)); rows.push_back(StatisticsRow("Leak", SC_WAVG, MT_CPAP)); rows.push_back(StatisticsRow("Leak", SC_90P, MT_CPAP)); + rows.push_back(StatisticsRow("Leak", SC_ABOVE, MT_CPAP)); rows.push_back(StatisticsRow(tr("Pressure Statistics"), SC_SUBHEADING, MT_CPAP)); rows.push_back(StatisticsRow("Pressure", SC_WAVG, MT_CPAP)); @@ -90,6 +91,8 @@ Statistics::Statistics(QObject *parent) : calcnames[SC_MAX] = tr("Max %1"); calcnames[SC_CPH] = tr("%1 Index"); calcnames[SC_SPH] = tr("% of time in %1"); + calcnames[SC_ABOVE] = tr("% of time above %1 threshold"); + calcnames[SC_BELOW] = tr("% of time below %1 threshold"); machinenames[MT_UNKNOWN] = STR_TR_Unknown; machinenames[MT_CPAP] = STR_TR_CPAP; @@ -609,6 +612,12 @@ QString Statistics::GenerateHTML() name = ahitxt; } else if ((row.calc == SC_HOURS) || (row.calc == SC_COMPLIANCE)) { name = row.src; + } else if ((row.calc == SC_ABOVE) || (row.calc == SC_BELOW)) { + ChannelID id = schema::channel[row.src].id(); + if ((id == NoChannel) || (!PROFILE.hasChannel(id))) { + continue; + } + name = calcnames[row.calc].arg(schema::channel[id].fullname()); //.arg(tr("threshold")); } else if (row.calc == SC_COLUMNHEADERS) { html += QString("%1\n").arg(tr("Details")); for (int j=0; j < periods.size(); j++) { @@ -1267,7 +1276,15 @@ QString StatisticsRow::value(QDate start, QDate end) value = QString("%1%").arg(100.0 / p_profile->calcHours(type, start, end) * p_profile->calcSum(code, type, start, end) / 3600.0, 0, 'f', decimals); - + break; + case SC_ABOVE: + value = QString("%1%").arg(100.0 / p_profile->calcHours(type, start, end) + * (p_profile->calcAboveThreshold(code, schema::channel[code].upperThreshold(), type, start, end) / 60.0), 0, 'f', decimals); + break; + case SC_BELOW: + value = QString("%1%").arg(100.0 / p_profile->calcHours(type, start, end) + * (p_profile->calcBelowThreshold(code, schema::channel[code].lowerThreshold(), type, start, end) / 60.0), 0, 'f', decimals); + break; default: break; }; diff --git a/sleepyhead/statistics.h b/sleepyhead/statistics.h index 0e70472b..b333de02 100644 --- a/sleepyhead/statistics.h +++ b/sleepyhead/statistics.h @@ -18,7 +18,7 @@ #include "SleepLib/schema.h" enum StatCalcType { - SC_UNDEFINED=0, SC_COLUMNHEADERS, SC_HEADING, SC_SUBHEADING, SC_MEDIAN, SC_AVG, SC_WAVG, SC_90P, SC_MIN, SC_MAX, SC_CPH, SC_SPH, SC_AHI, SC_HOURS, SC_COMPLIANCE, SC_DAYS + SC_UNDEFINED=0, SC_COLUMNHEADERS, SC_HEADING, SC_SUBHEADING, SC_MEDIAN, SC_AVG, SC_WAVG, SC_90P, SC_MIN, SC_MAX, SC_CPH, SC_SPH, SC_AHI, SC_HOURS, SC_COMPLIANCE, SC_DAYS, SC_ABOVE, SC_BELOW }; struct StatisticsRow {