From f299a80c7b82f773b946e824c0b2d4974ff0bab7 Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Thu, 30 Sep 2010 08:12:54 +0000
Subject: [PATCH] added two glgeterror for cleaning the error stack after qt
 render text

---
 wrap/gui/coordinateframe.cpp | 2 +-
 wrap/gui/rubberband.cpp      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wrap/gui/coordinateframe.cpp b/wrap/gui/coordinateframe.cpp
index 375a8d83..674ee635 100644
--- a/wrap/gui/coordinateframe.cpp
+++ b/wrap/gui/coordinateframe.cpp
@@ -153,7 +153,7 @@ void CoordinateFrame::Render(QGLWidget* glw)
       glw->renderText(0,0,-i,QString("-%1").arg(i,3,'f',1),font);
     }
   }
-  
+  glGetError(); // Patch to buggy qt rendertext;
   glPopAttrib();
   assert(!glGetError());  
 }
diff --git a/wrap/gui/rubberband.cpp b/wrap/gui/rubberband.cpp
index ed806529..e76bbbaf 100644
--- a/wrap/gui/rubberband.cpp
+++ b/wrap/gui/rubberband.cpp
@@ -39,7 +39,7 @@ Rubberband::Rubberband(Color4b c)
 start(0,0,0),end(0,0,0),have_to_pick(false),font()
 {
   font.setFamily("Helvetica");
-  font.setPixelSize(10);
+  font.setPixelSize(13);
 }
 
 void Rubberband::Render(QGLWidget* gla)
@@ -134,7 +134,7 @@ void Rubberband::Render(QGLWidget* gla)
 
 void Rubberband::Drag(QPoint p)
 {
-  if(currentphase==RUBBER_DRAGGING);
+  if(currentphase==RUBBER_DRAGGING)
     qt_cursor=p;
 }
 
@@ -192,6 +192,7 @@ void Rubberband::RenderLabel(QString text,QGLWidget* gla)
   glPushAttrib(GL_CURRENT_BIT | GL_DEPTH_BUFFER_BIT | GL_ENABLE_BIT | GL_LINE_BIT );
   glDisable(GL_LIGHTING);
   glDisable(GL_TEXTURE_2D);
+  glDisable(GL_DEPTH_TEST);
   glEnable(GL_BLEND);
   glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
 
@@ -219,6 +220,7 @@ void Rubberband::RenderLabel(QString text,QGLWidget* gla)
   glEnd();
   glColor3f(1,1,1);
   gla->renderText(x,y,0.99f,text,font);
+  glGetError();//Due to buggy glrenderText()
   glMatrixMode(GL_PROJECTION);
   glPopMatrix();
   glMatrixMode(GL_MODELVIEW);