Shared GL Line Buffer objects

Graphs/gFlagsLine.cpp

@@ -80,30 +80,37 @@ void gFlagsGroup::paint(gGraph &w, int left, int top, int width, int height)
         linetop+=barh;
     }
 
-    lines->add(left-1, top, left-1, top+height);
+    GLBuffer *outlines=w.lines();
-    lines->add(left+width, top+height, left+width, top);
+    QColor blk=Qt::black;
+    outlines->add(left-1, top, left-1, top+height, blk);
+    outlines->add(left-1, top+height, left+width,top+height, blk);
+    outlines->add(left+width,top+height, left+width, top, blk);
+    outlines->add(left+width, top, left-1, top, blk);
+
+    //lines->add(left-1, top, left-1, top+height);
+    //lines->add(left+width, top+height, left+width, top);
 }
 
 gFlagsLine::gFlagsLine(ChannelID code,QColor flag_color,QString label,bool always_visible,FlagType flt)
 :Layer(code),m_label(label),m_always_visible(always_visible),m_flt(flt),m_flag_color(flag_color)
 {
     addGLBuf(quads=new GLBuffer(flag_color,2048,GL_QUADS));
-    addGLBuf(lines=new GLBuffer(flag_color,1024,GL_LINES));
+    //addGLBuf(lines=new GLBuffer(flag_color,1024,GL_LINES));
     quads->setAntiAlias(true);
-    lines->setAntiAlias(true);
+    //lines->setAntiAlias(true);
     GetTextExtent(m_label,m_lx,m_ly);
     //m_static.setText(m_label);;
 }
 gFlagsLine::~gFlagsLine()
 {
-    delete lines;
+    //delete lines;
     delete quads;
 }
 void gFlagsLine::paint(gGraph & w,int left, int top, int width, int height)
 {
     if (!m_visible) return;
     if (!m_day) return;
-
+    lines=w.lines();
     double minx;
     double maxx;
 
@@ -144,7 +151,7 @@ void gFlagsLine::paint(gGraph & w,int left, int top, int width, int height)
             if (X > maxx) break;
             x1=(X - minx) * xmult + left;
             if (m_flt==FT_Bar) {
-                lines->add(x1,bartop,x1,bottom);
+                lines->add(x1,bartop,x1,bottom,m_flag_color);
                 if (lines->full()) { verts_exceeded=true; break; }
             } else if (m_flt==FT_Span) {
                 x2=(Y-minx)*xmult+left;

Graphs/gGraphView.cpp

@@ -55,11 +55,16 @@ GLBuffer::GLBuffer(QColor color,int max,int type)
     m_antialias=true;
     m_forceantialias=false;
     buffer=new GLshort [max+8];
+    if (m_type==GL_LINES) {
+        colors=new GLubyte[max*4+(8*4)];
+    } else colors=NULL;
     m_cnt=0;
+    m_colcnt=0;
     m_size=1;
 }
 GLBuffer::~GLBuffer()
 {
+    if (colors) delete [] colors;
     delete [] buffer;
 }
 void GLBuffer::add(GLshort s)
@@ -91,6 +96,42 @@ void GLBuffer::add(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
     }
 }
 
