From 639588a26142a36905f343352bea43d193b09f4e Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 6 Aug 2014 11:25:11 +1000 Subject: [PATCH] Show labels over top/bottom event markers --- sleepyhead/Graphs/gLineChart.cpp | 12 +++--- sleepyhead/Graphs/gLineOverlay.cpp | 60 ++++++++++++++++++------------ sleepyhead/docs/release_notes.html | 5 ++- sleepyhead/welcome.cpp | 2 +- 4 files changed, 48 insertions(+), 31 deletions(-) diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp index 68cf70c7..6859fd1f 100644 --- a/sleepyhead/Graphs/gLineChart.cpp +++ b/sleepyhead/Graphs/gLineChart.cpp @@ -859,12 +859,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion ®ion) legendx -= bw*2; } } - if (m_day && (p_profile->appearance->lineCursorMode() || (m_codes[0]==CPAP_FlowRate))) { - QHash::iterator fit; - for (fit = flags.begin(); fit != flags.end(); ++fit) { - fit.value()->paint(painter, w, region); - } - } if (!total_points) { // No Data? @@ -877,5 +871,11 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion ®ion) } } painter.setClipping(false); + if (m_day && (p_profile->appearance->lineCursorMode() || (m_codes[0]==CPAP_FlowRate))) { + QHash::iterator fit; + for (fit = flags.begin(); fit != flags.end(); ++fit) { + fit.value()->paint(painter, w, region); + } + } painter.setRenderHint(QPainter::Antialiasing, false); } diff --git a/sleepyhead/Graphs/gLineOverlay.cpp b/sleepyhead/Graphs/gLineOverlay.cpp index e1b41f5a..e13d7102 100644 --- a/sleepyhead/Graphs/gLineOverlay.cpp +++ b/sleepyhead/Graphs/gLineOverlay.cpp @@ -178,17 +178,17 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) m_count++; m_sum += raw; - if ((odt == ODT_Bars) || (xx < 3600000)) { +// if ((odt == ODT_Bars) || (xx < 3600000)) { // show the fat dots in the middle painter.setPen(QPen(m_flag_color,4)); painter.drawPoint(x1, double(height) / double(yy)*double(-20 - w.min_y) + topp); painter.setPen(QPen(m_flag_color,1)); - } else { - // thin lines down the bottom - painter.drawLine(x1, start_py + 1, x1, start_py + 1 + 12); - } +// } else { +// // thin lines down the bottom +// painter.drawLine(x1, start_py + 1, x1, start_py + 1 + 12); +// } } } else if (m_flt == FT_Bar) { //////////////////////////////////////////////////////////////////////////// @@ -203,19 +203,19 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) break; } - x1 = jj * double(X - w.min_x) + left; + x1 = jj * (double(X) - double(w.min_x)) + left; m_count++; m_sum += raw; int z = start_py + height; + double d1 = jj * double(raw) * 1000.0; - if ((odt == ODT_Bars) || (xx < 3600000)) { - z = top; - double d1 = jj * double(raw) * 1000.0; + if ((odt == ODT_Bars)) { // || (xx < 3600000)) { QRect rect(x1-d1-2, top, d1+2, height); QColor col = m_flag_color; + painter.setPen(QPen(col,4)); painter.drawPoint(x1, top); @@ -239,26 +239,40 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) painter.setPen(QPen(col,1)); painter.drawLine(x1, top, x1, bottom); } + QColor txcol = hover ? Qt::red: Qt::black; + + if (xx < 300000) { + QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(raw); + GetTextExtent(lab, x, y); + w.renderText(lab, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol); + } else if (xx < (3600000)) { + if (!hover) { + GetTextExtent(m_label, x, y); + w.renderText(m_label, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol); + } else { + QString lab = QString("%1 (%2)").arg(m_label).arg(raw); + GetTextExtent(lab, x, y); + w.renderText(lab, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol); + } + } } else { - painter.drawLine(x1, z, x1, z - 12); - } + QRect rect(x1-d1-2, topp, d1+6, height); - QColor txcol = hover ? Qt::red: Qt::black; - if (xx < 300000) { - QString lab = QString("%1 (%2)").arg(schema::channel[m_code].fullname()).arg(raw); - GetTextExtent(lab, x, y); - w.renderText(lab, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol); - } else if (xx < (3600000)) { - if (!hover) { - GetTextExtent(m_label, x, y); - w.renderText(m_label, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol); - } else { - QString lab = QString("%1 (%2)").arg(m_label).arg(raw); + if (rect.contains(mouse)) { + painter.setPen(QPen(m_flag_color,4)); + + QString lab = QString("%1 (%2)").arg(schema::channel[m_code].label()).arg(raw); GetTextExtent(lab, x, y); - w.renderText(lab, x1 - (x / 2)+2, top - y + (3 * w.printScaleY()),0,txcol); + w.renderText(lab, x1 - (x / 2)+2, start_py + 14 + y + (3 * w.printScaleY()),0); + x1-=1; + } else { + painter.setPen(QPen(m_flag_color,1)); } + + painter.drawLine(x1, z, x1, z - 12); + painter.drawLine(x1, start_py+2, x1, start_py + 14); } } } diff --git a/sleepyhead/docs/release_notes.html b/sleepyhead/docs/release_notes.html index a6b4e047..a7dde677 100644 --- a/sleepyhead/docs/release_notes.html +++ b/sleepyhead/docs/release_notes.html @@ -10,9 +10,12 @@
New features & bug fixes in v0.9.7
+
  • New Feature: Large Leak flagging where not present, using redline threshold
    • +
  • New Feature: Can switch off individual daily view linechart event overlays in a combo box down the bottom left
    • +
  • New Feature: Events are now visible on all daily charts in line cursor mode
  • Fix an issue that caused some burried PRS1 session data to not be imported
  • Fix a lot of pressure and pressure relief strings
    • -
  • New Feature: Added basic Weinmann SOMNOsoft2 Import importer
    • +
  • New Feature: Added (very experimental)Weinmann SOMNOsoft2 Import importer
  • Fixed inverted CMS50 .spoR file pulse and spo2
  • Added CMS50i .spo2 file import support
  • New Feature: Added a Welcome page to make things a little friendlier
    • diff --git a/sleepyhead/welcome.cpp b/sleepyhead/welcome.cpp index ca161355..8d909222 100644 --- a/sleepyhead/welcome.cpp +++ b/sleepyhead/welcome.cpp @@ -161,7 +161,7 @@ QString GenerateWelcomeHTML() else if (ahi < 10) ahitext = QString("")+QObject::tr("not very good")+""; else ahitext = QString("")+QObject::tr("horrible, please consult your doctor")+""; - html += QObject::tr("Your had an AHI of %1, which is considered %2").arg(ahi,0,'f',2).arg(ahitext)+"
    "; + html += QObject::tr("You had an AHI of %1, which is considered %2").arg(ahi,0,'f',2).arg(ahitext)+"
    "; int seconds = int(hours * 3600.0) % 60; int minutes = int(hours * 60) % 60;