Implemented yAxis Header texture cache to save on font drawing

Graphs/gGraphView.cpp

@@ -1053,7 +1053,9 @@ gGraph::gGraph(gGraphView *graphview,QString title,QString units, int height,sho
     m_lastx23=0;
 
     titleImage=QImage();
-    invalidate_VertTextCache=true;
+    yAxisImage=QImage();
+    yAxisImageTex=titleImageTex=0;
+    invalidate_yAxisImage=true;
 
     m_quad=new gVertexBuffer(64,GL_QUADS);
     m_quad->forceAntiAlias(true);
@@ -1178,22 +1180,28 @@ void gGraph::paint(int originX, int originY, int width, int height)
         int title_x,yh;
         if (titleImage.isNull()) {
             // Render the title to a texture so we don't have to draw the vertical text every time..
-            GetTextExtent("Wy@",x,yh,mediumfont);
+
+            GetTextExtent("Wy@",x,yh,mediumfont); // This gets a better consistent height. should be cached.
+
             GetTextExtent(title(),x,y,mediumfont);
 
             y=yh;
             QPixmap tpm=QPixmap(x+4,y+4);
 
-            tpm.fill(Qt::transparent);
+            tpm.fill(Qt::transparent); //empty it
             QPainter pmp(&tpm);
 
-            QBrush brush2(Qt::black);
+            pmp.setRenderHint(QPainter::Antialiasing, true);
+
+            QBrush brush2(Qt::black); // text color
             pmp.setBrush(brush2);
 
             pmp.setFont(*mediumfont);
-            pmp.drawText(2,y,title());
+
+            pmp.drawText(2,y,title()); // draw from the bottom
             pmp.end();
 
+            // convert to QImage and bind to a texture for future use
             titleImage=QGLWidget::convertToGLFormat(tpm.toImage().mirrored(false,true));
             titleImageTex=m_graphview->bindTexture(titleImage);
         }
@@ -1207,17 +1215,18 @@ void gGraph::paint(int originX, int originY, int width, int height)
 
         glEnable(GL_TEXTURE_2D);
 
+        // Rotate and draw vertical texture containing graph titles
         glPushMatrix();
         glTranslatef(marginLeft()+4,originY+height/2+x/2, 0);
         glRotatef(-90,0,0,1);
         m_graphview->drawTexture(QPoint(0,y/2),titleImageTex);
-
         glPopMatrix();
 
-
         glDisable(GL_TEXTURE_2D);
         glDisable(GL_BLEND);
 
+        // All that to replace this little, but -hideously- slow line of text..
+
         //renderText(title(),marginLeft()+title_x,originY+height/2,90,Qt::black,mediumfont);
         left+=title_x;
     } else left=0;
@@ -1228,8 +1237,6 @@ void gGraph::paint(int originX, int originY, int width, int height)
     lines()->add(0,originY,0,originY+height,col);
     lines()->add(left,originY,left,originY+height,col);
 #endif
-
-
     int tmp;
 
     left=0;

Graphs/gGraphView.h

@@ -548,7 +548,7 @@ public:
     float height() { return m_height; }
 
     //! \brief Set the height element. (relative to the total of all heights)
-    void setHeight(float height) { m_height=height; invalidate_VertTextCache=true;}
+    void setHeight(float height) { m_height=height; invalidate_yAxisImage=true;}
 
     int minHeight() { return m_min_height; }
     void setMinHeight(int height) { m_min_height=height; }
@@ -728,13 +728,17 @@ public:
     Layer * getLineChart();
     QRect m_lastbounds;
     QTimer * timer;
-    QImage titleImage;
+    QImage titleImage,yAxisImage;
-    GLuint titleImageTex;
+    GLuint titleImageTex,yAxisImageTex;
-    bool invalidate_VertTextCache;
+
+
+    // This gets set to true to force a redraw of the yAxis tickers when graphs are resized.
+    bool invalidate_yAxisImage;
 
     //! \brief Returns a Vector reference containing all this graphs layers
     QVector<Layer *>  & layers() { return m_layers; }
 
+    gGraphView * graphView() { return m_graphview; }
     short m_marginleft, m_marginright, m_margintop, m_marginbottom;
 protected:
     //void invalidate();

Graphs/gYAxis.cpp