+void GLBuffer::add(GLshort x, GLshort y,QColor & color)
+{
+    if (m_cnt<m_max+2) {
+        mutex.lock();
+        buffer[m_cnt++]=x;
+        buffer[m_cnt++]=y;
+        colors[m_colcnt++]=color.red();
+        colors[m_colcnt++]=color.green();
+        colors[m_colcnt++]=color.blue();
+        colors[m_colcnt++]=color.alpha();
+        mutex.unlock();
+    } else {
+        qDebug() << "GLBuffer overflow";
+    }
+}
+void GLBuffer::add(GLshort x1, GLshort y1, GLshort x2, GLshort y2,QColor & color)
+{
+    if (m_cnt<m_max+4) {
+        mutex.lock();
+        buffer[m_cnt++]=x1;
+        buffer[m_cnt++]=y1;
+        buffer[m_cnt++]=x2;
+        buffer[m_cnt++]=y2;
+        colors[m_colcnt++]=color.red();
+        colors[m_colcnt++]=color.green();
+        colors[m_colcnt++]=color.blue();
+        colors[m_colcnt++]=color.alpha();
+        colors[m_colcnt++]=color.red();
+        colors[m_colcnt++]=color.green();
+        colors[m_colcnt++]=color.blue();
+        colors[m_colcnt++]=color.alpha();
+        mutex.unlock();
+    } else {
+        qDebug() << "GLBuffer overflow";
+    }
+}
 void GLBuffer::draw()
 {
     if (m_cnt>0) {
@@ -114,13 +155,30 @@ void GLBuffer::draw()
             glScissor(s1,s2,s3,s4);
             glEnable(GL_SCISSOR_TEST);
         }
-        glEnableClientState(GL_VERTEX_ARRAY);
+
         glVertexPointer(2, GL_SHORT, 0, buffer);
-        glColor4ub(m_color.red(),m_color.green(),m_color.blue(),m_color.alpha());
+
+        if (m_colcnt<=0) {
+            glColor4ub(m_color.red(),m_color.green(),m_color.blue(),m_color.alpha());
+        } else {
+            glColorPointer(4, GL_UNSIGNED_BYTE, 0, colors);
+        }
+
+        glEnableClientState(GL_VERTEX_ARRAY);
+        if (m_colcnt>0) {
+            glEnableClientState(GL_COLOR_ARRAY);
+        }
         glDrawArrays(m_type, 0, m_cnt >> 1);
+
+        if (m_colcnt>0) {
+            glDisableClientState(GL_COLOR_ARRAY);
+        }
         glDisableClientState(GL_VERTEX_ARRAY);
+
+
         //qDebug() << "I Drawed" << m_cnt << "vertices";
         m_cnt=0;
+        m_colcnt=0;
         if (m_scissor) {
             glDisable(GL_SCISSOR_TEST);
             m_scissor=false;
@@ -310,17 +368,15 @@ void gThread::run()
 {
     m_running=true;
     while (m_running) {
-        //mutex.lock();
+        mutex.lock(); // this will hang until a paint event unlocks it..
-        if (mutex.tryLock(500)) {
+
-            if (!m_running) break;
+        if (!m_running) break;
-            int originX=m_lastbounds.x();
+        int originX=m_lastbounds.x();
-            int originY=m_lastbounds.y();
+        int originY=m_lastbounds.y();
-            int width=m_lastbounds.width();
+        int width=m_lastbounds.width();
-            int height=m_lastbounds.height();
+        int height=m_lastbounds.height();
-            graph->paint(originX,originY,width,height);
+        graph->paint(originX,originY,width,height);
-            graph->threadDone();
+        graph->threadDone();
-        }
-        this->yieldCurrentThread();
     }
 }
 void gThread::paint(int originX, int originY, int width, int height)
@@ -373,7 +429,7 @@ bool gGraph::isEmpty()
 }
 void gGraph::threadDone()
 {
-//    m_graphview->masterlock->release(1);
+    m_graphview->masterlock->release(1);
 }
 
 void gGraph::drawGLBuf()
@@ -466,7 +522,7 @@ void gGraph::paint(int originX, int originY, int width, int height)
     originY+=m_margintop;
     width-=m_marginleft+m_marginright;
     height-=m_margintop+m_marginbottom;
-    int lsize=m_layers.size();
+    //int lsize=m_layers.size();
 
     for (int i=0;i<m_layers.size();i++) {
         Layer *ll=m_layers[i];
@@ -514,12 +570,17 @@ void gGraph::paint(int originX, int originY, int width, int height)
         quad->add(originX+m_selection.x()+m_selection.width(),originY+height-top-bottom, originX+m_selection.x(),originY+height-top-bottom);
     }
 
-    m_graphview->masterlock->release(1);
+    //m_graphview->gl_mutex.lock();
-    /*m_graphview->gl_mutex.lock();
+    /*QGLFormat fmt=m_graphview->format();
-    ((QGLContext *)m_graphview->context())->makeCurrent();
+    QGLContext ctx(fmt);
-    drawGLBuf();
+    ctx.create(m_graphview->context());
-    m_graphview->gl_mutex.unlock(); */
+    ctx.doneCurrent();
+    ctx.makeCurrent(); */
 
+    //m_graphview->makeCurrent();
+    //drawGLBuf();
+    //ctx.doneCurrent();
+    //m_graphview->gl_mutex.unlock();
 }
 
 void gGraph::AddLayer(Layer * l,LayerPosition position, short width, short height, short order, bool movable, short x, short y)
