Tooltip improvements.. Still not finished yet

Graphs/gBarChart.cpp

@@ -150,7 +150,7 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
     }
     if (total_days>0) {
         float val=total_val/float(total_days);
-        QString z=m_label+"="+QString::number(val,'f',2)+" days="+QString::number(total_days,'f',0)+" This is going in overview later";
+        QString z=m_label+"="+QString::number(val,'f',2)+" days="+QString::number(total_days,'f',0)+" This needs optimising and will going in overview";
         w.renderText(z,left,top-1);
         // val = AHI for selected area.
     }
@@ -161,8 +161,7 @@ bool gBarChart::mouseMoveEvent(QMouseEvent *event)
     int y=event->y()-l_top;
     if (!(x>=0 && y>=0 && x<l_width && y<l_height)) {
         hl_day=-1;
-
+        //graph->timedRedraw(2000);
-        graph->redraw();
         return false;
     }
 
@@ -173,25 +172,39 @@ bool gBarChart::mouseMoveEvent(QMouseEvent *event)
     mx+=l_minx;
     mx=mx+l_offset;//-86400000L;
     int zd=mx/86400000L;
-    if (hl_day!=zd) {
+    //if (hl_day!=zd)
+    {
         hl_day=zd;
         QHash<int,QHash<short,EventDataType> >::iterator d=m_values.find(hl_day);
         if (d!=m_values.end()) {
-            QString z=m_label+"="+QString::number(d.value()[0],'f',2);
-            qstatus2->setText(z);
-
             QColor col(255,255,128,200);
 
-            GLBuffer *lines=graph->lines();
+            int yy=y;
-            graph->quads()->add(event->x()-20,rtop+y-12,event->x()-20,rtop+y+5,col);
+            int x=event->x()-10;
-            graph->quads()->add(event->x()+75,rtop+y+5,event->x()+75,rtop+y-12,col);
+            int w=90;
-            QColor blk(0,0,0,255);
+            int h=32;
-            lines->add(event->x()-21,rtop+y-12,event->x()+76,rtop+y-12,blk);
+            int y=rtop+event->y()-42;
-            lines->add(event->x()-21,rtop+y+6,event->x()+76,rtop+y+6,blk);
-            lines->add(event->x()-21,rtop+y-12,event->x()-21,rtop+y+6,blk);
-            lines->add(event->x()+76,rtop+y-12,event->x()+76,rtop+y+6,blk);
 
-            graph->renderText(z,event->x(),rtop+y);
+            //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,event->x(),y+11);
+            z=m_label+"="+QString::number(d.value()[0],'f',2);
+            qstatus2->setText(z);
+            graph->renderText(z,event->x(),y+26);
 
             return true;
         }

Graphs/gGraphView.cpp

@@ -2,6 +2,7 @@
 #include <QFontMetrics>
 #include "gGraphView.h"
 #include "SleepLib/profiles.h"
+#include <QTimer>
 bool _graph_init=false;
 
 QFont * defaultfont=NULL;
@@ -567,8 +568,9 @@ void gGraph::paint(int originX, int originY, int width, int height)
     }
 
     if (m_selection.width()>0 && m_selecting_area) {
-        m_quad->add(originX+m_selection.x(),originY+top, originX+m_selection.x()+m_selection.width(),originY+top);
+        QColor col(128,128,255,128);
-        m_quad->add(originX+m_selection.x()+m_selection.width(),originY+height-top-bottom, originX+m_selection.x(),originY+height-top-bottom);
+        quads()->add(originX+m_selection.x(),originY+top, originX+m_selection.x()+m_selection.width(),originY+top,col);
+        quads()->add(originX+m_selection.x()+m_selection.width(),originY+height-top-bottom, originX+m_selection.x(),originY+height-top-bottom,col);
     }
 
 }
@@ -581,6 +583,7 @@ void gGraph::AddLayer(Layer * l,LayerPosition position, short width, short heigh
     m_layers.push_back(l);
 }
 void gGraph::redraw() { m_graphview->updateGL(); }
