Event Flags upgrade

sleepyhead/Graphs/gGraphView.cpp

@@ -349,12 +349,61 @@ gGraphView::~gGraphView()
 
 void gGraphView::dumpInfo()
 {
-    QDateTime dt=QDateTime::fromMSecsSinceEpoch(currentTime());
+    QDate date = mainwin->getDaily()->getDate();
-    QString text = "==================== Line Cursor Dump ====================\n"+dt.toString("MMM dd - HH:mm:ss:zzz");
+    QString text = "==================== CPAP Information Dump ====================";
     mainwin->log(text);
-    for (int i=0;i<m_graphs.size();i++) {
+
-        m_graphs[i]->dumpInfo();
+    Day * day = p_profile->GetGoodDay(date, MT_CPAP);
+    if (day) {
+        QDateTime dt=QDateTime::fromMSecsSinceEpoch(day->first());
+
+        mainwin->log(QString("Available Channels for %1").arg(dt.toString("MMM dd yyyy")));
+        QHash<schema::ChanType, QList<schema::Channel *> > list;
+
+        for (int i=0; i< day->size(); ++i) {
+            Session * sess = day->sessions.at(i);
+            QHash<ChannelID, QVector<EventList *> >::iterator it;
+            for (it = sess->eventlist.begin(); it != sess->eventlist.end(); ++it) {
+                ChannelID code = it.key();
+                schema::Channel * chan = &schema::channel[code];
+                list[chan->type()].append(chan);
+            }
+        }
+
+        QHash<schema::ChanType, QList<schema::Channel *> >::iterator lit;
+        for (lit = list.begin(); lit != list.end(); ++lit) {
+            switch (lit.key()) {
+            case schema::DATA:
+                text = "DATA: ";
+                break;
+            case schema::SETTING:
+                text = "SETTING: ";
+                break;
+            case schema::FLAG:
+                text = "FLAG: ";
+                break;
+            case schema::MINOR_FLAG:
+                text = "MINOR_FLAG: ";
+                break;
+            case schema::SPAN:
+                text = "SPAN: ";
+                break;
+            case schema::WAVEFORM:
+                text = "WAVEFORM: ";
+                break;
+            }
+            QStringList str;
+            for (int i=0; i< lit.value().size(); ++i) {
+                str.append(lit.value().at(i)->code());
+            }
+            str.sort();
+            text.append(str.join(", "));
+            mainwin->log(text);
+        }
     }
+//    for (int i=0;i<m_graphs.size();i++) {
+//        m_graphs[i]->dumpInfo();
+//    }
 }
 
 bool gGraphView::usePixmapCache()
@@ -1876,7 +1925,7 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
         p_profile->appearance->setLineCursorMode(!p_profile->appearance->lineCursorMode());
         timedRedraw(0);
     }
-    if ((event->key() == Qt::Key_F10) && (event->modifiers() == Qt::ShiftModifier)) {
+    if ((event->key() == Qt::Key_F1)) {
         dumpInfo();
     }
 

sleepyhead/Graphs/gLineChart.cpp

@@ -20,6 +20,7 @@
 #include "Graphs/gGraph.h"
 #include "Graphs/gGraphView.h"
 #include "SleepLib/profiles.h"
+#include "Graphs/gLineOverlay.h"
 
 #define EXTRA_ASSERTS 1
 gLineChart::gLineChart(ChannelID code, QColor col, bool square_plot, bool disable_accel)
@@ -140,6 +141,40 @@ skipcheck:
     }
 
     subtract_offset = 0;
