From e8c72221435f61c0448fb5fce6790a7c1b8ff02b Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Wed, 27 Jul 2011 20:11:22 +1000
Subject: [PATCH] Stopped a huge text drawing related memory leak

---
 Graphs/gFlagsLine.cpp   |  2 +-
 Graphs/gLineChart.cpp   |  4 ++--
 Graphs/gLineOverlay.cpp |  2 +-
 Graphs/gTitle.cpp       |  2 +-
 Graphs/gXAxis.cpp       |  4 ++--
 Graphs/gYAxis.cpp       |  2 +-
 Graphs/glcommon.cpp     | 28 ++++++++++++++++------------
 Graphs/glcommon.h       |  2 +-
 8 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/Graphs/gFlagsLine.cpp b/Graphs/gFlagsLine.cpp
index 876acef1..b62a6b56 100644
--- a/Graphs/gFlagsLine.cpp
+++ b/Graphs/gFlagsLine.cpp
@@ -137,7 +137,7 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
     // Draw text label
     float x,y;
     GetTextExtent(label,x,y);
-    DrawText(label,start_px-x-10,(scry-line_top)-(line_h/2)+(y/2));
+    DrawText(w,label,start_px-x-10,(scry-line_top)-(line_h/2)+(y/2));
     float x1,x2;
 
     QColor & col=color[0];
diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp
index f6e273c4..44efe14e 100644
--- a/Graphs/gLineChart.cpp
+++ b/Graphs/gLineChart.cpp
@@ -27,7 +27,7 @@ gLineChart::~gLineChart()
 void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
 {
     const int max_drawlist_size=4096;
-    static QPoint m_drawlist[max_drawlist_size];
+    QPoint m_drawlist[max_drawlist_size];
 
     if (!m_visible)
         return;
@@ -407,7 +407,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
             QString msg="No Waveform Available";
             float x,y;
             GetTextExtent(msg,x,y,bigfont);
-            DrawText(msg,start_px+(width/2.0)-(x/2.0),scry-w.GetBottomMargin()-height/2.0+y/2.0,0,Qt::gray,bigfont);
+            DrawText(w,msg,start_px+(width/2.0)-(x/2.0),scry-w.GetBottomMargin()-height/2.0+y/2.0,0,Qt::gray,bigfont);
         }
     } else {
 
diff --git a/Graphs/gLineOverlay.cpp b/Graphs/gLineOverlay.cpp
index 7c6f90e4..1d7a3894 100644
--- a/Graphs/gLineOverlay.cpp
+++ b/Graphs/gLineOverlay.cpp
@@ -118,7 +118,7 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
                }
                if (xx<(1800000)) {
                     GetTextExtent(label,x,y);
-                    DrawText(label,x1-(x/2),scry-(start_py+height-30+y));
+                    DrawText(w,label,x1-(x/2),scry-(start_py+height-30+y));
                     //w.renderText(x1-(x/2),scry-(start_py+height-30+y),label);
                }
 
diff --git a/Graphs/gTitle.cpp b/Graphs/gTitle.cpp
index 963164ac..741f5bbd 100644
--- a/Graphs/gTitle.cpp
+++ b/Graphs/gTitle.cpp
@@ -22,7 +22,7 @@ void gTitle::Plot(gGraphWindow & w,float scrx,float scry)
     GetTextExtent(m_title,width,height);
     int xp=(height/2)+15;
     //if (m_alignment==wxALIGN_RIGHT) xp=scrx-4-height;
-    DrawText(m_title,xp,scry-(w.GetBottomMargin()+((scry-w.GetBottomMargin())/2.0)),90.0,m_color,&m_font);
+    DrawText(w,m_title,xp,scry-(w.GetBottomMargin()+((scry-w.GetBottomMargin())/2.0)),90.0,m_color,&m_font);
 
     //DrawText(w,m_title,150,-40,45.0); //20+xp,scry-(w.GetBottomMargin()+((scry-w.GetBottomMargin())/2.0)+(height/2)),90.0,m_color,&m_font);
 
diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp
index c4f662c3..c2af3576 100644
--- a/Graphs/gXAxis.cpp
+++ b/Graphs/gXAxis.cpp
@@ -179,9 +179,9 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry)
 
         GetTextExtent(fd,x,y);
         if (!show_time) {
-            DrawText(fd, px+y, scry-(py-(x/2)-8), 90.0);
+            DrawText(w,fd, px+y, scry-(py-(x/2)-8), 90.0);
         } else {
-            DrawText(fd, px-(x/2), scry-(py-8-y));
+            DrawText(w,fd, px-(x/2), scry-(py-8-y));
         }
 
     }
diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp
index 3ce93ca4..489360f6 100644
--- a/Graphs/gYAxis.cpp
+++ b/Graphs/gYAxis.cpp
@@ -144,7 +144,7 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
         GetTextExtent(fd,x,y);
         if (x>labelW) labelW=x;
         h=start_py+ty;
-        DrawText(fd,start_px-12-x,scry-(h-(y/2.0)),0);
+        DrawText(w,fd,start_px-12-x,scry-(h-(y/2.0)),0);
 
         vertarray[vertcnt++]=start_px-4;
         vertarray[vertcnt++]=h;
diff --git a/Graphs/glcommon.cpp b/Graphs/glcommon.cpp
index 42261a8f..d7609185 100644
--- a/Graphs/glcommon.cpp
+++ b/Graphs/glcommon.cpp
@@ -95,31 +95,32 @@ struct TextBuffer
     float angle;
     QColor color;
     QFont *font;
+    TextBuffer() { x=0; y=0; }
     TextBuffer(QString _text, int _x, int  _y, float _angle, QColor _color,QFont *_font) {
         text=_text; x=_x; y=_y; angle=_angle; color=_color; font=_font;
     }
 };
-vector<TextBuffer *> TextQue;
-vector<TextBuffer *> TextQueRot;
+vector<TextBuffer> TextQue;
+vector<TextBuffer> TextQueRot;
 
 void DrawTextQueue(gGraphWindow & wid)
 {
     //glFlush();
     for (unsigned i=0;i<TextQue.size();i++) {
-        TextBuffer & t=*TextQue[i];
+        TextBuffer & t=TextQue[i];
         wid.qglColor(t.color);
         wid.renderText(t.x,wid.GetScrY()-t.y,0,t.text,*t.font);
         //RDrawText(painter,t.text,t.x,t.y,t.angle,t.color,t.font);
-        delete TextQue[i];
+        //delete TextQue[i];
     }
 
     if (wid.parentWidget()!=0) {
         QPainter painter(&wid);
         // TODO.. Prerotate the 90degree stuff here and keep the matrix for all of these..
         for (unsigned i=0;i<TextQueRot.size();i++) {
-            TextBuffer & t=*TextQueRot[i];
+            TextBuffer & t=TextQueRot[i];
             RDrawText(painter,t.text,t.x,t.y,t.angle,t.color,t.font);
-            delete TextQueRot[i];
+            //delete TextQueRot[i];
         }
         painter.end();
     }
@@ -131,13 +132,16 @@ void DrawTextQueue(gGraphWindow & wid)
     glDisable(GL_DEPTH_TEST);
 }
 // I bet this slows things down craploads..  should probably skip the vector and use a preallocated textbuffer array.
-void DrawText(QString text, int x, int  y, float angle, QColor color,QFont *font)
+void DrawText(gGraphWindow &wid,QString text, int x, int  y, float angle, QColor color,QFont *font)
 {
-    TextBuffer *b=new TextBuffer(text,x,y,angle,color,font);
-    if (angle==90)
-        TextQueRot.push_back(b);
-    else
-        TextQue.push_back(b);
+    if (angle==90) {
+        //TextBuffer *b=new TextBuffer(text,x,y,angle,color,font);
+        TextQueRot.push_back(TextBuffer(text,x,y,angle,color,font));
+    } else {
+        wid.qglColor(color);
+        wid.renderText(x,wid.GetScrY()-y,0,text,*font);
+        //TextQue.push_back(b);
+    }
 }
 
 
diff --git a/Graphs/glcommon.h b/Graphs/glcommon.h
index 852eb2be..b85173f4 100644
--- a/Graphs/glcommon.h
+++ b/Graphs/glcommon.h
@@ -26,7 +26,7 @@ extern GLshort *vertex_array[num_vert_arrays];
 
 class gGraphWindow;
 void GetTextExtent(QString text, float & width, float & height, QFont *font=defaultfont);
-void DrawText(QString text, int x, int y, float angle=0, QColor color=QColor("black"),QFont *font=defaultfont);
+void DrawText(gGraphWindow &wid, QString text, int x, int y, float angle=0, QColor color=Qt::black,QFont *font=defaultfont);
 void DrawTextQueue(gGraphWindow & wid);
 
 void LinedRoundedRectangle(int x,int y,int w,int h,int radius,int lw,QColor color);