@@ -918,6 +979,15 @@ void gGraph::DrawStaticText(QStaticText & text, short x, short y)
 {
     m_graphview->DrawStaticText(text,x,y);
 }
+GLBuffer * gGraph::lines()
+{
+    return m_graphview->lines;
+}
+GLBuffer * gGraph::backlines()
+{
+    return m_graphview->backlines;
+}
+
 
 // Sets a new Min & Max X clipping, refreshing the graph and all it's layers.
 void gGraph::SetXBounds(qint64 minx, qint64 maxx)
@@ -958,6 +1028,9 @@ gGraphView::gGraphView(QWidget *parent, gGraphView * shared) :
     m_idealthreads=QThread::idealThreadCount();
     if (m_idealthreads<=0) m_idealthreads=1;
     masterlock=new QSemaphore(m_idealthreads);
+
+    lines=new GLBuffer(QColor(0,0,0,0),100000,GL_LINES); // big fat shared line list
+    backlines=new GLBuffer(QColor(0,0,0,0),10000,GL_LINES); // big fat shared line list
 }
 gGraphView::~gGraphView()
 {
@@ -966,6 +1039,7 @@ gGraphView::~gGraphView()
     }
     delete masterlock;
     m_graphs.clear();
+    delete lines;
     if (m_scrollbar) {
         this->disconnect(SIGNAL(sliderMoved(int)),this);
     }
@@ -1220,7 +1294,6 @@ void gGraphView::paintGL()
         threaded=true;
     } else threaded=false;
 
-    threaded=true;
     for (int i=0;i<m_graphs.size();i++) {
         if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible()) continue;
         numgraphs++;
@@ -1234,17 +1307,19 @@ void gGraphView::paintGL()
         if ((py + h + graphSpacer) >= 0) {
             w=width();
 
-            masterlock->acquire(1); // book an available CPU
 
             if (threaded) {
+                masterlock->acquire(1); // book an available CPU
                 m_graphs[i]->threadStart(); // this only happens once.. It stays dormant when not in use.
                 m_graphs[i]->thread()->paint(px,py,width()-titleWidth,h);
             } else {
                 m_graphs[i]->paint(px,py,width()-titleWidth,h);
             }
-            bool r=m_graphs[i]->thread()->isRunning();
+            //qDebug() << "Threads operational" << m_idealthreads-masterlock->available();
 
             // draw the splitter handle
+            gl_mutex.lock();
+
             glBegin(GL_QUADS);
             glColor4f(.5,.5,.5,1.0);
             glVertex2f(0,py+h);
@@ -1259,6 +1334,7 @@ void gGraphView::paintGL()
             glVertex2f(w,py+h+graphSpacer);
             glVertex2f(0,py+h+graphSpacer);
             glEnd();
+            gl_mutex.unlock();
         }
         py=ceil(py+h+graphSpacer);
     }
@@ -1269,14 +1345,18 @@ void gGraphView::paintGL()
         AddTextQue(m_emptytext,(width()/2)-x/2,(height()/2)+y/2,0.0,col,bigfont);
     }
 