+
+    QHash<ChannelID, gLineOverlayBar *>::iterator fit;
+    for (fit = flags.begin(); fit != flags.end(); ++fit) {
+        // destroy any overlay bar from previous day
+        delete fit.value();
+    }
+
+    flags.clear();
+
+    for (int i=0; i< m_day->size(); ++i) {
+        Session * sess = m_day->sessions.at(i);
+        QHash<ChannelID, QVector<EventList *> >::iterator it;
+        for (it = sess->eventlist.begin(); it != sess->eventlist.end(); ++it) {
+            ChannelID code = it.key();
+
+            if (flags.contains(code)) continue;
+
+            schema::Channel * chan = &schema::channel[code];
+            gLineOverlayBar * lob = nullptr;
+
+            if (chan->type() == schema::FLAG) {
+                lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Bar);
+            } else if (chan->type() == schema::MINOR_FLAG) {
+                lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Dot);
+            } else if (chan->type() == schema::SPAN) {
+                lob = new gLineOverlayBar(code, chan->defaultColor(), chan->label(), FT_Span);
+            }
+            if (lob != nullptr) {
+                lob->setOverlayDisplayType((m_codes[0] == CPAP_FlowRate) ? (OverlayDisplayType)p_profile->appearance->overlayType() : ODT_TopAndBottom);
+                lob->SetDay(m_day);
+                flags[code] = lob;
+            }
+        }
+    }
 }
 EventDataType gLineChart::Miny()
 {
@@ -204,11 +239,12 @@ QString gLineChart::getMetaString(qint64 time)
 // Time Domain Line Chart
 void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
 {
+    QRect rect = region.boundingRect();
     // TODO: Just use QRect directly.
-    int left = region.boundingRect().left();
+    int left = rect.left();
-    int top = region.boundingRect().top();
+    int top = rect.top();
-    int width = region.boundingRect().width();
+    int width = rect.width();
-    int height = region.boundingRect().height();
+    int height = rect.height();
 
     if (!m_visible) {
         return;
@@ -270,6 +306,13 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
         }
     }
 
+    bool mouseover = false;
+    if (rect.contains(w.graphView()->currentMousePos())) {
+        mouseover = true;
+
+        painter.fillRect(rect, QBrush(QColor(255,255,245,128)));
+    }
+
 
     // Display Line Cursor
     if (p_profile->appearance->lineCursorMode()) {
@@ -779,6 +822,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
             }
         }
 
+
 //        painter.setPen(QPen(m_colors[gi],p_profile->appearance->lineThickness()));
 //        painter.drawLines(lines);
 //        w.graphView()->lines_drawn_this_frame+=lines.count();
@@ -807,6 +851,13 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
             legendx -= bw*2;
         }
     }
+    if (m_day && (p_profile->appearance->lineCursorMode() || (m_codes[0]==CPAP_FlowRate || mouseover))) {
+        QHash<ChannelID, gLineOverlayBar *>::iterator fit;
+        for (fit = flags.begin(); fit != flags.end(); ++fit) {
+            fit.value()->paint(painter, w, region);
+        }
+    }
+
 
     if (!total_points) { // No Data?
 

sleepyhead/Graphs/gLineChart.h

@@ -18,6 +18,7 @@
 #include "Graphs/layer.h"
 #include "SleepLib/event.h"
 #include "SleepLib/day.h"
+#include "Graphs/gLineOverlay.h"
 
 /*! \class gLineChart
     \brief Draws a 2D linechart from all Session data in a day. EVL_Waveforms typed EventLists are accelerated.
@@ -102,6 +103,7 @@ class gLineChart: public Layer
     QVector<QColor> m_colors;
     QVector<bool> m_square;
     QHash<ChannelID, bool> m_enabled;
+    QHash<ChannelID, gLineOverlayBar *> flags;
 
     QVector<QLine> lines;
 

sleepyhead/Graphs/gLineOverlay.cpp

@@ -14,8 +14,9 @@
 #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)
+    : Layer(code), m_flag_color(color), m_label(label), m_flt(flt), m_odt(ODT_TopAndBottom)
 {
+
 }
 gLineOverlayBar::~gLineOverlayBar()
 {
@@ -25,6 +26,9 @@ QColor brighten(QColor color);
 
 void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
 {
+    if (!schema::channel[m_code].enabled())
+        return;
+
     int left = region.boundingRect().left();
     int topp = region.boundingRect().top(); // FIXME: Misspelling intentional.
     int width = region.boundingRect().width();
@@ -71,7 +75,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
     EventStoreType *dptr, *eptr;
     qint64 stime;
 
-    OverlayDisplayType odt = p_profile->appearance->overlayType();
+    OverlayDisplayType odt = m_odt;
     QHash<ChannelID, QVector<EventList *> >::iterator cei;
     int count;
 

sleepyhead/Graphs/gLineOverlay.h

@@ -12,8 +12,10 @@
 #ifndef GLINEOVERLAY_H
 #define GLINEOVERLAY_H
 
+#include "SleepLib/common.h"
 #include "gGraphView.h"
 
+
 /*! \class gLineOverlayBar
     \brief Shows a flag line, a dot, or a span over the top of a 2D line chart.
     */
@@ -38,6 +40,9 @@ class gLineOverlayBar: public Layer
     int count() { return m_count; }
     double sum() { return m_sum; }
     FlagType flagtype() { return m_flt; }
+
+    inline void setOverlayDisplayType(OverlayDisplayType odt) { m_odt = odt; }
+    inline OverlayDisplayType overlayDisplayType() { return m_odt; }
   protected:
     //! \brief Mouse moved over this layers area (shows the hover-over tooltips here)
     virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph);