+void gGraph::timedRedraw(int ms) { m_graphview->timedRedraw(ms); }
 
 void gGraph::mouseMoveEvent(QMouseEvent * event)
 {
@@ -595,6 +598,7 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
 
 
     bool nolayer=false;
+    bool doredraw=false;
 
     if (m_graphview->m_selected_graph==this) {
         if (event->buttons() & Qt::LeftButton) {
@@ -605,8 +609,9 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
             if (a2>w) a2=w;
             m_selecting_area=true;
             m_selection=QRect(a1-m_marginleft-1,0,a2-a1,m_lastbounds.height());
-            m_graphview->updateGL();
+            //m_graphview->updateGL();
-            nolayer=true;
+            nolayer=false;
+            doredraw=true;
         } else if (event->buttons() & Qt::RightButton) {
             m_graphview->setPointClicked(event->pos());
             x-=left+m_marginleft;
@@ -633,7 +638,8 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
                     min_x=rmax_x-xx;
                 }
                 //if (a2>rmax_x) a2=rmax_x;
-                m_graphview->SetXBounds(min_x,max_x,m_group);
+                m_graphview->SetXBounds(min_x,max_x,m_group,false);
+                doredraw=true;
                 nolayer=true;
             } else {
                 qint64 qq=rmax_x-rmin_x;
@@ -652,21 +658,21 @@ void gGraph::mouseMoveEvent(QMouseEvent * event)
                     max_x=rmax_x;
                     min_x=rmax_x-xx;
                 }
-                m_graphview->SetXBounds(min_x,max_x,m_group);
+                m_graphview->SetXBounds(min_x,max_x,m_group,false);
+                doredraw=true;
                 nolayer=true;
 
             }
         }
     }
 
-    if (!nolayer) { // no mouse button
+    //if (!nolayer) { // no mouse button
-        bool doredraw=false;
         for (int i=0;i<m_layers.size();i++) {
             if (m_layers[i]->mouseMoveEvent(event)) doredraw=true;
         }
         if (doredraw)
             m_graphview->updateGL();
-    }
+    //}
     //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;
@@ -1211,7 +1217,7 @@ void gGraphView::scrollbarValueChanged(int val)
         updateGL(); // do this on a timer?
     }
 }
-void gGraphView::ResetBounds() //short group)
+void gGraphView::ResetBounds(bool refresh) //short group)
 {
     for (int i=0;i<m_graphs.size();i++) {
         //if (m_graphs[i]->group()==group)
@@ -1220,13 +1226,13 @@ void gGraphView::ResetBounds() //short group)
     updateScale();
 }
 
-void gGraphView::SetXBounds(qint64 minx, qint64 maxx,short group)
+void gGraphView::SetXBounds(qint64 minx, qint64 maxx,short group,bool refresh)
 {
     for (int i=0;i<m_graphs.size();i++) {
         if (m_graphs[i]->group()==group)
             m_graphs[i]->SetXBounds(minx,maxx);
     }
-    updateGL();
+    if (refresh) updateGL();
 }
 void gGraphView::updateScale()
 {
@@ -1692,6 +1698,15 @@ void gGraphView::setDay(Day * day)
         m_graphs[i]->setDay(day);
     }
 }
+void gGraphView::TimedRefresh()
+{
+    updateGL();
+}
+void gGraphView::timedRedraw(int ms)
+{
+    QTimer::singleShot(ms,this,SLOT(TimedRefresh()));
+}
+
 
 MyScrollBar::MyScrollBar(QWidget * parent)
     :QScrollBar(parent)

Graphs/gGraphView.h

@@ -256,6 +256,8 @@ public:
     gThread * thread() { return m_thread; }
     virtual void paint(int originX, int originY, int width, int height);
     void redraw();
+    void timedRedraw(int ms);
+
     void threadDone();
     bool threadRunning() { return m_thread->isRunning(); }
     void threadStart() { if (!m_thread->isRunning()) m_thread->start(); }
@@ -314,8 +316,8 @@ public:
 
     float scaleY() { return m_scaleY; }
 
-    void ResetBounds(); //short group=0);
+    void ResetBounds(bool refresh=true); //short group=0);
-    void SetXBounds(qint64 minx, qint64 maxx, short group=0);
+    void SetXBounds(qint64 minx, qint64 maxx, short group=0,bool refresh=true);
 
     bool hasGraphs() { return m_graphs.size()>0; }
 
@@ -323,6 +325,7 @@ public:
     QPoint globalPointClicked() { return m_global_point_clicked; }
     void setPointClicked(QPoint p) { m_point_clicked=p; }
     void setGlobalPointClicked(QPoint p) { m_global_point_clicked=p; }
+    void timedRedraw(int ms);
 
     gGraph *m_selected_graph;
 
@@ -395,6 +398,7 @@ signals:
 
 public slots:
     void scrollbarValueChanged(int val);
+    void TimedRefresh();
 };
 
 #endif // GGRAPHVIEW_H