@@ -137,102 +137,124 @@ gYAxis::~gYAxis()
 }
 void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
 {
-    if (height<0) return;
+    // may as well draw a cached texture here, and only update it when screen or graph is resized.
-    if (height>2000) return;
+    int x,y,yh=0;
-    int x,y;
-    int labelW=0;
 
-    EventDataType miny=w.min_y;
+    if (w.invalidate_yAxisImage) {
-    EventDataType maxy=w.max_y;
 
-    if (miny<0) { // even it up if it's starts negative
+        if (!w.yAxisImage.isNull()) {
-        miny=-MAX(fabs(miny),fabs(maxy));
+            w.graphView()->deleteTexture(w.yAxisImageTex);
-    }
+            w.yAxisImage=QImage();
-
-    w.roundY(miny,maxy);
-
-    EventDataType dy=maxy-miny;
-
-    static QString fd="0";
-    GetTextExtent(fd,x,y);
-
-    double max_yticks=round(height / (y+14.0)); // plus spacing between lines
-
-    double mxy=MAX(fabs(maxy),fabs(miny));
-    double mny=miny;
-    if (miny<0) {
-        mny=-mxy;
-    }
-
-    double rxy=mxy-mny;
-
-    int myt;
-    bool fnd=false;
-    for (myt=max_yticks;myt>2;myt--) {
-        float v=rxy/float(myt);
-        if (v==int(v)) {
-            fnd=true;
-            break;
-        }
-    }
-    if (fnd) max_yticks=myt;
-    double yt=1/max_yticks;
-
-    double ymult=height/rxy;
-
-    double min_ytick=rxy*yt;
-
-
-    //if (dy>5) {
-    //    min_ytick=round(min_ytick);
-    //} else {
-
-    //}
-
-    float ty,h;
-
-    if (min_ytick<=0) {
-        qDebug() << "min_ytick error in gYAxis::paint() in" << w.title();
-        return;
-    }
-    if (min_ytick>=1000000) {
-        min_ytick=100;
-    }
-    lines=w.backlines();
-
-    GLuint line_color=m_line_color.rgba();
-    for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
-        ty=(i - miny) * ymult;
-        if (dy<5) {
-            fd=Format(i*m_yaxis_scale,2);
-        } else {
-            fd=Format(i*m_yaxis_scale,1);
         }
 
-        GetTextExtent(fd,x,y); // performance bottleneck..
 
-        if (x>labelW) labelW=x;
+        if (height<0) return;
-        h=top+height-ty;
+        if (height>2000) return;
-        if (h<top) continue;
-        w.renderText(fd,left+width-8-x,(h+(y/2.0)),0,m_text_color);
 
-        lines->add(left+width-4,h,left+width,h,line_color);
+        int labelW=0;
 
-        double z=(min_ytick/4)*ymult;
+        EventDataType miny=w.min_y;
-        double g=h;
+        EventDataType maxy=w.max_y;
-        for (int i=0;i<3;i++) {
+
-            g+=z;
+        if (miny<0) { // even it up if it's starts negative
-            if (g>top+height) break;
+            miny=-MAX(fabs(miny),fabs(maxy));
-            lines->add(left+width-3,g,left+width,g,line_color);
+        }
-            if (lines->full()) {
+
-                qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
+        w.roundY(miny,maxy);
+
+        EventDataType dy=maxy-miny;
+        static QString fd="0";
+        GetTextExtent(fd,x,y);
+        yh=y;
+
+        QPixmap pixmap(width,height+y+4);
+
+        pixmap.fill(Qt::transparent);
+        QPainter paint(&pixmap);
+
+
+        double max_yticks=round(height / (y+14.0)); // plus spacing between lines
+
+        double mxy=MAX(fabs(maxy),fabs(miny));
+        double mny=miny;
+        if (miny<0) {
+            mny=-mxy;
+        }
+
+        double rxy=mxy-mny;
+
+        int myt;
+        bool fnd=false;
+        for (myt=max_yticks;myt>2;myt--) {
+            float v=rxy/float(myt);
+            if (v==int(v)) {
+                fnd=true;
                 break;
             }
         }
-        if (lines->full()) {
+        if (fnd) max_yticks=myt;
-            qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
+        double yt=1/max_yticks;
-            break;
+
+        double ymult=height/rxy;
+
+        double min_ytick=rxy*yt;
+
+        float ty,h;
+
+        if (min_ytick<=0) {
+            qDebug() << "min_ytick error in gYAxis::paint() in" << w.title();
+            return;
         }
+        if (min_ytick>=1000000) {
+            min_ytick=100;
+        }
+
+        //lines=w.backlines();
+
+        for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
+            ty=(i - miny) * ymult;
+            if (dy<5) {
+                fd=Format(i*m_yaxis_scale,2);
+            } else {
+                fd=Format(i*m_yaxis_scale,1);
+            }
+
+            GetTextExtent(fd,x,y);
+
+            if (x>labelW) labelW=x;
+            h=height-ty;
+            h+=yh;
+            if (h<0)
+                continue;
+
+            paint.setBrush(Qt::black);
+            paint.drawText(width-8-x,h+y/2,fd);
+
+            paint.setPen(m_line_color);
+            paint.drawLine(width-4,h,width,h);
+
+            double z=(min_ytick/4)*ymult;
+            double g=h;
+            for (int i=0;i<3;i++) {
+                g+=z;
+                if (g>height+yh) break;
+                paint.drawLine(width-3,g,width,g);
+            }
+        }
+        paint.end();
+        w.yAxisImage=QGLWidget::convertToGLFormat(pixmap.toImage().mirrored(false,true));
+        w.yAxisImageTex=w.graphView()->bindTexture(w.yAxisImage);
+        w.invalidate_yAxisImage=false;
+    }
+
+    if (!w.yAxisImage.isNull()) {
+        glEnable(GL_BLEND);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        glEnable(GL_TEXTURE_2D);
+        w.graphView()->drawTexture(QPoint(left,(top+height)-w.yAxisImage.height()+3),w.yAxisImageTex);
+        glDisable(GL_TEXTURE_2D);
+        glDisable(GL_BLEND);
+
     }
 }
 const QString gYAxis::Format(EventDataType v, int dp) {