Re-usable ToolTip class

Graphs/gBarChart.cpp

@@ -179,40 +179,28 @@ bool gBarChart::mouseMoveEvent(QMouseEvent *event)
         hl_day=zd;
         QHash<int,QHash<short,EventDataType> >::iterator d=m_values.find(hl_day);
         if (d!=m_values.end()) {
-            QColor col(255,255,128,200);
 
-            int yy=y;
-            int x=event->x()-10;
-            int w=90;
+            //int yy=y;
+            //int x=event->x()+graph->left+gGraphView::titleWidth;
+                    ;
+            //int x=event->x()+gYAxis::Margin-gGraphView::titleWidth;
+            //if (x>l_width-45) x=l_width-45;
+            x+=gYAxis::Margin+gGraphView::titleWidth; //graph->m_marginleft+
+            int y=event->y()+rtop-10;
+            /*int w=90;
             int h=32;
-            int y=event->y()-42;
             if (x<41+w/2) x=41+w/2;
             if (y<1) y=1;
-            if (x>39+l_width-w/2) x=39+l_width-w/2;
-            if (y>l_height-h+1) y=l_height-h+1;
+            if (y>l_height-h+1) y=l_height-h+1; */
 
-            y+=rtop;
+
+            //y+=rtop;
             //TODO: Convert this to a ToolTip class
 
-            graph->quads()->add(x,y,x,y+h,col);
-            graph->quads()->add(x+w,y+h,x+w,y,col);
-            QColor blk(0,0,0,255);
-
-            // The outer lines stuffs up
-            GLBuffer *lines=graph->lines(); // toplines?
-            lines->add(x-1,y-1,x+w+1,y-1,blk);
-            lines->add(x-1,y+h+1,x+w+1,y+h+1,blk);
-            lines->add(x-1,y-1,x-1,y+h+1,blk);
-            lines->add(x+w+1,y-1,x+w+1,y+h+1,blk);
-
 
             QDateTime dt=QDateTime::fromTime_t(hl_day*86400);
-            QString z=dt.date().toString(Qt::SystemLocaleShortDate);
-            graph->renderText(z,x+10,y+11);
-            z=m_label+"="+QString::number(d.value()[0],'f',2);
-            qstatus2->setText(z);
-            graph->renderText(z,x+10,y+26);
-
+            QString z=dt.date().toString(Qt::SystemLocaleShortDate)+"\n"+m_label+"="+QString::number(d.value()[0],'f',2);;
+            graph->ToolTip(z,x,y,1500);
             return true;
         }
         //graph->redraw();

Graphs/gGraphView.cpp

@@ -192,6 +192,100 @@ void GLBuffer::draw()
     }
 }
 
+gToolTip::gToolTip(gGraphView * graphview)
+    :m_graphview(graphview)
+{
+
+    m_pos.setX(0);
+    m_pos.setY(0);
+    m_visible=false;
+    m_spacer=5; // pixels around text area
+    timer=new QTimer(graphview);
+    connect(timer,SIGNAL(timeout()),SLOT(timerDone()));
+}
+
+gToolTip::~gToolTip()
+{
+    disconnect(timer,SLOT(timerDone()));
+    delete timer;
+}
+
+void gToolTip::display(QString text, int x, int y, int timeout)
+{
+    m_text=text;
+    m_pos.setX(x);
+    m_pos.setY(y);
+    m_visible=true;
+    // TODO: split multiline here
+    GetTextExtent(m_text,tw,th);
+    tw+=m_spacer*2;
+    th+=m_spacer*2;
+    th*=2;
+    if (timer->isActive()) {
+        timer->stop();
+    }
+    timer->setSingleShot(true);
+    timer->start(timeout);
+}
+
+void gToolTip::cancel()
+{
+    m_visible=false;
+    timer->stop();
+}
+
+void gToolTip::paint()     //actually paints it.
+{
+    if (!m_visible) return;
+    int x=m_pos.x();// - tw / 2;
+    int y=m_pos.y();// - th;
+
+    /*GLBuffer * & lines=m_graphview->lines;
+    GLBuffer * & quads=m_graphview->quads;
+    QColor col(255,255,128,200);
+    quads->add(x,y,x,y+th,col);
+    quads->add(x+tw,y+th,x+tw,y,col);
+
+    QColor blk(0,0,0,255);
+    lines->add(x-1,y-1,x+tw+1,y-1,blk);
+    lines->add(x-1,y+th+1,x+tw+1,y+th+1,blk);
+    lines->add(x-1,y-1,x-1,y+th+1,blk);
+    lines->add(x+tw+1,y-1,x+tw+1,y+th+1,blk);
+
+    m_graphview->AddTextQue(m_text,x + m_spacer,y + m_spacer + th/2); */
+
+    QPainter painter(m_graphview);
+
+    QRect br;
+    QRect rect(x,y,0,0);
+    painter.setFont(*defaultfont);
+    rect=painter.boundingRect(rect,Qt::AlignCenter,m_text);
+    rect.setLeft(rect.x()-m_spacer);
+    rect.setTop(rect.y()-rect.height()/1.33);
+    rect.setWidth(rect.width()+m_spacer*2);
+    //rect.setHeight(rect.height());
+    QBrush brush(QColor(255,255,128,200));
+    painter.setBrush(brush);
+    int z=rect.x()+rect.width();
+    if (z>m_graphview->width()-10) {
+        rect.setLeft(m_graphview->width()-2-rect.width());//m_pos.x()-m_spacer);
+        rect.setRight(m_graphview->width()-2);
+    }
+
+    painter.drawRoundedRect(rect,5,5);
+    painter.drawText(rect,Qt::AlignCenter,m_text);
+
+    painter.end();
+
+
+
+}
+void gToolTip::timerDone()
+{
+    m_visible=false;
+    m_graphview->updateGL();
+}
+
 Layer::Layer(ChannelID code)
 {
     m_code = code;
@@ -1041,6 +1135,10 @@ void gGraph::ResetBounds()
     min_y=MinY();
     max_y=MaxY();
 }