-   // if (threaded) {
+    if (threaded) {
        masterlock->acquire(m_idealthreads); // ask for all the CPU's back..
        masterlock->release(m_idealthreads);
-    //}
+    }
 
+    //((QGLContext*)context())->makeCurrent();
+
+    backlines->draw();
     for (int i=0;i<m_graphs.size();i++) {
         m_graphs[i]->drawGLBuf();
     }
+    lines->draw();
     DrawTextQue();
     //glDisable(GL_TEXTURE_2D);
     //glDisable(GL_DEPTH_TEST);

Graphs/gGraphView.h

@@ -37,6 +37,10 @@ public:
     void add(GLshort s);
     void add(GLshort x, GLshort y);
     void add(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
+
+    void add(GLshort x, GLshort y,QColor & col);    // add with vertex color
+    void add(GLshort x1, GLshort y1, GLshort x2, GLshort y2,QColor & col); // add with vertex colors
+
     void scissor(GLshort x1, GLshort y1, GLshort x2, GLshort y2) { s1=x1; s2=y1; s3=x2; s4=y2; m_scissor=true; }
     void draw();
     inline GLshort & operator [](int i) { return buffer[i]; }
@@ -47,17 +51,21 @@ public:
     void setSize(float f) { m_size=f; }
     void setAntiAlias(bool b) { m_antialias=b; }
     void forceAntiAlias(bool b) { m_forceantialias=b; }
+    void setColor(QColor color) { m_color=color; }
 protected:
     QColor m_color;
     GLshort * buffer;
+    GLubyte * colors;
     int m_max;
     int m_type;     // type (GL_LINES, GL_QUADS, etc)
     int m_cnt;      // cnt
+    int m_colcnt;
     float m_size;
     int s1,s2,s3,s4;
     bool m_scissor;
     bool m_antialias;
     bool m_forceantialias;
+    QMutex mutex;
 };
 
 struct TextQue
@@ -237,6 +245,8 @@ public:
     void threadDone();
     bool threadRunning() { return m_thread->isRunning(); }
     void threadStart() { if (!m_thread->isRunning()) m_thread->start(); }
+    GLBuffer * lines();
+    GLBuffer * backlines();
 protected:
     //void invalidate();
 
@@ -317,6 +327,7 @@ public:
     void setDay(Day * day);
     QSemaphore * masterlock;
     bool useThreads() { return m_idealthreads>1; }
+    GLBuffer * lines, * backlines;
 protected:
     int m_idealthreads;
     Day * m_day;

Graphs/gLineChart.cpp

@@ -18,14 +18,12 @@ gLineChart::gLineChart(ChannelID code,QColor col,bool square_plot, bool disable_
     m_report_empty=false;
     addGLBuf(lines=new GLBuffer(col,100000,GL_LINES));
 
-    addGLBuf(outlines=new GLBuffer(QColor(0,0,0,255),20,GL_LINE_LOOP));
     lines->setAntiAlias(true);
-    outlines->setAntiAlias(false);
-
 }
 gLineChart::~gLineChart()
 {
     delete lines;
+    //delete outlines;
 }
 
 
@@ -41,6 +39,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
     if (width<0)
         return;
 
+   // lines=w.lines();
     EventDataType miny,maxy;
     double minx,maxx;
     miny=w.min_y, maxy=w.max_y;
@@ -114,8 +113,12 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
     int minz,maxz;
 
     // Draw bounding box
-    outlines->add(left, top, left, top+height);
+    GLBuffer *outlines=w.lines();
-    outlines->add(left+width,top+height, left+width, top);
+    QColor blk=Qt::black;
+    outlines->add(left, top, left, top+height, blk);
+    outlines->add(left, top+height, left+width,top+height, blk);
+    outlines->add(left+width,top+height, left+width, top, blk);
+    outlines->add(left+width, top, left,top, blk);
     width--;
     height-=2;
 
@@ -313,7 +316,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                        // ay1=(m_drawlist[i-1].y()+m_drawlist[i].y()+m_drawlist[i+1].y())/3.0;
                         ax1=m_drawlist[i].x();
                         ay1=m_drawlist[i].y();
