From c96a80e237f6a4e3171557d36ae7164fff6ac480 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Fri, 2 Sep 2011 12:00:04 +1000
Subject: [PATCH] Force redraw on tab change

---
 Graphs/gBarChart.cpp | 40 ++++++++++++++++++++++++++++++++--------
 Graphs/gBarChart.h   |  4 ++++
 SleepyHeadQT.pro     |  2 +-
 daily.cpp            |  1 +
 mainwindow.cpp       |  2 ++
 5 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/Graphs/gBarChart.cpp b/Graphs/gBarChart.cpp
index 4518ef00..6103d565 100644
--- a/Graphs/gBarChart.cpp
+++ b/Graphs/gBarChart.cpp
@@ -5,33 +5,57 @@
 */
 
 #include <math.h>
-#include <SleepLib/profiles.h>
+#include <QDateTime>
 #include "gBarChart.h"
 
-gBarChart::gBarChart(ChannelID code,QColor col,Qt::Orientation o)
+gBarChart::gBarChart(ChannelID code,QColor color,Qt::Orientation o)
 :Layer(code),m_orientation(o)
 {
-    color.clear();
-    color.push_back(col);
+    //Xaxis=new gXAxis();
+    addGLBuf(quads=new GLBuffer(color,20,GL_QUADS));
+    //addGLBuf(lines=new GLBuffer(col,20,GL_LINES));
+    quads->forceAntiAlias(true);
+    //lines->setAntiAlias(true);
+    //lines->setSize(2);
 
-    Xaxis=new gXAxis();
 }
 gBarChart::~gBarChart()
 {
-    delete Xaxis;
+    //delete Xaxis;
 }
 
 void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
 {
     if (!m_visible) return;
+
+    qint64 minx=w.min_x, maxx=w.max_x;
+    qint64 xx=maxx - minx;
+    qint32 days=xx/86400000L;
+
+    float barw=float(width)/float(days);
+
+    qint64 t2,ts;
+    int day;
+    for (QMap<QDate,QVector<Day *> >::iterator d=m_profile->daylist.begin();d!=m_profile->daylist.end();d++) {
+        t2=QDateTime(d.key(),QTime(0,0,0)).toTime_t();
+        ts=t2*1000L;
+        if (ts<minx) continue;
+        if (ts>maxx) continue;  // break; // out of order if I end up using a hash instead.??
+        day=t2/86400;
+        float pos=float(day)*barw;
+
+
+
+    }
+
+
+
    // if (!data) return;
    //if (!data->IsReady()) return;
 
     //int start_px=left;
     //int start_py=top;
 
-    //double xx=w.max_x - w.min_x;
-    //double days=int(xx);
     //days=data->np[0];
 
     //days=0;
diff --git a/Graphs/gBarChart.h b/Graphs/gBarChart.h
index 10960f00..c249f885 100644
--- a/Graphs/gBarChart.h
+++ b/Graphs/gBarChart.h
@@ -7,6 +7,7 @@
 #ifndef GBARCHART_H
 #define GBARCHART_H
 
+#include <SleepLib/profiles.h>
 #include "gGraphView.h"
 #include "gXAxis.h"
 
@@ -16,6 +17,7 @@ class gBarChart:public Layer
         gBarChart(ChannelID code=EmptyChannel,QColor col=QColor("blue"),Qt::Orientation o=Qt::Horizontal);
         virtual ~gBarChart();
 
+        void setProfile(Profile *profile);
         virtual void paint(gGraph & w,int left, int top, int width, int height);
 
     protected:
@@ -30,6 +32,8 @@ class gBarChart:public Layer
 
         gXAxis *Xaxis;
         QVector<QColor> color;
+        Profile * m_profile;
+        GLBuffer *quads;
 };
 
 #endif // GBARCHART_H
diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro
index b053f7f5..6dc6d094 100644
--- a/SleepyHeadQT.pro
+++ b/SleepyHeadQT.pro
@@ -19,7 +19,7 @@ CONFIG += rtti
 #CONFIG += link_pkgconfig
 #PKGCONFIG += freetype2
 
-TARGET = SleepyHeadQT
+TARGET = SleepyHead
 TEMPLATE = app
 
 
diff --git a/daily.cpp b/daily.cpp
index a9077047..c0fca2a2 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -1144,6 +1144,7 @@ void Daily::UpdateOXIGraphs(Day *day)
 
 void Daily::RedrawGraphs()
 {
+    GraphView->updateGL();
     /*for (int i=0;i<Graphs.size();i++) {
        Graphs[i]->updateGL();
     } */
diff --git a/mainwindow.cpp b/mainwindow.cpp
index e4cf2b4b..2231da46 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -274,6 +274,7 @@ void MainWindow::on_urlBar_activated(const QString &arg1)
 void MainWindow::on_dailyButton_clicked()
 {
     ui->tabWidget->setCurrentWidget(daily);
+    daily->RedrawGraphs();
 }
 
 void MainWindow::on_overviewButton_clicked()
@@ -378,5 +379,6 @@ void MainWindow::on_oximetryButton_clicked()
 {
     if (oximetry) {
         ui->tabWidget->setCurrentWidget(oximetry);
+        oximetry->RedrawGraphs();
     }
 }