Added SessionBar for easier CPAP session toggling, directory layout clean

sleepyhead/daily.cpp

@@ -16,6 +16,8 @@
 #include <QScrollBar>
 #include <QSpacerItem>
 #include <QWebFrame>
+#include <QLabel>
+
 #include <cmath>
 //#include <QPrinter>
 //#include <QProgressBar>
@@ -62,6 +64,23 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     layout->setSpacing(0);
     layout->setMargin(0);
     layout->setContentsMargins(0,0,0,0);
+
+    sessbar=new SessionBar(this);
+
+    const bool sessbar_under_graphs=false;
+    if (sessbar_under_graphs) {
+        ui->sessionBarLayout->addWidget(sessbar,1);
+    } else {
+        QLabel *label=new QLabel("The session bar could go here instead??",this);
+        label->setAlignment(Qt::AlignCenter);
+        ui->sessionBarLayout->addWidget(label,1);
+        ui->splitter->insertWidget(2,sessbar);
+        sessbar->setMaximumHeight(sessbar->height());
+        sessbar->setMinimumHeight(sessbar->height());
+    }
+    sessbar->setMouseTracking(true);
+
+    connect(sessbar, SIGNAL(toggledSession(Session*)), this, SLOT(doToggleSession(Session*)));
     ui->graphMainArea->setLayout(layout);
     //ui->graphMainArea->setLayout(layout);
 
@@ -340,6 +359,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
 Daily::~Daily()
 {
     GraphView->SaveSettings("Daily");
+    disconnect(sessbar, SIGNAL(toggledSession(Session*)), this, SLOT(doToggleSession(Session*)));
 
     disconnect(ui->webView,SIGNAL(linkClicked(QUrl)),this,SLOT(Link_clicked(QUrl)));
     // Save any last minute changes..
@@ -351,6 +371,17 @@ Daily::~Daily()
     delete icon_on;
     delete icon_off;
 }