-                        lines->add(xst+i,yst-ax1,xst+i,yst-ay1);
+                        lines->add(xst+i,yst-ax1,xst+i,yst-ay1,m_line_color);
 
                         if (lines->full()) break;
                     }
@@ -342,7 +345,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                             firstpx=false;
                             continue;
                         }
-                        lines->add(lastpx,lastpy,px,py);
+                        lines->add(lastpx,lastpy,px,py,m_line_color);
 
                         if (lines->full()) {
                             done=true;
@@ -385,13 +388,13 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                         firstpx=false;
                     } else {
                         if (square_plot) {
-                            lines->add(lastpx,lastpy,px,lastpy);
+                            lines->add(lastpx,lastpy,px,lastpy,m_line_color);
-                            lines->add(px,lastpy);
+                            lines->add(px,lastpy,px,py,m_line_color);
                         } else {
-                            lines->add(lastpx,lastpy);
+                            lines->add(lastpx,lastpy,px,py,m_line_color);
                         }
 
-                        lines->add(px,py);
+                        //lines->add(px,py,m_line_color);
 
                         if (lines->full()) {
                             done=true;
@@ -422,7 +425,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
             //DrawText(w,msg,left+(width/2.0)-(x/2.0),scry-w.GetBottomMargin()-height/2.0+y/2.0,0,Qt::gray,bigfont);
         }
     } else {
-        lines->scissor(left,w.flipY(top+height+2),width+1,height+1);
+        //lines->scissor(left,w.flipY(top+height+2),width+1,height+1);
         //lines->draw();
     }
 }

Graphs/gLineOverlay.cpp

@@ -14,14 +14,14 @@ gLineOverlayBar::gLineOverlayBar(ChannelID code,QColor color,QString label,FlagT
     addGLBuf(points=new GLBuffer(color,1024,GL_POINTS));
     points->setSize(4);
     addGLBuf(quads=new GLBuffer(color,2048,GL_QUADS));
-    addGLBuf(lines=new GLBuffer(color,1024,GL_LINES));
+    //addGLBuf(lines=new GLBuffer(color,1024,GL_LINES));
     points->setAntiAlias(true);
     quads->setAntiAlias(true);
-    lines->setAntiAlias(true);
+    //lines->setAntiAlias(true);
 }
 gLineOverlayBar::~gLineOverlayBar()
 {
-    delete lines;
+    //delete lines;
     delete quads;
     delete points;
 }
