From 35138b116523f47b58d7b97cb0829978b6f107ca Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 8 Mar 2016 01:45:28 +1000
Subject: [PATCH] Quick and dirty TAP yAxis labels

---
 sleepyhead/Graphs/MinutesAtPressure.cpp | 28 +++++++++++++++++++++----
 sleepyhead/daily.cpp                    |  2 +-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/sleepyhead/Graphs/MinutesAtPressure.cpp b/sleepyhead/Graphs/MinutesAtPressure.cpp
index f0cb9d65..ba385bed 100644
--- a/sleepyhead/Graphs/MinutesAtPressure.cpp
+++ b/sleepyhead/Graphs/MinutesAtPressure.cpp
@@ -179,7 +179,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
     int tot = max - min;
     float xstep = float(width) / float(tot);
     height -= 2;
-    float peak = float(qMax(ipap.peaktime, epap.peaktime));
+    float peak = ceil((float(qMax(ipap.peaktime, epap.peaktime))/600.0))*600.0;
 
     m_miny = m_physminy = 0;
     m_maxy = m_physmaxy = peak;
@@ -187,7 +187,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
     float ystep = float(height) / peak;
 
     int p0, p1, p2, p3;
-
+    QString label;
     if (ipap.min_pressure > 0) {
         float xp,yp;
 
@@ -196,15 +196,35 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
         xp = left;// /2.0;
         int w, h;
         for (int i = 0; i<=20; ++i) {
-            yp = bottom;
+            yp = bottom+1;
             painter.drawLine(xp, yp, xp, yp+6);
+            if (i>0) { // skip the first mid tick
+                painter.drawLine(xp-pstep/2, yp, xp-pstep/2, yp+4);
+            }
 
-            QString label = QString("%1").arg(i+4);
+            label = QString("%1").arg(i+4);
             GetTextExtent(label, w, h);
             graph.renderText(label, xp-w/2, yp+h+4);
             xp+= pstep;
         }
 
+        double bot = bottom+1;
+        double r = double(height+3) / (peak/600.0);
+        yp = bot;
+        for (float f=0.0; f<=peak/60.0; f+=10.0) {
+            painter.setPen(Qt::black);
+
+            painter.drawLine(left, bot, left-4, bot);
+            painter.setPen(QColor(128,128,128,64));
+            painter.drawLine(left, bot, left+width, bot);
+
+
+            label = QString("%1").arg(f);
+            GetTextExtent(label, w, h);
+            graph.renderText(label, left-8-w,  bot+h/2-2 );
+            bot -= r;
+        }
+
         xstep /= 5.0;
         painter.setPen(Qt::red);
 
diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp
index fda32039..6d2fba57 100644
--- a/sleepyhead/daily.cpp
+++ b/sleepyhead/daily.cpp
@@ -272,7 +272,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     graphlist[STR_GRAPH_TAP] = TAP2 = new gGraph(STR_GRAPH_TAP, GraphView, QObject::tr("Time at Pressure"), QObject::tr("Time at Pressure"), default_height);
     MinutesAtPressure * map;
     TAP2->AddLayer(map = new MinutesAtPressure());
-    TAP2->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
+    TAP2->AddLayer(new gLabelArea(map),LayerLeft,gYAxis::Margin);
     TAP2->AddLayer(new gXAxisPressure(),LayerBottom,gXAxisPressure::Margin);
     TAP2->setBlockSelect(true);