@@ -45,6 +50,7 @@ class gLineOverlayBar: public Layer
     QColor m_flag_color;
     QString m_label;
     FlagType m_flt;
+    OverlayDisplayType m_odt;
     int m_count;
     double m_sum;
 };

sleepyhead/Graphs/gSegmentChart.cpp

@@ -118,7 +118,7 @@ void gSegmentChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
         // Pie Chart
         /////////////////////////////////////////////////////////////////////////////////////
         if (m_graph_type == GST_Pie) {
-            QColor &col = schema::channel[m_codes[m % m_colors.size()]].defaultColor();
+            const QColor col = schema::channel[m_codes[m % m_colors.size()]].defaultColor();
 
             // length of this segment in degrees
             float len = 360.0 / float(m_total) * float(data);

sleepyhead/SleepLib/common.h

@@ -73,6 +73,8 @@ const QString getDefaultAppRoot();
 void initializeStrings();
 
 
+enum OverlayDisplayType { ODT_Bars, ODT_TopAndBottom };
+
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // Preference Name Strings
 ///////////////////////////////////////////////////////////////////////////////////////////////

sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp

@@ -1093,11 +1093,11 @@ bool PRS1Import::ParseF0Events()
             data[2] = buffer[pos + 1] << 8 | buffer[pos];
             pos += 2;
 
-            if (!Code[24]) {
+//            if (!Code[24]) {
-                if (!(Code[24] = session->AddEventList(PRS1_12, EVL_Event))) { return false; }
+//                if (!(Code[24] = session->AddEventList(PRS1_12, EVL_Event))) { return false; }
-            }
+//            }
 
-            Code[24]->AddEvent(t, data[0]);
+//            Code[24]->AddEvent(t, data[0]);
             break;
 
         default:

sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp

@@ -151,11 +151,46 @@ int WeinmannLoader::Open(QString path)
     Machine * mach = CreateMachine(info);
 
 
+    int WeekComplianceOffset = index["WeekComplianceOffset"];
+    int WCD_Pin_Offset = index["WCD_Pin_Offset"];
+    int WCD_Pex_Offset = index["WCD_Pex_Offset"];
+    int WCD_Snore_Offset = index["WCD_Snore_Offset"];
+    int WCD_Lf_Offset = index["WCD_Lf_Offset"];
+    int WCD_Events_Offset = index["WCD_Events_Offset"];
+    int WCD_IO_Offset = index["WCD_IO_Offset"];
+    int comp_start = index[CompOffset];
+
+    int wccount = index["WeekComplianceCount"];
+
+    int size = WCD_Pin_Offset - WeekComplianceOffset;
+
+    unsigned char weekco[size];
+    memset(weekco, 0, size);
+    wmdata.seek(WeekComplianceOffset);
+    wmdata.read((char *)weekco, size);
+
+    unsigned char *p = weekco;
+    for (int c=0; c < wccount; ++c) {
+        int year = QString().sprintf("%02i%02i", p[0], p[1]).toInt();
+        int month = p[2];
+        int day = p[3];
+        int hour = p[5];
+        int minute = p[6];
+        int second = p[7];
+        QDateTime date = QDateTime(QDate(year,month,day), QTime(hour,minute,second));
+        quint32 ts = date.toTime_t();
+        if (!mach->SessionExists(ts)) {
+            qDebug() << date;
+        }
+
+        p+=0x84;
+    }
+
+
     //////////////////////////////////////////////////////////////////////
     // Read Day Compliance Information....
     //////////////////////////////////////////////////////////////////////
 
-    int comp_start = index[CompOffset];
     int comp_end = index[FlowOffset];
     int comp_size = comp_end - comp_start;
 
@@ -165,7 +200,7 @@ int WeinmannLoader::Open(QString path)
     wmdata.seek(comp_start);
     wmdata.read((char *)comp, comp_size);
 
-    unsigned char * p = comp;
+    p = comp;
 
     QDateTime dt_epoch(QDate(2000,1,1), QTime(0,0,0));
     int epoch = dt_epoch.toTime_t();
@@ -190,6 +225,8 @@ int WeinmannLoader::Open(QString path)
         if (mach->SessionExists(ts)) continue;
 
         Session * sess = new Session(mach, ts);
+        sess->SetChanged(true);
+
 
         // Flow Waveform
         quint32 fs = p[8] | p[9] << 8 | p[10] << 16 | p[11] << 24;
@@ -220,7 +257,7 @@ int WeinmannLoader::Open(QString path)
         sess->really_set_last(qint64(ts+dur) * 1000L);
         sessions[ts] = sess;
 
-        qDebug() << date << ts << dur << QString().sprintf("%02i:%02i:%02i", dur / 3600, dur/60 % 60, dur % 60);
+//        qDebug() << date << ts << dur << QString().sprintf("%02i:%02i:%02i", dur / 3600, dur/60 % 60, dur % 60);
 
         p += 0xd6;
     }
