From af97cac3840897d122da088cfcb609b90be4f9f4 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Wed, 28 Dec 2011 00:27:26 +1000
Subject: [PATCH] Fix 2D Line plots mucking up with small amounts of data

---
 Graphs/gLineChart.cpp   | 22 ++++++++++++++++------
 Graphs/gLineOverlay.cpp |  3 ++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp
index 0631acb4..d2dd0f62 100644
--- a/Graphs/gLineChart.cpp
+++ b/Graphs/gLineChart.cpp
@@ -439,7 +439,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
     //////////////////////////////////////////////////////////////////
                     first=true;
                     double start=el.first();
-                    if (siz==2) {
+                    /*if (siz==2) {
                         time=start+tim[0];
                         data=dat[0]*gain;
                         data-=subtract_offset;
@@ -454,7 +454,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                         if (px>xst+width) px=xst+width;
 
                         lines->add(lastpx,lastpy,px,py,m_line_color);
-                    } else
+                    } else*/
                     for (int i=0;i<siz;i++) {
 
                         time=start+tim[i];
@@ -477,10 +477,20 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                         if (firstpx) {
                             firstpx=false;
                         } else {
-                            if (square_plot) {
-                                lines->add(lastpx,lastpy,px,lastpy,px,lastpy,px,py,m_line_color);
+                            if (py==lastpy) {
+                                if (lastpx<xst) lastpx=xst;
+                                if (px>xst+width) px=xst+width;
+                                if (square_plot) {
+                                    lines->add(lastpx,lastpy,px,lastpy,px,lastpy,px,py,m_line_color);
+                                } else {
+                                    lines->add(lastpx,lastpy,px,py,m_line_color);
+                                }
                             } else {
-                                lines->add(lastpx,lastpy,px,py,m_line_color);
+                                if (square_plot) {
+                                    lines->add(lastpx,lastpy,px,lastpy,px,lastpy,px,py,m_line_color);
+                                } else {
+                                    lines->add(lastpx,lastpy,px,py,m_line_color);
+                                }
                             }
 
                             //lines->add(px,py,m_line_color);
@@ -494,7 +504,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                         lastpy=py;
                         //if (lastpx>start_px+width) done=true;
                         if (time > maxx) {
-                            //done=true; // Let this iteration finish.. (This point will be in far clipping)
+                            done=true; // Let this iteration finish.. (This point will be in far clipping)
                             break;
                         }
                     }
diff --git a/Graphs/gLineOverlay.cpp b/Graphs/gLineOverlay.cpp
index 79d9f201..84091f88 100644
--- a/Graphs/gLineOverlay.cpp
+++ b/Graphs/gLineOverlay.cpp
@@ -194,7 +194,8 @@ void gLineOverlaySummary::paint(gGraph & w,int left, int top, int width, int hei
     if (time>0) val=cnt/time;
 
 
-    QString a="Event Count="+QString::number(cnt)+" Selection Time="+QString().sprintf("%02i:%02i:%02i",h,m,s)+" "+m_text+"="+QString::number(val,'f',2);
+
+    QString a=QString::number(cnt)+" Events, Duration="+QString().sprintf("%02i:%02i:%02i",h,m,s)+", "+m_text+"="+QString::number(val,'f',2);
 
     if (isSpan) {
         float sph;