diff --git a/sleepyhead/Graphs/gFlagsLine.cpp b/sleepyhead/Graphs/gFlagsLine.cpp
index f4105f90..ad93da9a 100644
--- a/sleepyhead/Graphs/gFlagsLine.cpp
+++ b/sleepyhead/Graphs/gFlagsLine.cpp
@@ -15,27 +15,29 @@
 #include "gFlagsLine.h"
 #include "gYAxis.h"
 
-gFlagsLabelArea::gFlagsLabelArea(gFlagsGroup * group)
-    :gSpacer(20)
+gFlagsLabelArea::gFlagsLabelArea(gFlagsGroup *group)
+    : gSpacer(20)
 {
-    m_group=group;
+    m_group = group;
 }
-bool gFlagsLabelArea::mouseMoveEvent(QMouseEvent * event,gGraph * graph)
+bool gFlagsLabelArea::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
 {
-    if (m_group)
-        return m_group->mouseMoveEvent(event,graph);
+    if (m_group) {
+        return m_group->mouseMoveEvent(event, graph);
+    }
+
     return false;
 }
 
 
 gFlagsGroup::gFlagsGroup()
 {
-    addVertexBuffer(quads=new gVertexBuffer(512,GL_QUADS));
-    addVertexBuffer(lines=new gVertexBuffer(20,GL_LINE_LOOP));
+    addVertexBuffer(quads = new gVertexBuffer(512, GL_QUADS));
+    addVertexBuffer(lines = new gVertexBuffer(20, GL_LINE_LOOP));
     quads->setAntiAlias(true);
     lines->setAntiAlias(false);
-    m_barh=0;
-    m_empty=true;
+    m_barh = 0;
+    m_empty = true;
 }
 gFlagsGroup::~gFlagsGroup()
 {
@@ -45,6 +47,7 @@ qint64 gFlagsGroup::Minx()
     if (m_day) {
         return m_day->first();
     }
+
     return 0;
 }
 qint64 gFlagsGroup::Maxx()
@@ -52,94 +55,114 @@ qint64 gFlagsGroup::Maxx()
     if (m_day) {
         return m_day->last();
     }
+
     return 0;
 }