@@ -441,6 +478,7 @@ int WeinmannLoader::Open(QString path)
 
 
     }
+    mach->Save();
 
     return 1;
 

sleepyhead/SleepLib/loader_plugins/weinmann_loader.h

@@ -116,7 +116,7 @@ class WeinmannLoader : public CPAPLoader
     static void Register();
 
     virtual MachineInfo newInfo() {
-        return MachineInfo(MT_CPAP, 0, weinmann_class_name, QObject::tr("Weinmann"), QString(), QString(), QString(), QObject::tr("Weinmann"), QDateTime::currentDateTime(), weinmann_data_version);
+        return MachineInfo(MT_CPAP, 0, weinmann_class_name, QObject::tr("Weinmann"), QObject::tr("SOMNOsoft2"), QString(), QString(), QObject::tr(""), QDateTime::currentDateTime(), weinmann_data_version);
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////

sleepyhead/SleepLib/profiles.h

@@ -26,7 +26,6 @@ class Machine;
 
 enum Gender { GenderNotSpecified, Male, Female };
 enum MaskType { Mask_Unknown, Mask_NasalPillows, Mask_Hybrid, Mask_StandardNasal, Mask_FullFace };
-enum OverlayDisplayType { ODT_Bars, ODT_TopAndBottom };
 enum OverviewLinechartModes { OLC_Bartop, OLC_Lines };
 
 class DoctorInfo;

sleepyhead/SleepLib/schema.cpp

@@ -19,6 +19,8 @@
 
 #include "common.h"
 #include "schema.h"
+#include "common_gui.h"
+
 
 namespace schema {
 
@@ -142,7 +144,7 @@ void init()
     schema::channel.add(GRP_CPAP, new Channel(CPAP_CSR           = 0x1000, SPAN,    SESSION, "CSR",
                         QObject::tr("Periodic Breathing"),
                         QObject::tr("A period of periodic breathing"),
-                        QObject::tr("PB"),       STR_UNIT_Percentage,            DEFAULT,    QColor("light green")));
+                        QObject::tr("PB"),       STR_UNIT_Percentage,            DEFAULT,    COLOR_CSR));
 
 
     schema::channel.add(GRP_CPAP, new Channel(CPAP_ClearAirway   = 0x1001, FLAG,    SESSION,
@@ -523,7 +525,8 @@ Channel::Channel(ChannelID id, ChanType type, ScopeType scope, QString code, QSt
     m_upperThreshold(0),
     m_lowerThreshold(0),
     m_upperThresholdColor(Qt::red),
-    m_lowerThresholdColor(Qt::green)
+    m_lowerThresholdColor(Qt::green),
+    m_enabled(true)
 {
 }
 bool Channel::isNull()

sleepyhead/SleepLib/schema.h

@@ -52,28 +52,28 @@ extern Channel EmptyChannel;
 class Channel
 {
   public:
-    Channel() { m_id = 0; m_upperThreshold = 0; m_lowerThreshold = 0;}
+    Channel() { m_id = 0; m_upperThreshold = 0; m_lowerThreshold = 0; m_enabled = true; }
     Channel(ChannelID id, ChanType type, ScopeType scope, QString code, QString fullname,
             QString description, QString label, QString unit, DataType datatype = DEFAULT, QColor = Qt::black,
             int link = 0);
     void addColor(Function f, QColor color) { m_colors[f] = color; }
     void addOption(int i, QString option) { m_options[i] = option; }
 
-    const int &id() { return m_id; }
+    inline ChannelID id() const { return m_id; }
-    const ChanType &type() { return m_type; }
+    inline ChanType type() const { return m_type; }
-    const DataType &datatype() { return m_datatype; }
+    inline DataType datatype() const { return m_datatype; }
     const QString &code() { return m_code; }
     const QString &fullname() { return m_fullname; }
     const QString &description() { return m_description; }
     const QString &label() { return m_label; }
     const QString &units() { return m_unit; }
 
-    const EventDataType &upperThreshold() { return m_upperThreshold; }
+    inline EventDataType upperThreshold() const { return m_upperThreshold; }
-    const EventDataType &lowerThreshold() { return m_lowerThreshold; }
+    inline EventDataType lowerThreshold() const { return m_lowerThreshold; }
-    const QColor &upperThresholdColor() { return m_upperThresholdColor; }
+    inline QColor upperThresholdColor() const { return m_upperThresholdColor; }
-    const QColor &lowerThresholdColor() { return m_lowerThresholdColor; }
+    inline QColor lowerThresholdColor() const { return m_lowerThresholdColor; }
 
-    const int &linkid() { return m_link; }
+    inline ChannelID linkid() const { return m_link; }
 
 
     void setLabel(QString label) { m_label = label; }
@@ -91,12 +91,15 @@ class Channel
 
         return QString();
     }
-    QColor &defaultColor() { return m_defaultcolor; }
+    inline QColor defaultColor() const { return m_defaultcolor; }
-    void setDefaultColor(QColor color) { m_defaultcolor = color; }
+    inline void setDefaultColor(QColor color) { m_defaultcolor = color; }
     QHash<int, QString> m_options;
     QHash<Function, QColor> m_colors;
     QList<Channel *> m_links;              // better versions of this data type
     bool isNull();
+
+    inline bool enabled() const { return m_enabled; }
+    void setEnabled(bool value) { m_enabled = value; }
   protected:
     int m_id;
     ChanType m_type;
@@ -116,6 +119,8 @@ class Channel
     EventDataType m_lowerThreshold;
     QColor m_upperThresholdColor;
     QColor m_lowerThresholdColor;
+
+    bool m_enabled;
 };
 
 /*! \class ChannelList
@@ -136,7 +141,7 @@ class ChannelList
     void add(QString group, Channel *chan);
 
     //! \brief Looks up Channel in this List with the index idx, returns EmptyChannel if not found
-    Channel &operator[](ChannelID idx) {
+    Channel & operator[](ChannelID idx) {
         if (channels.contains(idx)) {
             return *channels[idx];
         } else {

sleepyhead/SleepLib/session.cpp

@@ -977,7 +977,7 @@ EventDataType Session::SearchValue(ChannelID code, qint64 time)
 
                     a = el->data(i1);
 
-                    if (i2 > cnt) { return a; }
+                    if (i2 >= cnt) { return a; }
 
                     qint64 t1 = i1 * el->rate();
                     qint64 t2 = i2 * el->rate();
@@ -993,6 +993,7 @@ EventDataType Session::SearchValue(ChannelID code, qint64 time)
                 } else {
                     start = el->first();
                     tptr = el->rawTime();
+                    // TODO: square plots need fixing
 
                     for (int j = 0; j < cnt-1; ++j) {
                         tptr++;

sleepyhead/daily.cpp

@@ -81,14 +81,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
 
     lastcpapday=nullptr;
 
-    QList<int> a;
+    setSidebarVisible(true);
-
-    int panel_width = 350;
-    a.push_back(panel_width);
-    a.push_back(this->width() - panel_width);
-    ui->splitter_2->setStretchFactor(1,1);
-    ui->splitter_2->setSizes(a);
-    ui->splitter_2->setStretchFactor(1,1);
 
     layout=new QHBoxLayout();
     layout->setSpacing(0);
@@ -273,43 +266,43 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     gGraph *FRW = graphlist[schema::channel[CPAP_FlowRate].code()];
 
     // Draw layer is important... spans first..
-    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_CSR, COLOR_CSR, STR_TR_CSR, FT_Span)));
+//    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_CSR, COLOR_CSR, STR_TR_CSR, FT_Span)));
-    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_LargeLeak, COLOR_LargeLeak, STR_TR_LL, FT_Span)));
+//    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_LargeLeak, COLOR_LargeLeak, STR_TR_LL, FT_Span)));
     //FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Ramp, COLOR_Ramp, schema::channel[CPAP_Ramp].label(), FT_Span)));
 
     // Then the graph itself
     FRW->AddLayer(l);
 
     // Then the LineOverlaySummaries
-    FRW->AddLayer(AddCPAP(los->add(new gLineOverlayBar(CPAP_Hypopnea,COLOR_Hypopnea,STR_TR_H))));
+//    FRW->AddLayer(AddCPAP(los->add(new gLineOverlayBar(CPAP_Hypopnea,COLOR_Hypopnea,STR_TR_H))));
-    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_PressurePulse,COLOR_PressurePulse,STR_TR_PP,FT_Dot)));
+//    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_PressurePulse,COLOR_PressurePulse,STR_TR_PP,FT_Dot)));
-    //FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Pressure, COLOR_White,STR_TR_P,FT_Dot)));
+//    //FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Pressure, COLOR_White,STR_TR_P,FT_Dot)));
-    FRW->AddLayer(AddCPAP(new gLineOverlayBar(PRS1_0B,COLOR_Blue,"0B",FT_Dot)));
+//    FRW->AddLayer(AddCPAP(new gLineOverlayBar(PRS1_0B,COLOR_Blue,"0B",FT_Dot)));
-    FRW->AddLayer(AddCPAP(new gLineOverlayBar(PRS1_0E,COLOR_DarkRed,"0E",FT_Dot)));
+//    FRW->AddLayer(AddCPAP(new gLineOverlayBar(PRS1_0E,COLOR_DarkRed,"0E",FT_Dot)));
 
-    gLineOverlayBar * rera = new gLineOverlayBar(CPAP_RERA, COLOR_RERA, STR_TR_RE);
+//    gLineOverlayBar * rera = new gLineOverlayBar(CPAP_RERA, COLOR_RERA, STR_TR_RE);
-    if (p_profile->general->calculateRDI()) {
+//    if (p_profile->general->calculateRDI()) {
-        FRW->AddLayer(AddCPAP(los->add(rera)));
+//        FRW->AddLayer(AddCPAP(los->add(rera)));
-    } else {
+//    } else {
-        FRW->AddLayer(AddCPAP(rera));
+//        FRW->AddLayer(AddCPAP(rera));
-    }
+//    }
-    FRW->AddLayer(AddCPAP(los->add(new gLineOverlayBar(CPAP_Apnea, COLOR_Apnea, STR_TR_UA))));
+//    FRW->AddLayer(AddCPAP(los->add(new gLineOverlayBar(CPAP_Apnea, COLOR_Apnea, STR_TR_UA))));
-    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_VSnore, COLOR_VibratorySnore, STR_TR_VS)));
+//    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_VSnore, COLOR_VibratorySnore, STR_TR_VS)));
-    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_FlowLimit, COLOR_FlowLimit, STR_TR_FL)));
+//    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_FlowLimit, COLOR_FlowLimit, STR_TR_FL)));
-    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_SensAwake, COLOR_SensAwake, STR_TR_SA)));
+//    FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_SensAwake, COLOR_SensAwake, STR_TR_SA)));
-    FRW->AddLayer(AddCPAP(los->add(new gLineOverlayBar(CPAP_Obstructive, COLOR_Obstructive, STR_TR_OA))));
+//    FRW->AddLayer(AddCPAP(los->add(new gLineOverlayBar(CPAP_Obstructive, COLOR_Obstructive, STR_TR_OA))));
-    FRW->AddLayer(AddCPAP(los->add(new gLineOverlayBar(CPAP_ClearAirway, COLOR_ClearAirway, STR_TR_CA))));
+//    FRW->AddLayer(AddCPAP(los->add(new gLineOverlayBar(CPAP_ClearAirway, COLOR_ClearAirway, STR_TR_CA))));
-    if (p_profile->cpap->userEventFlagging()) {
+//    if (p_profile->cpap->userEventFlagging()) {
-        FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_UserFlag1, COLOR_Yellow, tr("U1"),FT_Bar)));
+//        FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_UserFlag1, COLOR_Yellow, tr("U1"),FT_Bar)));
-        FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_UserFlag2, COLOR_Orange, tr("U2"),FT_Bar)));
+//        FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_UserFlag2, COLOR_Orange, tr("U2"),FT_Bar)));
-        FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_UserFlag3, COLOR_Brown, tr("U3"),FT_Bar)));
+//        FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_UserFlag3, COLOR_Brown, tr("U3"),FT_Bar)));
-    }
+//    }
-    FRW->AddLayer(AddCPAP(new gLineOverlayBar(OXI_SPO2Drop, COLOR_SPO2Drop, STR_TR_O2)));
+//    FRW->AddLayer(AddCPAP(new gLineOverlayBar(OXI_SPO2Drop, COLOR_SPO2Drop, STR_TR_O2)));
 
     FRW->AddLayer(AddOXI(new gLineOverlayBar(OXI_SPO2Drop, COLOR_SPO2Drop, STR_TR_O2)));
     //FRW->AddLayer(AddOXI(new gLineOverlayBar(OXI_PulseChange, COLOR_PulseChange, STR_TR_PC,FT_Dot)));
 
-    FRW->AddLayer(AddCPAP(los));
+//    FRW->AddLayer(AddCPAP(los));
 
     bool square=p_profile->appearance->squareWavePlots();
     gLineChart *pc=new gLineChart(CPAP_Pressure, COLOR_Pressure, square);
@@ -1399,8 +1392,38 @@ void Daily::Load(QDate date)
     bool isBrick=false;
 
     updateGraphCombo();
+    ui->eventsCombo->clear();
 
     if (cpap) {
+        QMap<QString, schema::Channel *> flags;
+        for (int i=0; i< cpap->size(); ++i) {
+            Session * sess = cpap->sessions.at(i);
+            QHash<ChannelID, QVector<EventList *> >::iterator it;
+            for (it = sess->eventlist.begin(); it != sess->eventlist.end(); ++it) {
+                ChannelID code = it.key();
+                schema::Channel * chan = &schema::channel[code];
+                const QString & str = chan->label();
+                if (flags.contains(str)) continue;
+
+                if ((chan->type() == schema::FLAG) || (chan->type() == schema::MINOR_FLAG) || (chan->type() == schema::SPAN)) {
+                    flags[str] = chan;
+                }
+            }
+        }
+
+        QMap<QString, schema::Channel *>::iterator fit;
+        int c = 0;
+        for (fit = flags.begin(); fit != flags.end(); ++fit) {
+            ui->eventsCombo->addItem(fit.value()->enabled() ? *icon_on : * icon_off, fit.key(), fit.value()->id());
+            ui->eventsCombo->setItemData(c, fit.value()->description(), Qt::ToolTipRole);
+            c++;
+        }
+    }
+
+    if (cpap) {
+        //QHash<schema::ChanType, QList<schema::Channel *> > list;
+
+
         float hours=cpap->hours();
         if (GraphView->isEmpty() && (hours>0)) {
             if (!p_profile->hasChannel(CPAP_Obstructive) && !p_profile->hasChannel(CPAP_Hypopnea)) {
@@ -2326,6 +2349,7 @@ void Daily::updateCube()
         ui->toggleGraphs->setChecked(true);
         ui->toggleGraphs->blockSignals(false);
 
+
         if (ui->graphCombo->count() > 0) {
             GraphView->setEmptyText(tr("No Graphs On!"));
         } else {
@@ -2345,7 +2369,6 @@ void Daily::updateCube()
         ui->toggleGraphs->setChecked(false);
         ui->toggleGraphs->blockSignals(false);
     }
-
 }
 
 
@@ -2377,6 +2400,7 @@ void Daily::updateGraphCombo()
         g=(*GraphView)[i];
         if (g->isEmpty()) continue;
 
+
         if (g->visible()) {
             ui->graphCombo->addItem(*icon_on,g->title(),true);
         } else {
@@ -2384,6 +2408,8 @@ void Daily::updateGraphCombo()
         }
     }
     ui->graphCombo->setCurrentIndex(0);
+
+
     updateCube();
 }
 
@@ -2397,3 +2423,42 @@ void Daily::on_resetLayoutButton_clicked()
 {
     GraphView->resetLayout();
 }
+
+void Daily::on_eventsCombo_activated(int index)
+{
+    if (index<0)
+        return;
+
+
+    ChannelID code = ui->eventsCombo->itemData(index, Qt::UserRole).toUInt();
+    schema::Channel * chan = &schema::channel[code];
+
+    bool b = !chan->enabled();
+    chan->setEnabled(b);
+
+    ui->eventsCombo->setItemIcon(index,b ? *icon_on : *icon_off);
+
+    GraphView->redraw();
+}
+
+void Daily::on_toggleEvents_clicked(bool checked)
+{
+    QString s;
+    QIcon *icon=checked ? icon_on : icon_off;
+
+    ui->toggleEvents->setArrowType(checked ? Qt::DownArrow : Qt::UpArrow);
+    ui->toggleEvents->setToolTip(checked ? tr("Hide all events") : tr("Show all events"));
+//    ui->toggleEvents->blockSignals(true);
+//    ui->toggleEvents->setChecked(false);
+//    ui->toggleEvents->blockSignals(false);
+
+    for (int i=0;i<ui->eventsCombo->count();i++) {
+//        s=ui->eventsCombo->itemText(i);
+        ui->eventsCombo->setItemIcon(i,*icon);
+        ChannelID code = ui->eventsCombo->itemData(i).toUInt();
+        schema::channel[code].setEnabled(checked);
+    }
+
+    updateCube();
+    GraphView->redraw();
+}

sleepyhead/daily.h

@@ -266,6 +266,10 @@ private slots:
 
     void doToggleSession(Session *);
 
+    void on_eventsCombo_activated(int index);
+
+    void on_toggleEvents_clicked(bool checked);
+
 protected:
     virtual void closeEvent(QCloseEvent *);
     virtual void showEvent(QShowEvent *);

sleepyhead/daily.ui

@@ -1511,6 +1511,51 @@ QToolButton:pressed {
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QToolButton" name="toggleEvents">
+            <property name="styleSheet">
+             <string notr="true">QToolButton {
+ background: transparent;
+ border-radius: 8px;
+ border: 2px solid transparent;
+}
+
+QToolButton:hover {
+ border: 2px solid #456789;
+}
+
+QToolButton:pressed {
+ border: 2px solid #456789;
+ background-color: #89abcd;
+}</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <property name="autoRaise">
+             <bool>false</bool>
+            </property>
+            <property name="arrowType">
+             <enum>Qt::DownArrow</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Flags:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="eventsCombo"/>
+          </item>
           <item>
            <layout class="QHBoxLayout" name="sessionBarLayout">
             <property name="sizeConstraint">

sleepyhead/preferencesdialog.ui

@@ -51,7 +51,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="importTab">
       <attribute name="title">