From 926d5af10ebdfed874dcf4f6f5a1632362aedb85 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 20 Jul 2014 14:22:33 +1000 Subject: [PATCH] Highlight flow graph overlay durations on hover --- sleepyhead/Graphs/gGraphView.h | 2 + sleepyhead/Graphs/gLineOverlay.cpp | 75 ++++++++++++++++++++++++++---- sleepyhead/Graphs/gLineOverlay.h | 3 ++ sleepyhead/Graphs/layer.h | 1 + 4 files changed, 71 insertions(+), 10 deletions(-) diff --git a/sleepyhead/Graphs/gGraphView.h b/sleepyhead/Graphs/gGraphView.h index 32df1b63..9d094fea 100644 --- a/sleepyhead/Graphs/gGraphView.h +++ b/sleepyhead/Graphs/gGraphView.h @@ -375,6 +375,8 @@ class gGraphView //! \brief Used internally by graph mousehandler to set modifier state void setMetaSelect(bool b) { m_metaselect = b; } + inline QPoint currentMousePos() const { return m_mouse; } + // for profiling purposes, a count of lines drawn in a single frame int lines_drawn_this_frame; int quads_drawn_this_frame; diff --git a/sleepyhead/Graphs/gLineOverlay.cpp b/sleepyhead/Graphs/gLineOverlay.cpp index 28818b3f..72de500e 100644 --- a/sleepyhead/Graphs/gLineOverlay.cpp +++ b/sleepyhead/Graphs/gLineOverlay.cpp @@ -36,6 +36,8 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) double xx = w.max_x - w.min_x; double yy = w.max_y - w.min_y; + double jj = double(width) / double(xx); + if (xx <= 0) { return; } @@ -48,6 +50,8 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) double X; double Y; + QPoint mouse=w.graphView()->currentMousePos(); + m_count = 0; m_sum = 0; m_flag_color = schema::channel[m_code].defaultColor(); @@ -71,6 +75,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) qint64 clockdrift = qint64(p_profile->cpap->clockDrift()) * 1000L; qint64 drift = 0; + bool hover = false; // For each session, process it's eventlist for (QList::iterator s = m_day->begin(); s != m_day->end(); s++) { @@ -114,6 +119,8 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) // FT_Span //////////////////////////////////////////////////////////////////////////// for (; dptr < eptr; dptr++) { + hover = false; + X = stime + *tptr++; raw = *dptr; Y = X - (qint64(raw) * 1000.0L); // duration @@ -122,10 +129,10 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) break; } - x1 = double(width) / double(xx) * double(X - w.min_x) + left; + x1 = jj * double(X - w.min_x) + left; m_count++; m_sum += raw; - x2 = double(width) / double(xx) * double(Y - w.min_x) + left; + x2 = jj * double(Y - w.min_x) + left; if (int(x1) == int(x2)) { x2 += 1; @@ -138,14 +145,22 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) if (x1 > width + left) { x1 = width + left; } + QRect rect(x2, start_py, x1-x2, height); + QColor col = m_flag_color; + if (rect.contains(mouse)) { + col = QColor("gold"); + hover = true; + } - painter.fillRect(x2, start_py, x1-x2, height, QBrush(m_flag_color)); + painter.fillRect(rect, QBrush(col)); } } else if (m_flt == FT_Dot) { //////////////////////////////////////////////////////////////////////////// // FT_Dot //////////////////////////////////////////////////////////////////////////// for (; dptr < eptr; dptr++) { + hover = false; + X = stime + *tptr++; //el.time(i); raw = *dptr; //el.data(i); @@ -153,7 +168,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) break; } - x1 = double(width) / double(xx) * double(X - w.min_x) + left; + x1 = jj * double(X - w.min_x) + left; m_count++; m_sum += raw; @@ -174,6 +189,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) // FT_Bar //////////////////////////////////////////////////////////////////////////// for (; dptr < eptr; dptr++) { + hover = false; X = stime + *tptr++; raw = *dptr; @@ -181,26 +197,57 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) break; } - x1 = double(width) / double(xx) * double(X - w.min_x) + left; + x1 = jj * double(X - w.min_x) + left; m_count++; m_sum += raw; int z = start_py + height; + if ((odt == ODT_Bars) || (xx < 3600000)) { z = top; + double d1 = jj * double(raw) * 1000.0; - painter.setPen(QPen(m_flag_color,4)); + QRect rect(x1-d1-2, top, d1+2, height); + QColor col = m_flag_color; + + painter.setPen(QPen(col,4)); painter.drawPoint(x1, top); - painter.setPen(QPen(m_flag_color,1)); - painter.drawLine(x1, top, x1, bottom); + + if (rect.contains(mouse)) { + QColor col2(230,230,230,128); + QRect rect(x1-d1, start_py+2, d1, height-2); + if (rect.x() < left) { + rect.setX(left); + } + + painter.fillRect(rect, QBrush(col2)); + painter.setPen(col); + painter.drawRect(rect); +// painter.drawLine(rect.x(), top, rect.x()+d1, top); +// painter.drawLine(rect.x(), bottom, rect.x()+d1, bottom); +// painter.drawLine(rect.x(), top, rect.x(), bottom); + + // col = QColor("gold"); + hover = true; + } else { + painter.setPen(QPen(col,1)); + painter.drawLine(x1, top, x1, bottom); + } + } else { painter.drawLine(x1, z, x1, z - 12); } if (xx < (1800000)) { - GetTextExtent(m_label, x, y); - w.renderText(m_label, x1 - (x / 2), top - y + (3 * w.printScaleY())); + if (!hover) { + GetTextExtent(m_label, x, y); + w.renderText(m_label, x1 - (x / 2)+2, top - y + (3 * w.printScaleY())); + } 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,Qt::red); + } } } } @@ -209,6 +256,14 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion ®ion) } } +bool gLineOverlayBar::mouseMoveEvent(QMouseEvent *event, gGraph *graph) +{ + Q_UNUSED(event) + graph->timedRedraw(0); + return true; +} + + gLineOverlaySummary::gLineOverlaySummary(QString text, int x, int y) : Layer(CPAP_Obstructive), m_text(text), m_x(x), m_y(y) // The Layer code is a dummy here. diff --git a/sleepyhead/Graphs/gLineOverlay.h b/sleepyhead/Graphs/gLineOverlay.h index a51cc413..ace85bd4 100644 --- a/sleepyhead/Graphs/gLineOverlay.h +++ b/sleepyhead/Graphs/gLineOverlay.h @@ -39,6 +39,9 @@ class gLineOverlayBar: public Layer double sum() { return m_sum; } FlagType flagtype() { return m_flt; } protected: + //! \brief Mouse moved over this layers area (shows the hover-over tooltips here) + virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph); + QColor m_flag_color; QString m_label; FlagType m_flt; diff --git a/sleepyhead/Graphs/layer.h b/sleepyhead/Graphs/layer.h index 1b8df503..6466e129 100644 --- a/sleepyhead/Graphs/layer.h +++ b/sleepyhead/Graphs/layer.h @@ -163,6 +163,7 @@ class Layer short m_order; // order for positioning.. LayerPosition m_position; QRect m_rect; + bool m_mouseover; // //! \brief A vector containing all this layers custom drawing buffers // QVector mgl_buffers;