-void gFlagsGroup::SetDay(Day * d)
+void gFlagsGroup::SetDay(Day *d)
 {
     LayerGroup::SetDay(d);
     lvisible.clear();
-    int cnt=0;
-    for (int i=0;i<layers.size();i++) {
-        gFlagsLine *f=dynamic_cast<gFlagsLine *>(layers[i]);
-        if (!f) continue;
+    int cnt = 0;
+
+    for (int i = 0; i < layers.size(); i++) {
+        gFlagsLine *f = dynamic_cast<gFlagsLine *>(layers[i]);
+
+        if (!f) { continue; }
+
+        bool e = f->isEmpty();
 
-        bool e=f->isEmpty();
         if (!e || f->isAlwaysVisible()) {
             lvisible.push_back(f);
-            if (!e)
-               cnt++;
+
+            if (!e) {
+                cnt++;
+            }
         }
     }
-    m_empty=(cnt==0);
+
+    m_empty = (cnt == 0);
+
     if (m_empty) {
         if (d) {
-            m_empty=!d->channelExists(CPAP_Pressure);
+            m_empty = !d->channelExists(CPAP_Pressure);
         }
     }
-    m_barh=0;
+
+    m_barh = 0;
 }
 
 void gFlagsGroup::paint(gGraph &g, int left, int top, int width, int height)
 {
-    if (!m_visible) return;
-    if (!m_day) return;
+    if (!m_visible) { return; }
 
-    int vis=lvisible.size();
-    m_barh=float(height)/float(vis);
-    float linetop=top;
+    if (!m_day) { return; }
+
+    int vis = lvisible.size();
+    m_barh = float(height) / float(vis);
+    float linetop = top;
 
     QColor barcol;
-    for (int i=0;i<lvisible.size();i++) {
+
+    for (int i = 0; i < lvisible.size(); i++) {
         // Alternating box color
-        if (i & 1) barcol=COLOR_ALT_BG1; else barcol=COLOR_ALT_BG2;
-        quads->add(left, linetop, left, linetop+m_barh,   left+width-1, linetop+m_barh, left+width-1, linetop, barcol.rgba());
+        if (i & 1) { barcol = COLOR_ALT_BG1; }
+        else { barcol = COLOR_ALT_BG2; }
+
+        quads->add(left, linetop, left, linetop + m_barh,   left + width - 1, linetop + m_barh,
+                   left + width - 1, linetop, barcol.rgba());
 
         // Paint the actual flags
-        lvisible[i]->m_rect=QRect(left,linetop,width,m_barh);
-        lvisible[i]->paint(g,left,linetop,width,m_barh);
-        linetop+=m_barh;
+        lvisible[i]->m_rect = QRect(left, linetop, width, m_barh);
+        lvisible[i]->paint(g, left, linetop, width, m_barh);
+        linetop += m_barh;
     }
 
-    gVertexBuffer *outlines=g.lines();
-    outlines->add(left-1, top, left-1, top+height, COLOR_Outline.rgba());
-    outlines->add(left-1, top+height, left+width,top+height, COLOR_Outline.rgba());
-    outlines->add(left+width,top+height, left+width, top,COLOR_Outline.rgba());
-    outlines->add(left+width, top, left-1, top, COLOR_Outline.rgba());
+    gVertexBuffer *outlines = g.lines();
+    outlines->add(left - 1, top, left - 1, top + height, COLOR_Outline.rgba());
+    outlines->add(left - 1, top + height, left + width, top + height, COLOR_Outline.rgba());
+    outlines->add(left + width, top + height, left + width, top, COLOR_Outline.rgba());
+    outlines->add(left + width, top, left - 1, top, COLOR_Outline.rgba());
 
     //lines->add(left-1, top, left-1, top+height);
     //lines->add(left+width, top+height, left+width, top);
 }
 
-bool gFlagsGroup::mouseMoveEvent(QMouseEvent * event,gGraph * graph)
+bool gFlagsGroup::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
 {
-    if (!p_profile->appearance->graphTooltips())
+    if (!p_profile->appearance->graphTooltips()) {
         return false;
+    }
 
-    for (int i=0;i<lvisible.size();i++) {
-        gFlagsLine *fl=lvisible[i];
-        if (fl->m_rect.contains(event->x(),event->y())) {
-            if (fl->mouseMoveEvent(event,graph)) return true;
+    for (int i = 0; i < lvisible.size(); i++) {
+        gFlagsLine *fl = lvisible[i];
+
+        if (fl->m_rect.contains(event->x(), event->y())) {
+            if (fl->mouseMoveEvent(event, graph)) { return true; }
         } else {
             // Inside main graph area?
-            if ((event->y() > fl->m_rect.y()) && (event->y()) < (fl->m_rect.y()+fl->m_rect.height())) {
+            if ((event->y() > fl->m_rect.y()) && (event->y()) < (fl->m_rect.y() + fl->m_rect.height())) {
                 if (event->x() < lvisible[i]->m_rect.x()) {
                     // Display tooltip
-                    QString ttip=schema::channel[fl->code()].fullname()+"\n"+schema::channel[fl->code()].description();
-                    graph->ToolTip(ttip,event->x(),event->y()-15);
+                    QString ttip = schema::channel[fl->code()].fullname() + "\n" +
+                                   schema::channel[fl->code()].description();
+                    graph->ToolTip(ttip, event->x(), event->y() - 15);
                     graph->redraw();
                 }
             }
 
         }
     }
+
     return false;
 }
 
 
-gFlagsLine::gFlagsLine(ChannelID code,QColor flag_color,QString label,bool always_visible,FlagType flt)
-:Layer(code),m_label(label),m_always_visible(always_visible),m_flt(flt),m_flag_color(flag_color)
+gFlagsLine::gFlagsLine(ChannelID code, QColor flag_color, QString label, bool always_visible,
+                       FlagType flt)
+    : Layer(code), m_label(label), m_always_visible(always_visible), m_flt(flt),
+      m_flag_color(flag_color)
 {
-    addVertexBuffer(quads=new gVertexBuffer(2048,GL_QUADS));
+    addVertexBuffer(quads = new gVertexBuffer(2048, GL_QUADS));
     //addGLBuf(lines=new GLBuffer(flag_color,1024,GL_LINES));
     quads->setAntiAlias(true);
     //lines->setAntiAlias(true);
@@ -151,80 +174,94 @@ gFlagsLine::~gFlagsLine()
     //delete lines;
     //delete quads;
 }
-void gFlagsLine::paint(gGraph & w,int left, int top, int width, int height)
+void gFlagsLine::paint(gGraph &w, int left, int top, int width, int height)
 {
-    if (!m_visible) return;
-    if (!m_day) return;
-    lines=w.lines();
+    if (!m_visible) { return; }
+
+    if (!m_day) { return; }
+
+    lines = w.lines();
     double minx;
     double maxx;
 
     if (w.blockZoom()) {
-        minx=w.rmin_x;
-        maxx=w.rmax_x;
+        minx = w.rmin_x;
+        maxx = w.rmax_x;
     } else {
-        minx=w.min_x;
-        maxx=w.max_x;
+        minx = w.min_x;
+        maxx = w.max_x;
     }
 
-    double xx=maxx-minx;
-    if (xx<=0) return;
+    double xx = maxx - minx;
 
-    double xmult=width/xx;
+    if (xx <= 0) { return; }
 
-    GetTextExtent(m_label,m_lx,m_ly);
+    double xmult = width / xx;
+
+    GetTextExtent(m_label, m_lx, m_ly);
 
     // Draw text label
-    w.renderText(m_label,left-m_lx-10,top+(height/2)+(m_ly/2));
+    w.renderText(m_label, left - m_lx - 10, top + (height / 2) + (m_ly / 2));
 
-    float x1,x2;
+    float x1, x2;
 
-    float bartop=top+2;
-    float bottom=top+height-2;
-    bool verts_exceeded=false;
-    qint64 X,X2,L;
+    float bartop = top + 2;
+    float bottom = top + height - 2;
+    bool verts_exceeded = false;
+    qint64 X, X2, L;
     lines->setColor(schema::channel[m_code].defaultColor());
 
     qint64 start;
-    quint32 * tptr;
+    quint32 *tptr;
     EventStoreType *dptr, * eptr;
     int idx;
-    QHash<ChannelID,QVector<EventList *> >::iterator cei;
+    QHash<ChannelID, QVector<EventList *> >::iterator cei;
 
-    qint64 clockdrift=qint64(PROFILE.cpap->clockDrift()) * 1000L;
-    qint64 drift=0;
+    qint64 clockdrift = qint64(PROFILE.cpap->clockDrift()) * 1000L;
+    qint64 drift = 0;
 
-    for (QList<Session *>::iterator s=m_day->begin();s!=m_day->end(); s++) {
-        if (!(*s)->enabled())
+    for (QList<Session *>::iterator s = m_day->begin(); s != m_day->end(); s++) {
+        if (!(*s)->enabled()) {
             continue;
-        drift=((*s)->machine()->GetType()==MT_CPAP) ? clockdrift : 0;
+        }
 
-        cei=(*s)->eventlist.find(m_code);
-        if (cei==(*s)->eventlist.end())
+        drift = ((*s)->machine()->GetType() == MT_CPAP) ? clockdrift : 0;
+
+        cei = (*s)->eventlist.find(m_code);
+
+        if (cei == (*s)->eventlist.end()) {
             continue;
+        }
 
-        QVector<EventList *> & evlist=cei.value();
-        for (int k=0;k<evlist.size();k++) {
-            EventList & el=*(evlist[k]);
-            start=el.first() + drift;
-            tptr=el.rawTime();
-            dptr=el.rawData();
-            int np=el.count();
-            eptr=dptr+np;
+        QVector<EventList *> &evlist = cei.value();
 
-            for (idx=0;dptr < eptr; dptr++, tptr++, idx++) {
-                X=start + *tptr;
-                L=*dptr * 1000;
-                if (X >= minx)
+        for (int k = 0; k < evlist.size(); k++) {
+            EventList &el = *(evlist[k]);
+            start = el.first() + drift;
+            tptr = el.rawTime();
+            dptr = el.rawData();
+            int np = el.count();
+            eptr = dptr + np;
+
+            for (idx = 0; dptr < eptr; dptr++, tptr++, idx++) {
+                X = start + *tptr;
+                L = *dptr * 1000;
+
+                if (X >= minx) {
                     break;
-                X2=X-L;
-                if (X2 >= minx)
+                }
+
+                X2 = X - L;
+
+                if (X2 >= minx) {
                     break;
+                }
 
             }
-            np-=idx;
 
-            if (m_flt==FT_Bar) {
+            np -= idx;
+
+            if (m_flt == FT_Bar) {
                 ///////////////////////////////////////////////////////////////////////////
                 // Draw Event Flag Bars
                 ///////////////////////////////////////////////////////////////////////////
@@ -232,68 +269,74 @@ void gFlagsLine::paint(gGraph & w,int left, int top, int width, int height)
                 // Check bounds outside of loop is faster..
                 // This will have to be reverted if multithreaded drawing is ever brought back
 
-                int rem=lines->Max() - lines->cnt();
-                if ((np<<1) > rem) {
+                int rem = lines->Max() - lines->cnt();
+
+                if ((np << 1) > rem) {
                     qDebug() << "gFlagsLine would overfill lines for" << schema::channel[m_code].label();
-                    np=rem >> 1;
-                    verts_exceeded=true;
+                    np = rem >> 1;
+                    verts_exceeded = true;
                 }
 
-                for (int i=0;i<np;i++) {
-                    X=start + *tptr++;
+                for (int i = 0; i < np; i++) {
+                    X = start + *tptr++;
 
-                    if (X > maxx)
+                    if (X > maxx) {
                         break;
+                    }
 
-                    x1=(X - minx) * xmult + left;
-                    lines->add(x1,bartop,x1,bottom);
+                    x1 = (X - minx) * xmult + left;
+                    lines->add(x1, bartop, x1, bottom);
 
                     //if (lines->full()) { verts_exceeded=true; break; }
                 }
-            } else if (m_flt==FT_Span) {
+            } else if (m_flt == FT_Span) {
                 ///////////////////////////////////////////////////////////////////////////
                 // Draw Event Flag Spans
                 ///////////////////////////////////////////////////////////////////////////
                 quads->setColor(m_flag_color);
-                int rem=quads->Max() - quads->cnt();
+                int rem = quads->Max() - quads->cnt();
 
-                if ((np<<2) > rem) {
+                if ((np << 2) > rem) {
                     qDebug() << "gFlagsLine would overfill quads for" << schema::channel[m_code].label();
-                    np=rem >> 2;
-                    verts_exceeded=true;
+                    np = rem >> 2;
+                    verts_exceeded = true;
                 }
 
                 for (; dptr < eptr; dptr++) {
-                    X=start + * tptr++;
+                    X = start + * tptr++;
 
-                    if (X > maxx)
+                    if (X > maxx) {
                         break;
+                    }
 
-                    L=*dptr * 1000L;
-                    X2=X-L;
+                    L = *dptr * 1000L;
+                    X2 = X - L;
 
-                    x1=double(X - minx) * xmult + left;
-                    x2=double(X2 - minx) * xmult + left;
+                    x1 = double(X - minx) * xmult + left;
+                    x2 = double(X2 - minx) * xmult + left;
 
-                    quads->add(x2,bartop,x1,bartop, x1,bottom,x2,bottom);
+                    quads->add(x2, bartop, x1, bartop, x1, bottom, x2, bottom);
                     //if (quads->full()) { verts_exceeded=true; break; }
 
                 }
             }
-            if (verts_exceeded) break;
+
+            if (verts_exceeded) { break; }
         }
-        if (verts_exceeded) break;
+
+        if (verts_exceeded) { break; }
     }
+
     if (verts_exceeded) {
         qWarning() << "maxverts exceeded in gFlagsLine::plot()";
     }
 }
 
-bool gFlagsLine::mouseMoveEvent(QMouseEvent * event,gGraph * graph)
+bool gFlagsLine::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
 {
     Q_UNUSED(event)
     Q_UNUSED(graph)
-  //  qDebug() << code() << event->x() << event->y() << graph->rect();
+    //  qDebug() << code() << event->x() << event->y() << graph->rect();
 
     return false;
 }
diff --git a/sleepyhead/Graphs/gFlagsLine.h b/sleepyhead/Graphs/gFlagsLine.h
index 7cbdd0f3..fc99614d 100644
--- a/sleepyhead/Graphs/gFlagsLine.h
+++ b/sleepyhead/Graphs/gFlagsLine.h
@@ -20,20 +20,20 @@ class gFlagsGroup;
 /*! \class gYSpacer
     \brief A dummy vertical spacer object
    */
-class gFlagsLabelArea:public gSpacer
+class gFlagsLabelArea: public gSpacer
 {
-    public:
-        gFlagsLabelArea(gFlagsGroup * group);
-        virtual void paint(gGraph & w,int left,int top, int width, int height) {
-            Q_UNUSED(w)
-            Q_UNUSED(left)
-            Q_UNUSED(top)
-            Q_UNUSED(width)
-            Q_UNUSED(height)
-        }
-protected:
-        gFlagsGroup * m_group;
-        virtual bool mouseMoveEvent(QMouseEvent * event,gGraph * graph);
+  public:
+    gFlagsLabelArea(gFlagsGroup *group);
+    virtual void paint(gGraph &w, int left, int top, int width, int height) {
+        Q_UNUSED(w)
+        Q_UNUSED(left)
+        Q_UNUSED(top)
+        Q_UNUSED(width)
+        Q_UNUSED(height)
+    }
+  protected:
+    gFlagsGroup *m_group;
+    virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph);
 
 
 };
@@ -42,63 +42,64 @@ protected:
 /*! \class gFlagsLine
     \brief One single line of event flags in the Event Flags chart
     */
-class gFlagsLine:public Layer
+class gFlagsLine: public Layer
 {
     friend class gFlagsGroup;
-    public:
-        /*! \brief Constructs an individual gFlagsLine object
-            \param code  The Channel the data is sourced from
-            \param col   The colour to draw this flag
-            \param label The label to show to the left of the Flags line.
-            \param always_visible  Whether to always show this line, even if empty
-            \param Type of Flag, either FT_Bar, or FT_Span
-            */
-        gFlagsLine(ChannelID code,QColor col=Qt::black,QString label="",bool always_visible=false,FlagType flt=FT_Bar);
-        virtual ~gFlagsLine();
+  public:
+    /*! \brief Constructs an individual gFlagsLine object
+        \param code  The Channel the data is sourced from
+        \param col   The colour to draw this flag
+        \param label The label to show to the left of the Flags line.
+        \param always_visible  Whether to always show this line, even if empty
+        \param Type of Flag, either FT_Bar, or FT_Span
+        */
+    gFlagsLine(ChannelID code, QColor col = Qt::black, QString label = "", bool always_visible = false,
+               FlagType flt = FT_Bar);
+    virtual ~gFlagsLine();
 
-        //! \brief Drawing code to add the flags and span markers to the Vertex buffers.
-        virtual void paint(gGraph & w,int left, int top, int width, int height);
+    //! \brief Drawing code to add the flags and span markers to the Vertex buffers.
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
 
-        //! \brief Returns true if should always show this flag, even if it's empty
-        bool isAlwaysVisible() { return m_always_visible; }
-        //! \brief Set this to true to make a flag line always visible
-        void setAlwaysVisible(bool b) { m_always_visible=b; }
+    //! \brief Returns true if should always show this flag, even if it's empty
+    bool isAlwaysVisible() { return m_always_visible; }
+    //! \brief Set this to true to make a flag line always visible
+    void setAlwaysVisible(bool b) { m_always_visible = b; }
 
-        //! \brief Returns the label for this individual Event Flags line
-        QString label() { return m_label; }
+    //! \brief Returns the label for this individual Event Flags line
+    QString label() { return m_label; }
 
-        //! \brief Sets the label for this individual Event Flags line
-        void setLabel(QString s) { m_label=s; }
+    //! \brief Sets the label for this individual Event Flags line
+    void setLabel(QString s) { m_label = s; }
 
-        void setTotalLines(int i) { total_lines=i; }
-        void setLineNum(int i) { line_num=i; }
-    protected:
+    void setTotalLines(int i) { total_lines = i; }
+    void setLineNum(int i) { line_num = i; }
+  protected:
 
-        virtual bool mouseMoveEvent(QMouseEvent * event,gGraph * graph);
+    virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph);
 
-        QString m_label;
-        bool m_always_visible;
-        int total_lines,line_num;
-        FlagType m_flt;
-        QColor m_flag_color;
-        gVertexBuffer *quads;
-        gVertexBuffer *lines;
-        int m_lx, m_ly;
+    QString m_label;
+    bool m_always_visible;
+    int total_lines, line_num;
+    FlagType m_flt;
+    QColor m_flag_color;
+    gVertexBuffer *quads;
+    gVertexBuffer *lines;
+    int m_lx, m_ly;
 };
 
 /*! \class gFlagsGroup
     \brief Contains multiple gFlagsLine entries for the Events Flag graph
     */
-class gFlagsGroup:public LayerGroup
+class gFlagsGroup: public LayerGroup
 {
     friend class gFlagsLabelArea;
 
-public:
+  public:
     gFlagsGroup();
     virtual ~gFlagsGroup();
 
     //! Draw filled rectangles behind Event Flag's, and an outlines around them all, Calls the individual paint for each gFlagLine
-    virtual void paint(gGraph & w,int left, int top, int width, int height);
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
 
     //! Returns the first time represented by all gFlagLine layers, in milliseconds since epoch
     virtual qint64 Minx();
@@ -118,10 +119,10 @@ public:
     int barHeight() { return m_barh; }
 
     //! Returns a list of Visible gFlagsLine layers to draw
-    QVector<gFlagsLine *> & visibleLayers() { return lvisible; }
+    QVector<gFlagsLine *> &visibleLayers() { return lvisible; }
 
-protected:
-    virtual bool mouseMoveEvent(QMouseEvent * event,gGraph * graph);
+  protected:
+    virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph);
 
     gVertexBuffer *quads, *lines;
     QVector<gFlagsLine *> lvisible;
diff --git a/sleepyhead/Graphs/gFooBar.cpp b/sleepyhead/Graphs/gFooBar.cpp
index 6d0f7221..4fa208d1 100644
--- a/sleepyhead/Graphs/gFooBar.cpp
+++ b/sleepyhead/Graphs/gFooBar.cpp
@@ -13,11 +13,11 @@
 #include "gFooBar.h"
 #include "gYAxis.h"
 
-gShadowArea::gShadowArea(QColor shadow_color,QColor line_color)
-:Layer(NoChannel),m_shadow_color(shadow_color),m_line_color(line_color)
+gShadowArea::gShadowArea(QColor shadow_color, QColor line_color)
+    : Layer(NoChannel), m_shadow_color(shadow_color), m_line_color(line_color)
 {
-    addVertexBuffer(quads=new gVertexBuffer(20,GL_QUADS));
-    addVertexBuffer(lines=new gVertexBuffer(20,GL_LINES));
+    addVertexBuffer(quads = new gVertexBuffer(20, GL_QUADS));
+    addVertexBuffer(lines = new gVertexBuffer(20, GL_LINES));
     quads->forceAntiAlias(true);
     lines->setAntiAlias(true);
     lines->setSize(2);
@@ -25,108 +25,114 @@ gShadowArea::gShadowArea(QColor shadow_color,QColor line_color)
 gShadowArea::~gShadowArea()
 {
 }
-void gShadowArea::paint(gGraph & w,int left, int top, int width, int height)
+void gShadowArea::paint(gGraph &w, int left, int top, int width, int height)
 {
-    if (!m_visible) return;
-    double xx=w.max_x-w.min_x;
+    if (!m_visible) { return; }
 
-    if (xx==0)
+    double xx = w.max_x - w.min_x;
+
+    if (xx == 0) {
         return;
+    }
 
-    int start_px=left-1;
-    int end_px=left+width;
+    int start_px = left - 1;
+    int end_px = left + width;
 
     //float h=top;
 
-    double rmx=w.rmax_x-w.rmin_x;
-    double px=((1.0/rmx)*(w.min_x-w.rmin_x))*width;
-    double py=((1.0/rmx)*(w.max_x-w.rmin_x))*width;
+    double rmx = w.rmax_x - w.rmin_x;
+    double px = ((1.0 / rmx) * (w.min_x - w.rmin_x)) * width;
+    double py = ((1.0 / rmx) * (w.max_x - w.rmin_x)) * width;
 
-    quads->add(start_px,top,start_px,top+height,start_px+px, top+height, start_px+px, top,m_shadow_color.rgba());
-    quads->add(start_px+py, top, start_px+py, top+height,end_px, top+height, end_px, top,m_shadow_color.rgba());
+    quads->add(start_px, top, start_px, top + height, start_px + px, top + height, start_px + px, top,
+               m_shadow_color.rgba());
+    quads->add(start_px + py, top, start_px + py, top + height, end_px, top + height, end_px, top,
+               m_shadow_color.rgba());
 
-    lines->add(start_px+px, top, start_px+py, top,m_line_color.rgba());
-    lines->add(start_px+px, top+height+1, start_px+py, top+height+1,m_line_color.rgba());
+    lines->add(start_px + px, top, start_px + py, top, m_line_color.rgba());
+    lines->add(start_px + px, top + height + 1, start_px + py, top + height + 1, m_line_color.rgba());
 }
 
-gFooBar::gFooBar(int offset,QColor handle_color,QColor line_color)
-:Layer(NoChannel),m_offset(offset),m_handle_color(handle_color),m_line_color(line_color)
+gFooBar::gFooBar(int offset, QColor handle_color, QColor line_color)
+    : Layer(NoChannel), m_offset(offset), m_handle_color(handle_color), m_line_color(line_color)
 {
 }
 gFooBar::~gFooBar()
 {
 }
-void gFooBar::paint(gGraph & w,int left, int top, int width, int height)
+void gFooBar::paint(gGraph &w, int left, int top, int width, int height)
 {
     Q_UNUSED(top);
     Q_UNUSED(left);
     Q_UNUSED(width);
     Q_UNUSED(height);
-    if (!m_visible) return;
 
-    double xx=w.max_x-w.min_x;
+    if (!m_visible) { return; }
 
-    if (xx==0)
+    double xx = w.max_x - w.min_x;
+
+    if (xx == 0) {
         return;
+    }
 
     //int start_px=left;
     //int end_px=left+width;
 
     //float h=top;
 
-  /*  glLineWidth(1);
-    glBegin(GL_LINES);
-    w.qglColor(m_line_color);
-    glVertex2f(start_px, h);
-    glVertex2f(start_px+width, h);
-    glEnd();
+    /*  glLineWidth(1);
+      glBegin(GL_LINES);
+      w.qglColor(m_line_color);
+      glVertex2f(start_px, h);
+      glVertex2f(start_px+width, h);
+      glEnd();
 
-    double rmx=w.rmax_x-w.rmin_x;
-    double px=((1/rmx)*(w.min_x-w.rmin_x))*width;
-    double py=((1/rmx)*(w.max_x-w.rmin_x))*width;
+      double rmx=w.rmax_x-w.rmin_x;
+      double px=((1/rmx)*(w.min_x-w.rmin_x))*width;
+      double py=((1/rmx)*(w.max_x-w.rmin_x))*width;
 
-    int extra=0;
-    if (fabs(px-py)<2) extra=2;
+      int extra=0;
+      if (fabs(px-py)<2) extra=2;
 
-    int hh=25;
-    glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-    glEnable(GL_BLEND);
-    glBegin(GL_QUADS);
+      int hh=25;
+      glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+      glEnable(GL_BLEND);
+      glBegin(GL_QUADS);
 
-    w.qglColor(m_handle_color);
-    glVertex2f(start_px+px-extra,top-hh);
-    glVertex2f(start_px+py+extra,top-hh);
-    //glColor4ub(255,255,255,128);
-    glColor4ub(255,255,255,128);
-    glVertex2f(start_px+py+extra,top-hh/2.0);
-    glVertex2f(start_px+px-extra,top-hh/2.0);
-//    glColor4ub(255,255,255,128);
-    glColor4ub(255,255,255,128);
-    glVertex2f(start_px+px-extra,top-hh/2.0);
-    glVertex2f(start_px+py+extra,top-hh/2.0);
-    w.qglColor(m_handle_color);
-//    glColor4ub(192,192,192,128);
-    glVertex2f(start_px+py+extra,h);
-    glVertex2f(start_px+px-extra,h);
-    glEnd();
-    glDisable(GL_BLEND);
+      w.qglColor(m_handle_color);
+      glVertex2f(start_px+px-extra,top-hh);
+      glVertex2f(start_px+py+extra,top-hh);
+      //glColor4ub(255,255,255,128);
+      glColor4ub(255,255,255,128);
+      glVertex2f(start_px+py+extra,top-hh/2.0);
+      glVertex2f(start_px+px-extra,top-hh/2.0);
+    //    glColor4ub(255,255,255,128);
+      glColor4ub(255,255,255,128);
+      glVertex2f(start_px+px-extra,top-hh/2.0);
+      glVertex2f(start_px+py+extra,top-hh/2.0);
+      w.qglColor(m_handle_color);
+    //    glColor4ub(192,192,192,128);
+      glVertex2f(start_px+py+extra,h);
+      glVertex2f(start_px+px-extra,h);
+      glEnd();
+      glDisable(GL_BLEND);
 
-    w.qglColor(m_handle_color);
-    glBegin(GL_LINE_LOOP);
-    glVertex2f(start_px+px-extra,top-hh);
-    glVertex2f(start_px+py+extra,top-hh);
-    glVertex2f(start_px+py+extra,h);
-    glVertex2f(start_px+px-extra,h);
-    glEnd();
+      w.qglColor(m_handle_color);
+      glBegin(GL_LINE_LOOP);
+      glVertex2f(start_px+px-extra,top-hh);
+      glVertex2f(start_px+py+extra,top-hh);
+      glVertex2f(start_px+py+extra,h);
+      glVertex2f(start_px+px-extra,h);
+      glEnd();
 
-    glLineWidth(3);
-    glBegin(GL_LINES);
-    w.qglColor(m_handle_color);
-    glVertex2f(start_px+px-extra,h);
-    glVertex2f(start_px+py+extra,h);
-    glEnd();
+      glLineWidth(3);
+      glBegin(GL_LINES);
+      w.qglColor(m_handle_color);
+      glVertex2f(start_px+px-extra,h);
+      glVertex2f(start_px+py+extra,h);
+      glEnd();
 
-    glLineWidth(1);  */
+      glLineWidth(1);  */
 
 }
 
diff --git a/sleepyhead/Graphs/gFooBar.h b/sleepyhead/Graphs/gFooBar.h
index 1b76cc67..05187f41 100644
--- a/sleepyhead/Graphs/gFooBar.h
+++ b/sleepyhead/Graphs/gFooBar.h
@@ -17,34 +17,35 @@
 /*! \class gShadowArea
     \brief Displays a Shadow for all graph areas not highlighted (used in Event Flags)
     */
-class gShadowArea:public Layer
+class gShadowArea: public Layer
 {
-    public:
-        gShadowArea(QColor shadow_color=QColor(40,40,40,40),QColor line_color=Qt::blue);
-        virtual ~gShadowArea();
-        virtual void paint(gGraph & w,int left, int top, int width, int height);
-    protected:
-        QColor m_shadow_color;
-        QColor m_line_color;
-        gVertexBuffer *quads;
-        gVertexBuffer *lines;
+  public:
+    gShadowArea(QColor shadow_color = QColor(40, 40, 40, 40), QColor line_color = Qt::blue);
+    virtual ~gShadowArea();
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
+  protected:
+    QColor m_shadow_color;
+    QColor m_line_color;
+    gVertexBuffer *quads;
+    gVertexBuffer *lines;
 };
 
 /*! \class gFooBar
     \brief Was a kind of scrollbar thingy that used to be used for representing the overall graph areas.
     Currently Unused and empty.
     */
-class gFooBar:public Layer
+class gFooBar: public Layer
 {
-    public:
-        gFooBar(int offset=10,QColor handle_color=QColor("orange"),QColor line_color=QColor("dark grey"));
-        virtual ~gFooBar();
-        virtual void paint(gGraph & w,int left, int top, int width, int height);
-        static const int Margin=15;
-    protected:
-        int m_offset;
-        QColor m_handle_color;
-        QColor m_line_color;
+  public:
+    gFooBar(int offset = 10, QColor handle_color = QColor("orange"),
+            QColor line_color = QColor("dark grey"));
+    virtual ~gFooBar();
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
+    static const int Margin = 15;
+  protected:
+    int m_offset;
+    QColor m_handle_color;
+    QColor m_line_color;
 };
 
 #endif // GFOOBAR_H
diff --git a/sleepyhead/Graphs/gGraphView.h b/sleepyhead/Graphs/gGraphView.h
index 5fb857d2..09963b5d 100644
--- a/sleepyhead/Graphs/gGraphView.h
+++ b/sleepyhead/Graphs/gGraphView.h
@@ -55,7 +55,7 @@ int GetXHeight(QFont *font = defaultfont);
 class gGraphView;
 class gGraph;
 
-const int textque_max=512;
+const int textque_max = 512;
 
 typedef quint32 RGBA;
 /*union RGBA {
@@ -71,9 +71,8 @@ typedef quint32 RGBA;
 #ifdef BUILD_WITH_MSVC
 __declspec(align(1))
 #endif
-struct gVertex
-{
-    gVertex(GLshort _x, GLshort _y, GLuint _c) { x=_x; y=_y; color=_c; }
+struct gVertex {
+    gVertex(GLshort _x, GLshort _y, GLuint _c) { x = _x; y = _y; color = _c; }
     GLshort x;
     GLshort y;
     RGBA color;
@@ -87,22 +86,22 @@ class gVertexBuffer
 {
   public:
     gVertexBuffer(int max = 2048, int type = GL_LINES)
-      : m_max(max), m_type(type), m_cnt(0), m_size(1),
-        m_scissor(false), m_antialias(false), m_forceantialias(false), m_stippled(false),
-        buffer(NULL),
-        s_x(0), s_y(0), s_width(0), s_height(0),
-        m_color(0),
-        m_stipple(0xffff),
-        m_blendfunc1(GL_SRC_ALPHA),
-        m_blendfunc2(GL_ONE_MINUS_SRC_ALPHA)
-    {
+        : m_max(max), m_type(type), m_cnt(0), m_size(1),
+          m_scissor(false), m_antialias(false), m_forceantialias(false), m_stippled(false),
+          buffer(NULL),
+          s_x(0), s_y(0), s_width(0), s_height(0),
+          m_color(0),
+          m_stipple(0xffff),
+          m_blendfunc1(GL_SRC_ALPHA),
+          m_blendfunc2(GL_ONE_MINUS_SRC_ALPHA) {
         // FIXME: Really should not allocate in constructor.
         buffer = (gVertex *)calloc(max, sizeof(gVertex));
     }
 
     ~gVertexBuffer() {
-        if (buffer)
+        if (buffer) {
             free(buffer);
+        }
     }
 
     void add(GLshort x1, GLshort y1, RGBA color);
@@ -183,14 +182,14 @@ class GLBuffer
 {
   public:
     GLBuffer(int max = 2048, int type = GL_LINES, bool stippled = false)
-      : m_max(max), m_type(type), m_cnt(0), m_colcnt(0), m_size(1),
-        s1(0), s2(0), s3(0), s4(0),
-        m_scissor(false),
-        m_antialias(true),
-        m_forceantialias(false),
-        m_stippled(stippled),
-        m_blendfunc1(GL_SRC_ALPHA),
-        m_blendfunc2(GL_ONE_MINUS_SRC_ALPHA)
+        : m_max(max), m_type(type), m_cnt(0), m_colcnt(0), m_size(1),
+          s1(0), s2(0), s3(0), s4(0),
+          m_scissor(false),
+          m_antialias(true),
+          m_forceantialias(false),
+          m_stippled(stippled),
+          m_blendfunc1(GL_SRC_ALPHA),
+          m_blendfunc2(GL_ONE_MINUS_SRC_ALPHA)
     { }
     virtual ~GLBuffer() {}
 
@@ -199,7 +198,7 @@ class GLBuffer
         s2 = y1;
         s3 = x2;
         s4 = y2;
-        m_scissor=true;
+        m_scissor = true;
     }
 
     int Max() const { return m_max; }
@@ -215,7 +214,7 @@ class GLBuffer
     void setColor(QColor col) { m_color = col; }
     void setBlendFunc(GLuint b1, GLuint b2) { m_blendfunc1 = b1; m_blendfunc2 = b2; }
 
-    virtual void draw(){}
+    virtual void draw() {}
 
   protected:
     int m_max;
@@ -290,8 +289,7 @@ class GLFloatBuffer : public GLBuffer
 /*! \struct TextQue
     \brief Holds a single item of text for the drawing queue
     */
-struct TextQue
-{
+struct TextQue {
     //! \variable contains the x axis screen position to draw the text
     short x;
     //! \variable contains the y axis screen position to draw the text
@@ -315,10 +313,10 @@ class MyScrollBar : public QScrollBar
 {
   public:
     MyScrollBar(QWidget *parent = NULL)
-      : QScrollBar(parent)
+        : QScrollBar(parent)
     { }
 
-    void SendWheelEvent(QWheelEvent * e) {
+    void SendWheelEvent(QWheelEvent *e) {
         wheelEvent(e);
     }
 };
@@ -335,29 +333,29 @@ class Layer
 
   public:
     Layer(ChannelID code)
-      : m_refcount(0),
-        m_day(NULL),
-        m_visible(true),
-        m_movable(false),
-        m_minx(0), m_maxx(0),
-        m_miny(0), m_maxy(0),
-        m_physminy(0), m_physmaxy(0),
-        m_code(code),
-        m_width(0), m_height(0),
-        m_X(0), m_Y(0),
-        m_order(0),
-        m_position(LayerCenter)
+        : m_refcount(0),
+          m_day(NULL),
+          m_visible(true),
+          m_movable(false),
+          m_minx(0), m_maxx(0),
+          m_miny(0), m_maxy(0),
+          m_physminy(0), m_physmaxy(0),
+          m_code(code),
+          m_width(0), m_height(0),
+          m_X(0), m_Y(0),
+          m_order(0),
+          m_position(LayerCenter)
     { }
 
     virtual ~Layer();
 
     //! \brief This gets called on day selection, allowing this layer to precalculate any drawing data
-    virtual void SetDay(Day * d);
+    virtual void SetDay(Day *d);
 
     //! \brief Set the ChannelID used in this layer
     virtual void SetCode(ChannelID c) { m_code = c; }
     //! \brief Return the ChannelID used in this layer
-    const ChannelID & code() { return m_code; }
+    const ChannelID &code() { return m_code; }
 
     //! \brief returns true if this layer contains no data.
     virtual bool isEmpty();
@@ -417,7 +415,7 @@ class Layer
         \param int width
         \param int height
       */
-    virtual void paint(gGraph & gv,int left,int top,int width, int height) = 0;
+    virtual void paint(gGraph &gv, int left, int top, int width, int height) = 0;
 
     //! \brief Set the layout position and order for this layer.
     void setLayout(LayerPosition position, short width, short height, short order);
@@ -470,27 +468,39 @@ class Layer
 
     //! \brief Mouse wheel moved somewhere over this layer
     virtual bool wheelEvent(QWheelEvent *event, gGraph *graph) {
-        Q_UNUSED(event); Q_UNUSED(graph); return false;
+        Q_UNUSED(event);
+        Q_UNUSED(graph);
+        return false;
     }
     //! \brief Mouse moved somewhere over this layer
     virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph) {
-        Q_UNUSED(event); Q_UNUSED(graph); return false;
+        Q_UNUSED(event);
+        Q_UNUSED(graph);
+        return false;
     }
     //! \brief Mouse left or right button pressed somewhere on this layer
     virtual bool mousePressEvent(QMouseEvent *event, gGraph *graph) {
-        Q_UNUSED(event); Q_UNUSED(graph); return false;
+        Q_UNUSED(event);
+        Q_UNUSED(graph);
+        return false;
     }
     //! \brief Mouse button released that was originally pressed somewhere on this layer
     virtual bool mouseReleaseEvent(QMouseEvent *event, gGraph *graph) {
-        Q_UNUSED(event); Q_UNUSED(graph); return false;
+        Q_UNUSED(event);
+        Q_UNUSED(graph);
+        return false;
     }
     //! \brief Mouse button double clicked somewhere on this layer
     virtual bool mouseDoubleClickEvent(QMouseEvent *event, gGraph *graph) {
-        Q_UNUSED(event); Q_UNUSED(graph); return false;
+        Q_UNUSED(event);
+        Q_UNUSED(graph);
+        return false;
     }
     //! \brief A key was pressed on the keyboard while the graph area was focused.
     virtual bool keyPressEvent(QKeyEvent *event, gGraph *graph) {
-        Q_UNUSED(event); Q_UNUSED(graph); return false;
+        Q_UNUSED(event);
+        Q_UNUSED(graph);
+        return false;
     }
 };
 
@@ -501,7 +511,7 @@ class LayerGroup : public Layer
 {
   public:
     LayerGroup()
-      : Layer(NoChannel)
+        : Layer(NoChannel)
     { }
 
     virtual ~LayerGroup();
@@ -533,27 +543,27 @@ class LayerGroup : public Layer
     //! \brief Return the list of Layers this object holds
     QVector<Layer *> &getLayers() { return layers; }
 
-protected:
+  protected:
     //! \brief Contains all Layer objects in this group
     QVector<Layer *> layers;
 
     //! \brief Mouse wheel moved somewhere over this LayerGroup
-    virtual bool wheelEvent(QWheelEvent * event, gGraph * graph);
+    virtual bool wheelEvent(QWheelEvent *event, gGraph *graph);
 
     //! \brief Mouse moved somewhere over this LayerGroup
-    virtual bool mouseMoveEvent(QMouseEvent * event, gGraph * graph);
+    virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph);
 
     //! \brief Mouse left or right button pressed somewhere on this LayerGroup
-    virtual bool mousePressEvent(QMouseEvent * event, gGraph * graph);
+    virtual bool mousePressEvent(QMouseEvent *event, gGraph *graph);
 
     //! \brief Mouse button released that was originally pressed somewhere on this LayerGroup
-    virtual bool mouseReleaseEvent(QMouseEvent * event, gGraph * graph);
+    virtual bool mouseReleaseEvent(QMouseEvent *event, gGraph *graph);
 
     //! \brief Mouse button double clicked somewhere on this layerGroup
-    virtual bool mouseDoubleClickEvent(QMouseEvent * event, gGraph * graph);
+    virtual bool mouseDoubleClickEvent(QMouseEvent *event, gGraph *graph);
 
     //! \brief A key was pressed on the keyboard while the graph area was focused.
-    virtual bool keyPressEvent(QKeyEvent * event, gGraph * graph);
+    virtual bool keyPressEvent(QKeyEvent *event, gGraph *graph);
 };
 
 class gGraph;
@@ -720,13 +730,13 @@ class gGraph : public QObject
     QString title() { return m_title; }
 
     //! \brief Sets the Graph's (vertical) title
-    void setTitle(const QString title) { m_title=title; }
+    void setTitle(const QString title) { m_title = title; }
 
     //! \brief Returns the measurement Units the Y scale is referring to
     QString units() { return m_units; }
 
     //! \brief Sets the measurement Units the Y scale is referring to
-    void setUnits(const QString units) { m_units=units; }
+    void setUnits(const QString units) { m_units = units; }
 
     //virtual void repaint(); // Repaint individual graph..
 
@@ -821,7 +831,7 @@ class gGraph : public QObject
     void setDay(Day *day);
 
     //! \brief Returns the current day object
-    Day * day() { return m_day; }
+    Day *day() { return m_day; }
 
     //! \brief The Layer, layout and title drawing code
     virtual void paint(int originX, int originY, int width, int height);
@@ -837,8 +847,10 @@ class gGraph : public QObject
 
     //! \brief Sets the margins for the four sides of this graph.
     void setMargins(short left, short right, short top, short bottom) {
-        m_marginleft = left; m_marginright = right;
-        m_margintop = top; m_marginbottom = bottom;
+        m_marginleft = left;
+        m_marginright = right;
+        m_margintop = top;
+        m_marginbottom = bottom;
     }
 
     //! \brief Returns this graphs left margin
@@ -862,7 +874,7 @@ class gGraph : public QObject
     const inline QRect &rect() const { return m_rect; }
 
     bool isPinned() { return m_pinned; }
-    void setPinned(bool b) { m_pinned=b; }
+    void setPinned(bool b) { m_pinned = b; }
 
     // //! \brief Returns the main gGraphView objects gVertexBuffer stippled line list.
     //GLShortBuffer * stippled();
@@ -921,7 +933,7 @@ class gGraph : public QObject
 
     //! \brief Vector containing all this graphs Layers
     QVector<Layer *> m_layers;
-    float m_height,m_width;
+    float m_height, m_width;
 
     int m_min_height;
     int m_max_height;
@@ -950,8 +962,7 @@ class gGraph : public QObject
     \brief My version of Pixmap cache with texture binding support
 
  */
-struct myPixmapCache
-{
+struct myPixmapCache {
     quint64 last_used;
     QImage image;
     GLuint textureID;
@@ -1098,8 +1109,8 @@ class gGraphView : public QGLWidget
 
     void setCubeImage(QImage *);
 
-    inline const float & devicePixelRatio() { return m_dpr; }
-    void setDevicePixelRatio(float dpr) { m_dpr=dpr; }
+    inline const float &devicePixelRatio() { return m_dpr; }
+    void setDevicePixelRatio(float dpr) { m_dpr = dpr; }
 
     // Cube fun
     QVector<QImage *> cubeimg;
@@ -1108,15 +1119,15 @@ class gGraphView : public QGLWidget
 #ifdef ENABLE_THREADED_DRAWING
     QMutex text_mutex;
     QMutex gl_mutex;
-    QSemaphore * masterlock;
-    bool useThreads() { return m_idealthreads>1; }
+    QSemaphore *masterlock;
+    bool useThreads() { return m_idealthreads > 1; }
     QVector<gThread *> m_threads;
     int m_idealthreads;
     QMutex dl_mutex;
 #endif
 
     //! \brief Sends day object to be distributed to all Graphs Layers objects
-    void setDay(Day * day);
+    void setDay(Day *day);
 
     gVertexBuffer *lines, *backlines, *quads, *frontlines;
 
@@ -1144,7 +1155,7 @@ class gGraphView : public QGLWidget
     //! \brief Return whether or not the Pixmap Cache for text rendering is being used.
     bool usePixmapCache();
 
-protected:
+  protected:
     //! \brief Set up the OpenGL basics for the QGLWidget underneath
     virtual void initializeGL();
 
@@ -1202,7 +1213,7 @@ protected:
     QVector<gGraph *> m_graphs;
 
     //! \brief List of all graphs contained, indexed by title
-    QHash<QString,gGraph*> m_graphsbytitle;
+    QHash<QString, gGraph *> m_graphsbytitle;
 
     //! \variable Vertical scroll offset (adjusted when scrollbar gets moved)
     int m_offsetY;
@@ -1221,7 +1232,7 @@ protected:
     QPoint m_sizer_point;
     int m_horiz_travel;
 
-    MyScrollBar * m_scrollbar;
+    MyScrollBar *m_scrollbar;
     QTimer *redrawtimer;
 
     bool m_graph_dragging;
@@ -1231,13 +1242,13 @@ protected:
     TextQue m_textque[textque_max];
 
     int m_textque_items;
-    int m_lastxpos,m_lastypos;
+    int m_lastxpos, m_lastypos;
 
     QString m_emptytext;
     bool m_showsplitter;
 
-    qint64 m_minx,m_maxx;
-    float print_scaleX,print_scaleY;
+    qint64 m_minx, m_maxx;
+    float print_scaleX, print_scaleY;
 
     QPixmap previous_day_snapshot;
     QPixmap current_day_snapshot;
@@ -1253,13 +1264,13 @@ protected:
     QTime m_animationStarted;
 
     // turn this into a struct later..
-    QHash<QString,myPixmapCache *> pixmap_cache;
+    QHash<QString, myPixmapCache *> pixmap_cache;
     qint32 pixmap_cache_size;
     bool use_pixmap_cache;
 
     QTime horizScrollTime, vertScrollTime;
 
-public slots:
+  public slots:
     //! \brief Callback from the ScrollBar, to change scroll position
     void scrollbarValueChanged(int val);
 
diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp
index 64b05577..7f808c2c 100644
--- a/sleepyhead/Graphs/gLineChart.cpp
+++ b/sleepyhead/Graphs/gLineChart.cpp
@@ -17,13 +17,13 @@
 #include "glcommon.h"
 
 #define EXTRA_ASSERTS 1
-gLineChart::gLineChart(ChannelID code,QColor col,bool square_plot, bool disable_accel)
-:Layer(code),m_square_plot(square_plot),m_disable_accel(disable_accel)
+gLineChart::gLineChart(ChannelID code, QColor col, bool square_plot, bool disable_accel)
+    : Layer(code), m_square_plot(square_plot), m_disable_accel(disable_accel)
 {
-    addPlot(code,col,square_plot);
-    m_line_color=col;
-    m_report_empty=false;
-    addVertexBuffer(lines=new gVertexBuffer(100000,GL_LINES));
+    addPlot(code, col, square_plot);
+    m_line_color = col;
+    m_report_empty = false;
+    addVertexBuffer(lines = new gVertexBuffer(100000, GL_LINES));
     lines->setColor(col);
     lines->setAntiAlias(true);
     lines->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -34,72 +34,93 @@ gLineChart::~gLineChart()
 
 bool gLineChart::isEmpty()
 {
-    if (!m_day) return true;
-    for (int j=0;j<m_codes.size();j++) {
-        ChannelID code=m_codes[j];
-        for (int i=0;i<m_day->size();i++) {
-            Session *sess=m_day->getSessions()[i];
-            if (sess->channelExists(code))
+    if (!m_day) { return true; }
+
+    for (int j = 0; j < m_codes.size(); j++) {
+        ChannelID code = m_codes[j];
+
+        for (int i = 0; i < m_day->size(); i++) {
+            Session *sess = m_day->getSessions()[i];
+
+            if (sess->channelExists(code)) {
                 return false;
+            }
         }
     }
+
     return true;
 }
 
 void gLineChart::SetDay(Day *d)
 {
-//    Layer::SetDay(d);
-    m_day=d;
+    //    Layer::SetDay(d);
+    m_day = d;
 
-    m_minx=0,m_maxx=0;
-    m_miny=0,m_maxy=0;
-    m_physminy=0, m_physmaxy=0;
+    m_minx = 0, m_maxx = 0;
+    m_miny = 0, m_maxy = 0;
+    m_physminy = 0, m_physmaxy = 0;
 
-    if (!d)
+    if (!d) {
         return;
+    }
 
     qint64 t64;
     EventDataType tmp;
 
-    bool first=true;
+    bool first = true;
+
+    for (int j = 0; j < m_codes.size(); j++) {
+        ChannelID code = m_codes[j];
+
+        for (int i = 0; i < d->size(); i++) {
+            Session *sess = d->getSessions()[i];
+
+            if (!sess->channelExists(code)) { continue; }
 
-    for (int j=0;j<m_codes.size();j++) {
-        ChannelID code=m_codes[j];
-        for (int i=0;i<d->size();i++) {
-            Session *sess=d->getSessions()[i];
-            if (!sess->channelExists(code)) continue;
             if (first) {
-                m_miny=sess->Min(code);
-                m_maxy=sess->Max(code);
-                m_physminy=sess->physMin(code);
-                m_physmaxy=sess->physMax(code);
-                m_minx=sess->first(code);
-                m_maxx=sess->last(code);
-                first=false;
+                m_miny = sess->Min(code);
+                m_maxy = sess->Max(code);
+                m_physminy = sess->physMin(code);
+                m_physmaxy = sess->physMax(code);
+                m_minx = sess->first(code);
+                m_maxx = sess->last(code);
+                first = false;
             } else {
-                tmp=sess->physMin(code);
-                if (m_physminy > tmp)
-                    m_physminy=tmp;
+                tmp = sess->physMin(code);
 
-                tmp=sess->physMax(code);
-                if (m_physmaxy < tmp)
-                    m_physmaxy=tmp;
+                if (m_physminy > tmp) {
+                    m_physminy = tmp;
+                }
 
-                tmp=sess->Min(code);
-                if (m_miny > tmp)
-                    m_miny=tmp;
+                tmp = sess->physMax(code);
 
-                tmp=sess->Max(code);
-                if (m_maxy < tmp)
-                    m_maxy=tmp;
+                if (m_physmaxy < tmp) {
+                    m_physmaxy = tmp;
+                }
 
-                t64=sess->first(code);
-                if (m_minx > t64)
-                    m_minx=t64;
+                tmp = sess->Min(code);
 
-                t64=sess->last(code);
-                if (m_maxx < t64)
-                    m_maxx=t64;
+                if (m_miny > tmp) {
+                    m_miny = tmp;
+                }
+
+                tmp = sess->Max(code);
+
+                if (m_maxy < tmp) {
+                    m_maxy = tmp;
+                }
+
+                t64 = sess->first(code);
+
+                if (m_minx > t64) {
+                    m_minx = t64;
+                }
+
+                t64 = sess->last(code);
+
+                if (m_maxx < t64) {
+                    m_maxx = t64;
+                }
             }
         }
 
@@ -108,47 +129,53 @@ void gLineChart::SetDay(Day *d)
     //if (m_code==CPAP_Leak) {
     // subtract_offset=profile.cpap.[IntentionalLeak].toDouble();
     //} else
-    subtract_offset=0;
+    subtract_offset = 0;
 
 
 }
 EventDataType gLineChart::Miny()
 {
-    int m=Layer::Miny();
-    if (subtract_offset>0) {
-        m-=subtract_offset;
-        if (m<0) m=0;
+    int m = Layer::Miny();
+
+    if (subtract_offset > 0) {
+        m -= subtract_offset;
+
+        if (m < 0) { m = 0; }
     }
+
     return m;
 }
 EventDataType gLineChart::Maxy()
 {
-    return Layer::Maxy()-subtract_offset;
+    return Layer::Maxy() - subtract_offset;
 }
 
 // Time Domain Line Chart
-void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
+void gLineChart::paint(gGraph &w, int left, int top, int width, int height)
 {
-    if (!m_visible)
+    if (!m_visible) {
         return;
+    }
 
-    if (!m_day)
+    if (!m_day) {
         return;
+    }
 
     //if (!m_day->channelExists(m_code)) return;
 
-    if (width<0)
+    if (width < 0) {
         return;
+    }
 
-   // lines=w.lines();
-    EventDataType miny,maxy;
-    double minx,maxx;
+    // lines=w.lines();
+    EventDataType miny, maxy;
+    double minx, maxx;
 
 
     if (w.blockZoom()) {
-        minx=w.rmin_x, maxx=w.rmax_x;
+        minx = w.rmin_x, maxx = w.rmax_x;
     } else {
-        maxx=w.max_x, minx=w.min_x;
+        maxx = w.max_x, minx = w.min_x;
     }
 
     // hmmm.. subtract_offset..
@@ -157,138 +184,161 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
         miny=-MAX(fabs(miny),fabs(maxy));
     }*/
 
-    if (w.zoomY()==0 && PROFILE.appearance->allowYAxisScaling()) {
-        miny=m_physminy, maxy=m_physmaxy;
+    if (w.zoomY() == 0 && PROFILE.appearance->allowYAxisScaling()) {
+        miny = m_physminy, maxy = m_physmaxy;
     } else {
-        miny=w.min_y, maxy=w.max_y;
+        miny = w.min_y, maxy = w.max_y;
     }
-    w.roundY(miny,maxy);
 
-    double xx=maxx-minx;
-    double xmult=double(width)/xx;
+    w.roundY(miny, maxy);
 
-    EventDataType yy=maxy-miny;
-    EventDataType ymult=EventDataType(height-3)/yy;   // time to pixel conversion multiplier
+    double xx = maxx - minx;
+    double xmult = double(width) / xx;
+
+    EventDataType yy = maxy - miny;
+    EventDataType ymult = EventDataType(height - 3) / yy; // time to pixel conversion multiplier
 
     // Return on screwy min/max conditions
-    if (xx<0)
+    if (xx < 0) {
         return;
-    if (yy<=0) {
-        if (miny==0)
-            return;
-     }
+    }
 
-    EventDataType lastpx,lastpy;
-    EventDataType px,py;
+    if (yy <= 0) {
+        if (miny == 0) {
+            return;
+        }
+    }
+
+    EventDataType lastpx, lastpy;
+    EventDataType px, py;
     int idx;
     bool done;
-    double x0,xL;
+    double x0, xL;
     double sr;
     int sam;
-    int minz,maxz;
+    int minz, maxz;
 
     // Draw bounding box
-    gVertexBuffer *outlines=w.lines();
-    GLuint blk=QColor(Qt::black).rgba();
-    outlines->add(left, top, left, top+height, blk);
-    outlines->add(left, top+height, left+width,top+height, blk);
-    outlines->add(left+width,top+height, left+width, top, blk);
-    outlines->add(left+width, top, left,top, blk);
+    gVertexBuffer *outlines = w.lines();
+    GLuint blk = QColor(Qt::black).rgba();
+    outlines->add(left, top, left, top + height, blk);
+    outlines->add(left, top + height, left + width, top + height, blk);
+    outlines->add(left + width, top + height, left + width, top, blk);
+    outlines->add(left + width, top, left, top, blk);
     width--;
-    height-=2;
+    height -= 2;
 
-    int num_points=0;
-    int visible_points=0;
-    int total_points=0;
-    int total_visible=0;
-    bool square_plot,accel;
-    qint64 clockdrift=qint64(PROFILE.cpap->clockDrift()) * 1000L;
-    qint64 drift=0;
+    int num_points = 0;
+    int visible_points = 0;
+    int total_points = 0;
+    int total_visible = 0;
+    bool square_plot, accel;
+    qint64 clockdrift = qint64(PROFILE.cpap->clockDrift()) * 1000L;
+    qint64 drift = 0;
 
-    QHash<ChannelID,QVector<EventList *> >::iterator ci;
+    QHash<ChannelID, QVector<EventList *> >::iterator ci;
 
     //m_line_color=schema::channel[m_code].defaultColor();
-    int legendx=left+width;
+    int legendx = left + width;
 
     int codepoints;
+
     //GLuint color;
-    for (int gi=0;gi<m_codes.size();gi++) {
-        ChannelID code=m_codes[gi];
+    for (int gi = 0; gi < m_codes.size(); gi++) {
+        ChannelID code = m_codes[gi];
         //m_line_color=m_colors[gi];
         lines->setColor(m_colors[gi]);
         //color=m_line_color.rgba();
 
-        codepoints=0;
-        for (int svi=0;svi<m_day->size();svi++) {
-            Session *sess=(*m_day)[svi];
+        codepoints = 0;
+
+        for (int svi = 0; svi < m_day->size(); svi++) {
+            Session *sess = (*m_day)[svi];
+
             if (!sess) {
                 qWarning() << "gLineChart::Plot() NULL Session Record.. This should not happen";
                 continue;
             }
 
-            drift=(sess->machine()->GetType()==MT_CPAP) ? clockdrift : 0;
+            drift = (sess->machine()->GetType() == MT_CPAP) ? clockdrift : 0;
 
-            if (!sess->enabled()) continue;
-            schema::Channel ch=schema::channel[code];
-            bool fndbetter=false;
-            for (QList<schema::Channel *>::iterator l=ch.m_links.begin();l!=ch.m_links.end();l++) {
-                schema::Channel *c=*l;
-                ci=(*m_day)[svi]->eventlist.find(c->id());
-                if (ci!=(*m_day)[svi]->eventlist.end()) {
-                    fndbetter=true;
+            if (!sess->enabled()) { continue; }
+
+            schema::Channel ch = schema::channel[code];
+            bool fndbetter = false;
+
+            for (QList<schema::Channel *>::iterator l = ch.m_links.begin(); l != ch.m_links.end(); l++) {
+                schema::Channel *c = *l;
+                ci = (*m_day)[svi]->eventlist.find(c->id());
+
+                if (ci != (*m_day)[svi]->eventlist.end()) {
+                    fndbetter = true;
                     break;
                 }
 
             }
+
             if (!fndbetter) {
-                ci=(*m_day)[svi]->eventlist.find(code);
-                if (ci==(*m_day)[svi]->eventlist.end()) continue;
+                ci = (*m_day)[svi]->eventlist.find(code);
+
+                if (ci == (*m_day)[svi]->eventlist.end()) { continue; }
             }
 
 
-            QVector<EventList *> & evec=ci.value();
-            num_points=0;
-            for (int i=0;i<evec.size();i++)
-                num_points+=evec[i]->count();
-            total_points+=num_points;
-            codepoints+=num_points;
-            const int num_averages=20;  // Max n umber of samples taken from samples per pixel for better min/max values
-            for (int n=0;n<evec.size();n++) { // for each segment
-                EventList & el=*evec[n];
+            QVector<EventList *> &evec = ci.value();
+            num_points = 0;
+
+            for (int i = 0; i < evec.size(); i++) {
+                num_points += evec[i]->count();
+            }
+
+            total_points += num_points;
+            codepoints += num_points;
+            const int num_averages =
+                20; // Max n umber of samples taken from samples per pixel for better min/max values
+
+            for (int n = 0; n < evec.size(); n++) { // for each segment
+                EventList &el = *evec[n];
+
+                accel = (el.type() == EVL_Waveform); // Turn on acceleration if this is a waveform.
 
-                accel=(el.type()==EVL_Waveform); // Turn on acceleration if this is a waveform.
                 if (accel) {
-                    sr=el.rate();           // Time distance between samples
-                    if (sr<=0) {
+                    sr = el.rate();         // Time distance between samples
+
+                    if (sr <= 0) {
                         qWarning() << "qLineChart::Plot() assert(sr>0)";
                         continue;
                     }
                 }
-                if (m_disable_accel) accel=false;
+
+                if (m_disable_accel) { accel = false; }
 
 
-                square_plot=m_square_plot;
-                if (accel || num_points>20000) { // Don't square plot if too many points or waveform
-                    square_plot=false;
+                square_plot = m_square_plot;
+
+                if (accel || num_points > 20000) { // Don't square plot if too many points or waveform
+                    square_plot = false;
                 }
 
-                int siz=evec[n]->count();
-                if (siz<=1) continue; // Don't bother drawing 1 point or less.
+                int siz = evec[n]->count();
 
-                x0=el.time(0)+drift;
-                xL=el.time(siz-1)+drift;
+                if (siz <= 1) { continue; } // Don't bother drawing 1 point or less.
 
-                if (maxx<x0) continue;
-                if (xL<minx) continue;
+                x0 = el.time(0) + drift;
+                xL = el.time(siz - 1) + drift;
 
-                if (x0>xL) {
-                    if (siz==2) { // this happens on CPAP
-                        quint32 t=el.getTime()[0];
-                        el.getTime()[0]=el.getTime()[1];
-                        el.getTime()[1]=t;
-                        EventStoreType d=el.getData()[0];
-                        el.getData()[0]=el.getData()[1];
-                        el.getData()[1]=d;
+                if (maxx < x0) { continue; }
+
+                if (xL < minx) { continue; }
+
+                if (x0 > xL) {
+                    if (siz == 2) { // this happens on CPAP
+                        quint32 t = el.getTime()[0];
+                        el.getTime()[0] = el.getTime()[1];
+                        el.getTime()[1] = t;
+                        EventStoreType d = el.getData()[0];
+                        el.getData()[0] = el.getData()[1];
+                        el.getData()[1] = d;
 
                     } else {
                         qDebug() << "Reversed order sample fed to gLineChart - ignored.";
@@ -296,69 +346,76 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                         //assert(x1<x2);
                     }
                 }
+
                 if (accel) {
                     //x1=el.time(1);
 
-                    double XR=xx/sr;
-                    double Z1=MAX(x0,minx);
-                    double Z2=MIN(xL,maxx);
-                    double ZD=Z2-Z1;
-                    double ZR=ZD/sr;
-                    double ZQ=ZR/XR;
-                    double ZW=ZR/(width*ZQ);
-                    visible_points+=ZR*ZQ;
-                    if (accel && n>0) {
-                        sam=1;
+                    double XR = xx / sr;
+                    double Z1 = MAX(x0, minx);
+                    double Z2 = MIN(xL, maxx);
+                    double ZD = Z2 - Z1;
+                    double ZR = ZD / sr;
+                    double ZQ = ZR / XR;
+                    double ZW = ZR / (width * ZQ);
+                    visible_points += ZR * ZQ;
+
+                    if (accel && n > 0) {
+                        sam = 1;
                     }
-                    if (ZW<num_averages) {
-                        sam=1;
-                        accel=false;
+
+                    if (ZW < num_averages) {
+                        sam = 1;
+                        accel = false;
                     } else {
-                        sam=ZW/num_averages;
-                        if (sam<1) {
-                            sam=1;
-                            accel=false;
+                        sam = ZW / num_averages;
+
+                        if (sam < 1) {
+                            sam = 1;
+                            accel = false;
                         }
                     }
+
                     // Prepare the min max y values if we still are accelerating this plot
                     if (accel) {
-                        for (int i=0;i<width;i++) {
+                        for (int i = 0; i < width; i++) {
                             m_drawlist[i].setX(height);
                             m_drawlist[i].setY(0);
                         }
-                        minz=width;
-                        maxz=0;
+
+                        minz = width;
+                        maxz = 0;
                     }
-                    total_visible+=visible_points;
+
+                    total_visible += visible_points;
                 } else {
-                    sam=1;
+                    sam = 1;
                 }
 
                 // these calculations over estimate
                 // The Z? values are much more accurate
 
-                idx=0;
+                idx = 0;
 
-                if (el.type()==EVL_Waveform)  {
+                if (el.type() == EVL_Waveform)  {
                     // We can skip data previous to minx if this is a waveform
 
-                    if (minx>x0) {
-                        double j=minx-x0;  // == starting min of first sample in this segment
-                        idx=(j/sr);
+                    if (minx > x0) {
+                        double j = minx - x0; // == starting min of first sample in this segment
+                        idx = (j / sr);
                         //idx/=(sam*num_averages);
                         //idx*=(sam*num_averages);
                         // Loose the precision
-                        idx+=sam-(idx % sam);
+                        idx += sam - (idx % sam);
 
                     } // else just start from the beginning
                 }
 
-                int xst=left+1;
-                int yst=top+height+1;
+                int xst = left + 1;
+                int yst = top + height + 1;
 
                 double time;
                 EventDataType data;
-                EventDataType gain=el.gain();
+                EventDataType gain = el.gain();
                 //EventDataType nmult=ymult*gain;
                 //EventDataType ymin=EventDataType(miny)/gain;
 
@@ -369,96 +426,107 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
 
                 //qint64 stime=el.first();
 
-                done=false;
+                done = false;
 
-//                if (!accel) {
+                //                if (!accel) {
                 lines->setSize(1.5);
-//                } else lines->setSize(1);
+                //                } else lines->setSize(1);
 
-                if (el.type()==EVL_Waveform) {  // Waveform Plot
-                    if (idx > sam) idx-=sam;
-                    time=el.time(idx) + drift;
-                    double rate=double(sr)*double(sam);
-                    EventStoreType * ptr=el.rawData()+idx;
+                if (el.type() == EVL_Waveform) { // Waveform Plot
+                    if (idx > sam) { idx -= sam; }
+
+                    time = el.time(idx) + drift;
+                    double rate = double(sr) * double(sam);
+                    EventStoreType *ptr = el.rawData() + idx;
 
                     if (accel) {
                         //////////////////////////////////////////////////////////////////
                         // Accelerated Waveform Plot
                         //////////////////////////////////////////////////////////////////
 
-//                        qint64 tmax=(maxx-time)/rate;
-//                        if ((tmax*sam) < siz) {
-//                            siz=idx+tmax*sam;
-//                            done=true;
-//                        }
+                        //                        qint64 tmax=(maxx-time)/rate;
+                        //                        if ((tmax*sam) < siz) {
+                        //                            siz=idx+tmax*sam;
+                        //                            done=true;
+                        //                        }
 
-                        for (int i=idx;i<siz;i+=sam,ptr+=sam) {
-                            time+=rate;
+                        for (int i = idx; i < siz; i += sam, ptr += sam) {
+                            time += rate;
                             // This is much faster than QVector access.
-                            data=*ptr + el.offset();
+                            data = *ptr + el.offset();
                             data *= gain;
 
                             // Scale the time scale X to pixel scale X
-                            px=((time - minx) * xmult);
+                            px = ((time - minx) * xmult);
 
                             // Same for Y scale, with gain factored in nmult
-                            py=((data - miny) * ymult);
+                            py = ((data - miny) * ymult);
 
                             // In accel mode, each pixel has a min/max Y value.
                             // m_drawlist's index is the pixel index for the X pixel axis.
-                            int z=round(px); // Hmmm... round may screw this up.
+                            int z = round(px); // Hmmm... round may screw this up.
 
-                            if (z<minz)
-                                minz=z;  // minz=First pixel
-
-                            if (z>maxz)
-                                maxz=z;  // maxz=Last pixel
-
-                            if (minz<0) {
-                                qDebug() << "gLineChart::Plot() minz<0  should never happen!! minz =" << minz;
-                                minz=0;
+                            if (z < minz) {
+                                minz = z;    // minz=First pixel
                             }
-                            if (maxz>max_drawlist_size) {
-                                qDebug() << "gLineChart::Plot() maxz>max_drawlist_size!!!! maxz = " << maxz << " max_drawlist_size =" << max_drawlist_size;
-                                maxz=max_drawlist_size;
+
+                            if (z > maxz) {
+                                maxz = z;    // maxz=Last pixel
+                            }
+
+                            if (minz < 0) {
+                                qDebug() << "gLineChart::Plot() minz<0  should never happen!! minz =" << minz;
+                                minz = 0;
+                            }
+
+                            if (maxz > max_drawlist_size) {
+                                qDebug() << "gLineChart::Plot() maxz>max_drawlist_size!!!! maxz = " << maxz <<
+                                         " max_drawlist_size =" << max_drawlist_size;
+                                maxz = max_drawlist_size;
                             }
 
                             // Update the Y pixel bounds.
-                            if (py<m_drawlist[z].x())
+                            if (py < m_drawlist[z].x()) {
                                 m_drawlist[z].setX(py);
-                            if (py>m_drawlist[z].y())
-                                m_drawlist[z].setY(py);
+                            }
 
-                            if (time>maxx) {
-                                done=true;
+                            if (py > m_drawlist[z].y()) {
+                                m_drawlist[z].setY(py);
+                            }
+
+                            if (time > maxx) {
+                                done = true;
                                 break;
                             }
 
                         }
+
                         // Plot compressed accelerated vertex list
-                        if (maxz>width) {
-                            maxz=width;
+                        if (maxz > width) {
+                            maxz = width;
                         }
-                        float ax1,ay1;
-                        QPoint * drl=m_drawlist+minz;
+
+                        float ax1, ay1;
+                        QPoint *drl = m_drawlist + minz;
                         // Don't need to cap VertexBuffer here, as it's limited to max_drawlist_size anyway
 
 
                         // Cap within VertexBuffer capacity, one vertex per line point
-                        int np=(maxz-minz)*2;
+                        int np = (maxz - minz) * 2;
+
+                        int j = lines->Max() - lines->cnt();
 
-                        int j=lines->Max()-lines->cnt();
                         if (np < j) {
-                            for (int i=minz;i<maxz;i++, drl++) {
-                                ax1=drl->x();
-                                ay1=drl->y();
-                                lines->unsafe_add(xst+i,yst-ax1,xst+i,yst-ay1);
+                            for (int i = minz; i < maxz; i++, drl++) {
+                                ax1 = drl->x();
+                                ay1 = drl->y();
+                                lines->unsafe_add(xst + i, yst - ax1, xst + i, yst - ay1);
 
                                 //if (lines->full()) break;
                             }
                         } else {
                             qDebug() << "gLineChart full trying to draw" << schema::channel[code].label();
-                            done=true;
+                            done = true;
                         }
 
                     } else { // Zoomed in Waveform
@@ -467,38 +535,40 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                         //////////////////////////////////////////////////////////////////
 
                         // Cap within VertexBuffer capacity, one vertex per line point
-//                        int np=((siz-idx)/sam)*2;
-//                        int j=lines->Max()-lines->cnt();
-//                        if (np > j) {
-//                            siz=j*sam;
-//                        }
+                        //                        int np=((siz-idx)/sam)*2;
+                        //                        int j=lines->Max()-lines->cnt();
+                        //                        if (np > j) {
+                        //                            siz=j*sam;
+                        //                        }
 
                         // Prime first point
-                        data=(*ptr+el.offset()) * gain;
-                        lastpx=xst+((time - minx) * xmult);
-                        lastpy=yst-((data - miny) * ymult);
+                        data = (*ptr + el.offset()) * gain;
+                        lastpx = xst + ((time - minx) * xmult);
+                        lastpy = yst - ((data - miny) * ymult);
 
-                        for (int i=idx;i<siz;i+=sam) {
-                            ptr+=sam;
-                            time+=rate;
+                        for (int i = idx; i < siz; i += sam) {
+                            ptr += sam;
+                            time += rate;
 
-                            data=(*ptr + el.offset()) * gain;
+                            data = (*ptr + el.offset()) * gain;
 
-                            px=xst+((time - minx) * xmult);   // Scale the time scale X to pixel scale X
-                            py=yst-((data - miny) * ymult);   // Same for Y scale, with precomputed gain
+                            px = xst + ((time - minx) * xmult); // Scale the time scale X to pixel scale X
+                            py = yst - ((data - miny) * ymult); // Same for Y scale, with precomputed gain
                             //py=yst-((data - ymin) * nmult);   // Same for Y scale, with precomputed gain
 
-                            lines->add(lastpx,lastpy,px,py);
+                            lines->add(lastpx, lastpy, px, py);
 
-                            lastpx=px;
-                            lastpy=py;
+                            lastpx = px;
+                            lastpy = py;
 
-                            if (time>maxx) {
-                                done=true;
+                            if (time > maxx) {
+                                done = true;
                                 break;
                             }
-                            if (lines->full())
+
+                            if (lines->full()) {
                                 break;
+                            }
                         }
                     }
 
@@ -507,15 +577,16 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                     // Standard events/zoomed in Plot
                     //////////////////////////////////////////////////////////////////
 
-                    double start=el.first() + drift;
+                    double start = el.first() + drift;
 
-                    quint32 * tptr=el.rawTime();
+                    quint32 *tptr = el.rawTime();
 
-                    int idx=0;
+                    int idx = 0;
+
+                    if (siz > 15) {
+                        for (; idx < siz; ++idx) {
+                            time = start + *tptr++;
 
-                    if (siz>15) {
-                        for (;idx<siz;++idx) {
-                            time=start + *tptr++;
                             if (time >= minx) {
                                 break;
                             }
@@ -528,101 +599,105 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
                     }
 
                     // Step one backwards if possible (to draw through the left margin)
-                    EventStoreType * dptr=el.rawData() + idx;
-                    tptr=el.rawTime() + idx;
+                    EventStoreType *dptr = el.rawData() + idx;
+                    tptr = el.rawTime() + idx;
 
-                    time=start + *tptr++;
-                    data=(*dptr++ + el.offset()) * gain;
+                    time = start + *tptr++;
+                    data = (*dptr++ + el.offset()) * gain;
 
                     idx++;
 
-                    lastpx=xst+((time - minx) * xmult);   // Scale the time scale X to pixel scale X
-                    lastpy=yst-((data - miny) * ymult);   // Same for Y scale without precomputed gain
+                    lastpx = xst + ((time - minx) * xmult); // Scale the time scale X to pixel scale X
+                    lastpy = yst - ((data - miny) * ymult); // Same for Y scale without precomputed gain
 
-                    siz-=idx;
+                    siz -= idx;
 
                     // Check if would overflow lines gVertexBuffer
-                    int gs=siz << 1;
-                    int j=lines->Max()-lines->cnt();
-                    if (square_plot)
+                    int gs = siz << 1;
+                    int j = lines->Max() - lines->cnt();
+
+                    if (square_plot) {
                         gs <<= 1;
+                    }
+
                     if (gs > j) {
                         qDebug() << "Would overflow line points.. increase default VertexBuffer size in gLineChart";
-                        siz=(j >> square_plot) ? 2 : 1;
-                        done=true; // end after this partial draw..
+                        siz = (j >> square_plot) ? 2 : 1;
+                        done = true; // end after this partial draw..
                     }
 
                     // Unrolling square plot outside of loop to gain a minor speed improvement.
-                    EventStoreType *eptr=dptr+siz;
+                    EventStoreType *eptr = dptr + siz;
+
                     if (square_plot) {
                         for (; dptr < eptr; dptr++) {
-                            time=start + *tptr++;
-                            data=gain * (*dptr + el.offset());
+                            time = start + *tptr++;
+                            data = gain * (*dptr + el.offset());
 
-                            px=xst+((time - minx) * xmult);   // Scale the time scale X to pixel scale X
-                            py=yst-((data - miny) * ymult);   // Same for Y scale without precomputed gain
+                            px = xst + ((time - minx) * xmult); // Scale the time scale X to pixel scale X
+                            py = yst - ((data - miny) * ymult); // Same for Y scale without precomputed gain
 
                             // Horizontal lines are easy to cap
-                            if (py==lastpy) {
+                            if (py == lastpy) {
                                 // Cap px to left margin
-                                if (lastpx<xst) lastpx=xst;
+                                if (lastpx < xst) { lastpx = xst; }
 
                                 // Cap px to right margin
-                                if (px>xst+width) px=xst+width;
+                                if (px > xst + width) { px = xst + width; }
 
-                                lines->unsafe_add(lastpx,lastpy,px,lastpy,px,lastpy,px,py);
+                                lines->unsafe_add(lastpx, lastpy, px, lastpy, px, lastpy, px, py);
                             } else {
                                 // Letting the scissor do the dirty work for non horizontal lines
                                 // This really should be changed, as it might be cause that weird
                                 // display glitch on Linux..
-                                lines->unsafe_add(lastpx,lastpy,px,lastpy,px,lastpy,px,py);
+                                lines->unsafe_add(lastpx, lastpy, px, lastpy, px, lastpy, px, py);
                             }
 
-                            lastpx=px;
-                            lastpy=py;
+                            lastpx = px;
+                            lastpy = py;
 
                             if (time > maxx) {
-                                done=true; // Let this iteration finish.. (This point will be in far clipping)
+                                done = true; // Let this iteration finish.. (This point will be in far clipping)
                                 break;
                             }
                         }
                     } else {
                         for (; dptr < eptr; dptr++) {
-                        //for (int i=0;i<siz;i++) {
-                            time=start + *tptr++;
-                            data=gain * (*dptr + el.offset());
+                            //for (int i=0;i<siz;i++) {
+                            time = start + *tptr++;
+                            data = gain * (*dptr + el.offset());
 
-                            px=xst+((time - minx) * xmult);   // Scale the time scale X to pixel scale X
-                            py=yst-((data - miny) * ymult);   // Same for Y scale without precomputed gain
+                            px = xst + ((time - minx) * xmult); // Scale the time scale X to pixel scale X
+                            py = yst - ((data - miny) * ymult); // Same for Y scale without precomputed gain
 
                             // Horizontal lines are easy to cap
-                            if (py==lastpy) {
+                            if (py == lastpy) {
                                 // Cap px to left margin
-                                if (lastpx<xst) lastpx=xst;
+                                if (lastpx < xst) { lastpx = xst; }
 
                                 // Cap px to right margin
-                                if (px>xst+width) px=xst+width;
+                                if (px > xst + width) { px = xst + width; }
 
-                                lines->unsafe_add(lastpx,lastpy,px,py);
+                                lines->unsafe_add(lastpx, lastpy, px, py);
                             } else {
                                 // Letting the scissor do the dirty work for non horizontal lines
                                 // This really should be changed, as it might be cause that weird
                                 // display glitch on Linux..
-                                lines->unsafe_add(lastpx,lastpy,px,py);
+                                lines->unsafe_add(lastpx, lastpy, px, py);
                             }
 
-                            lastpx=px;
-                            lastpy=py;
+                            lastpx = px;
+                            lastpy = py;
 
                             if (time > maxx) { // Past right edge, abort further drawing..
-                                done=true;
+                                done = true;
                                 break;
                             }
                         }
                     }
                 }
 
-                if (done) break;
+                if (done) { break; }
             }
         }
 
@@ -631,45 +706,47 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
         ////////////////////////////////////////////////////////////////////
 
         QFontMetrics fm(*defaultfont);
-        int bw=fm.width('X');
-        int bh=fm.height()/1.8;
+        int bw = fm.width('X');
+        int bh = fm.height() / 1.8;
 
-        if ((codepoints>0)) { //(m_codes.size()>1) &&
-            QString text=schema::channel[code].label();
-            int wid,hi;
-            GetTextExtent(text,wid,hi);
-            legendx-=wid;
-            w.renderText(text,legendx,top-4);
+        if ((codepoints > 0)) { //(m_codes.size()>1) &&
+            QString text = schema::channel[code].label();
+            int wid, hi;
+            GetTextExtent(text, wid, hi);
+            legendx -= wid;
+            w.renderText(text, legendx, top - 4);
 
-            int tp=top-5-bh/2;
-            w.quads()->add(legendx-bw,tp+bh/2,legendx,tp+bh/2,legendx,tp-bh/2,legendx-bw,tp-bh/2,m_colors[gi].rgba());
-            legendx-=bw*2;
+            int tp = top - 5 - bh / 2;
+            w.quads()->add(legendx - bw, tp + bh / 2, legendx, tp + bh / 2, legendx, tp - bh / 2, legendx - bw,
+                           tp - bh / 2, m_colors[gi].rgba());
+            legendx -= bw * 2;
         }
     }
+
     if (!total_points) { // No Data?
 
         if (m_report_empty) {
-            QString msg="No Waveform Available";
-            int x,y;
-            GetTextExtent(msg,x,y,bigfont);
+            QString msg = "No Waveform Available";
+            int x, y;
+            GetTextExtent(msg, x, y, bigfont);
             //DrawText(w,msg,left+(width/2.0)-(x/2.0),scry-w.GetBottomMargin()-height/2.0+y/2.0,0,Qt::gray,bigfont);
         }
     } else {
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-        float dpr=w.graphView()->devicePixelRatio();
-        lines->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width+1)*dpr,(height+1)*dpr);
+        float dpr = w.graphView()->devicePixelRatio();
+        lines->scissor(left * dpr, w.flipY(top + height + 2)*dpr, (width + 1)*dpr, (height + 1)*dpr);
 #else
-        lines->scissor(left,w.flipY(top+height+2),width+1,height+1);
+        lines->scissor(left, w.flipY(top + height + 2), width + 1, height + 1);
 #endif
     }
 }
 
 
 AHIChart::AHIChart(QColor col)
-:Layer(NoChannel),m_color(col)
+    : Layer(NoChannel), m_color(col)
 {
-    m_miny=m_maxy=0;
-    addVertexBuffer(lines=new gVertexBuffer(100000,GL_LINES));
+    m_miny = m_maxy = 0;
+    addVertexBuffer(lines = new gVertexBuffer(100000, GL_LINES));
     lines->setColor(col);
     lines->setAntiAlias(true);
     lines->setSize(1.5);
@@ -679,160 +756,194 @@ AHIChart::~AHIChart()
 {
 }
 
-void AHIChart::paint(gGraph & w,int left, int top, int width, int height)
+void AHIChart::paint(gGraph &w, int left, int top, int width, int height)
 {
-    if (!m_visible)
+    if (!m_visible) {
         return;
+    }
 
-    if (!m_day)
+    if (!m_day) {
         return;
+    }
 
     // Draw bounding box
-    gVertexBuffer *outlines=w.lines();
-    GLuint blk=QColor(Qt::black).rgba();
-    outlines->add(left, top, left, top+height, blk);
-    outlines->add(left, top+height, left+width,top+height, blk);
-    outlines->add(left+width,top+height, left+width, top, blk);
-    outlines->add(left+width, top, left,top, blk);
+    gVertexBuffer *outlines = w.lines();
+    GLuint blk = QColor(Qt::black).rgba();
+    outlines->add(left, top, left, top + height, blk);
+    outlines->add(left, top + height, left + width, top + height, blk);
+    outlines->add(left + width, top + height, left + width, top, blk);
+    outlines->add(left + width, top, left, top, blk);
     width--;
-    height-=2;
+    height -= 2;
 
-    EventDataType miny,maxy;
-    double minx,maxx;
+    EventDataType miny, maxy;
+    double minx, maxx;
 
-    maxx=w.max_x, minx=w.min_x;
+    maxx = w.max_x, minx = w.min_x;
 
     // hmmm.. subtract_offset..
 
-    if (w.zoomY()==0 && PROFILE.appearance->allowYAxisScaling()) {
-        miny=w.physMinY();
-        maxy=w.physMaxY();
+    if (w.zoomY() == 0 && PROFILE.appearance->allowYAxisScaling()) {
+        miny = w.physMinY();
+        maxy = w.physMaxY();
     } else {
-        miny=w.min_y, maxy=w.max_y;
+        miny = w.min_y, maxy = w.max_y;
     }
-    w.roundY(miny,maxy);
 
-    double xx=maxx-minx;
-    double xmult=double(width)/xx;
+    w.roundY(miny, maxy);
 
-    EventDataType yy=maxy-miny;
-    EventDataType ymult=EventDataType(height-3)/yy;   // time to pixel conversion multiplier
+    double xx = maxx - minx;
+    double xmult = double(width) / xx;
+
+    EventDataType yy = maxy - miny;
+    EventDataType ymult = EventDataType(height - 3) / yy; // time to pixel conversion multiplier
+
+    bool first = true;
+    double px, py;
+    double lastpx, lastpy;
+    double top1 = top + height;
+    bool done = false;
 
-    bool first=true;
-    double px,py;
-    double lastpx,lastpy;
-    double top1=top+height;
-    bool done=false;
     //GLuint color=m_color.rgba();
-    for (int i=0;i<m_time.size();i++) {
-        qint64 ti=m_time[i];
-        EventDataType v=m_data[i];
-        if (ti<minx) continue;
-        if (ti>maxx) done=true;
+    for (int i = 0; i < m_time.size(); i++) {
+        qint64 ti = m_time[i];
+        EventDataType v = m_data[i];
+
+        if (ti < minx) { continue; }
+
+        if (ti > maxx) { done = true; }
+
         if (first) {
-            if (i>0) {
-                ti=m_time[i-1];
-                v=m_data[i-1];
+            if (i > 0) {
+                ti = m_time[i - 1];
+                v = m_data[i - 1];
                 i--;
             }
-            px=left+(double(ti-minx)*xmult);
-            py=top1-(double(v-miny)*ymult);
-            first=false;
+
+            px = left + (double(ti - minx) * xmult);
+            py = top1 - (double(v - miny) * ymult);
+            first = false;
         } else {
-           px=left+(double(ti-minx)*xmult);
-           py=top1-(double(v-miny)*ymult);
-           lines->add(px,py,lastpx,lastpy);
+            px = left + (double(ti - minx) * xmult);
+            py = top1 - (double(v - miny) * ymult);
+            lines->add(px, py, lastpx, lastpy);
         }
-        lastpx=px;
-        lastpy=py;
-        if (done) break;
+
+        lastpx = px;
+        lastpy = py;
+
+        if (done) { break; }
     }
+
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-        float dpr=w.graphView()->devicePixelRatio();
-        lines->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width+1)*dpr,(height+1)*dpr);
+    float dpr = w.graphView()->devicePixelRatio();
+    lines->scissor(left * dpr, w.flipY(top + height + 2)*dpr, (width + 1)*dpr, (height + 1)*dpr);
 #else
-    lines->scissor(left,w.flipY(top+height+2),width+1,height+1);
+    lines->scissor(left, w.flipY(top + height + 2), width + 1, height + 1);
 #endif
 }
 
 void AHIChart::SetDay(Day *d)
 {
-    m_day=d;
+    m_day = d;
     m_data.clear();
     m_time.clear();
-    m_maxy=0;
-    m_miny=0;
+    m_maxy = 0;
+    m_miny = 0;
 
-    if (!d) return;
-    m_miny=9999;
+    if (!d) { return; }
+
+    m_miny = 9999;
     QList<Session *>::iterator s;
-    qint64 first=d->first();
-    qint64 last=d->last();
+    qint64 first = d->first();
+    qint64 last = d->last();
     qint64 f;
 
-    qint64 winsize=30000; // 30 second windows
-    for (qint64 ti=first;ti<last;ti+=winsize) {
-        f=ti-3600000L;
+    qint64 winsize = 30000; // 30 second windows
+
+    for (qint64 ti = first; ti < last; ti += winsize) {
+        f = ti - 3600000L;
         //if (f<first) f=first;
         EventList *el[6];
-        EventDataType ahi=0;
-        int cnt=0;
+        EventDataType ahi = 0;
+        int cnt = 0;
 
-        qint64 clockdrift=(qint64(PROFILE.cpap->clockDrift())*1000L),drift=0;
+        qint64 clockdrift = (qint64(PROFILE.cpap->clockDrift()) * 1000L), drift = 0;
 
-        bool fnd=false;
-        for (s=d->begin();s!=d->end();s++) {
-            if (!(*s)->enabled()) continue;
-            Session *sess=*s;
-            if ((ti < sess->first()) || (f > sess->last())) continue;
-            drift=(sess->machine()->GetType()==MT_CPAP) ? clockdrift : 0;
+        bool fnd = false;
+
+        for (s = d->begin(); s != d->end(); s++) {
+            if (!(*s)->enabled()) { continue; }
+
+            Session *sess = *s;
+
+            if ((ti < sess->first()) || (f > sess->last())) { continue; }
+
+            drift = (sess->machine()->GetType() == MT_CPAP) ? clockdrift : 0;
 
             // Drop off suddenly outside of sessions
             //if (ti>sess->last()) continue;
 
-            fnd=true;
-            if (sess->eventlist.contains(CPAP_Obstructive))
-                el[0]=sess->eventlist[CPAP_Obstructive][0];
-            else el[0]=NULL;
-            if (sess->eventlist.contains(CPAP_Apnea))
-                el[1]=sess->eventlist[CPAP_Apnea][0];
-            else el[1]=NULL;
-            if (sess->eventlist.contains(CPAP_Hypopnea))
-                el[2]=sess->eventlist[CPAP_Hypopnea][0];
-            else el[2]=NULL;
-            if (sess->eventlist.contains(CPAP_ClearAirway))
-                el[3]=sess->eventlist[CPAP_ClearAirway][0];
-            else el[3]=NULL;
-            if (sess->eventlist.contains(CPAP_NRI))
-                el[4]=sess->eventlist[CPAP_NRI][0];
-            else el[4]=NULL;
-            int znt=5;
+            fnd = true;
+
+            if (sess->eventlist.contains(CPAP_Obstructive)) {
+                el[0] = sess->eventlist[CPAP_Obstructive][0];
+            } else { el[0] = NULL; }
+
+            if (sess->eventlist.contains(CPAP_Apnea)) {
+                el[1] = sess->eventlist[CPAP_Apnea][0];
+            } else { el[1] = NULL; }
+
+            if (sess->eventlist.contains(CPAP_Hypopnea)) {
+                el[2] = sess->eventlist[CPAP_Hypopnea][0];
+            } else { el[2] = NULL; }
+
+            if (sess->eventlist.contains(CPAP_ClearAirway)) {
+                el[3] = sess->eventlist[CPAP_ClearAirway][0];
+            } else { el[3] = NULL; }
+
+            if (sess->eventlist.contains(CPAP_NRI)) {
+                el[4] = sess->eventlist[CPAP_NRI][0];
+            } else { el[4] = NULL; }
+
+            int znt = 5;
+
             if (PROFILE.general->calculateRDI()) {
                 if (sess->eventlist.contains(CPAP_RERA)) {// What about ExP??
-                    el[5]=sess->eventlist[CPAP_RERA][0];
+                    el[5] = sess->eventlist[CPAP_RERA][0];
                     znt++;
-                } else el[5]=NULL;
+                } else { el[5] = NULL; }
             }
+
             qint64 t;
-            for (int i=0;i<znt;i++) {
-                if (!el[i]) continue;
-                for (quint32 j=0;j<el[i]->count();j++) {
-                    t=el[i]->time(j)+drift;
-                    if ((t>=f) && (t<ti)) {
+
+            for (int i = 0; i < znt; i++) {
+                if (!el[i]) { continue; }
+
+                for (quint32 j = 0; j < el[i]->count(); j++) {
+                    t = el[i]->time(j) + drift;
+
+                    if ((t >= f) && (t < ti)) {
                         cnt++;
                     }
                 }
             }
         }
-        if (!fnd) cnt=0;
-        double g=double(ti-f)/3600000.0;
-        if (g>0) ahi=cnt/g;
 
-        if (ahi<m_miny) m_miny=ahi;
-        if (ahi>m_maxy) m_maxy=ahi;
+        if (!fnd) { cnt = 0; }
+
+        double g = double(ti - f) / 3600000.0;
+
+        if (g > 0) { ahi = cnt / g; }
+
+        if (ahi < m_miny) { m_miny = ahi; }
+
+        if (ahi > m_maxy) { m_maxy = ahi; }
+
         m_time.append(ti);
         m_data.append(ahi);
     }
-    m_minx=first;
-    m_maxx=last;
+
+    m_minx = first;
+    m_maxx = last;
 }
diff --git a/sleepyhead/Graphs/gLineChart.h b/sleepyhead/Graphs/gLineChart.h
index f0d960d6..c47de6a0 100644
--- a/sleepyhead/Graphs/gLineChart.h
+++ b/sleepyhead/Graphs/gLineChart.h
@@ -21,15 +21,15 @@
 /*! \class AHIChart
     \brief Another graph calculating the AHI/hour, this one looks at all the sessions for a day. Currently Unused.
     */
-class AHIChart:public Layer
+class AHIChart: public Layer
 {
-public:
+  public:
     //! \brief Constructs an AHIChart object, with QColor col for the line plots.
-    AHIChart(QColor col=QColor("black"));
+    AHIChart(QColor col = QColor("black"));
     ~AHIChart();
 
     //! \brief Draws the precalculated data to the Vertex buffers
-    virtual void paint(gGraph & w,int left, int top, int width, int height);
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
 
     //! \brief AHI/hr Calculations are done for this day here.
     //! This also uses the sliding window method
@@ -42,9 +42,9 @@ public:
     virtual EventDataType Maxy() { return m_maxy; }
 
     //! \brief Returns true if no data was available
-    virtual bool isEmpty() { return m_data.size()==0; }
+    virtual bool isEmpty() { return m_data.size() == 0; }
 
-protected:
+  protected:
     //! \brief Contains the plot data (Y-axis) generated for this day
     QVector<EventDataType> m_data;
 
@@ -54,89 +54,90 @@ protected:
     EventDataType m_miny;
     EventDataType m_maxy;
     QColor m_color;
-    gVertexBuffer * lines;
+    gVertexBuffer *lines;
 };
 
 /*! \class gLineChart
     \brief Draws a 2D linechart from all Session data in a day. EVL_Waveforms typed EventLists are accelerated.
     */
-class gLineChart:public Layer
+class gLineChart: public Layer
 {
-    public:
-        /*! \brief Creates a new 2D gLineChart Layer
-            \param code  The Channel that gets drawn by this layer
-            \param col  Color of the Plot
-            \param square_plot Whether or not to use square plots (only effective for EVL_Event typed EventList data)
-            \param disable_accel Whether or not to disable acceleration for EVL_Waveform typed EventList data
-            */
-        gLineChart(ChannelID code,const QColor col=QColor("black"), bool square_plot=false,bool disable_accel=false);
-        virtual ~gLineChart();
+  public:
+    /*! \brief Creates a new 2D gLineChart Layer
+        \param code  The Channel that gets drawn by this layer
+        \param col  Color of the Plot
+        \param square_plot Whether or not to use square plots (only effective for EVL_Event typed EventList data)
+        \param disable_accel Whether or not to disable acceleration for EVL_Waveform typed EventList data
+        */
+    gLineChart(ChannelID code, const QColor col = QColor("black"), bool square_plot = false,
+               bool disable_accel = false);
+    virtual ~gLineChart();
 
-        //! \brief The drawing code that fills the vertex buffers
-        virtual void paint(gGraph & w,int left, int top, int width, int height);
+    //! \brief The drawing code that fills the vertex buffers
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
 
-        //! \brief Set Use Square plots for non EVL_Waveform data
-        void SetSquarePlot(bool b) { m_square_plot=b; }
+    //! \brief Set Use Square plots for non EVL_Waveform data
+    void SetSquarePlot(bool b) { m_square_plot = b; }
 
-        //! \brief Returns true if using Square plots for non EVL_Waveform data
-        bool GetSquarePlot() { return m_square_plot; }
+    //! \brief Returns true if using Square plots for non EVL_Waveform data
+    bool GetSquarePlot() { return m_square_plot; }
 
-        //! \brief Set this if you want this layer to draw it's empty data message
-        //! They don't show anymore due to the changes in gGraphView. Should modify isEmpty if this still gets to live
-        void ReportEmpty(bool b) { m_report_empty=b; }
+    //! \brief Set this if you want this layer to draw it's empty data message
+    //! They don't show anymore due to the changes in gGraphView. Should modify isEmpty if this still gets to live
+    void ReportEmpty(bool b) { m_report_empty = b; }
 
-        //! \brief Returns whether or not to show the empty text message
-        bool GetReportEmpty() { return m_report_empty; }
+    //! \brief Returns whether or not to show the empty text message
+    bool GetReportEmpty() { return m_report_empty; }
 
-        //! \brief Sets the ability to Disable waveform plot acceleration (which hides unseen data)
-        void setDisableAccel(bool b) { m_disable_accel=b; }
+    //! \brief Sets the ability to Disable waveform plot acceleration (which hides unseen data)
+    void setDisableAccel(bool b) { m_disable_accel = b; }
 
-        //! \brief Returns true if waveform plot acceleration is disabled
-        bool disableAccel() { return m_disable_accel; }
+    //! \brief Returns true if waveform plot acceleration is disabled
+    bool disableAccel() { return m_disable_accel; }
 
-        //! \brief Sets the Day object containing the Sessions this linechart draws from
-        virtual void SetDay(Day *d);
+    //! \brief Sets the Day object containing the Sessions this linechart draws from
+    virtual void SetDay(Day *d);
 
-        //! \brief Returns Minimum Y-axis value for this layer
-        virtual EventDataType Miny();
+    //! \brief Returns Minimum Y-axis value for this layer
+    virtual EventDataType Miny();
 
-        //! \brief Returns Maximum Y-axis value for this layer
-        virtual EventDataType Maxy();
+    //! \brief Returns Maximum Y-axis value for this layer
+    virtual EventDataType Maxy();
 
-        //! \brief Returns true if all subplots contain no data
-        virtual bool isEmpty();
+    //! \brief Returns true if all subplots contain no data
+    virtual bool isEmpty();
 
-        //! \brief Add Subplot 'code'. Note the first one is added in the constructor.
-        void addPlot(ChannelID code, QColor color, bool square) { m_codes.push_back(code); m_colors.push_back(color); m_enabled[code]=true; m_square.push_back(square); }
+    //! \brief Add Subplot 'code'. Note the first one is added in the constructor.
+    void addPlot(ChannelID code, QColor color, bool square) { m_codes.push_back(code); m_colors.push_back(color); m_enabled[code] = true; m_square.push_back(square); }
 
-        //! \brief Returns true of the subplot 'code' is enabled.
-        bool plotEnabled(ChannelID code) { if ((m_enabled.contains(code)) && m_enabled[code]) return true; else return false; }
+    //! \brief Returns true of the subplot 'code' is enabled.
+    bool plotEnabled(ChannelID code) { if ((m_enabled.contains(code)) && m_enabled[code]) { return true; } else { return false; } }
 
-        //! \brief Enable or Disable the subplot identified by code.
-        void setPlotEnabled(ChannelID code, bool b) { m_enabled[code]=b; }
+    //! \brief Enable or Disable the subplot identified by code.
+    void setPlotEnabled(ChannelID code, bool b) { m_enabled[code] = b; }
 
-protected:
-        bool m_report_empty;
-        bool m_square_plot;
-        bool m_disable_accel;
-        QColor m_line_color;
+  protected:
+    bool m_report_empty;
+    bool m_square_plot;
+    bool m_disable_accel;
+    QColor m_line_color;
 
-        gVertexBuffer * lines;
-        //GLShortBuffer * lines;
-        //GLShortBuffer * outlines;
+    gVertexBuffer *lines;
+    //GLShortBuffer * lines;
+    //GLShortBuffer * outlines;
 
-        //! \brief Used by accelerated waveform plots. Must be >= Screen Resolution (or at least graph width)
-        static const int max_drawlist_size=10000;
+    //! \brief Used by accelerated waveform plots. Must be >= Screen Resolution (or at least graph width)
+    static const int max_drawlist_size = 10000;
 
-        //! \brief The list of screen points used for accelerated waveform plots..
-        QPoint m_drawlist[max_drawlist_size];
+    //! \brief The list of screen points used for accelerated waveform plots..
+    QPoint m_drawlist[max_drawlist_size];
 
-        int subtract_offset;
+    int subtract_offset;
 
-        QVector<ChannelID> m_codes;
-        QVector<QColor> m_colors;
-        QVector<bool> m_square;
-        QHash<ChannelID,bool> m_enabled;
+    QVector<ChannelID> m_codes;
+    QVector<QColor> m_colors;
+    QVector<bool> m_square;
+    QHash<ChannelID, bool> m_enabled;
 };
 
 #endif // GLINECHART_H
diff --git a/sleepyhead/Graphs/gLineOverlay.cpp b/sleepyhead/Graphs/gLineOverlay.cpp
index 249bec9e..05c4a395 100644
--- a/sleepyhead/Graphs/gLineOverlay.cpp
+++ b/sleepyhead/Graphs/gLineOverlay.cpp
@@ -13,13 +13,13 @@
 #include "SleepLib/profiles.h"
 #include "gLineOverlay.h"
 
-gLineOverlayBar::gLineOverlayBar(ChannelID code,QColor color,QString label,FlagType flt)
-:Layer(code),m_flag_color(color),m_label(label),m_flt(flt)
+gLineOverlayBar::gLineOverlayBar(ChannelID code, QColor color, QString label, FlagType flt)
+    : Layer(code), m_flag_color(color), m_label(label), m_flt(flt)
 {
-    addVertexBuffer(points=new gVertexBuffer(2048,GL_POINTS));
+    addVertexBuffer(points = new gVertexBuffer(2048, GL_POINTS));
     points->setSize(4);
     points->setColor(m_flag_color);
-    addVertexBuffer(quads=new gVertexBuffer(2048,GL_QUADS));
+    addVertexBuffer(quads = new gVertexBuffer(2048, GL_QUADS));
     //addGLBuf(lines=new GLBuffer(color,1024,GL_LINES));
     points->setAntiAlias(true);
     quads->setAntiAlias(true);
@@ -33,186 +33,225 @@ gLineOverlayBar::~gLineOverlayBar()
     //delete points;
 }
 
-void gLineOverlayBar::paint(gGraph & w, int left, int topp, int width, int height)
+void gLineOverlayBar::paint(gGraph &w, int left, int topp, int width, int height)
 {
-    if (!m_visible) return;
-    if (!m_day) return;
+    if (!m_visible) { return; }
 
-    gVertexBuffer * lines=w.lines();
-    int start_py=topp;
+    if (!m_day) { return; }
 
-    double xx=w.max_x-w.min_x;
-    double yy=w.max_y-w.min_y;
-    if (xx<=0) return;
+    gVertexBuffer *lines = w.lines();
+    int start_py = topp;
 
-    float x1,x2;
+    double xx = w.max_x - w.min_x;
+    double yy = w.max_y - w.min_y;
 
-    int x,y;
+    if (xx <= 0) { return; }
 
-    float bottom=start_py+height-25*w.printScaleY(), top=start_py+25*w.printScaleY();
+    float x1, x2;
+
+    int x, y;
+
+    float bottom = start_py + height - 25 * w.printScaleY(), top = start_py + 25 * w.printScaleY();
 
     double X;
     double Y;
 
-    bool verts_exceeded=false;
+    bool verts_exceeded = false;
 
-    m_count=0;
-    m_sum=0;
-    m_flag_color=schema::channel[m_code].defaultColor();
+    m_count = 0;
+    m_sum = 0;
+    m_flag_color = schema::channel[m_code].defaultColor();
 
     lines->setColor(m_flag_color);
     points->setColor(m_flag_color);
-    if (m_flt==FT_Span) {
+
+    if (m_flt == FT_Span) {
         m_flag_color.setAlpha(128);
     }
+
     EventStoreType raw;
 
-    quint32 * tptr;
-    EventStoreType * dptr, *eptr;
+    quint32 *tptr;
+    EventStoreType *dptr, *eptr;
     qint64 stime;
 
-    OverlayDisplayType odt=PROFILE.appearance->overlayType();
-    QHash<ChannelID,QVector<EventList *> >::iterator cei;
+    OverlayDisplayType odt = PROFILE.appearance->overlayType();
+    QHash<ChannelID, QVector<EventList *> >::iterator cei;
     int count;
 
-    qint64 clockdrift=qint64(PROFILE.cpap->clockDrift()) * 1000L;
-    qint64 drift=0;
+    qint64 clockdrift = qint64(PROFILE.cpap->clockDrift()) * 1000L;
+    qint64 drift = 0;
 
     // For each session, process it's eventlist
-    for (QList<Session *>::iterator s=m_day->begin();s!=m_day->end(); s++) {
+    for (QList<Session *>::iterator s = m_day->begin(); s != m_day->end(); s++) {
 
-        if (!(*s)->enabled()) continue;
-        cei=(*s)->eventlist.find(m_code);
-        if (cei==(*s)->eventlist.end()) continue;
-        QVector<EventList *> & evlist=cei.value();
-        if (evlist.size()==0) continue;
-        drift=((*s)->machine()->GetType()==MT_CPAP) ? clockdrift : 0;
+        if (!(*s)->enabled()) { continue; }
+
+        cei = (*s)->eventlist.find(m_code);
+
+        if (cei == (*s)->eventlist.end()) { continue; }
+
+        QVector<EventList *> &evlist = cei.value();
+
+        if (evlist.size() == 0) { continue; }
+
+        drift = ((*s)->machine()->GetType() == MT_CPAP) ? clockdrift : 0;
 
         // Could loop through here, but nowhere uses more than one yet..
-        for (int k=0;k<evlist.size();k++) {
-            EventList & el=*(evlist[k]);
-            count=el.count();
-            stime=el.first() + drift;
-            dptr=el.rawData();
-            eptr=dptr+count;
-            tptr=el.rawTime();
+        for (int k = 0; k < evlist.size(); k++) {
+            EventList &el = *(evlist[k]);
+            count = el.count();
+            stime = el.first() + drift;
+            dptr = el.rawData();
+            eptr = dptr + count;
+            tptr = el.rawTime();
 
             ////////////////////////////////////////////////////////////////////////////
             // Skip data previous to minx bounds
             ////////////////////////////////////////////////////////////////////////////
             for (; dptr < eptr; dptr++) {
-                X=stime + *tptr;
-                if (X >= w.min_x)
+                X = stime + *tptr;
+
+                if (X >= w.min_x) {
                     break;
+                }
+
                 tptr++;
             }
 
-            if (m_flt==FT_Span) {
+            if (m_flt == FT_Span) {
                 ////////////////////////////////////////////////////////////////////////////
                 // FT_Span
                 ////////////////////////////////////////////////////////////////////////////
-                for (;dptr < eptr; dptr++) {
-                    X=stime + *tptr++;
-                    raw=*dptr;
-                    Y=X-(qint64(raw)*1000.0L); // duration
-                    if (Y > w.max_x)
+                for (; dptr < eptr; dptr++) {
+                    X = stime + *tptr++;
+                    raw = *dptr;
+                    Y = X - (qint64(raw) * 1000.0L); // duration
+
+                    if (Y > w.max_x) {
                         break;
-                    x1=double(width)/double(xx)*double(X-w.min_x)+left;
+                    }
+
+                    x1 = double(width) / double(xx) * double(X - w.min_x) + left;
                     m_count++;
-                    m_sum+=raw;
-                    x2=double(width)/double(xx)*double(Y-w.min_x)+left;
+                    m_sum += raw;
+                    x2 = double(width) / double(xx) * double(Y - w.min_x) + left;
 
-                    if (int(x1)==int(x2))
-                        x2+=1;
-                    if (x2<left)
-                        x2=left;
-                    if (x1>width+left)
-                        x1=width+left;
+                    if (int(x1) == int(x2)) {
+                        x2 += 1;
+                    }
+
+                    if (x2 < left) {
+                        x2 = left;
+                    }
+
+                    if (x1 > width + left) {
+                        x1 = width + left;
+                    }
+
+                    quads->add(x2, start_py, x1, start_py, x1, start_py + height, x2, start_py + height,
+                               m_flag_color.rgba());
 
-                    quads->add(x2,start_py, x1,start_py, x1,start_py+height, x2,start_py+height,m_flag_color.rgba());
                     if (quads->full()) {
-                        verts_exceeded=true;
+                        verts_exceeded = true;
                         break;
                     }
                 }
-            } else if (m_flt==FT_Dot) {
+            } else if (m_flt == FT_Dot) {
                 ////////////////////////////////////////////////////////////////////////////
                 // FT_Dot
                 ////////////////////////////////////////////////////////////////////////////
                 for (; dptr < eptr; dptr++) {
-                    X=stime + *tptr++; //el.time(i);
-                    raw=*dptr; //el.data(i);
-                    if (X > w.max_x)
+                    X = stime + *tptr++; //el.time(i);
+                    raw = *dptr; //el.data(i);
+
+                    if (X > w.max_x) {
                         break;
-                    x1=double(width)/double(xx)*double(X-w.min_x)+left;
+                    }
+
+                    x1 = double(width) / double(xx) * double(X - w.min_x) + left;
                     m_count++;
-                    m_sum+=raw;
-                    if ((odt==ODT_Bars) || (xx<3600000)) {
+                    m_sum += raw;
+
+                    if ((odt == ODT_Bars) || (xx < 3600000)) {
                         // show the fat dots in the middle
-                        points->add(x1,double(height)/double(yy)*double(-20-w.min_y)+topp);
+                        points->add(x1, double(height) / double(yy)*double(-20 - w.min_y) + topp);
+
                         if (points->full()) {
-                            verts_exceeded=true;
+                            verts_exceeded = true;
                             break;
                         }
                     } else {
                         // thin lines down the bottom
-                        lines->add(x1,start_py+1,x1,start_py+1+12);
+                        lines->add(x1, start_py + 1, x1, start_py + 1 + 12);
+
                         if (lines->full()) {
-                            verts_exceeded=true;
+                            verts_exceeded = true;
                             break;
                         }
                     }
 
                 }
-            } else if (m_flt==FT_Bar) {
+            } else if (m_flt == FT_Bar) {
                 ////////////////////////////////////////////////////////////////////////////
                 // FT_Bar
                 ////////////////////////////////////////////////////////////////////////////
                 for (; dptr < eptr; dptr++) {
-                    X=stime + *tptr++;
-                    raw=*dptr;
-                    if (X > w.max_x)
-                        break;
-                    x1=double(width)/double(xx)*double(X-w.min_x)+left;
-                    m_count++;
-                    m_sum+=raw;
-                    int z=start_py+height;
-                    if ((odt==ODT_Bars) || (xx<3600000)) {
-                        z=top;
+                    X = stime + *tptr++;
+                    raw = *dptr;
+
+                    if (X > w.max_x) {
+                        break;
+                    }
+
+                    x1 = double(width) / double(xx) * double(X - w.min_x) + left;
+                    m_count++;
+                    m_sum += raw;
+                    int z = start_py + height;
+
+                    if ((odt == ODT_Bars) || (xx < 3600000)) {
+                        z = top;
+
+                        points->add(x1, top);
+                        lines->add(x1, top, x1, bottom);
 
-                        points->add(x1,top);
-                        lines->add(x1,top,x1,bottom);
                         if (points->full()) {
-                            verts_exceeded=true;
+                            verts_exceeded = true;
                             break;
                         }
                     } else {
-                        lines->add(x1,z,x1,z-12);
+                        lines->add(x1, z, x1, z - 12);
                     }
+
                     if (lines->full()) {
-                        verts_exceeded=true;
+                        verts_exceeded = true;
                         break;
                     }
-                    if (xx<(1800000)) {
-                        GetTextExtent(m_label,x,y);
-                        w.renderText(m_label,x1-(x/2),top-y+(3*w.printScaleY()));
+
+                    if (xx < (1800000)) {
+                        GetTextExtent(m_label, x, y);
+                        w.renderText(m_label, x1 - (x / 2), top - y + (3 * w.printScaleY()));
                     }
                 }
             }
 
-            if (verts_exceeded)
+            if (verts_exceeded) {
                 break;
+            }
         }
-        if (verts_exceeded)
+
+        if (verts_exceeded) {
             break;
+        }
     }
+
     if (verts_exceeded) {
         qWarning() << "exceeded maxverts in gLineOverlay::Plot()";
     }
 }
 
 gLineOverlaySummary::gLineOverlaySummary(QString text, int x, int y)
-:Layer(CPAP_Obstructive),m_text(text),m_x(x),m_y(y) // The Layer code is a dummy here.
+    : Layer(CPAP_Obstructive), m_text(text), m_x(x), m_y(y) // The Layer code is a dummy here.
 {
 }
 
@@ -220,67 +259,84 @@ gLineOverlaySummary::~gLineOverlaySummary()
 {
 }
 
-void gLineOverlaySummary::paint(gGraph & w,int left, int top, int width, int height)
+void gLineOverlaySummary::paint(gGraph &w, int left, int top, int width, int height)
 {
-    if (!m_visible) return;
-    if (!m_day) return;
+    if (!m_visible) { return; }
+
+    if (!m_day) { return; }
 
 
     Q_UNUSED(width);
     Q_UNUSED(height);
-    float cnt=0;
-    double sum=0;
-    bool isSpan=false;
-    for (int i=0;i<m_overlays.size();i++) {
-        cnt+=m_overlays[i]->count();
-        sum+=m_overlays[i]->sum();
-        if (m_overlays[i]->flagtype()==FT_Span) isSpan=true;
+    float cnt = 0;
+    double sum = 0;
+    bool isSpan = false;
+
+    for (int i = 0; i < m_overlays.size(); i++) {
+        cnt += m_overlays[i]->count();
+        sum += m_overlays[i]->sum();
+
+        if (m_overlays[i]->flagtype() == FT_Span) { isSpan = true; }
     }
 
-    double val,first,last;
-    double time=0;
+    double val, first, last;
+    double time = 0;
 
     // Calculate the session time.
-    for (QList<Session *>::iterator s=m_day->begin();s!=m_day->end(); s++) {
-        if (!(*s)->enabled())  continue;
-        first=(*s)->first();
-        last=(*s)->last();
-        if (last < w.min_x) continue;
-        if (first > w.max_x) continue;
+    for (QList<Session *>::iterator s = m_day->begin(); s != m_day->end(); s++) {
+        if (!(*s)->enabled()) { continue; }
 
-        if (first < w.min_x)
-            first=w.min_x;
-        if (last > w.max_x)
-            last=w.max_x;
+        first = (*s)->first();
+        last = (*s)->last();
 
-        time+=last-first;
+        if (last < w.min_x) { continue; }
+
+        if (first > w.max_x) { continue; }
+
+        if (first < w.min_x) {
+            first = w.min_x;
+        }
+
+        if (last > w.max_x) {
+            last = w.max_x;
+        }
+
+        time += last - first;
     }
 
-    val=0;
+    val = 0;
 
-    time/=1000;
-    int h=time/3600;
-    int m=int(time/60) % 60;
-    int s=int(time) % 60;
+    time /= 1000;
+    int h = time / 3600;
+    int m = int(time / 60) % 60;
+    int s = int(time) % 60;
 
 
-    time/=3600;
+    time /= 3600;
 
     //if (time<1) time=1;
 
-    if (time>0) val=cnt/time;
+    if (time > 0) { val = cnt / time; }
 
 
 
-    QString a=QObject::tr("Events")+"="+QString::number(cnt)+" "+QObject::tr("Duration")+" "+QString().sprintf("%02i:%02i:%02i",h,m,s)+", "+m_text+"="+QString::number(val,'f',2);
+    QString a = QObject::tr("Events") + "=" + QString::number(cnt) + " " + QObject::tr("Duration") +
+                " " + QString().sprintf("%02i:%02i:%02i", h, m, s) + ", " + m_text + "=" + QString::number(val,
+                        'f', 2);
 
     if (isSpan) {
         float sph;
-        if (!time) sph=0; else {
-            sph=(100.0/float(time))*(sum/3600.0);
-            if (sph>100) sph=100;
+
+        if (!time) { sph = 0; }
+        else {
+            sph = (100.0 / float(time)) * (sum / 3600.0);
+
+            if (sph > 100) { sph = 100; }
         }
-        a+=" "+QObject::tr("(\%%1 in events)").arg(sph,0,'f',2); // eg: %num of time in a span, like Periodic Breathing
+
+        a += " " + QObject::tr("(\%%1 in events)").arg(sph, 0, 'f',
+                2); // eg: %num of time in a span, like Periodic Breathing
     }
-    w.renderText(a,left+m_x,top+m_y);
+
+    w.renderText(a, left + m_x, top + m_y);
 }
diff --git a/sleepyhead/Graphs/gLineOverlay.h b/sleepyhead/Graphs/gLineOverlay.h
index f5fc0656..34476385 100644
--- a/sleepyhead/Graphs/gLineOverlay.h
+++ b/sleepyhead/Graphs/gLineOverlay.h
@@ -17,61 +17,61 @@
 /*! \class gLineOverlayBar
     \brief Shows a flag line, a dot, or a span over the top of a 2D line chart.
     */
-class gLineOverlayBar:public Layer
+class gLineOverlayBar: public Layer
 {
-    public:
-        //! \brief Constructs a gLineOverlayBar object of type code, setting the flag/span color, the label to show when zoomed
-        //! in, and the display method requested, of either FT_Bar, FT_Span, or FT_Dot
-        gLineOverlayBar(ChannelID code,QColor col,QString _label="",FlagType _flt=FT_Bar);
-        virtual ~gLineOverlayBar();
+  public:
+    //! \brief Constructs a gLineOverlayBar object of type code, setting the flag/span color, the label to show when zoomed
+    //! in, and the display method requested, of either FT_Bar, FT_Span, or FT_Dot
+    gLineOverlayBar(ChannelID code, QColor col, QString _label = "", FlagType _flt = FT_Bar);
+    virtual ~gLineOverlayBar();
 
-        //! \brief The drawing code that fills the OpenGL vertex GLBuffers
-        virtual void paint(gGraph & w,int left, int top, int width, int height);
+    //! \brief The drawing code that fills the OpenGL vertex GLBuffers
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
 
-        virtual EventDataType Miny() { return 0; }
-        virtual EventDataType Maxy() { return 0; }
+    virtual EventDataType Miny() { return 0; }
+    virtual EventDataType Maxy() { return 0; }
 
-        //! \brief Returns true if no Channel data available for this code
-        virtual bool isEmpty() { return true; }
+    //! \brief Returns true if no Channel data available for this code
+    virtual bool isEmpty() { return true; }
 
-        //! \brief returns a count of all flags drawn during render. (for gLineOverlaySummary)
-        int count() { return m_count; }
-        double sum() { return m_sum; }
-        FlagType flagtype() { return m_flt; }
-    protected:
-        QColor m_flag_color;
-        QString m_label;
-        FlagType m_flt;
-        int m_count;
-        double m_sum;
+    //! \brief returns a count of all flags drawn during render. (for gLineOverlaySummary)
+    int count() { return m_count; }
+    double sum() { return m_sum; }
+    FlagType flagtype() { return m_flt; }
+  protected:
+    QColor m_flag_color;
+    QString m_label;
+    FlagType m_flt;
+    int m_count;
+    double m_sum;
 
-        gVertexBuffer *quads;
-        gVertexBuffer *points;
+    gVertexBuffer *quads;
+    gVertexBuffer *points;
 };
 
 /*! \class gLineOverlaySummary
     \brief A container class to hold a group of gLineOverlayBar's, and shows the "Section AHI" over the Flow Rate waveform.
     */
-class gLineOverlaySummary:public Layer
+class gLineOverlaySummary: public Layer
 {
-    public:
-        gLineOverlaySummary(QString text, int x, int y);
-        virtual ~gLineOverlaySummary();
+  public:
+    gLineOverlaySummary(QString text, int x, int y);
+    virtual ~gLineOverlaySummary();
 
-        virtual void paint(gGraph & w,int left, int top, int width, int height);
-        virtual EventDataType Miny() { return 0; }
-        virtual EventDataType Maxy() { return 0; }
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
+    virtual EventDataType Miny() { return 0; }
+    virtual EventDataType Maxy() { return 0; }
 
-        //! \brief Returns true if no Channel data available for this code
-        virtual bool isEmpty() { return true; }
+    //! \brief Returns true if no Channel data available for this code
+    virtual bool isEmpty() { return true; }
 
-        //! \brief Adds a gLineOverlayBar to this list
-        gLineOverlayBar *add(gLineOverlayBar *bar) { m_overlays.push_back(bar); return bar; }
-    protected:
-        QVector<gLineOverlayBar *> m_overlays;
-        QString m_text;
-        int m_x,m_y;
-  };
+    //! \brief Adds a gLineOverlayBar to this list
+    gLineOverlayBar *add(gLineOverlayBar *bar) { m_overlays.push_back(bar); return bar; }
+  protected:
+    QVector<gLineOverlayBar *> m_overlays;
+    QString m_text;
+    int m_x, m_y;
+};
 
 
 #endif // GLINEOVERLAY_H
diff --git a/sleepyhead/Graphs/gSegmentChart.cpp b/sleepyhead/Graphs/gSegmentChart.cpp
index a0e29b58..c4290304 100644
--- a/sleepyhead/Graphs/gSegmentChart.cpp
+++ b/sleepyhead/Graphs/gSegmentChart.cpp
@@ -12,12 +12,13 @@
 #include <cmath>
 #include "gSegmentChart.h"
 
-gSegmentChart::gSegmentChart(GraphSegmentType type,QColor gradient_color,QColor outline_color)
-:Layer(NoChannel),m_graph_type(type),m_gradient_color(gradient_color),m_outline_color(outline_color)
+gSegmentChart::gSegmentChart(GraphSegmentType type, QColor gradient_color, QColor outline_color)
+    : Layer(NoChannel), m_graph_type(type), m_gradient_color(gradient_color),
+      m_outline_color(outline_color)
 {
-    m_empty=true;
-    addGLBuf(poly=new GLFloatBuffer(4000,GL_POLYGON));
-    addGLBuf(lines=new GLFloatBuffer(4000,GL_LINE_LOOP));
+    m_empty = true;
+    addGLBuf(poly = new GLFloatBuffer(4000, GL_POLYGON));
+    addGLBuf(lines = new GLFloatBuffer(4000, GL_LINE_LOOP));
     lines->setSize(1);
     poly->forceAntiAlias(false);
     lines->forceAntiAlias(true);
@@ -26,33 +27,38 @@ gSegmentChart::gSegmentChart(GraphSegmentType type,QColor gradient_color,QColor
 gSegmentChart::~gSegmentChart()
 {
 }
-void gSegmentChart::AddSlice(ChannelID code,QColor color,QString name)
+void gSegmentChart::AddSlice(ChannelID code, QColor color, QString name)
 {
     m_codes.push_back(code);
     m_values.push_back(0);
     m_colors.push_back(color);
     m_names.push_back(name);
-    m_total=0;
+    m_total = 0;
 }
 void gSegmentChart::SetDay(Day *d)
 {
     Layer::SetDay(d);
-    m_total=0;
-    if (!m_day) return;
-    for (int c=0;c<m_codes.size();c++) {
-        m_values[c]=0;
-        for (QList<Session *>::iterator s=m_day->begin();s!=m_day->end();++s) {
-            if (!(*s)->enabled())  continue;
+    m_total = 0;
 
-            int cnt=(*s)->count(m_codes[c]);
-            m_values[c]+=cnt;
-            m_total+=cnt;
+    if (!m_day) { return; }
+
+    for (int c = 0; c < m_codes.size(); c++) {
+        m_values[c] = 0;
+
+        for (QList<Session *>::iterator s = m_day->begin(); s != m_day->end(); ++s) {
+            if (!(*s)->enabled()) { continue; }
+
+            int cnt = (*s)->count(m_codes[c]);
+            m_values[c] += cnt;
+            m_total += cnt;
         }
     }
-    m_empty=true;
-    for (int i=0;i<m_codes.size();i++) {
-        if (m_day->count(m_codes[i])>0) {
-            m_empty=false;
+
+    m_empty = true;
+
+    for (int i = 0; i < m_codes.size(); i++) {
+        if (m_day->count(m_codes[i]) > 0) {
+            m_empty = false;
             break;
         }
     }
@@ -63,139 +69,153 @@ bool gSegmentChart::isEmpty()
     return m_empty;
 }
 
-void gSegmentChart::paint(gGraph & w,int left, int top, int width, int height)
+void gSegmentChart::paint(gGraph &w, int left, int top, int width, int height)
 {
-    if (!m_visible) return;
-    if (!m_day) return;
-    int start_px=left;
-    int start_py=top;
+    if (!m_visible) { return; }
+
+    if (!m_day) { return; }
+
+    int start_px = left;
+    int start_py = top;
 
     width--;
-    float diameter=MIN(width,height);
-    diameter-=8;
-    float radius=diameter/2.0;
+    float diameter = MIN(width, height);
+    diameter -= 8;
+    float radius = diameter / 2.0;
 
-    float j=0.0;
-    float sum=0.0;
-    float step=1.0/720.0;
-    float px,py;
+    float j = 0.0;
+    float sum = 0.0;
+    float step = 1.0 / 720.0;
+    float px, py;
     float q;
 
-    float xmult=float(width)/float(m_total);
-    float ymult=float(height)/float(m_total);
+    float xmult = float(width) / float(m_total);
+    float ymult = float(height) / float(m_total);
 
-    float xp=left;
+    float xp = left;
 
-    int xoffset=width/2;
-    int yoffset=height/2;
-    if (m_total==0) {
-        QColor col=Qt::green;
-        QString a=":-)";
-        int x,y;
-        GetTextExtent(a,x,y,bigfont);
+    int xoffset = width / 2;
+    int yoffset = height / 2;
 
-        w.renderText(a,start_px+xoffset-x/2, (start_py+yoffset+y/2),0,col,bigfont);
+    if (m_total == 0) {
+        QColor col = Qt::green;
+        QString a = ":-)";
+        int x, y;
+        GetTextExtent(a, x, y, bigfont);
+
+        w.renderText(a, start_px + xoffset - x / 2, (start_py + yoffset + y / 2), 0, col, bigfont);
         return;
     }
 
     int data;
-    unsigned size=m_values.size();
-    float line_step=float(width)/float(size-1);
-    bool line_first=true;
+    unsigned size = m_values.size();
+    float line_step = float(width) / float(size - 1);
+    bool line_first = true;
     int line_last;
 
-    gVertexBuffer *quads=w.quads();
-    gVertexBuffer *lines2=w.lines();
-    for (unsigned m=0;m<size;m++) {
-        data=m_values[m];
+    gVertexBuffer *quads = w.quads();
+    gVertexBuffer *lines2 = w.lines();
 
-        if (data==0) continue;
-/////////////////////////////////////////////////////////////////////////////////////
-// Pie Chart
-/////////////////////////////////////////////////////////////////////////////////////
-        if (m_graph_type==GST_Pie) {
-            QColor & col=schema::channel[m_codes[m % m_colors.size()]].defaultColor();
-            j=float(data)/float(m_total); // ratio of this pie slice
+    for (unsigned m = 0; m < size; m++) {
+        data = m_values[m];
+
+        if (data == 0) { continue; }
+
+        /////////////////////////////////////////////////////////////////////////////////////
+        // Pie Chart
+        /////////////////////////////////////////////////////////////////////////////////////
+        if (m_graph_type == GST_Pie) {
+            QColor &col = schema::channel[m_codes[m % m_colors.size()]].defaultColor();
+            j = float(data) / float(m_total); // ratio of this pie slice
 
             // Draw Filling
-            poly->add(start_px+xoffset, start_py+height-yoffset,m_gradient_color);
-            for (q=sum;q<sum+j;q+=step) {
-                px=start_px+xoffset+sin(q*2*M_PI)*radius;
-                py=start_py+height-(yoffset+cos(q*2*M_PI)*radius);
-                poly->add(px,py,col);
-            }
-            q=sum+j;
-            px=start_px+xoffset+sin(q*2*M_PI)*radius;
-            py=start_py+height-(yoffset+cos(q*2*M_PI)*radius);
-            poly->add(px,py,col);
+            poly->add(start_px + xoffset, start_py + height - yoffset, m_gradient_color);
 
-            if (m_total!=data) {
+            for (q = sum; q < sum + j; q += step) {
+                px = start_px + xoffset + sin(q * 2 * M_PI) * radius;
+                py = start_py + height - (yoffset + cos(q * 2 * M_PI) * radius);
+                poly->add(px, py, col);
+            }
+
+            q = sum + j;
+            px = start_px + xoffset + sin(q * 2 * M_PI) * radius;
+            py = start_py + height - (yoffset + cos(q * 2 * M_PI) * radius);
+            poly->add(px, py, col);
+
+            if (m_total != data) {
                 // Draw the center point first
-                lines->add(start_px+xoffset, start_py+height-yoffset,m_outline_color);
-            }
-            for (q=sum;q<sum+j;q+=step) {
-                px=start_px+xoffset+sin(q*2*M_PI)*radius;
-                py=start_py+height-(yoffset+cos(q*2*M_PI)*radius);
-                lines->add(px,py,m_outline_color);
-            }
-            double tpx=start_px+xoffset+sin((sum+(j/2.0))*2*M_PI)*(radius/1.7);
-            double tpy=start_py+height-(yoffset+cos((sum+(j/2.0))*2*M_PI)*(radius/1.7));
-            q=sum+j;
-            px=start_px+xoffset+sin(q*2*M_PI)*radius;
-            py=start_py+height-(yoffset+cos(q*2*M_PI)*radius);
-            lines->add(px,py,m_outline_color);
-
-            if (j>.09) {
-                QString a=m_names[m]; //QString::number(floor(100.0/m_total*data),'f',0)+"%";
-                int x,y;
-                GetTextExtent(a,x,y);
-                w.renderText(a,tpx-(x/2.0),(tpy+y/2.0),0,Qt::black,defaultfont,false); // antialiasing looks like crap here..
+                lines->add(start_px + xoffset, start_py + height - yoffset, m_outline_color);
             }
 
-            sum=q;
+            for (q = sum; q < sum + j; q += step) {
+                px = start_px + xoffset + sin(q * 2 * M_PI) * radius;
+                py = start_py + height - (yoffset + cos(q * 2 * M_PI) * radius);
+                lines->add(px, py, m_outline_color);
+            }
 
-/////////////////////////////////////////////////////////////////////////////////////
-// CandleStick Chart
-/////////////////////////////////////////////////////////////////////////////////////
-        } else if (m_graph_type==GST_CandleStick) {
-            QColor & col=m_colors[m % m_colors.size()];
-            float bw=xmult*float(data);
+            double tpx = start_px + xoffset + sin((sum + (j / 2.0)) * 2 * M_PI) * (radius / 1.7);
+            double tpy = start_py + height - (yoffset + cos((sum + (j / 2.0)) * 2 * M_PI) * (radius / 1.7));
+            q = sum + j;
+            px = start_px + xoffset + sin(q * 2 * M_PI) * radius;
+            py = start_py + height - (yoffset + cos(q * 2 * M_PI) * radius);
+            lines->add(px, py, m_outline_color);
 
-            quads->add(xp,start_py,xp+bw,start_py,m_gradient_color.rgba());
-            quads->add(xp+bw,start_py+height,xp,start_py+height,col.rgba());
+            if (j > .09) {
+                QString a = m_names[m]; //QString::number(floor(100.0/m_total*data),'f',0)+"%";
+                int x, y;
+                GetTextExtent(a, x, y);
+                w.renderText(a, tpx - (x / 2.0), (tpy + y / 2.0), 0, Qt::black, defaultfont,
+                             false); // antialiasing looks like crap here..
+            }
 
-            lines2->add(xp,start_py,xp+bw,start_py,m_outline_color.rgba());
-            lines2->add(xp+bw,start_py+height,xp,start_py+height,m_outline_color.rgba());
+            sum = q;
+
+            /////////////////////////////////////////////////////////////////////////////////////
+            // CandleStick Chart
+            /////////////////////////////////////////////////////////////////////////////////////
+        } else if (m_graph_type == GST_CandleStick) {
+            QColor &col = m_colors[m % m_colors.size()];
+            float bw = xmult * float(data);
+
+            quads->add(xp, start_py, xp + bw, start_py, m_gradient_color.rgba());
+            quads->add(xp + bw, start_py + height, xp, start_py + height, col.rgba());
+
+            lines2->add(xp, start_py, xp + bw, start_py, m_outline_color.rgba());
+            lines2->add(xp + bw, start_py + height, xp, start_py + height, m_outline_color.rgba());
 
             if (!m_names[m].isEmpty()) {
-                int px,py;
-                GetTextExtent(m_names[m],px,py);
-                if (px+5<bw) {
-                    w.renderText(m_names[m],(xp+bw/2)-(px/2),top+((height/2)-(py/2)),0,Qt::black);
+                int px, py;
+                GetTextExtent(m_names[m], px, py);
+
+                if (px + 5 < bw) {
+                    w.renderText(m_names[m], (xp + bw / 2) - (px / 2), top + ((height / 2) - (py / 2)), 0, Qt::black);
                 }
             }
 
-            xp+=bw;
-/////////////////////////////////////////////////////////////////////////////////////
-// Line Chart
-/////////////////////////////////////////////////////////////////////////////////////
-        } else if (m_graph_type==GST_Line) {
-            QColor col=Qt::black; //m_colors[m % m_colors.size()];
-            float h=(top+height)-(float(data)*ymult);
+            xp += bw;
+            /////////////////////////////////////////////////////////////////////////////////////
+            // Line Chart
+            /////////////////////////////////////////////////////////////////////////////////////
+        } else if (m_graph_type == GST_Line) {
+            QColor col = Qt::black; //m_colors[m % m_colors.size()];
+            float h = (top + height) - (float(data) * ymult);
+
             if (line_first) {
-                line_first=false;
+                line_first = false;
             } else {
-                lines->add(xp,line_last,xp+line_step,h,col);
-                xp+=line_step;
+                lines->add(xp, line_last, xp + line_step, h, col);
+                xp += line_step;
             }
-            line_last=h;
+
+            line_last = h;
         }
     }
 }
 
 
-gTAPGraph::gTAPGraph(ChannelID code,GraphSegmentType gt, QColor gradient_color,QColor outline_color)
-:gSegmentChart(gt,gradient_color,outline_color),m_code(code)
+gTAPGraph::gTAPGraph(ChannelID code, GraphSegmentType gt, QColor gradient_color,
+                     QColor outline_color)
+    : gSegmentChart(gt, gradient_color, outline_color), m_code(code)
 {
     m_colors.push_back(Qt::red);
     m_colors.push_back(Qt::green);
@@ -206,68 +226,81 @@ gTAPGraph::~gTAPGraph()
 void gTAPGraph::SetDay(Day *d)
 {
     Layer::SetDay(d);
-    m_total=0;
-    if (!m_day) return;
-    QMap<EventStoreType,qint64> tap;
+    m_total = 0;
 
-    EventStoreType data=0,lastval=0;
-    qint64 time=0,lasttime=0;
+    if (!m_day) { return; }
+
+    QMap<EventStoreType, qint64> tap;
+
+    EventStoreType data = 0, lastval = 0;
+    qint64 time = 0, lasttime = 0;
     //bool first;
-    bool rfirst=true;
+    bool rfirst = true;
     //bool changed;
-    EventDataType gain=1,offset=0;
-    QHash<ChannelID,QVector<EventList *> >::iterator ei;
-    for (QList<Session *>::iterator s=m_day->begin();s!=m_day->end();++s) {
-        if (!(*s)->enabled())  continue;
+    EventDataType gain = 1, offset = 0;
+    QHash<ChannelID, QVector<EventList *> >::iterator ei;
+
+    for (QList<Session *>::iterator s = m_day->begin(); s != m_day->end(); ++s) {
+        if (!(*s)->enabled()) { continue; }
+
+        if ((ei = (*s)->eventlist.find(m_code)) == (*s)->eventlist.end()) { continue; }
+
+        for (int q = 0; q < ei.value().size(); q++) {
+            EventList &el = *(ei.value()[q]);
+            lasttime = el.time(0);
+            lastval = el.raw(0);
 
-        if ((ei=(*s)->eventlist.find(m_code))==(*s)->eventlist.end()) continue;
-        for (int q=0;q<ei.value().size();q++) {
-            EventList &el=*(ei.value()[q]);
-            lasttime=el.time(0);
-            lastval=el.raw(0);
             if (rfirst) {
-                gain=el.gain();
-                offset=el.offset();
-                rfirst=false;
+                gain = el.gain();
+                offset = el.offset();
+                rfirst = false;
             }
+
             //first=true;
             //changed=false;
-            for (quint32 i=1;i<el.count();i++) {
-                data=el.raw(i);
-                time=el.time(i);
-                if (lastval!=data) {
-                    qint64 v=(time-lasttime);
-                    if (tap.find(lastval)!=tap.end()) {
-                        tap[lastval]+=v;
+            for (quint32 i = 1; i < el.count(); i++) {
+                data = el.raw(i);
+                time = el.time(i);
+
+                if (lastval != data) {
+                    qint64 v = (time - lasttime);
+
+                    if (tap.find(lastval) != tap.end()) {
+                        tap[lastval] += v;
                     } else {
-                        tap[lastval]=v;
+                        tap[lastval] = v;
                     }
+
                     //changed=true;
-                    lasttime=time;
-                    lastval=data;
+                    lasttime = time;
+                    lastval = data;
                 }
             }
-            if (time!=lasttime) {
-                qint64 v=(time-lasttime);
-                if (tap.find(lastval)!=tap.end()) {
-                    tap[data]+=v;
+
+            if (time != lasttime) {
+                qint64 v = (time - lasttime);
+
+                if (tap.find(lastval) != tap.end()) {
+                    tap[data] += v;
                 } else {
-                    tap[data]=v;
+                    tap[data] = v;
                 }
             }
         }
     }
+
     m_values.clear();
     m_names.clear();
-    m_total=0;
+    m_total = 0;
     EventDataType val;
 
-    for (QMap<EventStoreType,qint64>::iterator i=tap.begin();i!=tap.end();i++) {
-        val=float(i.key())*gain+offset;
+    for (QMap<EventStoreType, qint64>::iterator i = tap.begin(); i != tap.end(); i++) {
+        val = float(i.key()) * gain + offset;
 
-        m_values.push_back(i.value()/1000L);
-        m_total+=i.value()/1000L;
-        m_names.push_back(QString::number(val,'f',2));
+        m_values.push_back(i.value() / 1000L);
+        m_total += i.value() / 1000L;
+        m_names.push_back(QString::number(val, 'f', 2));
     }
-    m_empty=m_values.size()==0;
+
+    m_empty = m_values.size() == 0;
 }
diff --git a/sleepyhead/Graphs/gSegmentChart.h b/sleepyhead/Graphs/gSegmentChart.h
index 6238e7c8..cdcaabd2 100644
--- a/sleepyhead/Graphs/gSegmentChart.h
+++ b/sleepyhead/Graphs/gSegmentChart.h
@@ -21,12 +21,13 @@ enum GraphSegmentType { GST_Pie, GST_CandleStick, GST_Line };
   */
 class gSegmentChart : public Layer
 {
-public:
-    gSegmentChart(GraphSegmentType gt=GST_Pie, QColor gradient_color=Qt::white,QColor outline_color=Qt::black);
+  public:
+    gSegmentChart(GraphSegmentType gt = GST_Pie, QColor gradient_color = Qt::white,
+                  QColor outline_color = Qt::black);
     virtual ~gSegmentChart();
 
     //! \brief The drawing code that fills the Vertex buffers
-    virtual void paint(gGraph & w,int left, int top, int width, int height);
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
 
     //! \brief Pre-fills a buffer with the data needed to draw
     virtual void SetDay(Day *d);
@@ -35,17 +36,17 @@ public:
     virtual bool isEmpty();
 
     //! \brief Adds a channel slice, and sets the color and label
-    void AddSlice(ChannelID code,QColor col,QString name="");
+    void AddSlice(ChannelID code, QColor col, QString name = "");
 
     //! \brief Sets the fade-out color to make the graphs look more attractive
-    void setGradientColor(QColor & color) { m_gradient_color=color; }
+    void setGradientColor(QColor &color) { m_gradient_color = color; }
 
     //! \brief Sets the outline color for the edges drawn around the Pie slices
-    void setOutlineColor(QColor & color) { m_outline_color=color; }
-    const GraphSegmentType & graphType() { return m_graph_type; }
-    void setGraphType(GraphSegmentType type) { m_graph_type=type; }
+    void setOutlineColor(QColor &color) { m_outline_color = color; }
+    const GraphSegmentType &graphType() { return m_graph_type; }
+    void setGraphType(GraphSegmentType type) { m_graph_type = type; }
 
-protected:
+  protected:
     QVector<ChannelID> m_codes;
     QVector<QString> m_names;
     QVector<int> m_values;
@@ -58,20 +59,21 @@ protected:
     bool m_empty;
 
     // gah.. can't convert these
-    GLFloatBuffer *poly,*lines;
+    GLFloatBuffer *poly, *lines;
 };
 
 /*! \class gTAPGraph
     \brief Time at Pressure chart, derived from gSegmentChart
     \notes Currently unused
     */
-class gTAPGraph:public gSegmentChart
+class gTAPGraph: public gSegmentChart
 {
-public:
-    gTAPGraph(ChannelID code,GraphSegmentType gt=GST_CandleStick, QColor gradient_color=Qt::lightGray,QColor outline_color=Qt::black);
+  public:
+    gTAPGraph(ChannelID code, GraphSegmentType gt = GST_CandleStick,
+              QColor gradient_color = Qt::lightGray, QColor outline_color = Qt::black);
     virtual ~gTAPGraph();
     virtual void SetDay(Day *d);
-protected:
+  protected:
     ChannelID m_code;
 };
 
diff --git a/sleepyhead/Graphs/gStatsLine.cpp b/sleepyhead/Graphs/gStatsLine.cpp
index 6e791bea..b3a68220 100644
--- a/sleepyhead/Graphs/gStatsLine.cpp
+++ b/sleepyhead/Graphs/gStatsLine.cpp
@@ -13,36 +13,37 @@
 #include "gYAxis.h"
 #include "gStatsLine.h"
 
-gStatsLine::gStatsLine(ChannelID code,QString label,QColor textcolor)
-    :Layer(code),m_label(label),m_textcolor(textcolor)
+gStatsLine::gStatsLine(ChannelID code, QString label, QColor textcolor)
+    : Layer(code), m_label(label), m_textcolor(textcolor)
 {
 }
-void gStatsLine::paint(gGraph & w, int left, int top, int width, int height)
+void gStatsLine::paint(gGraph &w, int left, int top, int width, int height)
 {
-    if (!m_visible) return;
+    if (!m_visible) { return; }
+
     //if (m_empty) return;
     Q_UNUSED(height);
 
-    int z=(width+gYAxis::Margin)/5;
-    int p=left-gYAxis::Margin;
+    int z = (width + gYAxis::Margin) / 5;
+    int p = left - gYAxis::Margin;
 
 
-    top+=4;
-    w.renderText(m_label,p,top);
+    top += 4;
+    w.renderText(m_label, p, top);
 
     //w.renderText(m_text,p,top,0,m_textcolor);
 
-    p+=z;
-    w.renderText(st_min,p,top);
+    p += z;
+    w.renderText(st_min, p, top);
 
-    p+=z;
-    w.renderText(st_avg,p,top);
+    p += z;
+    w.renderText(st_avg, p, top);
 
-    p+=z;
-    w.renderText(st_p90,p,top);
+    p += z;
+    w.renderText(st_p90, p, top);
 
-    p+=z;
-    w.renderText(st_max,p,top);
+    p += z;
+    w.renderText(st_max, p, top);
 
 }
 
@@ -50,15 +51,17 @@ void gStatsLine::paint(gGraph & w, int left, int top, int width, int height)
 void gStatsLine::SetDay(Day *d)
 {
     Layer::SetDay(d);
-    if (!m_day) return;
-    m_min=d->Min(m_code);
-    m_max=d->Max(m_code);
-    m_avg=d->wavg(m_code);
-    m_p90=d->p90(m_code);
 
-    st_min="Min="+QString::number(m_min,'f',2);
-    st_max="Max="+QString::number(m_max,'f',2);
-    st_avg="Avg="+QString::number(m_avg,'f',2);
-    st_p90="90%="+QString::number(m_p90,'f',2);
+    if (!m_day) { return; }
+
+    m_min = d->Min(m_code);
+    m_max = d->Max(m_code);
+    m_avg = d->wavg(m_code);
+    m_p90 = d->p90(m_code);
+
+    st_min = "Min=" + QString::number(m_min, 'f', 2);
+    st_max = "Max=" + QString::number(m_max, 'f', 2);
+    st_avg = "Avg=" + QString::number(m_avg, 'f', 2);
+    st_p90 = "90%=" + QString::number(m_p90, 'f', 2);
 
 }
diff --git a/sleepyhead/Graphs/gStatsLine.h b/sleepyhead/Graphs/gStatsLine.h
index 22edce6d..f79e66e3 100644
--- a/sleepyhead/Graphs/gStatsLine.h
+++ b/sleepyhead/Graphs/gStatsLine.h
@@ -20,17 +20,17 @@
     */
 class gStatsLine : public Layer
 {
-public:
-    gStatsLine(ChannelID code,QString label="",QColor textcolor=Qt::black);
-    virtual void paint(gGraph & w, int left, int top, int width, int height);
+  public:
+    gStatsLine(ChannelID code, QString label = "", QColor textcolor = Qt::black);
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
     void SetDay(Day *d);
 
-protected:
+  protected:
     QString m_label;
     QColor m_textcolor;
-    EventDataType m_min,m_max,m_avg,m_p90;
-    QString st_min,st_max,st_avg,st_p90;
-    float m_tx,m_ty;
+    EventDataType m_min, m_max, m_avg, m_p90;
+    QString st_min, st_max, st_avg, st_p90;
+    float m_tx, m_ty;
 };
 
 #endif // GSTATSLINE_H
diff --git a/sleepyhead/Graphs/gSummaryChart.cpp b/sleepyhead/Graphs/gSummaryChart.cpp
index 4e21c51f..426c987d 100644
--- a/sleepyhead/Graphs/gSummaryChart.cpp
+++ b/sleepyhead/Graphs/gSummaryChart.cpp
@@ -15,15 +15,15 @@
 #include "gYAxis.h"
 #include "gSummaryChart.h"
 
-extern QLabel * qstatus2;
-SummaryChart::SummaryChart(QString label,GraphType type)
-:Layer(NoChannel),m_label(label),m_graphtype(type)
+extern QLabel *qstatus2;
+SummaryChart::SummaryChart(QString label, GraphType type)
+    : Layer(NoChannel), m_label(label), m_graphtype(type)
 {
     //QColor color=Qt::black;
-    addVertexBuffer(quads=new gVertexBuffer(20000,GL_QUADS));
-    addVertexBuffer(lines=new gVertexBuffer(20000,GL_LINES));
-    addVertexBuffer(outlines=new gVertexBuffer(20000,GL_LINES));
-    addVertexBuffer(points=new gVertexBuffer(20000,GL_POINTS));
+    addVertexBuffer(quads = new gVertexBuffer(20000, GL_QUADS));
+    addVertexBuffer(lines = new gVertexBuffer(20000, GL_LINES));
+    addVertexBuffer(outlines = new gVertexBuffer(20000, GL_LINES));
+    addVertexBuffer(points = new gVertexBuffer(20000, GL_POINTS));
     quads->forceAntiAlias(true);
 
     outlines->setSize(1);
@@ -31,23 +31,23 @@ SummaryChart::SummaryChart(QString label,GraphType type)
     //lines->setBlendFunc(GL_SRC_COLOR, GL_ZERO);
     //lines->forceAntiAlias(false);
 
-    m_empty=true;
-    hl_day=-1;
-    m_machinetype=MT_CPAP;
+    m_empty = true;
+    hl_day = -1;
+    m_machinetype = MT_CPAP;
 
-    QDateTime d1=QDateTime::currentDateTime();
-    QDateTime d2=d1;
+    QDateTime d1 = QDateTime::currentDateTime();
+    QDateTime d2 = d1;
     d1.setTimeSpec(Qt::UTC);
-    tz_offset=d2.secsTo(d1);
-    tz_hours=tz_offset/3600.0;
+    tz_offset = d2.secsTo(d1);
+    tz_hours = tz_offset / 3600.0;
 
 }
 SummaryChart::~SummaryChart()
 {
 }
-void SummaryChart::SetDay(Day * nullday)
+void SummaryChart::SetDay(Day *nullday)
 {
-    Day * day=nullday;
+    Day *day = nullday;
     Layer::SetDay(day);
 
     m_values.clear();
@@ -55,150 +55,176 @@ void SummaryChart::SetDay(Day * nullday)
     m_days.clear();
     m_hours.clear();
     m_goodcodes.clear();
-    m_miny=999999999;
-    m_maxy=-999999999;
-    m_physmaxy=0;
-    m_physminy=0;
-    m_minx=0;
-    m_maxx=0;
+    m_miny = 999999999;
+    m_maxy = -999999999;
+    m_physmaxy = 0;
+    m_physminy = 0;
+    m_minx = 0;
+    m_maxx = 0;
 
 
     int dn;
-    EventDataType tmp,tmp2,total;
+    EventDataType tmp, tmp2, total;
     ChannelID code;
-    CPAPMode cpapmode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,PROFILE.FirstDay(MT_CPAP),PROFILE.LastDay(MT_CPAP));
-    if (m_label==STR_TR_Pressure) {
+    CPAPMode cpapmode = (CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode, MT_CPAP,
+                        PROFILE.FirstDay(MT_CPAP), PROFILE.LastDay(MT_CPAP));
+
+    if (m_label == STR_TR_Pressure) {
         m_codes.clear();
         m_colors.clear();
         m_type.clear();
         m_typeval.clear();
 
-        float perc=PROFILE.general->prefCalcPercentile()/100.0;
-        int mididx=PROFILE.general->prefCalcMiddle();
+        float perc = PROFILE.general->prefCalcPercentile() / 100.0;
+        int mididx = PROFILE.general->prefCalcMiddle();
         SummaryType mid;
-        if (mididx==0) mid=ST_PERC;
-        if (mididx==1) mid=ST_WAVG;
-        if (mididx==2) mid=ST_AVG;
 
-        if (cpapmode>=MODE_ASV) {
-            addSlice(CPAP_EPAP,QColor("green"),ST_SETMIN);
+        if (mididx == 0) { mid = ST_PERC; }
 
-            addSlice(CPAP_IPAPLo,QColor("light blue"),ST_SETMIN);
-            addSlice(CPAP_IPAP,QColor("cyan"),mid,0.5);
-            addSlice(CPAP_IPAP,QColor("dark cyan"),ST_PERC,perc);
+        if (mididx == 1) { mid = ST_WAVG; }
+
+        if (mididx == 2) { mid = ST_AVG; }
+
+        if (cpapmode >= MODE_ASV) {
+            addSlice(CPAP_EPAP, QColor("green"), ST_SETMIN);
+
+            addSlice(CPAP_IPAPLo, QColor("light blue"), ST_SETMIN);
+            addSlice(CPAP_IPAP, QColor("cyan"), mid, 0.5);
+            addSlice(CPAP_IPAP, QColor("dark cyan"), ST_PERC, perc);
             //addSlice(CPAP_IPAP,QColor("light blue"),ST_PERC,0.95);
-            addSlice(CPAP_IPAPHi,QColor("blue"),ST_SETMAX);
-        } else if (cpapmode>=MODE_BIPAP) {
-            addSlice(CPAP_EPAP,QColor("green"),ST_SETMIN);
-            addSlice(CPAP_EPAP,QColor("light green"),ST_PERC,perc);
-            addSlice(CPAP_IPAP,QColor("light cyan"),mid,0.5);
-            addSlice(CPAP_IPAP,QColor("light blue"),ST_PERC,perc);
-            addSlice(CPAP_IPAP,QColor("blue"),ST_SETMAX);
-        } else if (cpapmode>=MODE_APAP) {
-            addSlice(CPAP_PressureMin,QColor("orange"),ST_SETMIN);
-            addSlice(CPAP_Pressure,QColor("dark green"),mid,0.5);
-            addSlice(CPAP_Pressure,QColor("grey"),ST_PERC,perc);
-            addSlice(CPAP_PressureMax,QColor("red"),ST_SETMAX);
+            addSlice(CPAP_IPAPHi, QColor("blue"), ST_SETMAX);
+        } else if (cpapmode >= MODE_BIPAP) {
+            addSlice(CPAP_EPAP, QColor("green"), ST_SETMIN);
+            addSlice(CPAP_EPAP, QColor("light green"), ST_PERC, perc);
+            addSlice(CPAP_IPAP, QColor("light cyan"), mid, 0.5);
+            addSlice(CPAP_IPAP, QColor("light blue"), ST_PERC, perc);
+            addSlice(CPAP_IPAP, QColor("blue"), ST_SETMAX);
+        } else if (cpapmode >= MODE_APAP) {
+            addSlice(CPAP_PressureMin, QColor("orange"), ST_SETMIN);
+            addSlice(CPAP_Pressure, QColor("dark green"), mid, 0.5);
+            addSlice(CPAP_Pressure, QColor("grey"), ST_PERC, perc);
+            addSlice(CPAP_PressureMax, QColor("red"), ST_SETMAX);
         } else {
-            addSlice(CPAP_Pressure,QColor("dark green"),ST_SETWAVG);
+            addSlice(CPAP_Pressure, QColor("dark green"), ST_SETWAVG);
         }
     }
 
     m_goodcodes.resize(m_codes.size());
-    for (int i=0;i<m_codes.size();i++) {
-        m_goodcodes[i]=false;
+
+    for (int i = 0; i < m_codes.size(); i++) {
+        m_goodcodes[i] = false;
     }
 
-    m_fday=0;
-    qint64 tt,zt;
-    m_empty=true;
-    if (m_graphtype==GT_SESSIONS) {
-        if (PROFILE.countDays(MT_CPAP,PROFILE.FirstDay(MT_CPAP), PROFILE.LastDay(MT_CPAP))==0)
+    m_fday = 0;
+    qint64 tt, zt;
+    m_empty = true;
+
+    if (m_graphtype == GT_SESSIONS) {
+        if (PROFILE.countDays(MT_CPAP, PROFILE.FirstDay(MT_CPAP), PROFILE.LastDay(MT_CPAP)) == 0) {
             return;
+        }
     }
+
     int suboffset;
     SummaryType type;
-    bool first=true;
+    bool first = true;
 
-    for (QMap<QDate,QList<Day *> >::iterator d=PROFILE.daylist.begin();d!=PROFILE.daylist.end();d++) {
-        tt=QDateTime(d.key(),QTime(0,0,0),Qt::UTC).toTime_t();
-        dn=tt/86400;
-        tt*=1000L;
-        if (!m_minx || tt<m_minx) m_minx=tt;
-        if (!m_maxx || tt>m_maxx) m_maxx=tt;
+    for (QMap<QDate, QList<Day *> >::iterator d = PROFILE.daylist.begin(); d != PROFILE.daylist.end();
+            d++) {
+        tt = QDateTime(d.key(), QTime(0, 0, 0), Qt::UTC).toTime_t();
+        dn = tt / 86400;
+        tt *= 1000L;
 
-        total=0;
-        bool fnd=false;
-        if (m_graphtype==GT_SESSIONS) {
-            for (int i=0;i<m_codes.size();i++)
-                m_goodcodes[i]=true;
-            for (int i=0;i<d.value().size();i++) { // for each day
-                day=d.value().at(i);
-                if  (!day) continue;
-                if (day->machine_type()!=m_machinetype) continue;
-                int ft=qint64(day->first())/1000L;
-                ft+=tz_offset; // convert to local time
+        if (!m_minx || tt < m_minx) { m_minx = tt; }
 
-                int dz2=ft/86400;
-                dz2*=86400;  // ft = first sessions time, rounded back to midnight..
+        if (!m_maxx || tt > m_maxx) { m_maxx = tt; }
 
-                for (int s=0;s<day->size();s++) {
-                    Session *sess=(*day)[s];
-                    if (!sess->enabled()) continue;
+        total = 0;
+        bool fnd = false;
 
-                    tmp=sess->hours();
-                    m_values[dn][s]=tmp;
-                    total+=tmp;
-                    zt=qint64(sess->first())/1000L;
-                    zt+=tz_offset;
-                    tmp2=zt-dn*86400;
-                    tmp2/=3600.0;
+        if (m_graphtype == GT_SESSIONS) {
+            for (int i = 0; i < m_codes.size(); i++) {
+                m_goodcodes[i] = true;
+            }
 
-                    m_times[dn][s]=tmp2;
+            for (int i = 0; i < d.value().size(); i++) { // for each day
+                day = d.value().at(i);
+
+                if (!day) { continue; }
+
+                if (day->machine_type() != m_machinetype) { continue; }
+
+                int ft = qint64(day->first()) / 1000L;
+                ft += tz_offset; // convert to local time
+
+                int dz2 = ft / 86400;
+                dz2 *= 86400; // ft = first sessions time, rounded back to midnight..
+
+                for (int s = 0; s < day->size(); s++) {
+                    Session *sess = (*day)[s];
+
+                    if (!sess->enabled()) { continue; }
+
+                    tmp = sess->hours();
+                    m_values[dn][s] = tmp;
+                    total += tmp;
+                    zt = qint64(sess->first()) / 1000L;
+                    zt += tz_offset;
+                    tmp2 = zt - dn * 86400;
+                    tmp2 /= 3600.0;
+
+                    m_times[dn][s] = tmp2;
 
                     if (first) {
-                        m_miny=tmp2;
-                        m_maxy=tmp2+tmp;
-                        first=false;
+                        m_miny = tmp2;
+                        m_maxy = tmp2 + tmp;
+                        first = false;
                     } else {
-                        if (tmp2 < m_miny)
-                            m_miny=tmp2;
-                        if (tmp2+tmp > m_maxy)
-                            m_maxy=tmp2+tmp;
+                        if (tmp2 < m_miny) {
+                            m_miny = tmp2;
+                        }
+
+                        if (tmp2 + tmp > m_maxy) {
+                            m_maxy = tmp2 + tmp;
+                        }
                     }
                 }
-                if (total>0) {
-                    m_days[dn]=day;
-                    m_hours[dn]=total;
-                    m_empty=false;
+
+                if (total > 0) {
+                    m_days[dn] = day;
+                    m_hours[dn] = total;
+                    m_empty = false;
                 }
             }
         } else {
-            for (int j=0;j<m_codes.size();j++) { // for each code slice
-                code=m_codes[j];
-                suboffset=0;
-                type=m_type[j];
-                EventDataType typeval=m_typeval[j];
-                for (int i=0;i<d.value().size();i++) { // for each machine object for this day
-                    day=d.value()[i];
-                    CPAPMode mode=(CPAPMode)(int)day->settings_max(CPAP_Mode);
-                    if (day->machine_type()!=m_machinetype) continue;
+            for (int j = 0; j < m_codes.size(); j++) { // for each code slice
+                code = m_codes[j];
+                suboffset = 0;
+                type = m_type[j];
+                EventDataType typeval = m_typeval[j];
 
-                    bool hascode=//day->channelHasData(code) ||
-                            type==ST_HOURS ||
-                            type==ST_SESSIONS ||
-                            day->settingExists(code) ||
-                            day->hasData(code,type);
+                for (int i = 0; i < d.value().size(); i++) { // for each machine object for this day
+                    day = d.value()[i];
+                    CPAPMode mode = (CPAPMode)(int)day->settings_max(CPAP_Mode);
 
-                    if (code==CPAP_Pressure) {
-                        if ((cpapmode>MODE_CPAP) && (mode==MODE_CPAP)) {
-                            hascode=false;
-                            if ((type==ST_WAVG) || (type==ST_AVG) || ((type==ST_PERC) && (typeval==0.5))) {
-                                type=ST_SETWAVG;
-                                hascode=true;
+                    if (day->machine_type() != m_machinetype) { continue; }
+
+                    bool hascode = //day->channelHasData(code) ||
+                        type == ST_HOURS ||
+                        type == ST_SESSIONS ||
+                        day->settingExists(code) ||
+                        day->hasData(code, type);
+
+                    if (code == CPAP_Pressure) {
+                        if ((cpapmode > MODE_CPAP) && (mode == MODE_CPAP)) {
+                            hascode = false;
+
+                            if ((type == ST_WAVG) || (type == ST_AVG) || ((type == ST_PERC) && (typeval == 0.5))) {
+                                type = ST_SETWAVG;
+                                hascode = true;
                             }
                         } else {
-                            type=m_type[j];
+                            type = m_type[j];
                         }
                     }
 
@@ -206,507 +232,671 @@ void SummaryChart::SetDay(Day * nullday)
                     //    hascode=true;
                     //}
                     if (hascode) {
-                        m_days[dn]=day;
-                        switch(type) {
-                            case ST_AVG: tmp=day->avg(code); break;
-                            case ST_SUM: tmp=day->sum(code); break;
-                            case ST_WAVG: tmp=day->wavg(code); break;
-                            case ST_90P: tmp=day->p90(code); break;
-                            case ST_PERC: tmp=day->percentile(code,typeval); break;
-                            case ST_MIN: tmp=day->Min(code); break;
-                            case ST_MAX: tmp=day->Max(code); break;
-                            case ST_CNT: tmp=day->count(code); break;
-                            case ST_CPH: tmp=day->cph(code); break;
-                            case ST_SPH: tmp=day->sph(code); break;
-                            case ST_HOURS: tmp=day->hours(); break;
-                            case ST_SESSIONS: tmp=day->size(); break;
-                            case ST_SETMIN: tmp=day->settings_min(code); break;
-                            case ST_SETMAX: tmp=day->settings_max(code); break;
-                            case ST_SETAVG: tmp=day->settings_avg(code); break;
-                            case ST_SETWAVG: tmp=day->settings_wavg(code); break;
-                            case ST_SETSUM: tmp=day->settings_sum(code); break;
+                        m_days[dn] = day;
+
+                        switch (type) {
+                        case ST_AVG:
+                            tmp = day->avg(code);
+                            break;
+
+                        case ST_SUM:
+                            tmp = day->sum(code);
+                            break;
+
+                        case ST_WAVG:
+                            tmp = day->wavg(code);
+                            break;
+
+                        case ST_90P:
+                            tmp = day->p90(code);
+                            break;
+
+                        case ST_PERC:
+                            tmp = day->percentile(code, typeval);
+                            break;
+
+                        case ST_MIN:
+                            tmp = day->Min(code);
+                            break;
+
+                        case ST_MAX:
+                            tmp = day->Max(code);
+                            break;
+
+                        case ST_CNT:
+                            tmp = day->count(code);
+                            break;
+
+                        case ST_CPH:
+                            tmp = day->cph(code);
+                            break;
+
+                        case ST_SPH:
+                            tmp = day->sph(code);
+                            break;
+
+                        case ST_HOURS:
+                            tmp = day->hours();
+                            break;
+
+                        case ST_SESSIONS:
+                            tmp = day->size();
+                            break;
+
+                        case ST_SETMIN:
+                            tmp = day->settings_min(code);
+                            break;
+
+                        case ST_SETMAX:
+                            tmp = day->settings_max(code);
+                            break;
+
+                        case ST_SETAVG:
+                            tmp = day->settings_avg(code);
+                            break;
+
+                        case ST_SETWAVG:
+                            tmp = day->settings_wavg(code);
+                            break;
+
+                        case ST_SETSUM:
+                            tmp = day->settings_sum(code);
+                            break;
+
                         default:
-                            tmp=0;
+                            tmp = 0;
                             break;
                         }
-                        if (suboffset>0) {
-                            tmp-=suboffset;
-                            if (tmp<0) tmp=0;
+
+                        if (suboffset > 0) {
+                            tmp -= suboffset;
+
+                            if (tmp < 0) { tmp = 0; }
                         }
-                        total+=tmp;
-                        m_values[dn][j+1]=tmp;
-                        if (tmp<m_miny) m_miny=tmp;
-                        if (tmp>m_maxy) m_maxy=tmp;
-                        m_goodcodes[j]=true;
-                        fnd=true;
+
+                        total += tmp;
+                        m_values[dn][j + 1] = tmp;
+
+                        if (tmp < m_miny) { m_miny = tmp; }
+
+                        if (tmp > m_maxy) { m_maxy = tmp; }
+
+                        m_goodcodes[j] = true;
+                        fnd = true;
                         break;
                     }
                 }
             }
+
             if (fnd) {
-                if (!m_fday) m_fday=dn;
-                m_values[dn][0]=total;
-                m_hours[dn]=day->hours();
-                if (m_graphtype==GT_BAR) {
-                    if (total<m_miny) m_miny=total;
-                    if (total>m_maxy) m_maxy=total;
+                if (!m_fday) { m_fday = dn; }
+
+                m_values[dn][0] = total;
+                m_hours[dn] = day->hours();
+
+                if (m_graphtype == GT_BAR) {
+                    if (total < m_miny) { m_miny = total; }
+
+                    if (total > m_maxy) { m_maxy = total; }
                 }
-           }
+            }
         }
     }
-    m_empty=true;
-    for (int i=0;i<m_goodcodes.size();i++) {
+
+    m_empty = true;
+
+    for (int i = 0; i < m_goodcodes.size(); i++) {
         if (m_goodcodes[i]) {
-            m_empty=false;
+            m_empty = false;
             break;
         }
     }
-    if (m_graphtype==GT_BAR) {
-        m_miny=0;
+
+    if (m_graphtype == GT_BAR) {
+        m_miny = 0;
     }
-   // m_minx=qint64(QDateTime(PROFILE.FirstDay(),QTime(0,0,0),Qt::UTC).toTime_t())*1000L;
-    m_maxx=qint64(QDateTime(PROFILE.LastDay(),QTime(23,59,0),Qt::UTC).toTime_t())*1000L;
-    m_physmaxy=m_maxy;
-    m_physminy=m_miny;
+
+    // m_minx=qint64(QDateTime(PROFILE.FirstDay(),QTime(0,0,0),Qt::UTC).toTime_t())*1000L;
+    m_maxx = qint64(QDateTime(PROFILE.LastDay(), QTime(23, 59, 0), Qt::UTC).toTime_t()) * 1000L;
+    m_physmaxy = m_maxy;
+    m_physminy = m_miny;
 }
 
 QColor brighten(QColor color)
 {
-    int cr,cg,cb;
+    int cr, cg, cb;
 
-    cr=color.red();
-    cg=color.green();
-    cb=color.blue();
+    cr = color.red();
+    cg = color.green();
+    cb = color.blue();
 
-    if (cr<64) cr=64;
-    if (cg<64) cg=64;
-    if (cb<64) cb=64;
+    if (cr < 64) { cr = 64; }
 
-    cr*=2;
-    cg*=2;
-    cb*=2;
+    if (cg < 64) { cg = 64; }
 
-    if (cr>255) cr=255;
-    if (cg>255) cg=255;
-    if (cb>255) cb=255;
+    if (cb < 64) { cb = 64; }
 
-    return QColor(cr,cg,cb,255);
+    cr *= 2;
+    cg *= 2;
+    cb *= 2;
+
+    if (cr > 255) { cr = 255; }
+
+    if (cg > 255) { cg = 255; }
+
+    if (cb > 255) { cb = 255; }
+
+    return QColor(cr, cg, cb, 255);
 
 }
 
-void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
+void SummaryChart::paint(gGraph &w, int left, int top, int width, int height)
 {
-    if (!m_visible) return;
+    if (!m_visible) { return; }
 
     points->setSize(10);
 
 
-    GraphType graphtype=m_graphtype;
+    GraphType graphtype = m_graphtype;
 
-    if (graphtype==GT_LINE || graphtype==GT_POINTS) {
-        bool pts=PROFILE.appearance->overviewLinechartMode()==OLC_Lines;
-        graphtype=pts ? GT_POINTS : GT_LINE;
+    if (graphtype == GT_LINE || graphtype == GT_POINTS) {
+        bool pts = PROFILE.appearance->overviewLinechartMode() == OLC_Lines;
+        graphtype = pts ? GT_POINTS : GT_LINE;
     }
 
-    if (graphtype==GT_POINTS) {
+    if (graphtype == GT_POINTS) {
         lines->setSize(4);
-    } else
+    } else {
         lines->setSize(1.5);
+    }
 
 
-    rtop=top;
-    gVertexBuffer *outlines2=w.lines();
-  //  outlines2->setColor(Qt::black);
-    outlines2->add(left, top, left, top+height, left, top+height, left+width,top+height,QColor("black").rgba());
-    outlines2->add(left+width,top+height, left+width, top, left+width, top, left, top,QColor("black").rgba());
+    rtop = top;
+    gVertexBuffer *outlines2 = w.lines();
+    //  outlines2->setColor(Qt::black);
+    outlines2->add(left, top, left, top + height, left, top + height, left + width, top + height,
+                   QColor("black").rgba());
+    outlines2->add(left + width, top + height, left + width, top, left + width, top, left, top,
+                   QColor("black").rgba());
     //if (outlines->full()) qDebug() << "WTF??? Outlines full in SummaryChart::paint()";
 
-    qint64 minx=w.min_x, maxx=w.max_x;
-    qint64 xx=maxx - minx;
-    float days=double(xx)/86400000.0;
+    qint64 minx = w.min_x, maxx = w.max_x;
+    qint64 xx = maxx - minx;
+    float days = double(xx) / 86400000.0;
 
 
     EventDataType maxy;
     EventDataType miny;
 
-    if (w.zoomY()==0 && PROFILE.appearance->allowYAxisScaling()) {
-        maxy=m_physmaxy;
-        miny=m_physminy;
-        w.roundY(miny,maxy);
+    if (w.zoomY() == 0 && PROFILE.appearance->allowYAxisScaling()) {
+        maxy = m_physmaxy;
+        miny = m_physminy;
+        w.roundY(miny, maxy);
     } else {
-        maxy=m_maxy;
-        miny=m_miny;
-        w.roundY(miny,maxy);
+        maxy = m_maxy;
+        miny = m_miny;
+        w.roundY(miny, maxy);
     }
 
-    EventDataType yy=maxy-miny;
-    EventDataType ymult=float(height-2)/yy;
+    EventDataType yy = maxy - miny;
+    EventDataType ymult = float(height - 2) / yy;
 
-    barw=(float(width)/float(days));
+    barw = (float(width) / float(days));
 
-    float dpr=w.graphView()->devicePixelRatio();
+    float dpr = w.graphView()->devicePixelRatio();
 
-    graph=&w;
-    float px=left;
-    l_left=w.marginLeft()+gYAxis::Margin;
-    l_top=w.marginTop();
-    l_width=width;
-    l_height=height;
+    graph = &w;
+    float px = left;
+    l_left = w.marginLeft() + gYAxis::Margin;
+    l_top = w.marginTop();
+    l_width = width;
+    l_height = height;
     float py;
     EventDataType total;
 
-    int daynum=0;
-    EventDataType h,tmp,tmp2;
+    int daynum = 0;
+    EventDataType h, tmp, tmp2;
 
 
-    l_offset=(minx) % 86400000L;
-    offset=float(l_offset)/86400000.0;
+    l_offset = (minx) % 86400000L;
+    offset = float(l_offset) / 86400000.0;
 
-    offset*=barw;
-    px=left-offset;
-    l_minx=minx;
-    l_maxx=maxx+86400000L;
+    offset *= barw;
+    px = left - offset;
+    l_minx = minx;
+    l_maxx = maxx + 86400000L;
 
-    int total_days=0;
-    double total_val=0;
-    double total_hours=0;
-    bool lastdaygood=false;
+    int total_days = 0;
+    double total_val = 0;
+    double total_hours = 0;
+    bool lastdaygood = false;
     QVector<double> totalcounts;
     QVector<double> totalvalues;
     QVector<float> lastX;
     QVector<short> lastY;
-    int numcodes=m_codes.size();
+    int numcodes = m_codes.size();
     totalcounts.resize(numcodes);
     totalvalues.resize(numcodes);
     lastX.resize(numcodes);
     lastY.resize(numcodes);
-    int zd=minx/86400000L;
+    int zd = minx / 86400000L;
     zd--;
-    QHash<int,QHash<short,EventDataType> >::iterator d=m_values.find(zd);
+    QHash<int, QHash<short, EventDataType> >::iterator d = m_values.find(zd);
 
     QVector<bool> goodcodes;
     goodcodes.resize(m_goodcodes.size());
 
-    points->setSize(5.0*dpr);
-    lastdaygood=true;
-    for (int i=0;i<numcodes;i++) {
-        totalcounts[i]=0;
+    points->setSize(5.0 * dpr);
+    lastdaygood = true;
+
+    for (int i = 0; i < numcodes; i++) {
+        totalcounts[i] = 0;
 
         // Set min and max to the opposite largest starting value
-        if ((m_type[i]==ST_MIN) || (m_type[i]==ST_SETMIN)) {
-            totalvalues[i]=maxy;
-        } else if ((m_type[i]==ST_MAX) || (m_type[i]==ST_SETMAX)) {
-            totalvalues[i]=miny;
+        if ((m_type[i] == ST_MIN) || (m_type[i] == ST_SETMIN)) {
+            totalvalues[i] = maxy;
+        } else if ((m_type[i] == ST_MAX) || (m_type[i] == ST_SETMAX)) {
+            totalvalues[i] = miny;
         } else {
-            totalvalues[i]=0;
+            totalvalues[i] = 0;
         }
+
         // Turn off legend display.. It will only display if it's turned back on during draw.
-        goodcodes[i]=false;
+        goodcodes[i] = false;
 
-        if (!m_goodcodes[i]) continue;
+        if (!m_goodcodes[i]) { continue; }
 
-        lastX[i]=px;
-        if (d!=m_values.end() && d.value().contains(i+1)) {
+        lastX[i] = px;
 
-            tmp=d.value()[i+1];
-            h=tmp*ymult;
+        if (d != m_values.end() && d.value().contains(i + 1)) {
+
+            tmp = d.value()[i + 1];
+            h = tmp * ymult;
         } else {
-            lastdaygood=false;
-            h=0;
+            lastdaygood = false;
+            h = 0;
         }
-        lastY[i]=top+height-1-h;
-    }
-    float compliance_hours=0;
-    if (PROFILE.cpap->showComplianceInfo()) {
-        compliance_hours=PROFILE.cpap->complianceHours();
+
+        lastY[i] = top + height - 1 - h;
     }
 
-    int incompliant=0;
-    Day * day;
+    float compliance_hours = 0;
+
+    if (PROFILE.cpap->showComplianceInfo()) {
+        compliance_hours = PROFILE.cpap->complianceHours();
+    }
+
+    int incompliant = 0;
+    Day *day;
     EventDataType hours;
 
     //quint32 * tptr;
     //EventStoreType * dptr;
 
-    short px2,py2;
-    const qint64 ms_per_day=86400000L;
-    for (qint64 Q=minx;Q<=maxx+ms_per_day;Q+=ms_per_day) {
-        zd=Q/ms_per_day;
-        d=m_values.find(zd);
+    short px2, py2;
+    const qint64 ms_per_day = 86400000L;
 
-        if (Q<minx)
+    for (qint64 Q = minx; Q <= maxx + ms_per_day; Q += ms_per_day) {
+        zd = Q / ms_per_day;
+        d = m_values.find(zd);
+
+        if (Q < minx) {
             goto jumpnext;
+        }
 
-        if (d!=m_values.end()) {
-            day=m_days[zd];
-            if (!m_hours.contains(zd))
+        if (d != m_values.end()) {
+            day = m_days[zd];
+
+            if (!m_hours.contains(zd)) {
                 goto jumpnext;
+            }
 
-            hours=m_hours[zd];
+            hours = m_hours[zd];
 
-            int x1=px;
+            int x1 = px;
             //x1-=(barw/2.0);
-            int x2=px+barw;
+            int x2 = px + barw;
 
-            if (x1<left) x1=left;
-            if (x2>left+width) x2=left+width;
-          //  if (x2<x1)
-          //      goto jumpnext;
+            if (x1 < left) { x1 = left; }
+
+            if (x2 > left + width) { x2 = left + width; }
+
+            //  if (x2<x1)
+            //      goto jumpnext;
 
 
-            if (zd==hl_day) {
-                QColor col=QColor("red");
+            if (zd == hl_day) {
+                QColor col = QColor("red");
                 col.setAlpha(64);
-                if (graphtype!=GT_POINTS) {
-                    quads->add(x1-1,top,x1-1,top+height,x2,top+height,x2,top,col.rgba());
+
+                if (graphtype != GT_POINTS) {
+                    quads->add(x1 - 1, top, x1 - 1, top + height, x2, top + height, x2, top, col.rgba());
                 } else {
-                    quads->add((x1+barw/2)-5,top,(x1+barw/2)-5,top+height,(x2-barw/2)+5,top+height,(x2-barw/2)+5,top,col.rgba());
+                    quads->add((x1 + barw / 2) - 5, top, (x1 + barw / 2) - 5, top + height, (x2 - barw / 2) + 5,
+                               top + height, (x2 - barw / 2) + 5, top, col.rgba());
                 }
             }
 
-            if (graphtype==GT_SESSIONS) {
+            if (graphtype == GT_SESSIONS) {
                 int j;
-                QHash<int,QHash<short,EventDataType> >::iterator times=m_times.find(zd);
-                QColor col=m_colors[0];
+                QHash<int, QHash<short, EventDataType> >::iterator times = m_times.find(zd);
+                QColor col = m_colors[0];
                 //if (hours<compliance_hours) col=QColor("#f03030");
 
-                if (zd==hl_day) {
-                    col=QColor("gold");
+                if (zd == hl_day) {
+                    col = QColor("gold");
                 }
-                GLuint col1=col.rgba();
-                GLuint col2=brighten(col).rgba();
+
+                GLuint col1 = col.rgba();
+                GLuint col2 = brighten(col).rgba();
                 //outlines->setColor(Qt::black);
 
-                int np=d.value().size();
+                int np = d.value().size();
+
                 if (np > 0) {
-                    for (int i=0;i<goodcodes.size();i++) {
-                        goodcodes[i]=true;
+                    for (int i = 0; i < goodcodes.size(); i++) {
+                        goodcodes[i] = true;
                     }
                 }
-                for (j=0;j < np;j++) {
-                    tmp2=times.value()[j]-miny;
-                    py=top+height-(tmp2*ymult);
 
-                    tmp=d.value()[j]; // length
+                for (j = 0; j < np; j++) {
+                    tmp2 = times.value()[j] - miny;
+                    py = top + height - (tmp2 * ymult);
+
+                    tmp = d.value()[j]; // length
 
                     //tmp-=miny;
-                    h=tmp*ymult;
+                    h = tmp * ymult;
 
-                    quads->add(x1,py,x1,py-h,x2,py-h,x2,py,col1,col2);
-                    if (h>0 && barw>2) {
-                        outlines->add(x1,py,x1,py-h,x1,py-h,x2,py-h,QColor("black").rgba());
-                        outlines->add(x1,py,x2,py,x2,py,x2,py-h,QColor("black").rgba());
+                    quads->add(x1, py, x1, py - h, x2, py - h, x2, py, col1, col2);
+
+                    if (h > 0 && barw > 2) {
+                        outlines->add(x1, py, x1, py - h, x1, py - h, x2, py - h, QColor("black").rgba());
+                        outlines->add(x1, py, x2, py, x2, py, x2, py - h, QColor("black").rgba());
                     }
-                    totalvalues[0]+=hours*tmp;
+
+                    totalvalues[0] += hours * tmp;
                 }
-                totalcounts[0]+=hours;
-                totalvalues[1]+=j;
+
+                totalcounts[0] += hours;
+                totalvalues[1] += j;
                 totalcounts[1]++;
-                total_val+=hours;
-                total_hours+=hours;
+                total_val += hours;
+                total_hours += hours;
                 total_days++;
             } else {
-                if (!d.value().contains(0))
+                if (!d.value().contains(0)) {
                     goto jumpnext;
-                total=d.value()[0];
+                }
+
+                total = d.value()[0];
+
                 //if (total>0) {
                 if (day) {
-                    EventDataType hours=m_hours[zd];
-                    total_val+=total*hours;
-                    total_hours+=hours;
+                    EventDataType hours = m_hours[zd];
+                    total_val += total * hours;
+                    total_hours += hours;
                     total_days++;
                 }
-                py=top+height;
+
+                py = top + height;
 
                 //}
                 bool good;
                 SummaryType type;
-                for (QHash<short,EventDataType>::iterator g=d.value().begin();g!=d.value().end();g++) {
-                    short j=g.key();
-                    if (!j) continue;
+
+                for (QHash<short, EventDataType>::iterator g = d.value().begin(); g != d.value().end(); g++) {
+                    short j = g.key();
+
+                    if (!j) { continue; }
+
                     j--;
-                    good=m_goodcodes[j];
-                    if (!good)
+                    good = m_goodcodes[j];
+
+                    if (!good) {
                         continue;
+                    }
 
-                    type=m_type[j];
+                    type = m_type[j];
                     // code was actually used (to signal the display of the legend summary)
-                    goodcodes[j]=good;
+                    goodcodes[j] = good;
 
-                    tmp=g.value();
+                    tmp = g.value();
 
-                    QColor col=m_colors[j];
-                    if (type==ST_HOURS) {
-                        if (tmp<compliance_hours) {
-                            col=QColor("#f04040");
+                    QColor col = m_colors[j];
+
+                    if (type == ST_HOURS) {
+                        if (tmp < compliance_hours) {
+                            col = QColor("#f04040");
                             incompliant++;
                         }
                     }
 
-                    if (zd==hl_day) {
-                        col=QColor("gold");
+                    if (zd == hl_day) {
+                        col = QColor("gold");
                     }
 
                     //if (!tmp) continue;
-                    if ((type==ST_MAX) || (type==ST_SETMAX)) {
-                        if (totalvalues[j]<tmp)
-                            totalvalues[j]=tmp;
-                    } else if ((type==ST_MIN) || (type==ST_SETMIN)) {
-                        if (totalvalues[j]>tmp)
-                            totalvalues[j]=tmp;
+                    if ((type == ST_MAX) || (type == ST_SETMAX)) {
+                        if (totalvalues[j] < tmp) {
+                            totalvalues[j] = tmp;
+                        }
+                    } else if ((type == ST_MIN) || (type == ST_SETMIN)) {
+                        if (totalvalues[j] > tmp) {
+                            totalvalues[j] = tmp;
+                        }
                     } else {
-                        totalvalues[j]+=tmp*hours;
+                        totalvalues[j] += tmp * hours;
                     }
+
                     //if (tmp) {
-                        totalcounts[j]+=hours;
+                    totalcounts[j] += hours;
                     //}
-                    tmp-=miny;
-                    h=tmp*ymult; // height in pixels
+                    tmp -= miny;
+                    h = tmp * ymult; // height in pixels
 
-                    if (graphtype==GT_BAR) {
-                        GLuint col1=col.rgba();
-                        GLuint col2=brighten(col).rgba();
+                    if (graphtype == GT_BAR) {
+                        GLuint col1 = col.rgba();
+                        GLuint col2 = brighten(col).rgba();
 
-                        quads->add(x1,py,x1,py-h,col1);
-                        quads->add(x2,py-h,x2,py,col2);
-                        if (h>0 && barw>2) {
-                            outlines->add(x1,py,x1,py-h,x1,py-h,x2,py-h,QColor("black").rgba());
-                            outlines->add(x1,py,x2,py,x2,py,x2,py-h,QColor("black").rgba());
-                            if (outlines->full()) qDebug() << "WTF??? Outlines full in SummaryChart::paint()";
+                        quads->add(x1, py, x1, py - h, col1);
+                        quads->add(x2, py - h, x2, py, col2);
+
+                        if (h > 0 && barw > 2) {
+                            outlines->add(x1, py, x1, py - h, x1, py - h, x2, py - h, QColor("black").rgba());
+                            outlines->add(x1, py, x2, py, x2, py, x2, py - h, QColor("black").rgba());
+
+                            if (outlines->full()) { qDebug() << "WTF??? Outlines full in SummaryChart::paint()"; }
                         } // if (bar
-                        py-=h;
-                    } else if (graphtype==GT_LINE) { // if (m_graphtype==GT_BAR
-                        GLuint col1=col.rgba();
-                        GLuint col2=m_colors[j].rgba();
-                        px2=px+barw;
-                        py2=(top+height-2)-h;
+
+                        py -= h;
+                    } else if (graphtype == GT_LINE) { // if (m_graphtype==GT_BAR
+                        GLuint col1 = col.rgba();
+                        GLuint col2 = m_colors[j].rgba();
+                        px2 = px + barw;
+                        py2 = (top + height - 2) - h;
 
                         // If more than 1 day between records, skip the vertical crud.
-                        if ((px2-lastX[j])>barw+1) {
-                            lastdaygood=false;
+                        if ((px2 - lastX[j]) > barw + 1) {
+                            lastdaygood = false;
                         }
+
                         if (lastdaygood) {
-                            if (lastY[j]!=py2) {// vertical line
-                                lines->add(lastX[j],lastY[j],px,py2,col2);
+                            if (lastY[j] != py2) { // vertical line
+                                lines->add(lastX[j], lastY[j], px, py2, col2);
                             }
-                            lines->add(px-1,py2,px2+1,py2,col1);
+
+                            lines->add(px - 1, py2, px2 + 1, py2, col1);
                         } else {
-                            lines->add(x1-1,py2,x2+1,py2,col1);
+                            lines->add(x1 - 1, py2, x2 + 1, py2, col1);
                         }
-                        lastX[j]=px2;
-                        lastY[j]=py2;
-                    } else if (graphtype==GT_POINTS) {
-                        GLuint col1=col.rgba();
-                        GLuint col2=m_colors[j].rgba();
-                        px2=px+barw;
-                        py2=(top+height-2)-h;
+
+                        lastX[j] = px2;
+                        lastY[j] = py2;
+                    } else if (graphtype == GT_POINTS) {
+                        GLuint col1 = col.rgba();
+                        GLuint col2 = m_colors[j].rgba();
+                        px2 = px + barw;
+                        py2 = (top + height - 2) - h;
 
                         // If more than 1 day between records, skip the vertical crud.
-                        if ((px2-lastX[j])>barw+1) {
-                            lastdaygood=false;
+                        if ((px2 - lastX[j]) > barw + 1) {
+                            lastdaygood = false;
                         }
 
-                        if (zd==hl_day) {
-                            points->add(px2-barw/2,py2,col2);
+                        if (zd == hl_day) {
+                            points->add(px2 - barw / 2, py2, col2);
                         }
 
                         if (lastdaygood) {
-                            lines->add(lastX[j]-barw/2,lastY[j],px2-barw/2,py2,col2);
+                            lines->add(lastX[j] - barw / 2, lastY[j], px2 - barw / 2, py2, col2);
                         } else {
-                            lines->add(px+barw/2-1,py2,px+barw/2+1,py2,col1);
+                            lines->add(px + barw / 2 - 1, py2, px + barw / 2 + 1, py2, col1);
                         }
-                        lastX[j]=px2;
-                        lastY[j]=py2;
+
+                        lastX[j] = px2;
+                        lastY[j] = py2;
                     }
                 }  // for(QHash<short
             }
-            lastdaygood=true;
-        //    if (Q>maxx+extra) break;
+
+            lastdaygood = true;
+            //    if (Q>maxx+extra) break;
         } else {
-            if (Q<maxx)
+            if (Q < maxx) {
                 incompliant++;
-            lastdaygood=false;
+            }
+
+            lastdaygood = false;
         }
+
 jumpnext:
-        if (px>=left+width+barw)
+
+        if (px >= left + width + barw) {
             break;
-        px+=barw;
+        }
+
+        px += barw;
 
         daynum++;
         //lastQ=Q;
     }
+
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-    quads->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width)*dpr,(height+1)*dpr);
-    lines->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width+1)*dpr,(height+1)*dpr);
-    outlines->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width)*dpr,(height+1)*dpr);
+    quads->scissor(left * dpr, w.flipY(top + height + 2)*dpr, (width)*dpr, (height + 1)*dpr);
+    lines->scissor(left * dpr, w.flipY(top + height + 2)*dpr, (width + 1)*dpr, (height + 1)*dpr);
+    outlines->scissor(left * dpr, w.flipY(top + height + 2)*dpr, (width)*dpr, (height + 1)*dpr);
 #else
-    lines->scissor(left,w.flipY(top+height+2),width+1,height+2);
-    outlines->scissor(left,w.flipY(top+height+2),width,height+2);
-    quads->scissor(left,w.flipY(top+height+2),width,height+2);
+    lines->scissor(left, w.flipY(top + height + 2), width + 1, height + 2);
+    outlines->scissor(left, w.flipY(top + height + 2), width, height + 2);
+    quads->scissor(left, w.flipY(top + height + 2), width, height + 2);
 #endif
     // Draw Ledgend
-    px=left+width-3;
-    py=top-5;
-    int legendx=px;
-    QString a,b;
-    int x,y;
+    px = left + width - 3;
+    py = top - 5;
+    int legendx = px;
+    QString a, b;
+    int x, y;
 
     QFontMetrics fm(*defaultfont);
-    int bw=fm.width('X');
-    int bh=fm.height()/1.8;
+    int bw = fm.width('X');
+    int bh = fm.height() / 1.8;
+
+    bool ishours = false;
+    int good = 0;
+
+    for (int j = 0; j < m_codes.size(); j++) {
+        if (!goodcodes[j]) { continue; }
 
-    bool ishours=false;
-    int good=0;
-    for (int j=0;j<m_codes.size();j++) {
-        if (!goodcodes[j]) continue;
         good++;
-        SummaryType type=m_type[j];
-        ChannelID code=m_codes[j];
-        EventDataType tval=m_typeval[j];
-        switch(type) {
-                case ST_WAVG: b="Avg"; break;
-                case ST_AVG:  b="Avg"; break;
-                case ST_90P:  b="90%"; break;
-                case ST_PERC:
-                    if (tval>=0.99) b="Max";
-                    else if (tval==0.5) b="Med";
-                    else b=QString("%1%").arg(tval*100.0,0,'f',0);
-                    break;
-            //b=QString("%1%").arg(tval*100.0,0,'f',0); break;
-                case ST_MIN:  b="Min"; break;
-                case ST_MAX:  b="Max"; break;
-                case ST_SETMIN:  b="Min"; break;
-                case ST_SETMAX:  b="Max"; break;
-                case ST_CPH:  b=""; break;
-                case ST_SPH:  b="%"; break;
-                case ST_HOURS: b=STR_UNIT_Hours; break;
-                case ST_SESSIONS: b="Sessions"; break;
+        SummaryType type = m_type[j];
+        ChannelID code = m_codes[j];
+        EventDataType tval = m_typeval[j];
 
-                default:
-                    b="";
-                    break;
+        switch (type) {
+        case ST_WAVG:
+            b = "Avg";
+            break;
+
+        case ST_AVG:
+            b = "Avg";
+            break;
+
+        case ST_90P:
+            b = "90%";
+            break;
+
+        case ST_PERC:
+            if (tval >= 0.99) { b = "Max"; }
+            else if (tval == 0.5) { b = "Med"; }
+            else { b = QString("%1%").arg(tval * 100.0, 0, 'f', 0); }
+
+            break;
+
+        //b=QString("%1%").arg(tval*100.0,0,'f',0); break;
+        case ST_MIN:
+            b = "Min";
+            break;
+
+        case ST_MAX:
+            b = "Max";
+            break;
+
+        case ST_SETMIN:
+            b = "Min";
+            break;
+
+        case ST_SETMAX:
+            b = "Max";
+            break;
+
+        case ST_CPH:
+            b = "";
+            break;
+
+        case ST_SPH:
+            b = "%";
+            break;
+
+        case ST_HOURS:
+            b = STR_UNIT_Hours;
+            break;
+
+        case ST_SESSIONS:
+            b = "Sessions";
+            break;
+
+        default:
+            b = "";
+            break;
         }
-        a=schema::channel[code].label();
-        if (a==w.title() && !b.isEmpty()) a=b; else a+=" "+b;
+
+        a = schema::channel[code].label();
+
+        if (a == w.title() && !b.isEmpty()) { a = b; }
+        else { a += " " + b; }
 
         QString val;
-        float f=0;
-        if (totalcounts[j]>0) {
-            if ((type==ST_MIN) || (type==ST_MAX) || (type==ST_SETMIN) || (type==ST_SETMAX)) {
-                f=totalvalues[j];
+        float f = 0;
+
+        if (totalcounts[j] > 0) {
+            if ((type == ST_MIN) || (type == ST_MAX) || (type == ST_SETMIN) || (type == ST_SETMAX)) {
+                f = totalvalues[j];
             } else {
-                f=totalvalues[j]/totalcounts[j];
+                f = totalvalues[j] / totalcounts[j];
             }
         }
-        if (type==ST_HOURS) {
-            int h=f;
-            int m=int(f*60) % 60;
-            val.sprintf("%02i:%02i",h,m);
-            ishours=true;
+
+        if (type == ST_HOURS) {
+            int h = f;
+            int m = int(f * 60) % 60;
+            val.sprintf("%02i:%02i", h, m);
+            ishours = true;
         } else {
-            val=QString::number(f,'f',2);
+            val = QString::number(f, 'f', 2);
         }
-        a+="="+val;
+
+        a += "=" + val;
         //GetTextExtent(a,x,y);
         //float wt=20*w.printScaleX();
         //px-=wt+x;
@@ -716,32 +906,34 @@ jumpnext:
 
         //QString text=schema::channel[code].label();
 
-        int wid,hi;
-        GetTextExtent(a,wid,hi);
-        legendx-=wid;
-        w.renderText(a,legendx,top-4);
-      //  legendx-=bw/2;
+        int wid, hi;
+        GetTextExtent(a, wid, hi);
+        legendx -= wid;
+        w.renderText(a, legendx, top - 4);
+        //  legendx-=bw/2;
 
-        int tp=top-5-bh/2;
-        w.quads()->add(legendx-bw,tp+bh/2,legendx,tp+bh/2,legendx,tp-bh/2,legendx-bw,tp-bh/2,m_colors[j].rgba());
-        legendx-=bw*2;
+        int tp = top - 5 - bh / 2;
+        w.quads()->add(legendx - bw, tp + bh / 2, legendx, tp + bh / 2, legendx, tp - bh / 2, legendx - bw,
+                       tp - bh / 2, m_colors[j].rgba());
+        legendx -= bw * 2;
 
 
         //lines->add(px,py,px+20,py,m_colors[j]);
         //lines->add(px,py+1,px+20,py+1,m_colors[j]);
     }
-    if ((m_graphtype==GT_BAR) && (good>0)) {
 
-        if (m_type.size()>1) {
-            float val=total_val/float(total_hours);
-            a=m_label+"="+QString::number(val,'f',2)+" ";
-            GetTextExtent(a,x,y);
-            legendx-=x;
-            w.renderText(a,legendx,py+1);
+    if ((m_graphtype == GT_BAR) && (good > 0)) {
+
+        if (m_type.size() > 1) {
+            float val = total_val / float(total_hours);
+            a = m_label + "=" + QString::number(val, 'f', 2) + " ";
+            GetTextExtent(a, x, y);
+            legendx -= x;
+            w.renderText(a, legendx, py + 1);
         }
     }
 
-    a="";
+    a = "";
     /*if (m_graphtype==GT_BAR) {
         if (m_type.size()>1) {
             float val=total_val/float(total_days);
@@ -749,10 +941,13 @@ jumpnext:
             //
         }
     }*/
-    a+="Days="+QString::number(total_days,'f',0);
+    a += "Days=" + QString::number(total_days, 'f', 0);
+
     if (PROFILE.cpap->showComplianceInfo()) {
-        if (ishours && incompliant>0) {
-            a+=" Low Usage Days="+QString::number(incompliant,'f',0)+" (%"+QString::number((1.0/daynum)*(total_days-incompliant)*100.0,'f',2)+" compliant, defined as >"+QString::number(compliance_hours,'f',1)+" hours)";
+        if (ishours && incompliant > 0) {
+            a += " Low Usage Days=" + QString::number(incompliant, 'f',
+                    0) + " (%" + QString::number((1.0 / daynum) * (total_days - incompliant) * 100.0, 'f',
+                                                 2) + " compliant, defined as >" + QString::number(compliance_hours, 'f', 1) + " hours)";
         }
     }
 
@@ -760,182 +955,237 @@ jumpnext:
     //GetTextExtent(a,x,y);
     //legendx-=30+x;
     //w.renderText(a,px+24,py+5);
-    w.renderText(a,left,py+1);
+    w.renderText(a, left, py + 1);
 }
 
-QString formatTime(EventDataType v, bool show_seconds=false, bool duration=false,bool show_12hr=false)
+QString formatTime(EventDataType v, bool show_seconds = false, bool duration = false,
+                   bool show_12hr = false)
 {
-    int h=int(v);
+    int h = int(v);
 
     if (!duration) {
-        h%=24;
-    } else show_12hr=false;
+        h %= 24;
+    } else { show_12hr = false; }
 
-    int m=int(v*60) % 60;
-    int s=int(v*3600) % 60;
+    int m = int(v * 60) % 60;
+    int s = int(v * 3600) % 60;
 
-    char pm[3]={"am"};
+    char pm[3] = {"am"};
 
     if (show_12hr) {
-        h>=12 ? pm[0]='p' : pm[0]='a';
+        h >= 12 ? pm[0] = 'p' : pm[0] = 'a';
         h %= 12;
-        if (h==0) h=12;
+
+        if (h == 0) { h = 12; }
 
     } else {
-        pm[0]=0;
+        pm[0] = 0;
+    }
+
+    if (show_seconds) {
+        return QString().sprintf("%i:%02i:%02i%s", h, m, s, pm);
+    } else {
+        return QString().sprintf("%i:%02i%s", h, m, pm);
     }
-    if (show_seconds)
-        return QString().sprintf("%i:%02i:%02i%s",h,m,s,pm);
-    else
-        return QString().sprintf("%i:%02i%s",h,m,pm);
 }
 
-bool SummaryChart::mouseMoveEvent(QMouseEvent *event,gGraph * graph)
+bool SummaryChart::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
 {
-    int x=event->x();
-    int y=event->y();
+    int x = event->x();
+    int y = event->y();
 
-    if (!m_rect.contains(x,y)) {
-//    if ((x<0 || y<0 || x>l_width || y>l_height)) {
-        hl_day=-1;
+    if (!m_rect.contains(x, y)) {
+        //    if ((x<0 || y<0 || x>l_width || y>l_height)) {
+        hl_day = -1;
         //graph->timedRedraw(2000);
         return false;
     }
 
-    x-=m_rect.left();
-    y-=m_rect.top();
+    x -= m_rect.left();
+    y -= m_rect.top();
 
-    double xx=l_maxx-l_minx;
+    double xx = l_maxx - l_minx;
 
-    double xmult=xx/double(l_width+barw);
+    double xmult = xx / double(l_width + barw);
 
-    qint64 mx=ceil(xmult*double(x-offset));
-    mx+=l_minx;
-    mx=mx+l_offset;//-86400000L;
-    int zd=mx/86400000L;
+    qint64 mx = ceil(xmult * double(x - offset));
+    mx += l_minx;
+    mx = mx + l_offset; //-86400000L;
+    int zd = mx / 86400000L;
 
-    Day * day;
+    Day *day;
     //if (hl_day!=zd)   // This line is an optimization
 
     {
-        hl_day=zd;
+        hl_day = zd;
         graph->Trigger(2000);
 
-        QHash<int,QHash<short,EventDataType> >::iterator d=m_values.find(hl_day);
+        QHash<int, QHash<short, EventDataType> >::iterator d = m_values.find(hl_day);
 
-        QHash<short,EventDataType> & valhash=d.value();
+        QHash<short, EventDataType> &valhash = d.value();
 
-        x+=m_rect.left(); //gYAxis::Margin+gGraphView::titleWidth; //graph->m_marginleft+
-        int y=event->y()-m_rect.top()+rtop-15;
+        x += m_rect.left(); //gYAxis::Margin+gGraphView::titleWidth; //graph->m_marginleft+
+        int y = event->y() - m_rect.top() + rtop - 15;
         //QDateTime dt1=QDateTime::fromTime_t(hl_day*86400).toLocalTime();
-        QDateTime dt2=QDateTime::fromTime_t(hl_day*86400).toUTC();
+        QDateTime dt2 = QDateTime::fromTime_t(hl_day * 86400).toUTC();
 
         //QTime t1=dt1.time();
         //QTime t2=dt2.time();
 
-        QDate dt=dt2.date();
-        if (d!=m_values.end()) {
+        QDate dt = dt2.date();
 
-            day=m_days[zd];
+        if (d != m_values.end()) {
 
-            QString z=dt.toString(Qt::SystemLocaleShortDate);
+            day = m_days[zd];
+
+            QString z = dt.toString(Qt::SystemLocaleShortDate);
 
             // Day * day=m_days[hl_day];
             //EventDataType val;
             QString val;
-            if (m_graphtype==GT_SESSIONS) {
-                if (m_type[0]==ST_HOURS) {
 
-                    int t=m_hours[zd]*3600.0;
-                    int h=t/3600;
-                    int m=(t / 60) % 60;
+            if (m_graphtype == GT_SESSIONS) {
+                if (m_type[0] == ST_HOURS) {
+
+                    int t = m_hours[zd] * 3600.0;
+                    int h = t / 3600;
+                    int m = (t / 60) % 60;
                     //int s=t % 60;
-                    val.sprintf("%02i:%02i",h,m);
-                } else
-                    val=QString::number(d.value()[0],'f',2);
-                z+="\r\n"+m_label+"="+val;
-
-                if (m_type[1]==ST_SESSIONS){
-                    z+=" (Sess="+QString::number(day->size(),'f',0)+")";
+                    val.sprintf("%02i:%02i", h, m);
+                } else {
+                    val = QString::number(d.value()[0], 'f', 2);
                 }
 
-                EventDataType v=m_times[zd][0];
-                int lastt=m_times[zd].size()-1;
-                if (lastt<0) lastt=0;
-                z+="\r\nBedtime="+formatTime(v,false,false,true);
-                v=m_times[zd][lastt]+m_values[zd][lastt];
-                z+="\r\nWaketime="+formatTime(v,false,false,true);
+                z += "\r\n" + m_label + "=" + val;
 
-            } else
-            if (m_graphtype==GT_BAR){
-                if (m_type[0]==ST_HOURS) {
-                    int t=d.value()[0]*3600.0;
-                    int h=t/3600;
-                    int m=(t / 60) % 60;
+                if (m_type[1] == ST_SESSIONS) {
+                    z += " (Sess=" + QString::number(day->size(), 'f', 0) + ")";
+                }
+
+                EventDataType v = m_times[zd][0];
+                int lastt = m_times[zd].size() - 1;
+
+                if (lastt < 0) { lastt = 0; }
+
+                z += "\r\nBedtime=" + formatTime(v, false, false, true);
+                v = m_times[zd][lastt] + m_values[zd][lastt];
+                z += "\r\nWaketime=" + formatTime(v, false, false, true);
+
+            } else if (m_graphtype == GT_BAR) {
+                if (m_type[0] == ST_HOURS) {
+                    int t = d.value()[0] * 3600.0;
+                    int h = t / 3600;
+                    int m = (t / 60) % 60;
                     //int s=t % 60;
-                    val.sprintf("%02i:%02i",h,m);
-                } else
-                    val=QString::number(d.value()[0],'f',2);
-                z+="\r\n"+m_label+"="+val;
+                    val.sprintf("%02i:%02i", h, m);
+                } else {
+                    val = QString::number(d.value()[0], 'f', 2);
+                }
+
+                z += "\r\n" + m_label + "=" + val;
                 //z+="\r\nMode="+QString::number(day->settings_min("FlexSet"),'f',0);
 
             } else {
                 QString a;
-                for (int i=0;i<m_type.size();i++) {
-                    if (!m_goodcodes[i])
+
+                for (int i = 0; i < m_type.size(); i++) {
+                    if (!m_goodcodes[i]) {
                         continue;
-                    if (!valhash.contains(i+1))
-                        continue;
-                    EventDataType tval=m_typeval[i];
-                    switch(m_type[i]) {
-                            case ST_WAVG: a="W-avg"; break;
-                            case ST_AVG:  a="Avg"; break;
-                            case ST_90P:  a="90%"; break;
-                            case ST_PERC:
-                                if (tval>=0.99) a="Max";
-                                else if (tval==0.5) a="Med";
-                                else a=QString("%1%").arg(tval*100.0,0,'f',0);
-                                break;
-                            case ST_MIN:  a="Min"; break;
-                            case ST_MAX:  a="Max"; break;
-                            case ST_CPH:  a=""; break;
-                            case ST_SPH:  a="%"; break;
-                            case ST_HOURS: a=STR_UNIT_Hours; break;
-                            case ST_SESSIONS: a="Sessions"; break;
-                            case ST_SETMIN:  a="Min"; break;
-                            case ST_SETMAX:  a="Max"; break;
-                            default:
-                                a="";
-                                break;
                     }
-                    if (m_type[i]==ST_SESSIONS) {
-                        val=QString::number(d.value()[i+1],'f',0);
-                        z+="\r\n"+a+"="+val;
+
+                    if (!valhash.contains(i + 1)) {
+                        continue;
+                    }
+
+                    EventDataType tval = m_typeval[i];
+
+                    switch (m_type[i]) {
+                    case ST_WAVG:
+                        a = "W-avg";
+                        break;
+
+                    case ST_AVG:
+                        a = "Avg";
+                        break;
+
+                    case ST_90P:
+                        a = "90%";
+                        break;
+
+                    case ST_PERC:
+                        if (tval >= 0.99) { a = "Max"; }
+                        else if (tval == 0.5) { a = "Med"; }
+                        else { a = QString("%1%").arg(tval * 100.0, 0, 'f', 0); }
+
+                        break;
+
+                    case ST_MIN:
+                        a = "Min";
+                        break;
+
+                    case ST_MAX:
+                        a = "Max";
+                        break;
+
+                    case ST_CPH:
+                        a = "";
+                        break;
+
+                    case ST_SPH:
+                        a = "%";
+                        break;
+
+                    case ST_HOURS:
+                        a = STR_UNIT_Hours;
+                        break;
+
+                    case ST_SESSIONS:
+                        a = "Sessions";
+                        break;
+
+                    case ST_SETMIN:
+                        a = "Min";
+                        break;
+
+                    case ST_SETMAX:
+                        a = "Max";
+                        break;
+
+                    default:
+                        a = "";
+                        break;
+                    }
+
+                    if (m_type[i] == ST_SESSIONS) {
+                        val = QString::number(d.value()[i + 1], 'f', 0);
+                        z += "\r\n" + a + "=" + val;
                     } else {
                         //if (day && (day->channelExists(m_codes[i]) || day->settingExists(m_codes[i]))) {
-                            schema::Channel & chan=schema::channel[m_codes[i]];
-                            EventDataType v;
-                            if (valhash.contains(i+1))
-                                v=valhash[i+1];
-                            else v=0;
+                        schema::Channel &chan = schema::channel[m_codes[i]];
+                        EventDataType v;
 
-                            if (m_codes[i]==Journal_Weight) {
-                                val=weightString(v,PROFILE.general->unitSystem());
-                            } else {
-                                val=QString::number(v,'f',2);
-                            }
-                            z+="\r\n"+chan.label()+" "+a+"="+val;
+                        if (valhash.contains(i + 1)) {
+                            v = valhash[i + 1];
+                        } else { v = 0; }
+
+                        if (m_codes[i] == Journal_Weight) {
+                            val = weightString(v, PROFILE.general->unitSystem());
+                        } else {
+                            val = QString::number(v, 'f', 2);
+                        }
+
+                        z += "\r\n" + chan.label() + " " + a + "=" + val;
                         //}
                     }
                 }
 
             }
 
-            graph->ToolTip(z,x,y-15,p_profile->general->tooltipTimeout());
+            graph->ToolTip(z, x, y - 15, p_profile->general->tooltipTimeout());
             return true;
         } else {
-            QString z=dt.toString(Qt::SystemLocaleShortDate)+"\r\nNo Data";
-            graph->ToolTip(z,x,y-15,p_profile->general->tooltipTimeout());
+            QString z = dt.toString(Qt::SystemLocaleShortDate) + "\r\nNo Data";
+            graph->ToolTip(z, x, y - 15, p_profile->general->tooltipTimeout());
             return true;
         }
     }
@@ -944,17 +1194,18 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event,gGraph * graph)
     return false;
 }
 
-bool SummaryChart::mousePressEvent(QMouseEvent * event,gGraph * graph)
+bool SummaryChart::mousePressEvent(QMouseEvent *event, gGraph *graph)
 {
     if (event->modifiers() & Qt::ShiftModifier) {
         //qDebug() << "Jump to daily view?";
         return true;
     }
+
     Q_UNUSED(graph)
     return false;
 }
 
-bool SummaryChart::keyPressEvent(QKeyEvent * event,gGraph * graph)
+bool SummaryChart::keyPressEvent(QKeyEvent *event, gGraph *graph)
 {
     Q_UNUSED(event)
     Q_UNUSED(graph)
@@ -964,22 +1215,24 @@ bool SummaryChart::keyPressEvent(QKeyEvent * event,gGraph * graph)
 
 #include "mainwindow.h"
 extern MainWindow *mainwin;
-bool SummaryChart::mouseReleaseEvent(QMouseEvent * event,gGraph * graph)
+bool SummaryChart::mouseReleaseEvent(QMouseEvent *event, gGraph *graph)
 {
     if (event->modifiers() & Qt::ShiftModifier) {
-        if (hl_day<0) {
-            mouseMoveEvent(event,graph);
+        if (hl_day < 0) {
+            mouseMoveEvent(event, graph);
         }
-        if (hl_day>0) {
-            QDateTime d=QDateTime::fromTime_t(hl_day*86400).toUTC();
+
+        if (hl_day > 0) {
+            QDateTime d = QDateTime::fromTime_t(hl_day * 86400).toUTC();
             mainwin->getDaily()->LoadDate(d.date());
             mainwin->JumpDaily();
-           //qDebug() << "Jump to daily view?" << d;
+            //qDebug() << "Jump to daily view?" << d;
             return true;
         }
     }
+
     Q_UNUSED(event)
-    hl_day=-1;
+    hl_day = -1;
     graph->timedRedraw(2000);
     return false;
 }
diff --git a/sleepyhead/Graphs/gSummaryChart.h b/sleepyhead/Graphs/gSummaryChart.h
index b0f41010..82185bda 100644
--- a/sleepyhead/Graphs/gSummaryChart.h
+++ b/sleepyhead/Graphs/gSummaryChart.h
@@ -26,92 +26,91 @@ enum GraphType { GT_BAR, GT_LINE, GT_POINTS, GT_SESSIONS };
 /*! \class SummaryChart
     \brief The main overall chart type layer used in Overview page
     */
-class SummaryChart:public Layer
+class SummaryChart: public Layer
 {
-    public:
-        //! \brief Constructs a SummaryChart with QString label, of GraphType type
-        SummaryChart(QString label, GraphType type=GT_BAR);
-        virtual ~SummaryChart();
+  public:
+    //! \brief Constructs a SummaryChart with QString label, of GraphType type
+    SummaryChart(QString label, GraphType type = GT_BAR);
+    virtual ~SummaryChart();
 
-        //! \brief Drawing code that fills the Vertex buffers
-        virtual void paint(gGraph & w,int left, int top, int width, int height);
+    //! \brief Drawing code that fills the Vertex buffers
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
 
-        //! \brief Precalculation code prior to drawing. Day object is not needed here, it's just here for Layer compatability.
-        virtual void SetDay(Day * day=NULL);
+    //! \brief Precalculation code prior to drawing. Day object is not needed here, it's just here for Layer compatability.
+    virtual void SetDay(Day *day = NULL);
 
-        //! \brief Returns true if no data was found for this day during SetDay
-        virtual bool isEmpty() { return m_empty; }
+    //! \brief Returns true if no data was found for this day during SetDay
+    virtual bool isEmpty() { return m_empty; }
 
-        //! \brief Adds a layer to the summaryChart (When in Bar mode, it becomes culminative, eg, the AHI chart)
-        void addSlice(ChannelID code, QColor color, SummaryType type, EventDataType tval=0.00f)
-        {
-            m_codes.push_back(code);
-            m_colors.push_back(color);
-            m_type.push_back(type);
-            //m_zeros.push_back(ignore_zeros);
-            m_typeval.push_back(tval);
-        }
+    //! \brief Adds a layer to the summaryChart (When in Bar mode, it becomes culminative, eg, the AHI chart)
+    void addSlice(ChannelID code, QColor color, SummaryType type, EventDataType tval = 0.00f) {
+        m_codes.push_back(code);
+        m_colors.push_back(color);
+        m_type.push_back(type);
+        //m_zeros.push_back(ignore_zeros);
+        m_typeval.push_back(tval);
+    }
 
-        //! \brief Deselect highlighting (the gold bar)
-        virtual void deselect() {
-            hl_day=-1;
-        }
+    //! \brief Deselect highlighting (the gold bar)
+    virtual void deselect() {
+        hl_day = -1;
+    }
 
-        //! \brief Returns true if currently selected..
-        virtual bool isSelected() { return hl_day>=0; }
+    //! \brief Returns true if currently selected..
+    virtual bool isSelected() { return hl_day >= 0; }
 
 
-        //! \brief Sets the MachineType this SummaryChart is interested in
-        void setMachineType(MachineType type) { m_machinetype=type; }
+    //! \brief Sets the MachineType this SummaryChart is interested in
+    void setMachineType(MachineType type) { m_machinetype = type; }
 
-        //! \brief Returns the MachineType this SummaryChart is interested in
-        MachineType machineType() { return m_machinetype; }
-    protected:
-        Qt::Orientation m_orientation;
+    //! \brief Returns the MachineType this SummaryChart is interested in
+    MachineType machineType() { return m_machinetype; }
+  protected:
+    Qt::Orientation m_orientation;
 
-        QVector<QColor> m_colors;
-        QVector<ChannelID> m_codes;
-        QVector<bool> m_goodcodes;
-        //QVector<bool> m_zeros;
-        QVector<SummaryType> m_type;
-        QVector<EventDataType> m_typeval;
-        QHash<int,QHash<short,EventDataType> > m_values;
-        QHash<int,QHash<short,EventDataType> > m_times;
-        QHash<int,EventDataType> m_hours;
-        QHash<int,Day *> m_days;
+    QVector<QColor> m_colors;
+    QVector<ChannelID> m_codes;
+    QVector<bool> m_goodcodes;
+    //QVector<bool> m_zeros;
+    QVector<SummaryType> m_type;
+    QVector<EventDataType> m_typeval;
+    QHash<int, QHash<short, EventDataType> > m_values;
+    QHash<int, QHash<short, EventDataType> > m_times;
+    QHash<int, EventDataType> m_hours;
+    QHash<int, Day *> m_days;
 
-        gVertexBuffer *quads;
-        gVertexBuffer *lines;
-        gVertexBuffer *outlines;
-        gVertexBuffer *points;
-        bool m_empty;
-        int m_fday;
-        QString m_label;
+    gVertexBuffer *quads;
+    gVertexBuffer *lines;
+    gVertexBuffer *outlines;
+    gVertexBuffer *points;
+    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;
-        int rtop;
-        qint64 l_minx,l_maxx;
-        int hl_day;
-        gGraph * graph;
-        GraphType m_graphtype;
-        MachineType m_machinetype;
-        int tz_offset;
-        float tz_hours;
+    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;
+    int rtop;
+    qint64 l_minx, l_maxx;
+    int hl_day;
+    gGraph *graph;
+    GraphType m_graphtype;
+    MachineType m_machinetype;
+    int tz_offset;
+    float tz_hours;
 
-        //! \brief Key was pressed that effects this layer
-        virtual bool keyPressEvent(QKeyEvent * event,gGraph * graph);
+    //! \brief Key was pressed that effects this layer
+    virtual bool keyPressEvent(QKeyEvent *event, gGraph *graph);
 
-        //! \brief Mouse moved over this layers area (shows the hover-over tooltips here)
-        virtual bool mouseMoveEvent(QMouseEvent * event,gGraph * graph);
+    //! \brief Mouse moved over this layers area (shows the hover-over tooltips here)
+    virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph);
 
-        //! \brief Mouse Button was pressed over this area
-        virtual bool mousePressEvent(QMouseEvent * event,gGraph * graph);
+    //! \brief Mouse Button was pressed over this area
+    virtual bool mousePressEvent(QMouseEvent *event, gGraph *graph);
 
-        //! \brief Mouse Button was released over this area. (jumps to daily view here)
-        virtual bool mouseReleaseEvent(QMouseEvent * event,gGraph * graph);
+    //! \brief Mouse Button was released over this area. (jumps to daily view here)
+    virtual bool mouseReleaseEvent(QMouseEvent *event, gGraph *graph);
 };
 
 
diff --git a/sleepyhead/Graphs/gXAxis.cpp b/sleepyhead/Graphs/gXAxis.cpp
index 0d1fbeb7..d768f632 100644
--- a/sleepyhead/Graphs/gXAxis.cpp
+++ b/sleepyhead/Graphs/gXAxis.cpp
@@ -14,48 +14,48 @@
 
 #include "gXAxis.h"
 
-const quint64 divisors[]={
+const quint64 divisors[] = {
     15552000000ULL, 7776000000ULL, 5184000000ULL, 2419200000ULL, 1814400000ULL, 1209600000L, 604800000L, 259200000L,
-    172800000L, 86400000,2880000,14400000,7200000,3600000,2700000,
-    1800000,1200000,900000,600000,300000,120000,60000,45000,30000,
-    20000,15000,10000,5000,2000,1000,100,50,10
+    172800000L, 86400000, 2880000, 14400000, 7200000, 3600000, 2700000,
+    1800000, 1200000, 900000, 600000, 300000, 120000, 60000, 45000, 30000,
+    20000, 15000, 10000, 5000, 2000, 1000, 100, 50, 10
 };
-const int divcnt=sizeof(divisors)/sizeof(quint64);
+const int divcnt = sizeof(divisors) / sizeof(quint64);
 
-gXAxis::gXAxis(QColor col,bool fadeout)
-:Layer(NoChannel)
+gXAxis::gXAxis(QColor col, bool fadeout)
+    : Layer(NoChannel)
 {
-    m_line_color=col;
-    m_text_color=col;
-    m_major_color=Qt::darkGray;
-    m_minor_color=Qt::lightGray;
-    m_show_major_lines=false;
-    m_show_minor_lines=false;
-    m_show_minor_ticks=true;
-    m_show_major_ticks=true;
-    m_utcfix=false;
-    m_fadeout=fadeout;
-    m_textureID=0;
-//    QDateTime d=QDateTime::currentDateTime();
-//    QTime t1=d.time();
-//    QTime t2=d.toUTC().time();
+    m_line_color = col;
+    m_text_color = col;
+    m_major_color = Qt::darkGray;
+    m_minor_color = Qt::lightGray;
+    m_show_major_lines = false;
+    m_show_minor_lines = false;
+    m_show_minor_ticks = true;
+    m_show_major_ticks = true;
+    m_utcfix = false;
+    m_fadeout = fadeout;
+    m_textureID = 0;
+    //    QDateTime d=QDateTime::currentDateTime();
+    //    QTime t1=d.time();
+    //    QTime t2=d.toUTC().time();
 
-//    tz_offset=t2.secsTo(t1);
-//    tz_hours=tz_offset/3600.0;
-//    tz_offset*=1000L;
+    //    tz_offset=t2.secsTo(t1);
+    //    tz_hours=tz_offset/3600.0;
+    //    tz_offset*=1000L;
 
-    tz_offset=timezoneOffset();
-    tz_hours=tz_offset/3600000.0;
+    tz_offset = timezoneOffset();
+    tz_hours = tz_offset / 3600000.0;
 }
 gXAxis::~gXAxis()
 {
 }
-void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
+void gXAxis::paint(gGraph &w, int left, int top, int width, int height)
 {
     Q_UNUSED(height)
-    QString months[]={
+    QString months[] = {
         QObject::tr("Jan"), QObject::tr("Feb"), QObject::tr("Mar"), QObject::tr("Apr"), QObject::tr("May"), QObject::tr("Jun"),
-        QObject::tr("Jul"), QObject::tr("Aug"), QObject::tr("Sep"), QObject::tr("Oct"), QObject::tr("Nov"),QObject::tr("Dec")
+        QObject::tr("Jul"), QObject::tr("Aug"), QObject::tr("Sep"), QObject::tr("Oct"), QObject::tr("Nov"), QObject::tr("Dec")
     };
     //static QString dow[]={"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
 
@@ -65,110 +65,124 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
 
     // pixmap caching screws font size when printing
 
-    bool usepixmap=w.graphView()->usePixmapCache(); // Whether or not to use pixmap caching
+    bool usepixmap = w.graphView()->usePixmapCache(); // Whether or not to use pixmap caching
 
     if (!usepixmap || (usepixmap && w.invalidate_xAxisImage)) {
 
         if (usepixmap) {
             // Unbind any previous texture
-            if (m_textureID) w.graphView()->deleteTexture(m_textureID);
+            if (m_textureID) { w.graphView()->deleteTexture(m_textureID); }
 
-            m_image=QImage(width+22,height+4,QImage::Format_ARGB32_Premultiplied);
+            m_image = QImage(width + 22, height + 4, QImage::Format_ARGB32_Premultiplied);
             m_image.fill(Qt::transparent);
             painter.begin(&m_image);
             painter.setPen(Qt::black);
             painter.setFont(*defaultfont);
         }
-        double px,py;
 
-        int start_px=left;
+        double px, py;
+
+        int start_px = left;
         //int start_py=top;
         //int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
-    //    float height=scry-(w.GetTopMargin()+w.GetBottomMargin());
+        //    float height=scry-(w.GetTopMargin()+w.GetBottomMargin());
 
-        if (width<40)
+        if (width < 40) {
             return;
+        }
+
         qint64 minx;
         qint64 maxx;
+
         if (w.blockZoom()) {
-            minx=w.rmin_x;
-            maxx=w.rmax_x;
+            minx = w.rmin_x;
+            maxx = w.rmax_x;
         } else {
-            minx=w.min_x;
-            maxx=w.max_x;
+            minx = w.min_x;
+            maxx = w.max_x;
         }
-        qint64 xx=maxx-minx;
-        if (xx<=0) return;
+
+        qint64 xx = maxx - minx;
+
+        if (xx <= 0) { return; }
 
         //Most of this could be precalculated when min/max is set..
-        QString fd,tmpstr;
-        int divmax,dividx;
+        QString fd, tmpstr;
+        int divmax, dividx;
         int fitmode;
-        if (xx>=86400000L) {         // Day
-            fd="Mjj 00";
-            dividx=0;
-            divmax=10;
-            fitmode=0;
-        } else if (xx>600000) {    // Minutes
-            fd=" j0:00";
-            dividx=10;
-            divmax=27;
-            fitmode=1;
-        } else if (xx>5000) {      // Seconds
-            fd=" j0:00:00";
-            dividx=16;
-            divmax=27;
-            fitmode=2;
+
+        if (xx >= 86400000L) {       // Day
+            fd = "Mjj 00";
+            dividx = 0;
+            divmax = 10;
+            fitmode = 0;
+        } else if (xx > 600000) {  // Minutes
+            fd = " j0:00";
+            dividx = 10;
+            divmax = 27;
+            fitmode = 1;
+        } else if (xx > 5000) {    // Seconds
+            fd = " j0:00:00";
+            dividx = 16;
+            divmax = 27;
+            fitmode = 2;
         } else {                   // Microseconds
-            fd="j0:00:00:000";
-            dividx=28;
-            divmax=divcnt;
-            fitmode=3;
+            fd = "j0:00:00:000";
+            dividx = 28;
+            divmax = divcnt;
+            fitmode = 3;
         }
+
         //if (divmax>divcnt) divmax=divcnt;
 
-        int x,y;
-        GetTextExtent(fd,x,y);
+        int x, y;
+        GetTextExtent(fd, x, y);
 
-        if (x<=0) {
+        if (x <= 0) {
             qWarning() << "gXAxis::Plot() x<=0 font size bug";
             return;
         }
 
-        int max_ticks=width/(x+15);  // Max number of ticks that will fit
+        int max_ticks = width / (x + 15); // Max number of ticks that will fit
 
-        int fit_ticks=0;
-        int div=-1;
-        qint64 closest=0,tmp,tmpft;
-        for (int i=dividx;i<divmax;i++){
-            tmpft=xx/divisors[i];
-            tmp=max_ticks-tmpft;
-            if (tmp<0) continue;
-            if (tmpft>closest) {     // Find the closest scale to the number
-                closest=tmpft;       // that will fit
-                div=i;
-                fit_ticks=tmpft;
+        int fit_ticks = 0;
+        int div = -1;
+        qint64 closest = 0, tmp, tmpft;
+
+        for (int i = dividx; i < divmax; i++) {
+            tmpft = xx / divisors[i];
+            tmp = max_ticks - tmpft;
+
+            if (tmp < 0) { continue; }
+
+            if (tmpft > closest) {   // Find the closest scale to the number
+                closest = tmpft;     // that will fit
+                div = i;
+                fit_ticks = tmpft;
             }
         }
-        if (fit_ticks==0) {
+
+        if (fit_ticks == 0) {
             qDebug() << "gXAxis::Plot() Couldn't fit ticks.. Too short?" << minx << maxx << xx;
             return;
         }
-        if ((div<0) || (div>divcnt)) {
+
+        if ((div < 0) || (div > divcnt)) {
             qDebug() << "gXAxis::Plot() div out of bounds";
             return;
         }
-        qint64 step=divisors[div];
+
+        qint64 step = divisors[div];
 
         //Align left minimum to divisor by losing precision
-        qint64 aligned_start=minx/step;
-        aligned_start*=step;
+        qint64 aligned_start = minx / step;
+        aligned_start *= step;
 
-        while (aligned_start<minx) {
-            aligned_start+=step;
+        while (aligned_start < minx) {
+            aligned_start += step;
         }
 
-        gVertexBuffer *lines=w.backlines();
+        gVertexBuffer *lines = w.backlines();
         lines->setColor(Qt::black);
 
 
@@ -177,85 +191,104 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
         //utcoff=0;
         int num_minor_ticks;
 
-        if (step>=86400000) {
-            qint64 i=step/86400000L; // number of days
-            if (i>14) i/=2;
-            if (i<0) i=1;
-            num_minor_ticks=i;
-        } else num_minor_ticks=10;
+        if (step >= 86400000) {
+            qint64 i = step / 86400000L; // number of days
 
-        float xmult=double(width)/double(xx);
-        float step_pixels=double(step/float(num_minor_ticks))*xmult;
+            if (i > 14) { i /= 2; }
 
-        py=left+float(aligned_start-minx)*xmult;
+            if (i < 0) { i = 1; }
+
+            num_minor_ticks = i;
+        } else { num_minor_ticks = 10; }
+
+        float xmult = double(width) / double(xx);
+        float step_pixels = double(step / float(num_minor_ticks)) * xmult;
+
+        py = left + float(aligned_start - minx) * xmult;
 
         //py+=usepixmap ? 20 : left;
 
-        int mintop=top+4.0*(float(y)/10.0);
-        int majtop=top+6.0*(float(y)/10.0);
-        int texttop=majtop+y; // 18*w.printScaleY();
+        int mintop = top + 4.0 * (float(y) / 10.0);
+        int majtop = top + 6.0 * (float(y) / 10.0);
+        int texttop = majtop + y; // 18*w.printScaleY();
 
         // Fill in the minor tick marks up to the first major alignment tick
 
-        for (int i=0;i<num_minor_ticks;i++) {
-            py-=step_pixels;
-            if (py<start_px) continue;
-            if (usepixmap)
-                painter.drawLine(py-left+20,0,py-left+20,mintop-top);
-            else
-                lines->add(py,top,py,mintop);
+        for (int i = 0; i < num_minor_ticks; i++) {
+            py -= step_pixels;
+
+            if (py < start_px) { continue; }
+
+            if (usepixmap) {
+                painter.drawLine(py - left + 20, 0, py - left + 20, mintop - top);
+            } else {
+                lines->add(py, top, py, mintop);
+            }
         }
 
-        int ms,m,h,s,d;
+        int ms, m, h, s, d;
         qint64 j;
-        for (qint64 i=aligned_start;i<maxx;i+=step) {
-            px=(i-minx)*xmult;
-            px+=left;
+
+        for (qint64 i = aligned_start; i < maxx; i += step) {
+            px = (i - minx) * xmult;
+            px += left;
+
             if (usepixmap) {
-                painter.drawLine(px-left+20,0,px-left+20,majtop-top);
-            } else lines->add(px,top,px,majtop);
-            j=i;
-            if (!m_utcfix) j+=tz_offset;
-            ms=j % 1000;
-            m=(j/60000L) % 60L;
-            h=(j/3600000L) % 24L;
-            s=(j/1000L) % 60L;
+                painter.drawLine(px - left + 20, 0, px - left + 20, majtop - top);
+            } else { lines->add(px, top, px, majtop); }
+
+            j = i;
+
+            if (!m_utcfix) { j += tz_offset; }
+
+            ms = j % 1000;
+            m = (j / 60000L) % 60L;
+            h = (j / 3600000L) % 24L;
+            s = (j / 1000L) % 60L;
             //int d=(j/86400000) % 7;
 
-            if (fitmode==0) {
-                d=(j/1000);
-                QDateTime dt=QDateTime::fromTime_t(d).toUTC();
-                QDate date=dt.date();
+            if (fitmode == 0) {
+                d = (j / 1000);
+                QDateTime dt = QDateTime::fromTime_t(d).toUTC();
+                QDate date = dt.date();
                 // SLOW SLOW SLOW!!! On Mac especially, this function is pathetically slow.
                 //dt.toString("MMM dd");
 
                 // Doing it this way instead because it's MUUUUUUCH faster
-                tmpstr=QString("%1 %2").arg(months[date.month()-1]).arg(date.day());
-            //} else if (fitmode==0) {
-    //            tmpstr=QString("%1 %2:%3").arg(dow[d]).arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0'));
-            } else if (fitmode==1) { // minute
-                tmpstr=QString("%1:%2").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0'));
-            } else if (fitmode==2) { // second
-                tmpstr=QString("%1:%2:%3").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0'));
-            } else if (fitmode==3) { // milli
-                tmpstr=QString("%1:%2:%3:%4").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0')).arg(ms,3,10,QChar('0'));
+                tmpstr = QString("%1 %2").arg(months[date.month() - 1]).arg(date.day());
+                //} else if (fitmode==0) {
+                //            tmpstr=QString("%1 %2:%3").arg(dow[d]).arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0'));
+            } else if (fitmode == 1) { // minute
+                tmpstr = QString("%1:%2").arg(h, 2, 10, QChar('0')).arg(m, 2, 10, QChar('0'));
+            } else if (fitmode == 2) { // second
+                tmpstr = QString("%1:%2:%3").arg(h, 2, 10, QChar('0')).arg(m, 2, 10, QChar('0')).arg(s, 2, 10,
+                         QChar('0'));
+            } else if (fitmode == 3) { // milli
+                tmpstr = QString("%1:%2:%3:%4").arg(h, 2, 10, QChar('0')).arg(m, 2, 10, QChar('0')).arg(s, 2, 10,
+                         QChar('0')).arg(ms, 3, 10, QChar('0'));
             }
 
-            int tx=px-x/2.0;
+            int tx = px - x / 2.0;
 
-            if (m_utcfix)
-                tx+=step_pixels/2.0;
-            if ((tx+x)<(left+width)) {
-                if (!usepixmap) w.renderText(tmpstr,tx,texttop,0,Qt::black,defaultfont);
-                else painter.drawText(tx-left+20,texttop-top,tmpstr);
+            if (m_utcfix) {
+                tx += step_pixels / 2.0;
             }
-            py=px;
-            for (int j=1;j<num_minor_ticks;j++) {
-                py+=step_pixels;
-                if (py>=left+width) break;
+
+            if ((tx + x) < (left + width)) {
+                if (!usepixmap) { w.renderText(tmpstr, tx, texttop, 0, Qt::black, defaultfont); }
+                else { painter.drawText(tx - left + 20, texttop - top, tmpstr); }
+            }
+
+            py = px;
+
+            for (int j = 1; j < num_minor_ticks; j++) {
+                py += step_pixels;
+
+                if (py >= left + width) { break; }
+
                 if (usepixmap) {
-                    painter.drawLine(py-left+20,0,py-left+20,mintop-top);
-                } else lines->add(py,top,py,mintop);
+                    painter.drawLine(py - left + 20, 0, py - left + 20, mintop - top);
+                } else { lines->add(py, top, py, mintop); }
             }
 
             if (lines->full()) {
@@ -266,18 +299,20 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
 
         if (usepixmap) {
             painter.end();
-            m_image=QGLWidget::convertToGLFormat(m_image);
-            m_textureID=w.graphView()->bindTexture(m_image,GL_TEXTURE_2D,GL_RGBA,QGLContext::NoBindOption);
+            m_image = QGLWidget::convertToGLFormat(m_image);
+            m_textureID = w.graphView()->bindTexture(m_image, GL_TEXTURE_2D, GL_RGBA,
+                          QGLContext::NoBindOption);
 
         }
-        w.invalidate_xAxisImage=false;
+
+        w.invalidate_xAxisImage = false;
     }
 
     if (usepixmap && !m_image.isNull()) {
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         glEnable(GL_TEXTURE_2D);
-        w.graphView()->drawTexture(QPoint(left-20,(top+height)-m_image.height()+4),m_textureID);
+        w.graphView()->drawTexture(QPoint(left - 20, (top + height) - m_image.height() + 4), m_textureID);
         glDisable(GL_TEXTURE_2D);
         glDisable(GL_BLEND);
     }
diff --git a/sleepyhead/Graphs/gXAxis.h b/sleepyhead/Graphs/gXAxis.h
index a66707f7..96efac68 100644
--- a/sleepyhead/Graphs/gXAxis.h
+++ b/sleepyhead/Graphs/gXAxis.h
@@ -15,41 +15,41 @@
 
 /*! \class gXAxis
     \brief Draws the XTicker timescales underneath graphs */
-class gXAxis:public Layer
+class gXAxis: public Layer
 {
-    public:
-        gXAxis(QColor col=Qt::black,bool fadeout=true);
-        virtual ~gXAxis();
-        virtual void paint(gGraph & w,int left,int top, int width, int height);
-        static const int Margin=20; // How much room does this take up. (Bottom margin)
-        void SetShowMinorLines(bool b) { m_show_minor_lines=b; }
-        void SetShowMajorLines(bool b) { m_show_major_lines=b; }
-        bool ShowMinorLines() { return m_show_minor_lines; }
-        bool ShowMajorLines() { return m_show_major_lines; }
-        void SetShowMinorTicks(bool b) { m_show_minor_ticks=b; }
-        void SetShowMajorTicks(bool b) { m_show_major_ticks=b; }
-        bool ShowMinorTicks() { return m_show_minor_ticks; }
-        bool ShowMajorTicks() { return m_show_major_ticks; }
-        void setUtcFix(bool b) { m_utcfix=b; }
+  public:
+    gXAxis(QColor col = Qt::black, bool fadeout = true);
+    virtual ~gXAxis();
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
+    static const int Margin = 20; // How much room does this take up. (Bottom margin)
+    void SetShowMinorLines(bool b) { m_show_minor_lines = b; }
+    void SetShowMajorLines(bool b) { m_show_major_lines = b; }
+    bool ShowMinorLines() { return m_show_minor_lines; }
+    bool ShowMajorLines() { return m_show_major_lines; }
+    void SetShowMinorTicks(bool b) { m_show_minor_ticks = b; }
+    void SetShowMajorTicks(bool b) { m_show_major_ticks = b; }
+    bool ShowMinorTicks() { return m_show_minor_ticks; }
+    bool ShowMajorTicks() { return m_show_major_ticks; }
+    void setUtcFix(bool b) { m_utcfix = b; }
 
-    protected:
-//        virtual const wxString & Format(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; };
-        bool m_show_major_lines;
-        bool m_show_minor_lines;
-        bool m_show_minor_ticks;
-        bool m_show_major_ticks;
+  protected:
+    //        virtual const wxString & Format(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; };
+    bool m_show_major_lines;
+    bool m_show_minor_lines;
+    bool m_show_minor_ticks;
+    bool m_show_major_ticks;
 
-        bool m_utcfix;
+    bool m_utcfix;
 
-        QColor m_line_color;
-        QColor m_text_color;
-        QColor m_major_color;
-        QColor m_minor_color;
-        bool m_fadeout;
-        qint64 tz_offset;
-        float tz_hours;
+    QColor m_line_color;
+    QColor m_text_color;
+    QColor m_major_color;
+    QColor m_minor_color;
+    bool m_fadeout;
+    qint64 tz_offset;
+    float tz_hours;
 
-        QImage m_image;
-        GLuint m_textureID;
+    QImage m_image;
+    GLuint m_textureID;
 };
 #endif // GXAXIS_H
diff --git a/sleepyhead/Graphs/gYAxis.cpp b/sleepyhead/Graphs/gYAxis.cpp
index 289fbfcd..144ae5d1 100644
--- a/sleepyhead/Graphs/gYAxis.cpp
+++ b/sleepyhead/Graphs/gYAxis.cpp
@@ -15,114 +15,130 @@
 #include "SleepLib/profiles.h"
 
 gXGrid::gXGrid(QColor col)
-    :Layer(NoChannel)
+    : Layer(NoChannel)
 {
     Q_UNUSED(col)
 
-    m_major_color=QColor(180,180,180,64);
+    m_major_color = QColor(180, 180, 180, 64);
     //m_major_color=QColor(180,180,180,92);
-    m_minor_color=QColor(230,230,230,64);
-    m_show_major_lines=true;
-    m_show_minor_lines=true;
+    m_minor_color = QColor(230, 230, 230, 64);
+    m_show_major_lines = true;
+    m_show_minor_lines = true;
 }
 gXGrid::~gXGrid()
 {
 }
-void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
+void gXGrid::paint(gGraph &w, int left, int top, int width, int height)
 {
-    int x,y;
+    int x, y;
 
-    gVertexBuffer * stippled, * lines;
+    gVertexBuffer *stippled, * lines;
 
-    EventDataType miny,maxy;
+    EventDataType miny, maxy;
 
-    if (w.zoomY()==0 && PROFILE.appearance->allowYAxisScaling()) {
-        miny=w.physMinY();
-        maxy=w.physMaxY();
+    if (w.zoomY() == 0 && PROFILE.appearance->allowYAxisScaling()) {
+        miny = w.physMinY();
+        maxy = w.physMaxY();
     } else {
-        miny=w.min_y;
-        maxy=w.max_y;
+        miny = w.min_y;
+        maxy = w.max_y;
 
-        if (miny<0) { // even it up if it's starts negative
-            miny=-MAX(fabs(miny),fabs(maxy));
+        if (miny < 0) { // even it up if it's starts negative
+            miny = -MAX(fabs(miny), fabs(maxy));
         }
     }
 
-    w.roundY(miny,maxy);
+    w.roundY(miny, maxy);
 
     //EventDataType dy=maxy-miny;
 
-    if (height<0) return;
+    if (height < 0) { return; }
 
-    static QString fd="0";
-    GetTextExtent(fd,x,y);
+    static QString fd = "0";
+    GetTextExtent(fd, x, y);
 
-    double max_yticks=round(height / (y+14.0)); // plus spacing between lines
+    double max_yticks = round(height / (y + 14.0)); // plus spacing between lines
     //double yt=1/max_yticks;
 
-    double mxy=MAX(fabs(maxy),fabs(miny));
-    double mny=miny;
-    if (miny<0) {
-        mny=-mxy;
+    double mxy = MAX(fabs(maxy), fabs(miny));
+    double mny = miny;
+
+    if (miny < 0) {
+        mny = -mxy;
     }
-    double rxy=mxy-mny;
+
+    double rxy = mxy - mny;
 
     int myt;
-    bool fnd=false;
-    for (myt=max_yticks;myt>=1;myt--) {
-        float v=rxy/float(myt);
-        if (float(v)==int(v)) {
-            fnd=true;
+    bool fnd = false;
+
+    for (myt = max_yticks; myt >= 1; myt--) {
+        float v = rxy / float(myt);
+
+        if (float(v) == int(v)) {
+            fnd = true;
             break;
         }
     }
-    if (fnd) max_yticks=myt;
+
+    if (fnd) { max_yticks = myt; }
     else {
-        max_yticks=2;
+        max_yticks = 2;
     }
-    double yt=1/max_yticks;
 
-    double ymult=height/rxy;
+    double yt = 1 / max_yticks;
 
-    double min_ytick=rxy*yt;
+    double ymult = height / rxy;
 
-    float ty,h;
+    double min_ytick = rxy * yt;
 
-    if (min_ytick<=0) {
+    float ty, h;
+
+    if (min_ytick <= 0) {
         qDebug() << "min_ytick error in gXGrid::paint() in" << w.title();
         return;
     }
-    if (min_ytick>=1000000) {
-        min_ytick=100;
+
+    if (min_ytick >= 1000000) {
+        min_ytick = 100;
     }
 
 
-    stippled=w.backlines();
-    lines=w.backlines();
-    for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
-        ty=(i - miny) * ymult;
-        h=top+height-ty;
+    stippled = w.backlines();
+    lines = w.backlines();
+
+    for (double i = miny; i <= maxy + min_ytick - 0.00001; i += min_ytick) {
+        ty = (i - miny) * ymult;
+        h = top + height - ty;
+
         if (m_show_major_lines && (i > miny)) {
-            stippled->add(left,h,left+width,h,m_major_color.rgba());
+            stippled->add(left, h, left + width, h, m_major_color.rgba());
         }
-        double z=(min_ytick/4)*ymult;
-        double g=h;
-        for (int i=0;i<3;i++) {
-            g+=z;
-            if (g>top+height) break;
+
+        double z = (min_ytick / 4) * ymult;
+        double g = h;
+
+        for (int i = 0; i < 3; i++) {
+            g += z;
+
+            if (g > top + height) { break; }
+
             //if (vertcnt>=maxverts) {
-              //  qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
-//                break;
-  //          }
+            //  qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
+            //                break;
+            //          }
             if (m_show_minor_lines) {// && (i > miny)) {
-                stippled->add(left,g,left+width,g,m_minor_color.rgba());
+                stippled->add(left, g, left + width, g, m_minor_color.rgba());
             }
+
             if (stippled->full()) {
                 break;
             }
         }
+
         if (lines->full() || stippled->full()) {
-            qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
+            qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<
+                       miny << "MaxY =" << maxy << "min_ytick=" << min_ytick;
             break;
         }
     }
@@ -131,197 +147,205 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
 
 
 gYAxis::gYAxis(QColor col)
-:Layer(NoChannel)
+    : Layer(NoChannel)
 {
-    m_line_color=col;
-    m_text_color=col;
-    m_textureID=0;
+    m_line_color = col;
+    m_text_color = col;
+    m_textureID = 0;
 
-    m_yaxis_scale=1;
+    m_yaxis_scale = 1;
 }
 gYAxis::~gYAxis()
 {
 }
-void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
+void gYAxis::paint(gGraph &w, int left, int top, int width, int height)
 {
 
-    int x,y;//,yh=0;
+    int x, y; //,yh=0;
 
     //Todo: clean this up as there is a lot of duplicate code between the sections
 
     if (0) {//w.graphView()->usePixmapCache()) {
-/*        if (w.invalidate_yAxisImage) {
+        /*        if (w.invalidate_yAxisImage) {
 
-            if (!m_image.isNull()) {
-                w.graphView()->deleteTexture(m_textureID);
-                m_image=QImage();
-            }
+                    if (!m_image.isNull()) {
+                        w.graphView()->deleteTexture(m_textureID);
+                        m_image=QImage();
+                    }
 
 
-            if (height<0) return;
-            if (height>2000) return;
+                    if (height<0) return;
+                    if (height>2000) return;
 
-            int labelW=0;
+                    int labelW=0;
 
-            EventDataType miny=w.min_y;
-            EventDataType maxy=w.max_y;
+                    EventDataType miny=w.min_y;
+                    EventDataType maxy=w.max_y;
 
-            if (miny<0) { // even it up if it's starts negative
-                miny=-MAX(fabs(miny),fabs(maxy));
-            }
+                    if (miny<0) { // even it up if it's starts negative
+                        miny=-MAX(fabs(miny),fabs(maxy));
+                    }
 
-            w.roundY(miny,maxy);
+                    w.roundY(miny,maxy);
 
-            EventDataType dy=maxy-miny;
-            static QString fd="0";
-            GetTextExtent(fd,x,y);
-            yh=y;
+                    EventDataType dy=maxy-miny;
+                    static QString fd="0";
+                    GetTextExtent(fd,x,y);
+                    yh=y;
 
-            m_image=QImage(width,height+y+4,QImage::Format_ARGB32_Premultiplied);
+                    m_image=QImage(width,height+y+4,QImage::Format_ARGB32_Premultiplied);
 
-            m_image.fill(Qt::transparent);
-            QPainter paint(&m_image);
+                    m_image.fill(Qt::transparent);
+                    QPainter paint(&m_image);
 
 
-            double max_yticks=round(height / (y+14.0)); // plus spacing between lines
+                    double max_yticks=round(height / (y+14.0)); // plus spacing between lines
 
-            double mxy=MAX(fabs(maxy),fabs(miny));
-            double mny=miny;
-            if (miny<0) {
-                mny=-mxy;
-            }
+                    double mxy=MAX(fabs(maxy),fabs(miny));
+                    double mny=miny;
+                    if (miny<0) {
+                        mny=-mxy;
+                    }
 
-            double rxy=mxy-mny;
+                    double rxy=mxy-mny;
 
-            int myt;
-            bool fnd=false;
-            for (myt=max_yticks;myt>2;myt--) {
-                float v=rxy/float(myt);
-                if (v==int(v)) {
-                    fnd=true;
-                    break;
-                }
-            }
-            if (fnd) max_yticks=myt;
-            double yt=1/max_yticks;
+                    int myt;
+                    bool fnd=false;
+                    for (myt=max_yticks;myt>2;myt--) {
+                        float v=rxy/float(myt);
+                        if (v==int(v)) {
+                            fnd=true;
+                            break;
+                        }
+                    }
+                    if (fnd) max_yticks=myt;
+                    double yt=1/max_yticks;
 
-            double ymult=height/rxy;
+                    double ymult=height/rxy;
 
-            double min_ytick=rxy*yt;
+                    double min_ytick=rxy*yt;
 
-            float ty,h;
+                    float ty,h;
 
-            if (min_ytick<=0) {
-                qDebug() << "min_ytick error in gYAxis::paint() in" << w.title();
-                return;
-            }
-            if (min_ytick>=1000000) {
-                min_ytick=100;
-            }
+                    if (min_ytick<=0) {
+                        qDebug() << "min_ytick error in gYAxis::paint() in" << w.title();
+                        return;
+                    }
+                    if (min_ytick>=1000000) {
+                        min_ytick=100;
+                    }
 
-            //lines=w.backlines();
+                    //lines=w.backlines();
 
-            for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
-                ty=(i - miny) * ymult;
-                if (dy<5) {
-                    fd=Format(i*m_yaxis_scale,2);
-                } else {
-                    fd=Format(i*m_yaxis_scale,1);
+                    for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
+                        ty=(i - miny) * ymult;
+                        if (dy<5) {
+                            fd=Format(i*m_yaxis_scale,2);
+                        } else {
+                            fd=Format(i*m_yaxis_scale,1);
+                        }
+
+                        GetTextExtent(fd,x,y);
+
+                        if (x>labelW) labelW=x;
+                        h=(height-2)-ty;
+                        h+=yh;
+            #ifndef Q_OS_MAC
+                        // stupid pixel alignment rubbish, I really should be using floats..
+                        h+=1;
+            #endif
+                        if (h<0)
+                            continue;
+
+                        paint.setBrush(Qt::black);
+                        paint.drawText(width-8-x,h+y/2,fd);
+
+                        paint.setPen(m_line_color);
+                        paint.drawLine(width-4,h,width,h);
+
+                        double z=(min_ytick/4)*ymult;
+                        double g=h;
+                        for (int i=0;i<3;i++) {
+                            g+=z;
+                            if (g>height+yh) break;
+                            paint.drawLine(width-3,g,width,g);
+                        }
+                    }
+                    paint.end();
+                    m_image=QGLWidget::convertToGLFormat(m_image);
+                    m_textureID=w.graphView()->bindTexture(m_image,GL_TEXTURE_2D,GL_RGBA,QGLContext::NoBindOption);
+                    w.invalidate_yAxisImage=false;
                 }
 
-                GetTextExtent(fd,x,y);
-
-                if (x>labelW) labelW=x;
-                h=(height-2)-ty;
-                h+=yh;
-    #ifndef Q_OS_MAC
-                // stupid pixel alignment rubbish, I really should be using floats..
-                h+=1;
-    #endif
-                if (h<0)
-                    continue;
-
-                paint.setBrush(Qt::black);
-                paint.drawText(width-8-x,h+y/2,fd);
-
-                paint.setPen(m_line_color);
-                paint.drawLine(width-4,h,width,h);
-
-                double z=(min_ytick/4)*ymult;
-                double g=h;
-                for (int i=0;i<3;i++) {
-                    g+=z;
-                    if (g>height+yh) break;
-                    paint.drawLine(width-3,g,width,g);
+                if (!m_image.isNull()) {
+                    glEnable(GL_BLEND);
+                    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                    glEnable(GL_TEXTURE_2D);
+                    w.graphView()->drawTexture(QPoint(left,(top+height)-m_image.height()+5),m_textureID);
+                    glDisable(GL_TEXTURE_2D);
+                    glDisable(GL_BLEND);
                 }
-            }
-            paint.end();
-            m_image=QGLWidget::convertToGLFormat(m_image);
-            m_textureID=w.graphView()->bindTexture(m_image,GL_TEXTURE_2D,GL_RGBA,QGLContext::NoBindOption);
-            w.invalidate_yAxisImage=false;
-        }
-
-        if (!m_image.isNull()) {
-            glEnable(GL_BLEND);
-            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-            glEnable(GL_TEXTURE_2D);
-            w.graphView()->drawTexture(QPoint(left,(top+height)-m_image.height()+5),m_textureID);
-            glDisable(GL_TEXTURE_2D);
-            glDisable(GL_BLEND);
-        }
-*/
+        */
     } else {
-        if (height<0) return;
-        if (height>2000) return;
-        int labelW=0;
+        if (height < 0) { return; }
+
+        if (height > 2000) { return; }
+
+        int labelW = 0;
 
         EventDataType miny;
         EventDataType maxy;
 
-        if (w.zoomY()==0 && PROFILE.appearance->allowYAxisScaling()) {
-            miny=w.physMinY();
-            maxy=w.physMaxY();
+        if (w.zoomY() == 0 && PROFILE.appearance->allowYAxisScaling()) {
+            miny = w.physMinY();
+            maxy = w.physMaxY();
         } else {
 
-            miny=w.min_y;
-            maxy=w.max_y;
+            miny = w.min_y;
+            maxy = w.max_y;
 
-            if (miny<0) { // even it up if it's starts negative
-                miny=-MAX(fabs(miny),fabs(maxy));
+            if (miny < 0) { // even it up if it's starts negative
+                miny = -MAX(fabs(miny), fabs(maxy));
             }
         }
-        w.roundY(miny,maxy);
 
-        EventDataType dy=maxy-miny;
+        w.roundY(miny, maxy);
 
-        static QString fd="0";
-        GetTextExtent(fd,x,y);
+        EventDataType dy = maxy - miny;
 
-        double max_yticks=round(height / (y+14.0)); // plus spacing between lines
+        static QString fd = "0";
+        GetTextExtent(fd, x, y);
 
-        double mxy=MAX(fabs(maxy),fabs(miny));
-        double mny=miny;
-        if (miny<0) {
-            mny=-mxy;
+        double max_yticks = round(height / (y + 14.0)); // plus spacing between lines
+
+        double mxy = MAX(fabs(maxy), fabs(miny));
+        double mny = miny;
+
+        if (miny < 0) {
+            mny = -mxy;
         }
 
-        double rxy=mxy-mny;
+        double rxy = mxy - mny;
 
         int myt;
-        bool fnd=false;
-        for (myt=max_yticks;myt>2;myt--) {
-            float v=rxy/float(myt);
-            if (v==int(v)) {
-                fnd=true;
+        bool fnd = false;
+
+        for (myt = max_yticks; myt > 2; myt--) {
+            float v = rxy / float(myt);
+
+            if (v == int(v)) {
+                fnd = true;
                 break;
             }
         }
-        if (fnd) max_yticks=myt;
-        double yt=1/max_yticks;
 
-        double ymult=height/rxy;
+        if (fnd) { max_yticks = myt; }
 
-        double min_ytick=rxy*yt;
+        double yt = 1 / max_yticks;
+
+        double ymult = height / rxy;
+
+        double min_ytick = rxy * yt;
 
 
         //if (dy>5) {
@@ -330,106 +354,128 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
 
         //}
 
-        float ty,h;
+        float ty, h;
 
-        if (min_ytick<=0) {
+        if (min_ytick <= 0) {
             qDebug() << "min_ytick error in gYAxis::paint() in" << w.title();
             return;
         }
-        if (min_ytick>=1000000) {
-            min_ytick=100;
-        }
-        lines=w.backlines();
 
-        GLuint line_color=m_line_color.rgba();
-        for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
-            ty=(i - miny) * ymult;
-            if (dy<5) {
-                fd=Format(i*m_yaxis_scale,2);
+        if (min_ytick >= 1000000) {
+            min_ytick = 100;
+        }
+
+        lines = w.backlines();
+
+        GLuint line_color = m_line_color.rgba();
+
+        for (double i = miny; i <= maxy + min_ytick - 0.00001; i += min_ytick) {
+            ty = (i - miny) * ymult;
+
+            if (dy < 5) {
+                fd = Format(i * m_yaxis_scale, 2);
             } else {
-                fd=Format(i*m_yaxis_scale,1);
+                fd = Format(i * m_yaxis_scale, 1);
             }
 
-            GetTextExtent(fd,x,y); // performance bottleneck..
+            GetTextExtent(fd, x, y); // performance bottleneck..
 
-            if (x>labelW) labelW=x;
-            h=top+height-ty;
-            if (h<top) continue;
-            w.renderText(fd,left+width-8-x,(h+(y/2.0)),0,m_text_color,defaultfont);
+            if (x > labelW) { labelW = x; }
 
-            lines->add(left+width-4,h,left+width,h,line_color);
+            h = top + height - ty;
+
+            if (h < top) { continue; }
+
+            w.renderText(fd, left + width - 8 - x, (h + (y / 2.0)), 0, m_text_color, defaultfont);
+
+            lines->add(left + width - 4, h, left + width, h, line_color);
+
+            double z = (min_ytick / 4) * ymult;
+            double g = h;
+
+            for (int i = 0; i < 3; i++) {
+                g += z;
+
+                if (g > top + height) { break; }
+
+                lines->add(left + width - 3, g, left + width, g, line_color);
 
-            double z=(min_ytick/4)*ymult;
-            double g=h;
-            for (int i=0;i<3;i++) {
-                g+=z;
-                if (g>top+height) break;
-                lines->add(left+width-3,g,left+width,g,line_color);
                 if (lines->full()) {
-                    qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
+                    qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<
+                               miny << "MaxY =" << maxy << "min_ytick=" << min_ytick;
                     break;
                 }
             }
+
             if (lines->full()) {
-                qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
+                qWarning() << "vertarray bounds exceeded in gYAxis for " << w.title() << "graph" << "MinY =" <<
+                           miny << "MaxY =" << maxy << "min_ytick=" << min_ytick;
                 break;
             }
         }
     }
 }
-const QString gYAxis::Format(EventDataType v, int dp) {
-   return QString::number(v,'f',dp);
+const QString gYAxis::Format(EventDataType v, int dp)
+{
+    return QString::number(v, 'f', dp);
 }
 
-bool gYAxis::mouseMoveEvent(QMouseEvent * event, gGraph * graph)
+bool gYAxis::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
 {
-    if (!p_profile->appearance->graphTooltips())
+    if (!p_profile->appearance->graphTooltips()) {
         return false;
-
-    int x=event->x();
-    int y=event->y();
-    if (!graph->units().isEmpty()) {
-        graph->ToolTip(graph->units(),x,y-20,0);
-     //   graph->redraw();
     }
+
+    int x = event->x();
+    int y = event->y();
+
+    if (!graph->units().isEmpty()) {
+        graph->ToolTip(graph->units(), x, y - 20, 0);
+        //   graph->redraw();
+    }
+
     return true;
 }
 
-bool gYAxis::mouseDoubleClickEvent(QMouseEvent * event, gGraph * graph)
+bool gYAxis::mouseDoubleClickEvent(QMouseEvent *event, gGraph *graph)
 {
     if (graph) {
-//        int x=event->x();
-//        int y=event->y();
-        short z=(graph->zoomY()+1) % gGraph::maxZoomY;
+        //        int x=event->x();
+        //        int y=event->y();
+        short z = (graph->zoomY() + 1) % gGraph::maxZoomY;
         graph->setZoomY(z);
         qDebug() << "Mouse double clicked for" << graph->title() << z;
     }
+
     Q_UNUSED(event);
     return false;
 }
 
 const QString gYAxisTime::Format(EventDataType v, int dp)
 {
-    int h=int(v) % 24;
-    int m=int(v*60) % 60;
-    int s=int(v*3600) % 60;
+    int h = int(v) % 24;
+    int m = int(v * 60) % 60;
+    int s = int(v * 3600) % 60;
 
-    char pm[3]={"am"};
+    char pm[3] = {"am"};
 
     if (show_12hr) {
 
-        h>=12 ? pm[0]='p' : pm[0]='a';
+        h >= 12 ? pm[0] = 'p' : pm[0] = 'a';
         h %= 12;
-        if (h==0) h=12;
+
+        if (h == 0) { h = 12; }
     } else {
-        pm[0]=0;
+        pm[0] = 0;
     }
-    if (dp>2) return QString().sprintf("%02i:%02i:%02i%s",h,m,s,pm);
-    return QString().sprintf("%i:%02i%s",h,m,pm);
+
+    if (dp > 2) { return QString().sprintf("%02i:%02i:%02i%s", h, m, s, pm); }
+
+    return QString().sprintf("%i:%02i%s", h, m, pm);
 }
 
 const QString gYAxisWeight::Format(EventDataType v, int dp)
 {
     Q_UNUSED(dp)
-    return weightString(v,m_unitsystem);
+    return weightString(v, m_unitsystem);
 }
diff --git a/sleepyhead/Graphs/gYAxis.h b/sleepyhead/Graphs/gYAxis.h
index 9a55ba2b..bf2de33c 100644
--- a/sleepyhead/Graphs/gYAxis.h
+++ b/sleepyhead/Graphs/gYAxis.h
@@ -18,28 +18,28 @@
 /*! \class gXGrid
     \brief Draws the horizintal major/minor grids over graphs
    */
-class gXGrid:public Layer
+class gXGrid: public Layer
 {
-public:
+  public:
     //! \brief Constructs an gXGrid object with default settings, and col for line colour.
-    gXGrid(QColor col=QColor("black"));
+    gXGrid(QColor col = QColor("black"));
     virtual ~gXGrid();
 
     //! \brief Draw the horizontal lines by adding the to the Vertex GLbuffers
-    virtual void paint(gGraph & w,int left,int top, int width, int height);
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
 
     //! \brief set the visibility status of Major lines
-    void setShowMinorLines(bool b) { m_show_minor_lines=b; }
+    void setShowMinorLines(bool b) { m_show_minor_lines = b; }
 
     //! \brief set the visibility status of Minor lines
-    void setShowMajorLines(bool b) { m_show_major_lines=b; }
+    void setShowMajorLines(bool b) { m_show_major_lines = b; }
 
     //! \brief Returns the visibility status of minor lines
     bool showMinorLines() { return m_show_minor_lines; }
 
     //! \brief Returns the visibility status of Major lines
     bool showMajorLines() { return m_show_major_lines; }
-protected:
+  protected:
     bool m_show_major_lines;
     bool m_show_minor_lines;
     QColor m_major_color;
@@ -49,73 +49,73 @@ protected:
 /*! \class gYAxis
    \brief Draws the YAxis tick markers, and numeric labels
    */
-class gYAxis:public Layer
+class gYAxis: public Layer
 {
-    public:
-        //! \brief Construct a gYAxis object, with QColor col for tickers & text
-        gYAxis(QColor col=Qt::black);
-        virtual ~gYAxis();
+  public:
+    //! \brief Construct a gYAxis object, with QColor col for tickers & text
+    gYAxis(QColor col = Qt::black);
+    virtual ~gYAxis();
 
-        //! \brief Draw the horizontal tickers display
-        virtual void paint(gGraph & w,int left,int top, int width, int height);
+    //! \brief Draw the horizontal tickers display
+    virtual void paint(gGraph &w, int left, int top, int width, int height);
 
-//        void SetShowMinorLines(bool b) { m_show_minor_lines=b; }
-//        void SetShowMajorLines(bool b) { m_show_major_lines=b; }
-//        bool ShowMinorLines() { return m_show_minor_lines; }
-//        bool ShowMajorLines() { return m_show_major_lines; }
+    //        void SetShowMinorLines(bool b) { m_show_minor_lines=b; }
+    //        void SetShowMajorLines(bool b) { m_show_major_lines=b; }
+    //        bool ShowMinorLines() { return m_show_minor_lines; }
+    //        bool ShowMajorLines() { return m_show_major_lines; }
 
-        //! \brief Sets the visibility status of minor ticks
-        void SetShowMinorTicks(bool b) { m_show_minor_ticks=b; }
+    //! \brief Sets the visibility status of minor ticks
+    void SetShowMinorTicks(bool b) { m_show_minor_ticks = b; }
 
-        //! \brief Sets the visibility status of Major ticks
-        void SetShowMajorTicks(bool b) { m_show_major_ticks=b; }
+    //! \brief Sets the visibility status of Major ticks
+    void SetShowMajorTicks(bool b) { m_show_major_ticks = b; }
 
-        //! \brief Returns the visibility status of Minor ticks
-        bool ShowMinorTicks() { return m_show_minor_ticks; }
+    //! \brief Returns the visibility status of Minor ticks
+    bool ShowMinorTicks() { return m_show_minor_ticks; }
 
-        //! \brief Returns the visibility status of Major ticks
-        bool ShowMajorTicks() { return m_show_major_ticks; }
+    //! \brief Returns the visibility status of Major ticks
+    bool ShowMajorTicks() { return m_show_major_ticks; }
 
-        //! \brief Formats the ticker value.. Override to implement other types
-        virtual const QString Format(EventDataType v, int dp);
+    //! \brief Formats the ticker value.. Override to implement other types
+    virtual const QString Format(EventDataType v, int dp);
 
-        //! \brief Left Margin space in pixels
-        static const int Margin=60;
+    //! \brief Left Margin space in pixels
+    static const int Margin = 60;
 
-        //! \brief Set the scale of the Y axis values.. Values can be multiplied by this to convert formats
-        void SetScale(float f) { m_yaxis_scale=f; }
+    //! \brief Set the scale of the Y axis values.. Values can be multiplied by this to convert formats
+    void SetScale(float f) { m_yaxis_scale = f; }
 
-        //! \brief Returns the scale of the Y axis values.. Values can be multiplied by this to convert formats
-        float Scale() { return m_yaxis_scale; }
+    //! \brief Returns the scale of the Y axis values.. Values can be multiplied by this to convert formats
+    float Scale() { return m_yaxis_scale; }
 
-    protected:
-        //bool m_show_major_lines;
-        //bool m_show_minor_lines;
-        bool m_show_minor_ticks;
-        bool m_show_major_ticks;
-        float m_yaxis_scale;
+  protected:
+    //bool m_show_major_lines;
+    //bool m_show_minor_lines;
+    bool m_show_minor_ticks;
+    bool m_show_major_ticks;
+    float m_yaxis_scale;
 
-        QColor m_line_color;
-        QColor m_text_color;
-        gVertexBuffer * lines;
-        virtual bool mouseMoveEvent(QMouseEvent * event,gGraph * graph);
-        virtual bool mouseDoubleClickEvent(QMouseEvent * event, gGraph * graph);
+    QColor m_line_color;
+    QColor m_text_color;
+    gVertexBuffer *lines;
+    virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph);
+    virtual bool mouseDoubleClickEvent(QMouseEvent *event, gGraph *graph);
 
-        QImage m_image;
-        GLuint m_textureID;
+    QImage m_image;
+    GLuint m_textureID;
 
 };
 
 /*! \class gYAxisTime
    \brief Draws the YAxis tick markers, and labels in time format
    */
-class gYAxisTime:public gYAxis
+class gYAxisTime: public gYAxis
 {
-public:
+  public:
     //! \brief Construct a gYAxisTime object, with QColor col for tickers & times
-    gYAxisTime(bool hr12=true, QColor col=Qt::black) : gYAxis(col), show_12hr(hr12) {}
+    gYAxisTime(bool hr12 = true, QColor col = Qt::black) : gYAxis(col), show_12hr(hr12) {}
     virtual ~gYAxisTime() {}
-protected:
+  protected:
     //! \brief Overrides gYAxis Format to display Time format
     virtual const QString Format(EventDataType v, int dp);
 
@@ -127,19 +127,19 @@ protected:
 /*! \class gYAxisWeight
    \brief Draws the YAxis tick markers, and labels in weight format
    */
-class gYAxisWeight:public gYAxis
+class gYAxisWeight: public gYAxis
 {
-public:
+  public:
     //! \brief Construct a gYAxisWeight object, with QColor col for tickers & weight values
-    gYAxisWeight(UnitSystem us=US_Metric, QColor col=Qt::black) :gYAxis(col), m_unitsystem(us) {}
+    gYAxisWeight(UnitSystem us = US_Metric, QColor col = Qt::black) : gYAxis(col), m_unitsystem(us) {}
     virtual ~gYAxisWeight() {}
 
     //! \brief Returns the current UnitSystem displayed (eg, US_Metric (the rest of the world), US_Archiac (American) )
     UnitSystem unitSystem() { return m_unitsystem; }
 
     //! \brief Set the unit system displayed by this YTicker
-    void setUnitSystem(UnitSystem us) { m_unitsystem=us; }
-protected:
+    void setUnitSystem(UnitSystem us) { m_unitsystem = us; }
+  protected:
     //! \brief Overrides gYAxis Format to display Time format
     virtual const QString Format(EventDataType v, int dp);
     UnitSystem m_unitsystem;
diff --git a/sleepyhead/Graphs/glcommon.cpp b/sleepyhead/Graphs/glcommon.cpp
index 84298ee1..fd0f3b53 100644
--- a/sleepyhead/Graphs/glcommon.cpp
+++ b/sleepyhead/Graphs/glcommon.cpp
@@ -15,59 +15,80 @@
 #ifdef BUILD_WITH_MSVC
 double round(double number)
 {
-    return number < 0.0 ? ceil(number - 0.5) : floor(number+0.5);
+    return number < 0.0 ? ceil(number - 0.5) : floor(number + 0.5);
 }
 #endif
 
 
-void RoundedRectangle(int x,int y,int w,int h,int radius,const QColor color)
+void RoundedRectangle(int x, int y, int w, int h, int radius, const QColor color)
 {
 
     glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-    glColor4ub(color.red(),color.green(),color.blue(),color.alpha());
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glColor4ub(color.red(), color.green(), color.blue(), color.alpha());
 
     glBegin(GL_POLYGON);
-        glVertex2i(x+radius,y);
-        glVertex2i(x+w-radius,y);
-        for(float i=(float)M_PI*1.5f;i<M_PI*2;i+=0.1f)
-            glVertex2f(x+w-radius+cos(i)*radius,y+radius+sin(i)*radius);
-        glVertex2i(x+w,y+radius);
-        glVertex2i(x+w,y+h-radius);
-        for(float i=0;i<(float)M_PI*0.5f;i+=0.1f)
-            glVertex2f(x+w-radius+cos(i)*radius,y+h-radius+sin(i)*radius);
-        glVertex2i(x+w-radius,y+h);
-        glVertex2i(x+radius,y+h);
-        for(float i=(float)M_PI*0.5f;i<M_PI;i+=0.1f)
-            glVertex2f(x+radius+cos(i)*radius,y+h-radius+sin(i)*radius);
-        glVertex2i(x,y+h-radius);
-        glVertex2i(x,y+radius);
-        for(float i=(float)M_PI;i<M_PI*1.5f;i+=0.1f)
-            glVertex2f(x+radius+cos(i)*radius,y+radius+sin(i)*radius);
+    glVertex2i(x + radius, y);
+    glVertex2i(x + w - radius, y);
+
+    for (float i = (float)M_PI * 1.5f; i < M_PI * 2; i += 0.1f) {
+        glVertex2f(x + w - radius + cos(i)*radius, y + radius + sin(i)*radius);
+    }
+
+    glVertex2i(x + w, y + radius);
+    glVertex2i(x + w, y + h - radius);
+
+    for (float i = 0; i < (float)M_PI * 0.5f; i += 0.1f) {
+        glVertex2f(x + w - radius + cos(i)*radius, y + h - radius + sin(i)*radius);
+    }
+
+    glVertex2i(x + w - radius, y + h);
+    glVertex2i(x + radius, y + h);
+
+    for (float i = (float)M_PI * 0.5f; i < M_PI; i += 0.1f) {
+        glVertex2f(x + radius + cos(i)*radius, y + h - radius + sin(i)*radius);
+    }
+
+    glVertex2i(x, y + h - radius);
+    glVertex2i(x, y + radius);
+
+    for (float i = (float)M_PI; i < M_PI * 1.5f; i += 0.1f) {
+        glVertex2f(x + radius + cos(i)*radius, y + radius + sin(i)*radius);
+    }
+
     glEnd();
 
     glDisable(GL_BLEND);
 }
 
-void LinedRoundedRectangle(int x,int y,int w,int h,int radius,int lw,QColor color)
+void LinedRoundedRectangle(int x, int y, int w, int h, int radius, int lw, QColor color)
 {
     //glDisable(GL_TEXTURE_2D);
     glShadeModel(GL_SMOOTH);
     glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-    glColor4ub(color.red(),color.green(),color.blue(),color.alpha());
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glColor4ub(color.red(), color.green(), color.blue(), color.alpha());
     glLineWidth((GLfloat)lw);
 
     glBegin(GL_LINE_STRIP);
-        for(float i=(float)M_PI;i<=1.5f*M_PI;i+=0.1f)
-            glVertex2f(radius*cos(i)+x+radius,radius*sin(i)+y+radius);
-        for(float i=1.5f*(float)M_PI;i<=2*M_PI; i+=0.1f)
-            glVertex2f(radius*cos(i)+x+w-radius,radius*sin(i)+y+radius);
-        for(float i=0;i<=0.5f*M_PI; i+=0.1f)
-            glVertex2f(radius*cos(i)+x+w-radius,radius*sin(i)+y+h-radius);
-        for(float i=0.5f*(float)M_PI;i<=M_PI;i+=0.1f)
-            glVertex2f(radius*cos(i)+x+radius,radius*sin(i)+y+h-radius);
-        glVertex2i(x,y+radius);
+
+    for (float i = (float)M_PI; i <= 1.5f * M_PI; i += 0.1f) {
+        glVertex2f(radius * cos(i) + x + radius, radius * sin(i) + y + radius);
+    }
+
+    for (float i = 1.5f * (float)M_PI; i <= 2 * M_PI; i += 0.1f) {
+        glVertex2f(radius * cos(i) + x + w - radius, radius * sin(i) + y + radius);
+    }
+
+    for (float i = 0; i <= 0.5f * M_PI; i += 0.1f) {
+        glVertex2f(radius * cos(i) + x + w - radius, radius * sin(i) + y + h - radius);
+    }
+
+    for (float i = 0.5f * (float)M_PI; i <= M_PI; i += 0.1f) {
+        glVertex2f(radius * cos(i) + x + radius, radius * sin(i) + y + h - radius);
+    }
+
+    glVertex2i(x, y + radius);
     glEnd();
 
     //glEnable(GL_TEXTURE_2D);
diff --git a/sleepyhead/Graphs/glcommon.h b/sleepyhead/Graphs/glcommon.h
index 6749dc7f..104756c7 100644
--- a/sleepyhead/Graphs/glcommon.h
+++ b/sleepyhead/Graphs/glcommon.h
@@ -15,37 +15,39 @@
 #include <QtOpenGL/qgl.h>
 #include <QColor>
 
-const QColor COLOR_Black=Qt::black;
-const QColor COLOR_LightGreen=QColor("light green");
-const QColor COLOR_DarkGreen=Qt::darkGreen;
-const QColor COLOR_Purple=QColor("purple");
-const QColor COLOR_Aqua=QColor("#40c0ff");
-const QColor COLOR_Magenta=Qt::magenta;
-const QColor COLOR_Blue=Qt::blue;
-const QColor COLOR_LightBlue=QColor("light blue");
-const QColor COLOR_Gray=Qt::gray;
-const QColor COLOR_LightGray=Qt::lightGray;
-const QColor COLOR_DarkGray=Qt::darkGray;
-const QColor COLOR_Cyan=Qt::cyan;
-const QColor COLOR_DarkCyan=Qt::darkCyan;
-const QColor COLOR_DarkBlue=Qt::darkBlue;
-const QColor COLOR_DarkMagenta=Qt::darkMagenta;
-const QColor COLOR_Gold=QColor("gold");
-const QColor COLOR_White=Qt::white;
-const QColor COLOR_Red=Qt::red;
-const QColor COLOR_Pink=QColor("pink");
-const QColor COLOR_DarkRed=Qt::darkRed;
-const QColor COLOR_Yellow=Qt::yellow;
-const QColor COLOR_DarkYellow=Qt::darkYellow;
-const QColor COLOR_Orange=QColor("orange");
-const QColor COLOR_Green=Qt::green;
-const QColor COLOR_Brown=QColor("brown");
+const QColor COLOR_Black = Qt::black;
+const QColor COLOR_LightGreen = QColor("light green");
+const QColor COLOR_DarkGreen = Qt::darkGreen;
+const QColor COLOR_Purple = QColor("purple");
+const QColor COLOR_Aqua = QColor("#40c0ff");
+const QColor COLOR_Magenta = Qt::magenta;
+const QColor COLOR_Blue = Qt::blue;
+const QColor COLOR_LightBlue = QColor("light blue");
+const QColor COLOR_Gray = Qt::gray;
+const QColor COLOR_LightGray = Qt::lightGray;
+const QColor COLOR_DarkGray = Qt::darkGray;
+const QColor COLOR_Cyan = Qt::cyan;
+const QColor COLOR_DarkCyan = Qt::darkCyan;
+const QColor COLOR_DarkBlue = Qt::darkBlue;
+const QColor COLOR_DarkMagenta = Qt::darkMagenta;
+const QColor COLOR_Gold = QColor("gold");
+const QColor COLOR_White = Qt::white;
+const QColor COLOR_Red = Qt::red;
+const QColor COLOR_Pink = QColor("pink");
+const QColor COLOR_DarkRed = Qt::darkRed;
+const QColor COLOR_Yellow = Qt::yellow;
+const QColor COLOR_DarkYellow = Qt::darkYellow;
+const QColor COLOR_Orange = QColor("orange");
+const QColor COLOR_Green = Qt::green;
+const QColor COLOR_Brown = QColor("brown");
 
-const QColor COLOR_Text=Qt::black;
-const QColor COLOR_Outline=Qt::black;
+const QColor COLOR_Text = Qt::black;
+const QColor COLOR_Outline = Qt::black;
 
-const QColor COLOR_ALT_BG1=QColor(0xd8,0xff,0xd8,0xff); // Alternating Background Color 1 (Event Flags)
-const QColor COLOR_ALT_BG2=COLOR_White;                 // Alternating Background Color 2 (Event Flags)
+const QColor COLOR_ALT_BG1 = QColor(0xd8, 0xff, 0xd8,
+                                    0xff); // Alternating Background Color 1 (Event Flags)
+const QColor COLOR_ALT_BG2 =
+    COLOR_White;               // Alternating Background Color 2 (Event Flags)
 
 
 /*! \brief Draw an outline of a rounded rectangle
@@ -53,17 +55,17 @@ const QColor COLOR_ALT_BG2=COLOR_White;                 // Alternating Backgroun
     \param lw Line Width
     \param color Color of drawn lines
     */
-void LinedRoundedRectangle(int x,int y,int w,int h,int radius,int lw,QColor color);
+void LinedRoundedRectangle(int x, int y, int w, int h, int radius, int lw, QColor color);
 
 /*! \brief Draws a filled rounded rectangle
     \param radius Radius of corner rounding
     \param color Color of entire rectangle
     */
-void RoundedRectangle(int x,int y,int w,int h,int radius,const QColor color);
+void RoundedRectangle(int x, int y, int w, int h, int radius, const QColor color);
 
 #ifdef BUILD_WITH_MSVC
 // Visual C++ doesn't have either of these in it's maths header.. I'm not surprised at Microsofts maths abilities..
-const double M_PI=3.141592653589793;
+const double M_PI = 3.141592653589793;
 
 double round(double number);
 #endif
diff --git a/sleepyhead/Graphs/gspacer.cpp b/sleepyhead/Graphs/gspacer.cpp
index e16e06c1..47c2029e 100644
--- a/sleepyhead/Graphs/gspacer.cpp
+++ b/sleepyhead/Graphs/gspacer.cpp
@@ -12,7 +12,7 @@
 #include "gspacer.h"
 
 gSpacer::gSpacer(int space)
-    :Layer(NoChannel)
+    : Layer(NoChannel)
 {
-    m_space=space;
+    m_space = space;
 }
diff --git a/sleepyhead/Graphs/gspacer.h b/sleepyhead/Graphs/gspacer.h
index 6866ba06..ec300ad9 100644
--- a/sleepyhead/Graphs/gspacer.h
+++ b/sleepyhead/Graphs/gspacer.h
@@ -18,21 +18,21 @@
 /*! \class gSpacer
     \brief A dummy graph spacer layer object
    */
-class gSpacer:public Layer
+class gSpacer: public Layer
 {
-    public:
-        gSpacer(int space=20); // orientation?
-        virtual void paint(gGraph & g,int left,int top, int width, int height) {
-            Q_UNUSED(g)
-            Q_UNUSED(left)
-            Q_UNUSED(top)
-            Q_UNUSED(width)
-            Q_UNUSED(height)
-        }
-        int space() { return m_space; }
+  public:
+    gSpacer(int space = 20); // orientation?
+    virtual void paint(gGraph &g, int left, int top, int width, int height) {
+        Q_UNUSED(g)
+        Q_UNUSED(left)
+        Q_UNUSED(top)
+        Q_UNUSED(width)
+        Q_UNUSED(height)
+    }
+    int space() { return m_space; }
 
-protected:
-        int m_space;
+  protected:
+    int m_space;
 };
 
 #endif // GSPACER_H