Pie Chart Experiments

Graphs/gCandleStick.cpp

@@ -97,9 +97,10 @@ void gCandleStick::Plot(gGraphWindow & w,float scrx,float scry)
 
         str="";
         if ((int)m_names.size()>i) {
-       //     str=m_names[i]+" ";
+        //    str=m_names[i]+" ";
         }
-        str+=st.sprintf("%0.1f",data->point[0][i].x());
+        st.sprintf("%0.1f",data->point[0][i].x());
+        str+=st;
         GetTextExtent(str, x, y);
         //x+=5;
         if (t2>x+5) {
@@ -107,8 +108,8 @@ void gCandleStick::Plot(gGraphWindow & w,float scrx,float scry)
             if (m_orientation==Qt::Vertical) {
                 DrawText(w,str,start_px+barwidth+2+y,scry-j,270.0);
             } else {
-                //w.renderText(j,float(scry)-(float(start_py)+(barwidth/2.0)-(y/2.0)+3),str);
-                DrawText(w,str,j,scry-(start_py+(barwidth/2.0)-(y/2.0)));
+                w.renderText(j,float(scry)-(float(start_py)+(barwidth/2.0)-(y/2.0)),str);
+                //DrawText(w,str,j,scry-(start_py+(barwidth/2.0)-(y/2.0)));
             }
         }
     } // for (int i

Graphs/gFlagsLine.cpp

@@ -41,7 +41,7 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
 
     int start_px=w.GetLeftMargin();
     int start_py=w.GetBottomMargin();
-    int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
+    int width=scrx-(w.GetLeftMargin()+w.GetRightMargin())-1;
     int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
 
     double xmult=width/xx;
@@ -76,8 +76,8 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
     // Filled rectangle
     glColor4ub(barcol->red(),barcol->green(),barcol->blue(),barcol->alpha());
     glBegin(GL_QUADS);
-    glVertex2f(start_px-1, line_top);
-    glVertex2f(start_px-1, line_top+line_h);
+    glVertex2f(start_px+1, line_top);
+    glVertex2f(start_px+1, line_top+line_h);
     glVertex2f(start_px+width-1, line_top+line_h);
     glVertex2f(start_px+width-1, line_top);
     glEnd();

Graphs/glcommon.cpp

@@ -18,6 +18,7 @@ QFont * mediumfont=NULL;
 QFont * bigfont=NULL;
 
 GLshort *vertex_array[num_vert_arrays]={NULL};
+bool evil_intel_graphics_chip=false;
 
 // Must be called from a thread inside the application.
 void InitGraphs()

Graphs/gpiechart.cpp

@@ -0,0 +1,80 @@
+#include <math.h>
+#include "gpiechart.h"
+
+gPieChart::gPieChart(gPointData *d,QColor col)
+:gLayer(d)
+{
+    color.clear();
+    color.push_back(col);
+}
+gPieChart::~gPieChart()
+{
+}
+
+void gPieChart::Plot(gGraphWindow & w,float scrx,float scry)
+{
+    if (!m_visible) return;
+    if (!data) return;
+    if (!data->IsReady()) return;
+
+    int start_px=w.GetLeftMargin();
+    int start_py=w.GetBottomMargin();
+    int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
+    int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
+
+    float diameter=MIN(width,height);
+    diameter-=4;
+    float radius=diameter/2.0;
+
+    double total=0;
+    for (int i=0;i<data->np[0];i++)
+        total+=data->point[0][i].y();
+
+
+    double j=0.0;
+    double sum=0.0;
+    double step=1.0/360.0;
+    float px,py;
+    //glEnable(GL_TEXTURE_2D);
+    //glEnable(GL_DEPTH_TEST);
+    glEnable(GL_BLEND);
+    glEnable(GL_POLYGON_SMOOTH);
+    glEnable(GL_LINE_SMOOTH);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    //glBlendFunc( GL_SRC_ALPHA_SATURATE, GL_ONE );
+    glHint(GL_POLYGON_SMOOTH_HINT,  GL_NICEST);
+
+    for (int i=0;i<data->np[0];i++) {
+        j=(data->point[0][i].y()/total); // ratio of this pie slice
+        QColor col1=color[i % color.size()];
+        w.qglColor(col1);
+        glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
+        glBegin(GL_POLYGON);
+        glVertex2f(start_px+radius+2, start_py+radius+2);
+
+        for (double q=sum;q<sum+j;q+=step) {
+            px=start_px+radius+sin(q*2*M_PI)*radius;
+            py=start_py+radius+cos(q*2*M_PI)*radius;
+            glVertex2f(px,py);
+        }
+        glEnd();
+
+        glPolygonMode(GL_BACK,GL_LINE);
+        w.qglColor(Qt::black);
+        glBegin(GL_POLYGON);
+        glVertex2f(start_px+radius+2, start_py+radius+2);
+        for (double q=sum;q<sum+j;q+=step) {
+            px=start_px+radius+sin(q*2*M_PI)*radius;
+            py=start_py+radius+cos(q*2*M_PI)*radius;
+            glVertex2f(px,py);
+        }
+        glEnd();
+
+
+        sum+=j;
+    }
+    glDisable(GL_POLYGON_SMOOTH);
+    glDisable(GL_BLEND);
+    //glDisable(GL_DEPTH_TEST);
+    //glDisable(GL_TEXTURE_2D);
+}