+void gGraph::ToolTip(QString text, int x, int y, int timeout)
+{
+    m_graphview->m_tooltip->display(text,x,y,timeout);
+}
 
 void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
 {
@@ -1101,6 +1199,7 @@ gGraphView::gGraphView(QWidget *parent, gGraphView * shared) :
     if (m_idealthreads<=0) m_idealthreads=1;
     masterlock=new QSemaphore(m_idealthreads);
 
+    m_tooltip=new gToolTip(this);
     for (int i=0;i<m_idealthreads;i++) {
         gThread * gt=new gThread(this);
         m_threads.push_back(gt);
@@ -1120,6 +1219,7 @@ gGraphView::~gGraphView()
     for (int i=0;i<m_graphs.size();i++) {
         delete m_graphs[i];
     }
+    delete m_tooltip;
     delete masterlock;
     m_graphs.clear();
     delete lines;
@@ -1178,7 +1278,7 @@ void gGraphView::DrawTextQue()
     m_textque_items=0;
 }
 
-void gGraphView::AddTextQue(QString & text, short x, short y, float angle, QColor & color, QFont * font)
+void gGraphView::AddTextQue(QString & text, short x, short y, float angle, QColor color, QFont * font)
 {
     text_mutex.lock();
     if (m_textque_items>=textque_max) {
@@ -1443,6 +1543,7 @@ void gGraphView::paintGL()
     lines->draw();
     quads->draw();
     DrawTextQue();
+    m_tooltip->paint();
     if (pref["ShowDebug"].toBool()) {
         QString ss;
         ss="PreDraw took "+QString::number(elapsed)+"ms";

Graphs/gGraphView.h

@@ -191,6 +191,27 @@ protected:
     volatile bool m_running;
 };
 
+class gToolTip: public QObject
+{
+    Q_OBJECT
+public:
+    gToolTip(gGraphView * graphview);
+    virtual ~gToolTip();
+    virtual void display(QString text, int x, int y, int timeout=2000);
+    virtual void paint(); //actually paints it.
+    void cancel();
+protected:
+    gGraphView * m_graphview;
+    QTimer * timer;
+    QPoint m_pos;
+    int tw,th;
+    QString m_text;
+    bool m_visible;
+    int m_spacer;
+protected slots:
+    void timerDone();
+};
+
 class gGraph
 {
 public:
@@ -251,6 +272,7 @@ public:
     void DrawTextQue();
     void setDay(Day * day);
     virtual void paint(int originX, int originY, int width, int height);
+    void ToolTip(QString text, int x, int y, int timeout=2000);
     void redraw();
     void timedRedraw(int ms);
 
@@ -258,6 +280,7 @@ public:
     GLBuffer * backlines();
     GLBuffer * quads();
     short m_marginleft, m_marginright, m_margintop, m_marginbottom;
+    short left,right,top,bottom; // dirty magin hacks..
 
     QRect m_lastbounds;
 
@@ -278,7 +301,6 @@ protected:
     QVector<Layer *> m_layers;
     float m_height,m_width;
 
-    short left,right,top,bottom; // dirty magin hacks..
 
     int m_min_height;
     int m_max_height;
@@ -322,8 +344,9 @@ public:
     void timedRedraw(int ms);
 
     gGraph *m_selected_graph;
+    gToolTip * m_tooltip;
 
-    void AddTextQue(QString & text, short x, short y, float angle, QColor & color, QFont * font);
+    void AddTextQue(QString & text, short x, short y, float angle=0.0, QColor color=Qt::black, QFont * font=defaultfont);
     int horizTravel() { return m_horiz_travel; }
     void DrawTextQue();