Basic barchart hover code.. Selections are flickering.. I'll fix later

Graphs/gBarChart.cpp

@@ -6,6 +6,7 @@
 
 #include <math.h>
 #include <QDateTime>
+#include "gYAxis.h"
 #include "gBarChart.h"
 
 gBarChart::gBarChart(ChannelID code,QColor color,Qt::Orientation o)
@@ -14,6 +15,7 @@ gBarChart::gBarChart(ChannelID code,QColor color,Qt::Orientation o)
     addGLBuf(quads=new GLBuffer(color,20000,GL_QUADS));
     quads->forceAntiAlias(true);
     m_empty=true;
+    hl_day=-1;
 }
 gBarChart::~gBarChart()
 {
@@ -51,11 +53,16 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
     EventDataType yy=maxy-miny;
     EventDataType ymult=float(height-2)/yy;
 
-    float barw=(float(width)/float(days));
+    barw=(float(width)/float(days));
 
     qint64 ts;
 
+    graph=&w;
     float px=left;
+    l_left=w.m_marginleft+gYAxis::Margin;
+    l_top=w.m_margintop;
+    l_width=width;
+    l_height=height;
     float py;
     EventDataType total;
 
@@ -63,13 +70,13 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
     float h,tmp;
 
 
-    qint64 offs=(minx) % 86400000L;
-    //zz*=86400000L;
-    float offset=(offs)/86400000.0;
-    //offset+=float(utcoff)/86400000.0;
+    l_offset=(minx) % 86400000L;
+    offset=float(l_offset)/86400000.0;
 
     offset*=barw;
     px=left-offset;
+    l_minx=minx;
+    l_maxx=maxx+86400000L;
 
     int total_days=0;
     double total_val=0;
@@ -96,7 +103,8 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
             for (QHash<short,EventDataType>::iterator g=d.value().begin();g!=d.value().end();g++) {
                 short j=g.key();
                 if (!j) continue;
-                QColor & col=m_colors[j-1];
+                QColor col=m_colors[j-1];
+
                 int cr,cg,cb;
 
                 cr=col.red();
@@ -114,6 +122,10 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
                 if (cr>255) cr=255;
                 if (cg>255) cg=255;
                 if (cb>255) cb=255;
+
+                if (zd==hl_day) {
+                    col=QColor("gold");
+                }
                 QColor col2=QColor(cr,cg,cb,255);
                 //col2=QColor(220,220,220,255);
 
@@ -141,6 +153,47 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
         // val = AHI for selected area.
     }
 }
+bool gBarChart::mouseMoveEvent(QMouseEvent *event)
+{
+    int x=event->x()-l_left;
+    int y=event->y()-l_top;
+    if (!(x>=0 && y>=0 && x<l_width && y<l_height)) {
+        hl_day=-1;
+
+        graph->redraw();
+        return false;
+    }
+
+    double xx=l_maxx-l_minx;
+    double xmult=xx/double(l_width+barw);
+
+    qint64 mx=xmult*double(x-offset);
+    mx+=l_minx;
+    mx=mx+l_offset;//-86400000L;
+    int zd=mx/86400000L;
+    if (hl_day!=zd) {
+        hl_day=zd;
+        QHash<int,QHash<short,EventDataType> >::iterator d=m_values.find(hl_day);
+        if (d!=m_values.end()) {
+            qDebug() << m_label+"="+QString::number(d.value()[0],'f',2);
+        }
+
+        graph->redraw();
+    }
+    //qDebug() << l_left <<  x << hl_day << y << offset << barw;
+    return false;
+}
+
+bool gBarChart::mousePressEvent(QMouseEvent * event)
+{
+    return false;
+}
+
+bool gBarChart::mouseReleaseEvent(QMouseEvent * event)
+{
+    return false;
+}
+
 
 UsageChart::UsageChart(Profile *profile)
     :gBarChart()

Graphs/gBarChart.h

@@ -33,6 +33,18 @@ class gBarChart:public Layer
         bool m_empty;
         int m_fday;
         QString m_label;
+
+        float barw; // bar width from last draw
+        qint64 l_offset; // last offset
+        float offset;    // in pixels;
+        int l_left,l_top,l_width,l_height;
+        qint64 l_minx,l_maxx;
+        int hl_day;
+        gGraph * graph;
+        virtual bool mouseMoveEvent(QMouseEvent * event);
+        virtual bool mousePressEvent(QMouseEvent * event);
+        virtual bool mouseReleaseEvent(QMouseEvent * event);
+
 };
 
 class AHIChart:public gBarChart