Graphs/gpiechart.h

@@ -0,0 +1,19 @@
+#ifndef GPIECHART_H
+#define GPIECHART_H
+
+#include "graphlayer.h"
+class gPieChart : public gLayer
+{
+public:
+    gPieChart(gPointData *d,QColor col=Qt::black);
+    virtual ~gPieChart();
+
+    virtual void Plot(gGraphWindow & w,float scrx,float scry);
+    void AddName(QString name) { m_names.push_back(name); };
+
+protected:
+    vector<QString> m_names;
+
+};
+
+#endif // GPIECHART_H

Graphs/graphwindow.cpp

@@ -17,6 +17,7 @@ gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLWidget * s
     m_mouseRDown=m_mouseLDown=false;
     m_block_zoom=false;
     m_drag_foobar=false;
+    m_draw_background=true;
     m_foobar_pos=0;
     m_foobar_moved=0;
     SetMargins(10, 15, 0, 0);
@@ -39,6 +40,7 @@ gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLContext *
     SetMargins(10, 15, 0, 0);
     m_block_zoom=false;
     m_drag_foobar=false;
+    m_draw_background=false;
     m_foobar_pos=0;
     m_foobar_moved=0;
     lastlayer=NULL;
@@ -676,15 +678,22 @@ void gGraphWindow::Render(float w, float h)
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();*/
 