+
+void Daily::doToggleSession(Session * sess)
+{
+   // sess->StoreSummary();
+    Day *day=PROFILE.GetDay(previous_date,MT_CPAP);
+    if (day) {
+        day->machine->Save();
+        this->LoadDate(previous_date);
+    }
+}
+
 void Daily::Link_clicked(const QUrl &url)
 {
     QString code=url.toString().section("=",0,0).toLower();
@@ -1515,8 +1546,25 @@ Session * Daily::GetJournalSession(QDate date) // Get the first journal session
 void Daily::UpdateCPAPGraphs(Day *day)
 {
     //if (!day) return;
+    QColor cols[]={
+        QColor("gold"),
+        QColor("light blue"),
+        QColor("light green"),
+        QColor("purple"),
+        QColor("red"),
+    };
+    const int maxcolors=sizeof(cols)/sizeof(QColor);
     if (day) {
         day->OpenEvents();
+        QVector<Session *>::iterator i;
+        sessbar->clear();
+        int c=0;
+        for (i=day->begin();i!=day->end();++i) {
+            Session * s=*i;
+            sessbar->add(s, cols[c % maxcolors]);
+            c++;
+        }
+        sessbar->update();
     }
     for (QList<Layer *>::iterator g=CPAPData.begin();g!=CPAPData.end();g++) {
         (*g)->SetDay(day);

sleepyhead/daily.h

@@ -25,6 +25,7 @@
 #include "Graphs/gGraphView.h"
 
 #include "Graphs/gLineChart.h"
+#include "sessionbar.h"
 
 namespace Ui {
     class Daily;
@@ -222,6 +223,7 @@ private slots:
 
     void on_weightSpinBox_valueChanged(double arg1);
 
+    void doToggleSession(Session *);
 protected:
 
 private:
@@ -283,6 +285,7 @@ private:
     void UpdateOXIGraphs(Day *day);
     void UpdateSTAGEGraphs(Day *day);
 
+
     Ui::Daily *ui;
     QDate previous_date;
     QMenu *show_graph_menu;
@@ -294,6 +297,8 @@ private:
     QIcon * icon_on;
     QIcon * icon_off;
 
+    SessionBar * sessbar;
+
     bool ZombieMeterMoved;
     bool BookmarksChanged;
 };

sleepyhead/daily.ui

@@ -23,7 +23,16 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -52,7 +61,16 @@
         <property name="spacing">
          <number>0</number>
         </property>
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
@@ -261,7 +279,16 @@
          <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
@@ -292,7 +319,16 @@
          <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
@@ -321,7 +357,16 @@
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_9">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>4</number>
+           </property>
+           <property name="topMargin">
+            <number>4</number>
+           </property>
+           <property name="rightMargin">
+            <number>4</number>
+           </property>
+           <property name="bottomMargin">
             <number>4</number>
            </property>
            <item>
@@ -358,7 +403,7 @@
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
-             <property name="numDigits">
+             <property name="digitCount">
               <number>3</number>
              </property>
              <property name="segmentStyle">
@@ -378,7 +423,16 @@
          <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
@@ -635,7 +689,7 @@
                 <property name="smallDecimalPoint">
                  <bool>true</bool>
                 </property>
-                <property name="numDigits">
+                <property name="digitCount">
                  <number>5</number>
                 </property>
                 <property name="segmentStyle">
@@ -784,17 +838,11 @@
            </widget>
           </item>
           <item>
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+           <layout class="QHBoxLayout" name="sessionBarLayout" stretch="">
+            <property name="sizeConstraint">
+             <enum>QLayout::SetMaximumSize</enum>
             </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
+           </layout>
           </item>
           <item>
            <widget class="QToolButton" name="toggleGraphs">
@@ -838,7 +886,7 @@
   <customwidget>
    <class>QWebView</class>
    <extends>QWidget</extends>
-   <header>QtWebKit/QWebView</header>
+   <header>QtWebKitWidgets/QWebView</header>
   </customwidget>
  </customwidgets>
  <resources>

sleepyhead/sessionbar.cpp

@@ -0,0 +1,188 @@
+#include <QPainter>
+#include <QLinearGradient>
+#include <QBrush>
+#include <QRect>
+#include <QMouseEvent>
+#include <QDebug>
+
+#include "sessionbar.h"
+
+SessionBar::SessionBar(QWidget *parent) :
+    QWidget(parent)
+{
+    timer.setParent(this);
+}
+SessionBar::~SessionBar()
+{
+
+}
+void SessionBar::updateTimer()
+{
+    if (!underMouse()) {
+        QList<SBSeg>::iterator i;
+
+        for (i=segments.begin();i!=segments.end();++i) {
+            (*i).highlight=false;
+        }
+    } else {
+        timer.singleShot(50,this, SLOT(updateTimer()));
+    }
+    update();
+}
+
+SegType SessionBar::min()
+{
+    if (segments.isEmpty())
+        return 0;
+
+    QList<SBSeg>::iterator i=segments.begin();
+    SegType min=(*i).session->first();
+    i++;
+
+    qint64 val;
+    for (;i!=segments.end();++i) {
+        val=(*i).session->first();
+        if (min > val)
+            min=val;
+    }
+    return min;
+}
+
+SegType SessionBar::max()
+{
+    if (segments.isEmpty())
+        return 0;
+
+    QList<SBSeg>::iterator i=segments.begin();
+    SegType max=(*i).session->last();
+    i++;
+    qint64 val;
+    for (;i!=segments.end();++i) {
+        val=(*i).session->last();
+        if (max < val)
+            max=val;
+    }
+    return max;
+}
+
+QColor brighten(QColor color);
+
+void SessionBar::mousePressEvent(QMouseEvent * ev)
+{
+    SegType mn=min();
+    SegType mx=max();
+    Q_ASSERT(mx > mn);
+
+    SegType total=mx-mn;
+    double px=double(width()-5) / double(total);
+
+    double sx,ex;
+    QList<SBSeg>::iterator i;
+
+    int cnt=0;
+    for (i=segments.begin();i!=segments.end();++i) {
+        Session * sess=(*i).session;
+        sx=double(sess->first() - mn) * px;
+        ex=double(sess->last() - mn) * px;
+        if (ex>width()-5) ex=width()-5;
+        //ex-=sx;
+
+        if ((ev->x() > sx) && (ev->x() < ex)
+            && (ev->y() > 0) && (ev->y() < height())) {
+            (*i).session->setEnabled(!(*i).session->enabled());
+            emit toggledSession((*i).session);
+            break;
+        }
+        cnt++;
+    }
+    if (timer.isActive()) timer.stop();
+    timer.singleShot(50,this, SLOT(updateTimer()));
+
+}
+
+void SessionBar::mouseMoveEvent(QMouseEvent * ev)
+{
+    SegType mn=min();
+    SegType mx=max();
+    Q_ASSERT(mx > mn);
+
+    SegType total=mx-mn;
+    double px=double(width()-5) / double(total);
+
+    double sx,ex;
+    QList<SBSeg>::iterator i;
+
+    for (i=segments.begin();i!=segments.end();++i) {
+        SBSeg & seg=*i;
+        sx=double(seg.session->first() - mn) * px;
+        ex=double(seg.session->last() - mn) * px;
+        if (ex>width()-5) ex=width()-5;
+        //ex-=sx;
+
+        if ((ev->x() > sx) && (ev->x() < ex)
+            && (ev->y() > 0) && (ev->y() < height())) {
+            seg.highlight=true;
+        } else seg.highlight=false;
+    }
+    if (timer.isActive()) timer.stop();
+    timer.singleShot(50,this, SLOT(updateTimer()));
+}
+
+
+void SessionBar::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+
+    QRect rect(1,1,width()-2,height()-2);
+
+    painter.drawRect(rect);
+
+    SegType mn=min();
+    SegType mx=max();
+    Q_ASSERT(mx > mn);
+
+    SegType total=mx-mn;
+    double px=double(width()-5) / double(total);
+
+    double sx,ex;
+    QList<SBSeg>::iterator i;
+    for (i=segments.begin();i!=segments.end();++i) {
+        SBSeg & seg=*i;
+        qint64 mm=seg.session->first(), MM=seg.session->last(), L=MM-mm;
+        sx=double(mm - mn) * px;
+        ex=double(MM - mn) * px;
+        if (ex>width()-5) ex=width()-5;
+        ex-=sx;
+
+        int len=L/1000L;
+        int h=len/3600;
+        int m=(len/60) % 60;
+        int s=len % 60;
+
+        QString msg=QString("%1h %2m").arg((short)h,1,10,QChar('0')).arg((short)m,1,10,QChar('0'));//.arg((short)s,2,10,QChar('0'));
+        //painter.setBrush(QBrush((*i).color);
+        QRect segrect(3+sx,3,ex,height()-6);
+        if (seg.session->enabled()) {
+            QLinearGradient linearGrad(QPointF(0, 0), QPointF(0, height()/2));
+            linearGrad.setSpread(QGradient::ReflectSpread);
+            QColor col=seg.color;
+            if (seg.highlight) col=brighten(col);
+            linearGrad.setColorAt(0, col);
+            linearGrad.setColorAt(1, brighten(col));
+            QBrush brush(linearGrad);
+            painter.fillRect(segrect,brush);
+        } else {
+            if (seg.highlight) {
+                QColor col=QColor("#f0f0f0");
+                painter.fillRect(segrect,col);
+            }
+            //msg="Off";
+        }
+        QRect rect=painter.boundingRect(segrect, Qt::AlignCenter, msg);
+        if (rect.width() < segrect.width()) {
+            painter.drawText(segrect,Qt::AlignCenter,msg);
+        }
+        painter.drawRect(segrect);
+
+    }
+}

sleepyhead/sessionbar.h

@@ -0,0 +1,49 @@
+#ifndef SESSIONBAR_H
+#define SESSIONBAR_H
+
+#include <QList>
+#include <QColor>
+#include <QWidget>
+#include <QTimer>
+
+#include "SleepLib/session.h"
+
+typedef qint64 SegType;
+
+class SBSeg {
+public:
+    SBSeg() { session=NULL; color=QColor(); highlight=false; }
+    SBSeg(Session * sess, QColor col) { session=sess; color=col; highlight=false; }
+    SBSeg(const SBSeg & a) { session=a.session; color=a.color; highlight=a.highlight; }
+
+    Session * session;
+    QColor color;
+    bool highlight;
+};
+
+
+class SessionBar : public QWidget
+{
+    Q_OBJECT
+public:
+    SessionBar(QWidget *parent = 0);
+    virtual ~SessionBar();
+    void clear() { segments.clear(); }
+    void add(Session * sess, QColor col) { if (sess) segments.push_back(SBSeg(sess,col)); }
+
+protected slots:
+    void updateTimer();
+signals:
+    void toggledSession(Session * sess);
+protected:
+    void paintEvent(QPaintEvent * event);
+    void mouseMoveEvent(QMouseEvent *);
+    void mousePressEvent(QMouseEvent *);
+
+    QList<SBSeg> segments;
+    SegType min();
+    SegType max();
+    QTimer timer;
+};
+
+#endif

sleepyhead/sleepyhead.pro

@@ -109,7 +109,8 @@ SOURCES += main.cpp\
     SleepLib/loader_plugins/icon_loader.cpp \
     SleepLib/loader_plugins/mseries_loader.cpp \
     reports.cpp \
-    summary.cpp
+    summary.cpp \
+    sessionbar.cpp
 
 HEADERS  += \
     SleepLib/machine.h \
@@ -154,7 +155,8 @@ HEADERS  += \
     SleepLib/loader_plugins/icon_loader.h \
     SleepLib/loader_plugins/mseries_loader.h \
     reports.h \
-    summary.h
+    summary.h \
+    sessionbar.h
 
 
 FORMS    += \
@@ -170,7 +172,7 @@ FORMS    += \
     UpdaterWindow.ui
 
 RESOURCES += \
-    ../Resources.qrc
+    Resources.qrc
 
 OTHER_FILES += \
     docs/index.html \
@@ -182,13 +184,12 @@ OTHER_FILES += \
     docs/startup_tips.txt \
     docs/countries.txt \
     docs/tz.txt \
-    LICENSE.txt \
+    ../LICENSE.txt \
     docs/tooltips.css \
     docs/script.js \
-    update.xml \
+    ../update.xml \
     docs/changelog.txt \
-    docs/update_notes.html \
-    qextserialport/qextserialport.pri
+    docs/update_notes.html
 
 win32 {
     CONFIG(debug, debug|release) {