@@ -31,6 +31,7 @@ void gLineOverlayBar::paint(gGraph & w, int left, int topp, int width, int heigh
     if (!m_visible) return;
     if (!m_day) return;
 
+    lines=w.lines();
     int start_py=topp;
 
     double xx=w.max_x-w.min_x;
@@ -86,8 +87,8 @@ void gLineOverlayBar::paint(gGraph & w, int left, int topp, int width, int heigh
                     if (points->full()) { verts_exceeded=true; break; }
                 } else {
                     // thin lines down the bottom
-                    lines->add(x1,start_py+1);
+                    lines->add(x1,start_py+1,m_flag_color);
-                    lines->add(x1,start_py+1+12);
+                    lines->add(x1,start_py+1+12,m_flag_color);
                     if (lines->full()) { verts_exceeded=true; break; }
 
                 }
@@ -97,12 +98,12 @@ void gLineOverlayBar::paint(gGraph & w, int left, int topp, int width, int heigh
                     z=top;
 
                     points->add(x1,top);
-                    lines->add(x1,top);
+                    lines->add(x1,top,m_flag_color);
-                    lines->add(x1,bottom);
+                    lines->add(x1,bottom,m_flag_color);
                     if (points->full()) { verts_exceeded=true; break; }
                } else {
-                    lines->add(x1,z);
+                    lines->add(x1,z,m_flag_color);
-                    lines->add(x1,z-12);
+                    lines->add(x1,z-12,m_flag_color);
                }
                if (lines->full()) { verts_exceeded=true; break; }
                if (xx<(1800000)) {

Graphs/gXAxis.cpp

@@ -29,11 +29,9 @@ gXAxis::gXAxis(QColor col,bool fadeout)
     tz_offset=t2.secsTo(t1)/60L;
     tz_offset*=60000L;
 
-    addGLBuf(vertarray=new GLBuffer(m_line_color));
 }
 gXAxis::~gXAxis()
 {
-    delete vertarray;
 }
 void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
 {
@@ -121,32 +119,26 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
     qint64 aligned_start=minx/step;
     aligned_start*=step;
 
-    //qint32 vertcnt=0;
-    /*GLshort * vertarray=vertex_array[0];
-    if (vertarray==NULL) {
-        qWarning() << "VertArray==NULL";
-        return;
-    } */
-
     while (aligned_start<minx) {
         aligned_start+=step;
     }
 
+    QColor linecol=Qt::black;
+    GLBuffer *lines=w.backlines();
+
     double xmult=double(width)/double(xx);
     double step_pixels=double(step/10.0)*xmult;
     py=left+double(aligned_start-minx)*xmult;
     for (int i=0;i<10;i++) {
         py-=step_pixels;
         if (py<start_px) continue;
-        vertarray->add(py,top);
+        lines->add(py,top,py,top+4,linecol);
-        vertarray->add(py,top+4);
     }
-    w.qglColor(Qt::black);
+
     for (qint64 i=aligned_start;i<maxx;i+=step) {
         px=double(i-minx)*xmult;
         px+=left;
-        vertarray->add(px,top);
+        lines->add(px,top,px,top+6,linecol);
-        vertarray->add(px,top+6);
         qint64 j=i+tz_offset;
         int ms=j % 1000;
         int m=(j/60000L) % 60L;
@@ -165,57 +157,18 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
             tmpstr=QString("%1:%2:%3:%4").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0')).arg(ms,3,10,QChar('0'));
         }
 
-        //w.renderText(px-(x/2),scry-(w.GetBottomMargin()-18),tmpstr);
-        //DrawText(w,tmpstr,,0);
         w.renderText(tmpstr,px-(x/2),top+18);
         py=px;
         for (int j=1;j<10;j++) {
             py+=step_pixels;
             if (py>=left+width) break;
-            vertarray->add(py,top);
+            lines->add(py,top,py,top+4,linecol);
-            vertarray->add(py,top+4);
         }
 
-        if (vertarray->full()) {
+        if (lines->full()) {
             qWarning() << "maxverts exceeded in gXAxis::Plot()";
             break;
         }
     }
-
-    //glLineWidth(1);
-    //vertarray->draw();
-/*    glEnableClientState(GL_VERTEX_ARRAY);
-    w.qglColor(Qt::black);
-    glVertexPointer(2, GL_SHORT, 0, vertarray);
-    glDrawArrays(GL_LINES, 0, vertcnt>>1);
-    glDisableClientState(GL_VERTEX_ARRAY); // deactivate vertex arrays after drawing*/
-
-
-   /* if (m_fadeout) {
-
-        glFlush();
-        w.DrawTextQue();
-
-        glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-        glEnable(GL_BLEND);
-        glBegin(GL_QUADS);
-        glColor4ub(255,255,255,255);
-        glVertex2f(left-20,top+5);
-        glVertex2f(left-20,top+height);
-        //glColor4ub(255,255,255,0);
-        glVertex2f(left,top+height);
-        glVertex2f(left,top+5);
-
-        //glColor4ub(255,255,255,0);
-        glVertex2f(left+width,top+5);
-        glVertex2f(left+width,top+height);
-        //glColor4ub(255,255,255,255);
-        glVertex2f(left+width+20,top+height);
-        glVertex2f(left+width+20,top+5);
-        glEnd();
-        glDisable(GL_BLEND);
-   }*/
-   // glDisable(GL_SCISSOR_TEST);
-
 }
 

Graphs/gXAxis.h

@@ -38,6 +38,5 @@ class gXAxis:public Layer
         QColor m_minor_color;
         bool m_fadeout;
         qint64 tz_offset;
-        GLBuffer * vertarray;
 };
 #endif // GXAXIS_H