-    glBegin(GL_QUADS);
-    glColor3f(1.0,1.0,1.0); // Gradient start
-    glVertex2f(0, h);
-    glVertex2f(0, 0);
+    if (m_draw_background) {
+        glBegin(GL_QUADS);
+        glColor3f(1.0,1.0,1.0); // Gradient start
+        glVertex2f(0, h);
+        glVertex2f(0, 0);
 
-    glColor3f(0.8,0.8,1.0); // Gradient End
-    glVertex2f(w, 0);
-    glVertex2f(w, h);
-    glEnd();
+        glColor3f(0.8,0.8,1.0); // Gradient End
+        glVertex2f(w, 0);
+        glVertex2f(w, h);
+        glEnd();
+    } else {
+
+        glClearColor(0,0,0,255);
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    //    glClear(GL_COLOR_BUFFER_BIT);
+    }
 
 
     for (list<gLayer *>::iterator l=layers.begin();l!=layers.end();l++) {
@@ -707,7 +716,7 @@ void gGraphWindow::paintGL()
     if (m_mouseLDown) {
         if (m_mouseRBrect.width()>0)
             glDisable(GL_DEPTH_TEST);
-            RoundedRectangle(m_mouseRBrect.x(),m_mouseRBrect.y(),m_mouseRBrect.width()-1,m_mouseRBrect.height(),5,QColor(50,50,50,128));
+            RoundedRectangle(m_mouseRBrect.x(),m_mouseRBrect.y(),m_mouseRBrect.width(),m_mouseRBrect.height(),5,QColor(50,50,50,128));
             glEnable(GL_DEPTH_TEST);
     }
     glEnable(GL_DEPTH_TEST);

Graphs/graphwindow.h

@@ -138,6 +138,8 @@ public:
       bool BlockZoom() { return m_block_zoom; };
       QGLContext *gl_context;
       //FTFont *texfont;
+      void SetDrawBackground(bool b) { m_draw_background=b; };
+      bool DrawBackground() { return m_draw_background; };
 
   protected:
       void initializeGL();
@@ -148,6 +150,7 @@ public:
       bool m_block_zoom;
       bool m_drag_foobar;
       double m_foobar_pos,m_foobar_moved;
+      bool m_draw_background;
       std::list<gLayer *> layers;
       QString m_title;
       int    m_scrX;

SleepyHeadQT.pro

@@ -57,7 +57,8 @@ SOURCES += main.cpp\
     Graphs/gTitle.cpp \
     Graphs/gCandleStick.cpp \
     Graphs/gBarChart.cpp \
-    SleepLib/loader_plugins/resmed_loader.cpp
+    SleepLib/loader_plugins/resmed_loader.cpp \
+    Graphs/gpiechart.cpp
 
 HEADERS  += \
     SleepLib/binary_file.h \
@@ -92,7 +93,8 @@ HEADERS  += \
     Graphs/gTitle.h \
     Graphs/gCandleStick.h \
     Graphs/gBarChart.h \
-    SleepLib/loader_plugins/resmed_loader.h
+    SleepLib/loader_plugins/resmed_loader.h \
+    Graphs/gpiechart.h
 
 FORMS    += \
     daily.ui \

daily.cpp

@@ -1,8 +1,8 @@
-/********************************************************************
+/*
  Daily Panel
  Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net>
  License: GPL
-*********************************************************************/
+*/
 
 #include "daily.h"
 #include "ui_daily.h"
@@ -23,6 +23,7 @@
 #include "Graphs/gYAxis.h"
 #include "Graphs/gCandleStick.h"
 #include "Graphs/gBarChart.h"
+#include "Graphs/gpiechart.h"
 
 Daily::Daily(QWidget *parent,QGLContext *context) :
     QWidget(parent),
@@ -41,8 +42,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
 
     gSplitter=new QSplitter(Qt::Vertical,ui->scrollArea);
     gSplitter->setStyleSheet("QSplitter::handle { background-color: 'dark grey'; }");
-    gSplitter->setChildrenCollapsible(true);
-    gSplitter->setHandleWidth(1);
+    gSplitter->setHandleWidth(2);
     //gSplitter->handle
     ui->graphSizer->addWidget(gSplitter);
 
@@ -181,6 +181,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
     //TAP->SetMargins(20,15,5,50);
     TAP->SetMargins(0,0,0,0);
     TAP->AddLayer(new gCandleStick(tap));
+    //TAP->AddLayer(new gPieChart(tap));
 
     TAP_EAP=new gGraphWindow(gSplitter,"",SF);
     TAP_EAP->SetMargins(0,0,0,0);
@@ -193,7 +194,8 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
     G_AHI=new gGraphWindow(gSplitter,"",SF);
     G_AHI->SetMargins(0,0,0,0);
     AddCPAPData(g_ahi=new AHIData());
-    gCandleStick *l=new gCandleStick(g_ahi);
+    //gCandleStick *l=new gCandleStick(g_ahi);
+    gPieChart *l=new gPieChart(g_ahi);
     l->AddName(tr("H"));
     l->AddName(tr("OA"));
     l->AddName(tr("CA"));
@@ -205,9 +207,10 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
     l->color.push_back(QColor("aqua"));
     l->color.push_back(QColor("purple")); //0xff,0x40,0xff,0xff)); //wxPURPLE);
     l->color.push_back(QColor("yellow"));
-    l->color.push_back(QColor("black"));
+    l->color.push_back(QColor(20,20,20,255));
     l->color.push_back(QColor("light green"));
     G_AHI->AddLayer(l);
+    //G_AHI->SetDrawBackground(false);
     //G_AHI->setMaximumSize(2000,30);
     //TAP->setMaximumSize(2000,30);
     NoData=new QLabel(tr("No CPAP Data"),gSplitter);
@@ -253,6 +256,12 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
     gSplitter->addWidget(SPO2);
     gSplitter->refresh();
 
+
+    gSplitter->setChildrenCollapsible(true);  // We set this per widget..
+    for (int i=1;i<gSplitter->count();i++)
+        gSplitter->setCollapsible(i,true);
+    gSplitter->setCollapsible(0,false);
+    gSplitter->setCollapsible(1,false);
     ui->graphSizer->layout();
 
     QTextCharFormat format = ui->calendar->weekdayTextFormat(Qt::Saturday);
@@ -471,7 +480,7 @@ void Daily::Load(QDate date)
         html=html+("<tr><td colspan=4 align=center><i>")+tr("Event Breakdown")+("</i></td></tr>\n");
         {
             G_AHI->setFixedSize(gwwidth,gwheight);
-            QPixmap pixmap=G_AHI->renderPixmap(gwwidth,gwheight,false);
+            QPixmap pixmap=G_AHI->renderPixmap(200,200,false); //gwwidth,gwheight,false);
             QByteArray byteArray;
             QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
             buffer.open(QIODevice::WriteOnly);

main.cpp

@@ -1,8 +1,8 @@
-/********************************************************************
+/*
  Main
  Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net>
  License: GPL
-*********************************************************************/
+*/
 
 //#include <QtPlugin>
 #include <QtGui/QApplication>

mainwindow.cpp

@@ -1,8 +1,8 @@
-/********************************************************************
+/*
  MainWindow Implementation
  Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net>
  License: GPL
-*********************************************************************/
+*/
 
 #include <QGLFormat>
 #include <QFileDialog>

overview.cpp

@@ -1,8 +1,8 @@
-/********************************************************************
+/*
  Overview GUI Implementation
  Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net>
  License: GPL
-*********************************************************************/
+*/
 
 #include <QCalendarWidget>
 #include <QTextCharFormat>