From b4c324ef985767d2a281b6799c8423d22dc33328 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 19 Jul 2011 20:48:25 +1000
Subject: [PATCH] Barchart corner pixel fix, plus killed the rounded selection
 box

---
 Graphs/gBarChart.cpp    |  5 +++--
 Graphs/gSessionTime.cpp |  4 ++--
 Graphs/graphwindow.cpp  | 15 +++++++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Graphs/gBarChart.cpp b/Graphs/gBarChart.cpp
index aef14383..5ec414bc 100644
--- a/Graphs/gBarChart.cpp
+++ b/Graphs/gBarChart.cpp
@@ -117,10 +117,11 @@ void gBarChart::Plot(gGraphWindow & w,float scrx,float scry)
         glColor4ub(0,0,0,255);
         glLineWidth (1);
         glBegin(GL_LINE_LOOP);
-        glVertex2f(rect.x(), rect.y()+rect.height());
+        glVertex2f(rect.x(), rect.y()+rect.height()+.5);
         glVertex2f(rect.x(), rect.y());
         glVertex2f(rect.x()+rect.width(),rect.y());
-        glVertex2f(rect.x()+rect.width(), rect.y()+rect.height());
+        glVertex2f(rect.x()+rect.width(), rect.y()+rect.height()+.5);
+        //glVertex2f(rect.x(), rect.y()+rect.height());
         glEnd();
 
         if (!draw_xticks_instead) {
diff --git a/Graphs/gSessionTime.cpp b/Graphs/gSessionTime.cpp
index a8e450ca..49baf1cc 100644
--- a/Graphs/gSessionTime.cpp
+++ b/Graphs/gSessionTime.cpp
@@ -122,10 +122,10 @@ void gSessionTime::Plot(gGraphWindow & w,float scrx,float scry)
         glColor4ub(0,0,0,255);
         glLineWidth (1);
         glBegin(GL_LINE_LOOP);
-        glVertex2f(rect.x(), rect.y()+rect.height());
+        glVertex2f(rect.x(), rect.y()+rect.height()+.5);
         glVertex2f(rect.x(), rect.y());
         glVertex2f(rect.x()+rect.width(),rect.y());
-        glVertex2f(rect.x()+rect.width(), rect.y()+rect.height());
+        glVertex2f(rect.x()+rect.width(), rect.y()+rect.height()+.5);
         glEnd();
         if (!draw_xticks_instead) {
             if (datedrawn.find(dy)==datedrawn.end()) {
diff --git a/Graphs/graphwindow.cpp b/Graphs/graphwindow.cpp
index 6b118d32..e964e272 100644
--- a/Graphs/graphwindow.cpp
+++ b/Graphs/graphwindow.cpp
@@ -868,8 +868,19 @@ void gGraphWindow::paintGL()
 
     if (m_mouseLDown) {
         if (m_mouseRBrect.width()>0)
-            //glDisable(GL_DEPTH_TEST);
-            RoundedRectangle(m_mouseRBrect.x(),m_mouseRBrect.y(),m_mouseRBrect.width(),m_mouseRBrect.height(),5,QColor(50,50,200,64));
+            glDisable(GL_DEPTH_TEST);
+            glColor4ub(50,50,200,64);
+            glEnable(GL_BLEND);
+            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+            glBegin(GL_QUADS);
+            glVertex2f(m_mouseRBrect.x(),m_mouseRBrect.y());
+            glVertex2f(m_mouseRBrect.x()+m_mouseRBrect.width(),m_mouseRBrect.y());
+            glVertex2f(m_mouseRBrect.x()+m_mouseRBrect.width(),m_mouseRBrect.y()+m_mouseRBrect.height());
+            glVertex2f(m_mouseRBrect.x(),m_mouseRBrect.y()+m_mouseRBrect.height());
+            glEnd();
+            glDisable(GL_BLEND);
+            //RoundedRectangle(m_mouseRBrect.x(),m_mouseRBrect.y(),m_mouseRBrect.width(),m_mouseRBrect.height(),5,QColor(50,50,200,64));
             //glEnable(GL_DEPTH_TEST);
     }
     glEnable(GL_DEPTH_TEST);