Graphs/gGraphView.cpp

@@ -593,6 +593,8 @@ void gGraph::AddLayer(Layer * l,LayerPosition position, short width, short heigh
     l->setPos(x,y);
     m_layers.push_back(l);
 }
+void gGraph::redraw() { m_graphview->updateGL(); }
+
 void gGraph::mouseMoveEvent(QMouseEvent * event)
 {
    // qDebug() << m_title << "Move" << event->pos() << m_graphview->pointClicked();
@@ -605,6 +607,11 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
     double xmult=xx/w;
     m_selecting_area=false;
 
+
+    for (int i=0;i<m_layers.size();i++) {
+        if (m_layers[i]->mouseMoveEvent(event)) return;
+    }
+
     if (m_graphview->m_selected_graph==this) {
         if (event->buttons() & Qt::LeftButton) {
             //qDebug() << m_title << "Moved" << x << y << left << right << top << bottom << m_width << h;
@@ -662,18 +669,21 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
                 m_graphview->SetXBounds(min_x,max_x,m_group);
 
             }
+        } else {
+            // no mouse button
         }
     }
 
-    if (x>left+m_marginleft && x<m_lastbounds.width()-(right+m_marginright) && y>top+m_margintop && y<m_lastbounds.height()-(bottom+m_marginbottom)) { // main area
-        x-=left+m_marginleft;
-        y-=top+m_margintop;
-        //qDebug() << m_title << "Moved" << x << y << left << right << top << bottom << m_width << m_height;
-    }
+    //if (x>left+m_marginleft && x<m_lastbounds.width()-(right+m_marginright) && y>top+m_margintop && y<m_lastbounds.height()-(bottom+m_marginbottom)) { // main area
+//        x-=left+m_marginleft;
+//        y-=top+m_margintop;
+//        //qDebug() << m_title << "Moved" << x << y << left << right << top << bottom << m_width << m_height;
+//    }
 }
 void gGraph::mousePressEvent(QMouseEvent * event)
 {
-    event=event;
+    for (int i=0;i<m_layers.size();i++)
+        if (m_layers[i]->mousePressEvent(event)) return ;
     /*int y=event->pos().y();
     int x=event->pos().x();
     int w=m_lastbounds.width()-(right+m_marginright);
@@ -691,6 +701,10 @@ void gGraph::mousePressEvent(QMouseEvent * event)
 
 void gGraph::mouseReleaseEvent(QMouseEvent * event)
 {
+    for (int i=0;i<m_layers.size();i++)
+        if (m_layers[i]->mouseReleaseEvent(event))
+            return;
+
     int y=event->pos().y();
     int x=event->pos().x();
     int w=m_lastbounds.width()-(m_marginleft+left+right+m_marginright);

Graphs/gGraphView.h

@@ -144,6 +144,14 @@ protected:
     short m_order;                     // order for positioning..
     LayerPosition m_position;
     QVector<GLBuffer *> mgl_buffers;
+
+    // Default layer mouse handling = Do nothing
+    virtual bool wheelEvent(QWheelEvent * event) { return false; }
+    virtual bool mouseMoveEvent(QMouseEvent * event) { return false; }
+    virtual bool mousePressEvent(QMouseEvent * event) { return false; }
+    virtual bool mouseReleaseEvent(QMouseEvent * event) { return false; }
+    virtual bool mouseDoubleClickEvent(QMouseEvent * event) { return false; }
+    virtual bool keyPressEvent(QKeyEvent * event) { return false; }
 };
 
 class LayerGroup:public Layer
@@ -163,6 +171,8 @@ public:
 
 protected:
     QVector<Layer *> layers;
+
+    //overide mouse handling to pass to sublayers..
 };
 
 class gGraph;
@@ -245,11 +255,13 @@ public:
     void setDay(Day * day);
     gThread * thread() { return m_thread; }
     virtual void paint(int originX, int originY, int width, int height);
+    void redraw();
     void threadDone();
     bool threadRunning() { return m_thread->isRunning(); }
     void threadStart() { if (!m_thread->isRunning()) m_thread->start(); }
     GLBuffer * lines();
     GLBuffer * backlines();
+    short m_marginleft, m_marginright, m_margintop, m_marginbottom;
 protected:
     //void invalidate();
 
@@ -268,7 +280,6 @@ protected:
     QVector<Layer *> m_layers;
     float m_height,m_width;
 
-    short m_marginleft, m_marginright, m_margintop, m_marginbottom;
     short left,right,top,bottom; // dirty magin hacks..
 
     int m_min_height;