Graphs/gYAxis.cpp

@@ -19,14 +19,9 @@ gXGrid::gXGrid(QColor col)
     m_minor_color=QColor(220,220,220,64);
     m_show_major_lines=true;
     m_show_minor_lines=true;
-
-    addGLBuf(majorvert=new GLBuffer(m_major_color));
-    addGLBuf(minorvert=new GLBuffer(m_minor_color));
 }
 gXGrid::~gXGrid()
 {
-    delete minorvert;
-    delete majorvert;
 }
 void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
 {
@@ -95,18 +90,6 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
 
     float ty,h;
 
-    /*qint32 vertcnt=0;
-    GLshort * vertarray=(GLshort *)vertex_array[0];
-    qint32 minorvertcnt=0;
-    GLshort * minorvertarray=(GLshort *)vertex_array[1];
-    qint32 majorvertcnt=0;
-    GLshort * majorvertarray=(GLshort *)vertex_array[2];
-
-    if ((vertarray==NULL) || (minorvertarray==NULL) || (majorvertarray==NULL)) {
-        qWarning() << "gXGrid::Paint()  VertArray==NULL";
-        return;
-    } */
-
     if (min_ytick<=0) {
         qDebug() << "min_ytick error in gXGrid::paint()";
         return;
@@ -115,17 +98,13 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
         min_ytick=100;
     }
 
-    //double q=((maxy-(miny+(min_ytick/2.0)))/min_ytick)*4;
-    //if (q>=maxverts) {
-    //    qDebug() << "Would exeed maxverts. Should be another two bounds exceeded messages after this. (I can do a minor optimisation by disabling the other checks if this turns out to be consistent)" << q << maxverts;
-    //}
 
+    lines=w.backlines();
     for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
         ty=(i - miny) * ymult;
         h=top+height-ty;
         if (m_show_major_lines && (i > miny)) {
-            majorvert->add(left,h);
+            lines->add(left,h,left+width,h,m_major_color);
-            majorvert->add(left+width,h);
         }
         double z=(min_ytick/4)*ymult;
         double g=h;
@@ -137,35 +116,17 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
 //                break;
   //          }
             if (m_show_minor_lines) {// && (i > miny)) {
-                minorvert->add(left,g);
+                lines->add(left,g,left+width,g,m_minor_color);
-                minorvert->add(left+width,g);
             }
-            if (minorvert->full()) {
+            if (lines->full()) {
                 break;
             }
         }
-        if (majorvert->full() || minorvert->full()) {
+        if (lines->full()) {
             qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
             break;
         }
     }
-
-    // Draw the lines & ticks
-    // Turn on blending??
-
-    //glLineWidth(1);
-    //majorvert->draw();
-    //minorvert->draw();
-    /*
-    glEnableClientState(GL_VERTEX_ARRAY);
-    w.qglColor(m_minor_color);
-    glVertexPointer(2, GL_SHORT, 0, minorvertarray);
-    glDrawArrays(GL_LINES, 0, minorvertcnt>>1);
-    w.qglColor(m_major_color);
-    glVertexPointer(2, GL_SHORT, 0, majorvertarray);
-    glDrawArrays(GL_LINES, 0, majorvertcnt>>1);
-    glDisableClientState(GL_VERTEX_ARRAY); // deactivate vertex arrays after drawing
-    */
 }
 
 
@@ -177,11 +138,9 @@ gYAxis::gYAxis(QColor col)
     m_text_color=col;
 
     m_yaxis_scale=1;
