From 5ebc7dc283894efb4f1c3a422f68101a22f98e37 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Wed, 14 May 2014 15:58:47 +1000
Subject: [PATCH] Fix QPainter::drawLines glitch in gLineChart

---
 sleepyhead/Graphs/gLineChart.cpp              | 23 ++++++++++++-------
 .../SleepLib/loader_plugins/resmed_loader.h   | 10 ++++----
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp
index 62a47d3a..f10c7167 100644
--- a/sleepyhead/Graphs/gLineChart.cpp
+++ b/sleepyhead/Graphs/gLineChart.cpp
@@ -522,6 +522,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
                         lastpx = xst + ((time - minx) * xmult);
                         lastpy = yst - ((data - miny) * ymult);
 
+                        siz--;
                         for (int i = idx; i < siz; i += sam) {
                             ptr += sam;
                             time += rate;
@@ -556,6 +557,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
                     int idx = 0;
 
                     if (siz > 15) {
+
                         for (; idx < siz; ++idx) {
                             time = start + *tptr++;
 
@@ -566,7 +568,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
                         if (idx > 0) {
                             idx--;
-                            //tptr--;
                         }
                     }
 
@@ -609,16 +610,16 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
                                 // Cap px to right margin
                                 if (px > xst + width) { px = xst + width; }
 
-                                lines.append(QLine(lastpx, lastpy, px, lastpy));
-                                lines.append(QLine(px, lastpy, px, py));
-                            } else {
+//                                lines.append(QLine(lastpx, lastpy, px, lastpy));
+//                                lines.append(QLine(px, lastpy, px, py));
+                            } // else {
                                 // Letting the scissor do the dirty work for non horizontal lines
                                 // This really should be changed, as it might be cause that weird
                                 // display glitch on Linux..
 
                                 lines.append(QLine(lastpx, lastpy, px, lastpy));
                                 lines.append(QLine(px, lastpy, px, py));
-                            }
+//                            }
 
                             lastpx = px;
                             lastpy = py;
@@ -645,13 +646,13 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
                                 // Cap px to right margin
                                 if (px > xst + width) { px = xst + width; }
 
-                                lines.append(QLine(lastpx, lastpy, px, py));
-                            } else {
+                              //  lines.append(QLine(lastpx, lastpy, px, py));
+                            } //else {
                                 // Letting the scissor do the dirty work for non horizontal lines
                                 // This really should be changed, as it might be cause that weird
                                 // display glitch on Linux..
                                 lines.append(QLine(lastpx, lastpy, px, py));
-                            }
+                            //}
 
                             lastpx = px;
                             lastpy = py;
@@ -662,11 +663,17 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
                             }
                         }
                     }
+                    painter.setPen(QPen(m_colors[gi],p_profile->appearance->lineThickness()));
+                    painter.drawLines(lines);
+                    w.graphView()->lines_drawn_this_frame+=lines.count();
+                    lines.clear();
+
                 }
 
                 if (done) { break; }
             }
         }
+
         painter.setPen(QPen(m_colors[gi],p_profile->appearance->lineThickness()));
         painter.drawLines(lines);
         w.graphView()->lines_drawn_this_frame+=lines.count();
diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.h b/sleepyhead/SleepLib/loader_plugins/resmed_loader.h
index 3cac698c..a5074381 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.h
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.h
@@ -23,7 +23,7 @@
 //********************************************************************************************
 // Please INCREMENT the following value when making changes to this loaders implementation.
 //
-const int resmed_data_version = 6;
+const int resmed_data_version = 7;
 //
 //********************************************************************************************
 
@@ -238,10 +238,10 @@ struct EDFGroup {
         SAD = sad;
     }
     EDFGroup(const EDFGroup & copy) {
-        BRP=copy.BRP;
-        EVE=copy.EVE;
-        PLD=copy.PLD;
-        SAD=copy.SAD;
+        BRP = copy.BRP;
+        EVE = copy.EVE;
+        PLD = copy.PLD;
+        SAD = copy.SAD;
     }
     QString BRP;
     QString EVE;