From d361a6398f681b27e962da62228a603a270f1ac1 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Wed, 6 Aug 2014 12:08:19 +1000
Subject: [PATCH] Stop event text from being stacked when too close

---
 sleepyhead/Graphs/gLineChart.cpp   |  7 ++++++-
 sleepyhead/Graphs/gLineOverlay.cpp | 25 ++++++++++++++++---------
 sleepyhead/Graphs/gLineOverlay.h   |  5 +++++
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp
index 6859fd1f..bf7aaabc 100644
--- a/sleepyhead/Graphs/gLineChart.cpp
+++ b/sleepyhead/Graphs/gLineChart.cpp
@@ -873,8 +873,13 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
     painter.setClipping(false);
     if (m_day && (p_profile->appearance->lineCursorMode() || (m_codes[0]==CPAP_FlowRate))) {
         QHash<ChannelID, gLineOverlayBar *>::iterator fit;
+        bool blockhover = false;
+
         for (fit = flags.begin(); fit != flags.end(); ++fit) {
-            fit.value()->paint(painter, w, region);
+            gLineOverlayBar * lob = fit.value();
+            lob->setBlockHover(blockhover);
+            lob->paint(painter, w, region);
+            if (lob->hover()) blockhover = true; // did it render a hover over?
         }
     }
     painter.setRenderHint(QPainter::Antialiasing, false);
diff --git a/sleepyhead/Graphs/gLineOverlay.cpp b/sleepyhead/Graphs/gLineOverlay.cpp
index e13d7102..a57be838 100644
--- a/sleepyhead/Graphs/gLineOverlay.cpp
+++ b/sleepyhead/Graphs/gLineOverlay.cpp
@@ -16,7 +16,8 @@
 gLineOverlayBar::gLineOverlayBar(ChannelID code, QColor color, QString label, FlagType flt)
     : Layer(code), m_flag_color(color), m_label(label), m_flt(flt), m_odt(ODT_TopAndBottom)
 {
-
+    m_hover = false;
+    m_blockhover = false;
 }
 gLineOverlayBar::~gLineOverlayBar()
 {
@@ -26,9 +27,11 @@ QColor brighten(QColor color);
 
 void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
 {
+    m_hover = false;
     if (!schema::channel[m_code].enabled())
         return;
 
+
     int left = region.boundingRect().left();
     int topp = region.boundingRect().top(); // FIXME: Misspelling intentional.
     int width = region.boundingRect().width();
@@ -258,15 +261,19 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
 
                     } else {
-                        QRect rect(x1-d1-2, topp, d1+6, height);
+                        if (!m_blockhover && QRect(x1-d1-2, topp, d1+6, height).contains(mouse)) {
+                            if (!m_hover) {
+                                m_hover = true;
 
-                        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, start_py + 14 + y + (3 * w.printScaleY()),0);
-                            x1-=1;
+                                QString lab = QString("%1 (%2)").arg(schema::channel[m_code].label()).arg(raw);
+                                GetTextExtent(lab, x, y);
+                                painter.fillRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4, QBrush(QColor(255,255,255,245)));
+                                painter.setPen(QPen(Qt::gray,1));
+                                painter.drawRect(x1 - (x / 2) - x, start_py + 14 + (3 * w.printScaleY()), x+4,y+4);
+                                w.renderText(lab, x1 - (x / 2)+2 - x, start_py + 14 + y + (3 * w.printScaleY()),0);
+                                x1-=1;
+                                painter.setPen(QPen(m_flag_color,4));
+                            }
                         } else {
                             painter.setPen(QPen(m_flag_color,1));
                         }
diff --git a/sleepyhead/Graphs/gLineOverlay.h b/sleepyhead/Graphs/gLineOverlay.h
index 12268613..a9ad2aed 100644
--- a/sleepyhead/Graphs/gLineOverlay.h
+++ b/sleepyhead/Graphs/gLineOverlay.h
@@ -40,6 +40,9 @@ class gLineOverlayBar: public Layer
     int count() { return m_count; }
     double sum() { return m_sum; }
     FlagType flagtype() { return m_flt; }
+    bool hover() { return m_hover; }
+
+    void setBlockHover(bool b) { m_blockhover = b; }
 
     inline void setOverlayDisplayType(OverlayDisplayType odt) { m_odt = odt; }
     inline OverlayDisplayType overlayDisplayType() { return m_odt; }
@@ -53,6 +56,8 @@ class gLineOverlayBar: public Layer
     OverlayDisplayType m_odt;
     int m_count;
     double m_sum;
+    bool m_hover;
+    bool m_blockhover;
 };
 
 /*! \class gLineOverlaySummary