-    addGLBuf(vertarray=new GLBuffer(m_line_color));
 }
 gYAxis::~gYAxis()
 {
-    delete vertarray;
 }
 void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
 {
@@ -268,18 +227,6 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
 
     float ty,h;
 
-    /*qint32 vertcnt=0;
-    GLshort * vertarray=(GLshort *)vertex_array[0];
-    qint32 minorvertcnt=0;
-    GLshort * minorvertarray=(GLshort *)vertex_array[1];
-    qint32 majorvertcnt=0;
-    GLshort * majorvertarray=(GLshort *)vertex_array[2];
-
-    if ((vertarray==NULL) || (minorvertarray==NULL) || (majorvertarray==NULL)) {
-        qWarning() << "gYAxis::Plot()  VertArray==NULL";
-        return;
-    } */
-
     if (min_ytick<=0) {
         qDebug() << "min_ytick error in gYAxis::Plot()";
         return;
@@ -287,13 +234,13 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
     if (min_ytick>=1000000) {
         min_ytick=100;
     }
+    lines=w.backlines();
 
     //double q=((maxy-(miny+(min_ytick/2.0)))/min_ytick)*4;
     /*if (q>=maxverts) {
         qDebug() << "Would exeed maxverts. Should be another two bounds exceeded messages after this. (I can do a minor optimisation by disabling the other checks if this turns out to be consistent)" << q << maxverts;
     }*/
 
-    w.qglColor(m_text_color);
     for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
         ty=(i - miny) * ymult;
         fd=Format(i*m_yaxis_scale); // Override this as a function.
@@ -304,22 +251,20 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
         //DrawText(w,fd,left+width-8-x,(h+(y/2.0)),0,m_text_color);
         w.renderText(fd,left+width-8-x,(h+(y/2.0)),0,m_text_color);
 
-        vertarray->add(left+width-4,h);
+        lines->add(left+width-4,h,left+width,h,m_line_color);
-        vertarray->add(left+width,h);
 
         double z=(min_ytick/4)*ymult;
         double g=h;
         for (int i=0;i<3;i++) {
             g+=z;
             if (g>top+height) break;
-            vertarray->add(left+width-3,g);
+            lines->add(left+width-3,g,left+width,g,m_line_color);
-            vertarray->add(left+width,g);
+            if (lines->full()) {
-            if (vertarray->full()) {
                 qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
                 break;
             }
         }
-        if (vertarray->full()) {
+        if (lines->full()) {
             qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
             break;
         }

Graphs/gYAxis.h

@@ -33,7 +33,7 @@ protected:
     bool m_show_minor_lines;
     QColor m_major_color;
     QColor m_minor_color;
-    GLBuffer * minorvert, * majorvert;
+    GLBuffer * lines;
 };
 
 class gYAxis:public Layer
@@ -64,7 +64,7 @@ class gYAxis:public Layer
 
         QColor m_line_color;
         QColor m_text_color;
-        GLBuffer * vertarray;
+        GLBuffer * lines;
 };
 
 #endif // GYAXIS_H

SleepyHeadQT.pro

@@ -57,6 +57,7 @@ SOURCES += main.cpp\
 
 unix:SOURCES           += qextserialport/posix_qextserialport.cpp
 unix:!macx:SOURCES     += qextserialport/qextserialenumerator_unix.cpp
+unix:!macx:LIBS        += -lX11
 
 macx {
   SOURCES          += qextserialport/qextserialenumerator_osx.cpp

main.cpp

@@ -9,9 +9,15 @@
 #include <QFontDatabase>
 #include <QStringList>
 #include <QDebug>
+
+
 #include "mainwindow.h"
 #include "SleepLib/profiles.h"
 
+#ifdef Q_WS_X11
+#include <X11/Xlib.h>
+#endif
+
 
 MainWindow *mainwin=NULL;
 
@@ -40,6 +46,7 @@ void MyOutputHandler(QtMsgType type, const char *msg) {
 
 int main(int argc, char *argv[])
 {
+    XInitThreads();
     QApplication a(argc, argv);
 
     a.setApplicationName("SleepyHead");