PRS1 Loader Restructure to fix ASV bugs, and allow for chunked summary/event files

Graphs/gFlagsLine.cpp

@@ -19,6 +19,7 @@ gFlagsGroup::gFlagsGroup()
     quads->setAntiAlias(true);
     lines->setAntiAlias(false);
     m_barh=0;
+    m_empty=true;
 }
 gFlagsGroup::~gFlagsGroup()
 {
@@ -41,14 +42,21 @@ 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;
 
-        if (!f->isEmpty() || f->isAlwaysVisible()) {
+        bool e=f->isEmpty();
+        if (!e || f->isAlwaysVisible()) {
             lvisible.push_back(f);
+            if (!e) cnt++;
         }
     }
+    if (cnt==0)
+        m_empty=true;
+    else m_empty=false;
+    //if (lvisible.size()==0) m_empty=false;
     m_barh=0;
 }
 

Graphs/gFlagsLine.h

@@ -45,6 +45,7 @@ public:
     virtual qint64 Minx();
     virtual qint64 Maxx();
     virtual void SetDay(Day *);
+    virtual bool isEmpty() { return m_empty; }
     int count() { return lvisible.size(); }
     int barHeight() { return m_barh; }
     QVector<gFlagsLine *> & visibleLayers() { return lvisible; }
@@ -53,6 +54,7 @@ protected:
     GLShortBuffer *quads, *lines;
     QVector<gFlagsLine *> lvisible;
     float m_barh;
+    bool m_empty;
 };
 
 #endif // GFLAGSLINE_H

Graphs/gGraphView.cpp

@@ -103,7 +103,7 @@ void GetTextExtent(QString text, int & width, int & height, QFont *font)
 #ifdef Q_WS_WIN32
     height=fm.ascent();
 #else
-    height=fm.xHeight()+2; //fm.ascent();
+    height=fm.xHeight()+2; // doesn't work properly on windows..
 #endif
 #ifdef ENABLE_THREADED_DRAWING
     mut.unlock();
@@ -733,7 +733,8 @@ void Layer::SetDay(Day * d)
 
 bool Layer::isEmpty()
 {
-    if (m_day && (m_day->count(m_code)>0))
+    //if (m_day && (m_day->count(m_code)>0))
+    if (m_day && (m_day->channelExists(m_code)))
         return false;
     return true;
 }
@@ -2621,6 +2622,18 @@ void gGraphView::setDay(Day * day)
     }
     ResetBounds();
 }
+bool gGraphView::isEmpty()
+{
+    bool res=true;
+    for (int i=0;i<m_graphs.size();i++) {
+        if (!m_graphs[i]->isEmpty()) {
+            res=false;
+            break;
+        }
+    }
+    return res;
+}
+
 void gGraphView::refreshTimeout()
 {
     updateGL();

Graphs/gGraphView.h

@@ -428,6 +428,7 @@ public:
     inline float printScaleY() { return print_scaleY; }
     inline void setPrintScaleX(float x) { print_scaleX=x; }
     inline void setPrintScaleY(float y) { print_scaleY=y; }
+    bool isEmpty();
 
     void deselect();
     QPoint pointClicked() { return m_point_clicked; }

Graphs/gLineChart.cpp

@@ -131,6 +131,9 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
             qWarning() << "gLineChart::Plot() NULL Session Record.. This should not happen";
             continue;
         }
+        if (m_code==CPAP_FlowRate){
+            int i=5;
+        }
         schema::Channel ch=schema::channel[m_code];
         bool fndbetter=false;
         for (QList<schema::Channel *>::iterator l=ch.m_links.begin();l!=ch.m_links.end();l++) {

Graphs/gSummaryChart.cpp

@@ -128,8 +128,16 @@ void SummaryChart::SetDay(Day * nullday)
                     if (day->machine_type()!=m_machinetype) continue;
                     //m_values[dn][j+1]=0;
 
-                    bool hascode=day->channelHasData(code) || day->settingExists(code);
+                    bool hascode=//day->channelHasData(code) ||
-                    if (type==ST_HOURS || type==ST_SESSIONS || hascode) { // too many lookups happening here.. stop the crap..
+                            type==ST_HOURS ||
+                            type==ST_SESSIONS ||
+                            day->settingExists(code) ||
+                            day->hasData(code,type);
+
+                    if (code==CPAP_RespRate) {
+                        int i=5;
+                    }
+                    if (hascode) {
                         m_days[dn]=day;
                         switch(m_type[j]) {
                             case ST_AVG: tmp=day->avg(code); break;
@@ -150,6 +158,9 @@ void SummaryChart::SetDay(Day * nullday)
                             case ST_SETSUM: tmp=day->settings_sum(code); break;
                         default:    break;
                         }
+                        if (tmp>10000) {
+                            int i=5;
+                        }
                         if (suboffset>0) {
                             tmp-=suboffset;
                             if (tmp<0) tmp=0;

SleepLib/calcs.cpp

@@ -49,9 +49,9 @@ int filterFlow(EventList *in, EventList *out, EventList *tv, EventList *mv, doub
     //stage1[i]=in->data(i);
 
     // Anti-Alias the flow waveform to get rid of jagged edges.
-    stage2[0]=stage1[0];
+    stage2[0]=in->data(0);
-    stage2[1]=stage1[1];
+    stage2[1]=in->data(1);
-    stage2[2]=stage1[2];
+    stage2[2]=in->data(2);
 
     i=3;
     for (;i<size-3;i++) {
@@ -75,11 +75,11 @@ int filterFlow(EventList *in, EventList *out, EventList *tv, EventList *mv, doub
 
     float weight=0.6;
     //stage2[0]=in->data(0);
-    stage1[0]=stage2[0];
+//    stage1[0]=stage2[0];
-    for (int i=1;i<size;i++) {
+   /* for (int i=1;i<size;i++) {
         //stage2[i]=in->data(i);
         stage1[i]=weight*stage2[i]+(1.0-weight)*stage1[i-1];
-    }
+    } */
 
     qint64 time=in->first();
     qint64 u1=0,u2=0,len,l1=0,l2=0;
@@ -91,7 +91,7 @@ int filterFlow(EventList *in, EventList *out, EventList *tv, EventList *mv, doub
     //int lasti=0;
 
     for (i=0;i<size;i++) {
-        c=stage1[i];
+        c=stage2[i];
         if (c>thresh) {
             if (lastc<=thresh) {
                 u2=u1;
@@ -102,7 +102,7 @@ int filterFlow(EventList *in, EventList *out, EventList *tv, EventList *mv, doub
                     if (tv) { // && z1>0) { // Tidal Volume Calculations
                         EventDataType t=0;
                         for (int g=z1;g<z2;g++) {
-                            tmp=-stage1[g];
+                            tmp=-stage2[g];
                             t+=tmp;
                         }
                         TV.push_back(t);
@@ -122,7 +122,7 @@ int filterFlow(EventList *in, EventList *out, EventList *tv, EventList *mv, doub
                         // Average the other half of the breath to increase accuracy.
                         EventDataType t=0;
                         for (int g=z2;g<z1;g++) {
-                            tmp=stage1[g];
+                            tmp=stage2[g];
                             t+=tmp;
                         }
                         int ts=TV.size()-2;
@@ -137,6 +137,10 @@ int filterFlow(EventList *in, EventList *out, EventList *tv, EventList *mv, doub
         lastc=c;
         time+=rate;
     }
+    if (!breaths.size()) {
+
+        return 0;
+    }
 
     qint64 window=60000;
     qint64 t1=in->first()-window/2;
@@ -218,7 +222,7 @@ int filterFlow(EventList *in, EventList *out, EventList *tv, EventList *mv, doub
         }
         qSort(med);
         br=med[2];
-        out->AddEvent(t,br);
+        if (out) out->AddEvent(t,br);
 
         //t=TV2_start[i];
         med.clear();
@@ -227,9 +231,10 @@ int filterFlow(EventList *in, EventList *out, EventList *tv, EventList *mv, doub
         }
         qSort(med);
         tmp=med[3];
-        tv->AddEvent(t,tmp);
 
-        mv->AddEvent(t,(tmp*br)/1000.0);
+        if (tv) tv->AddEvent(t,tmp);
+
+        if (mv) mv->AddEvent(t,(tmp*br)/1000.0);
     }
 
     delete [] stage2;
@@ -243,27 +248,43 @@ int calcRespRate(Session *session)
 {
     if (session->machine()->GetType()!=MT_CPAP) return 0;
     if (session->machine()->GetClass()!="PRS1") return 0;
-    if (session->eventlist.contains(CPAP_RespRate)) return 0; // already exists?
+    if (!session->eventlist.contains(CPAP_FlowRate))
+        return 0; //need flow waveform
 
-    if (!session->eventlist.contains(CPAP_FlowRate)) return 0; //need flow waveform
+    if (session->eventlist.contains(CPAP_RespRate))
+        return 0; // already exists?
+
+    EventList *flow, *rr=NULL,  *tv=NULL, *mv=NULL;
 
-    EventList *flow, *rr,  *tv=NULL, *mv=NULL;
     if (!session->eventlist.contains(CPAP_TidalVolume)) {
         tv=new EventList(EVL_Event);
-        session->eventlist[CPAP_TidalVolume].push_back(tv);
+    } else tv=NULL;
-    }
     if (!session->eventlist.contains(CPAP_MinuteVent)) {
         mv=new EventList(EVL_Event);
-        session->eventlist[CPAP_MinuteVent].push_back(mv);
+    } else mv=NULL;
-    }
+    if (!session->eventlist.contains(CPAP_RespRate)) {
+        rr=new EventList(EVL_Event);
+    } else rr=NULL;
+
+    if (!rr & !tv & !mv) return 0;
+    if (rr) session->eventlist[CPAP_RespRate].push_back(rr);
+    if (tv) session->eventlist[CPAP_TidalVolume].push_back(tv);
+    if (mv) session->eventlist[CPAP_MinuteVent].push_back(mv);
+
     int cnt=0;
     for (int ws=0; ws < session->eventlist[CPAP_FlowRate].size(); ws++) {
         flow=session->eventlist[CPAP_FlowRate][ws];
         if (flow->count() > 5) {
-            rr=new EventList(EVL_Event);
-            session->eventlist[CPAP_RespRate].push_back(rr);
 
+
+            if (flow->count()==103200) {
+                int i=5;
+            }
             cnt+=filterFlow(flow,rr,tv,mv,flow->rate());
+
+            if (tv->count()==0) {
+                int i=5;
+            }
         }
     }
     return cnt;
@@ -299,6 +320,11 @@ int calcAHIGraph(Session *session)
     if (session->machine()->GetType()!=MT_CPAP) return 0;
     if (session->eventlist.contains(CPAP_AHI)) return 0; // abort if already there
 
+    if (!session->channelExists(CPAP_Obstructive) &&
+            !session->channelExists(CPAP_Hypopnea) &&
+            !session->channelExists(CPAP_Apnea) &&
+            !session->channelExists(CPAP_ClearAirway)) return 0;
+
     const qint64 winsize=30000; // 30 second windows
 
     qint64 first=session->first(),
@@ -370,6 +396,9 @@ int calcLeaks(Session *session)
             if (idx>=med.size()) idx--;
             median=tmp-med[idx];
             if (median<0) median=0;
+            if (median>9999) {
+                int i=5;
+            }
             leak->AddEvent(ti,median);
 
             rpos=rpos % rbsize;

SleepLib/day.cpp

@@ -188,8 +188,8 @@ EventDataType Day::wavg(ChannelID code)
     for (QVector<Session *>::iterator s=sessions.begin();s!=sessions.end();s++) {
         Session & sess=*(*s);
         if (sess.m_wavg.contains(code)) {
-            d=sess.last(code)-sess.first(code);
+            d=sess.length();//.last(code)-sess.first(code);
-            s0=double(d)/1000.0;
+            s0=double(d)/3600000.0;
             if (s0>0) {
                 s1+=sess.wavg(code)*s0;
                 s2+=s0;
@@ -280,6 +280,54 @@ EventDataType Day::min(ChannelID code)
     return min;
 }
 
+bool Day::hasData(ChannelID code, SummaryType type)
+{
+    bool has=false;
+    for (QVector<Session *>::iterator s=sessions.begin();s!=sessions.end();s++) {
+        Session *sess=*s;
+        switch(type) {
+        case ST_90P:
+            has=sess->m_90p.contains(code);
+            break;
+        case ST_MIN:
+            has=sess->m_min.contains(code);
+            break;
+        case ST_MAX:
+            has=sess->m_max.contains(code);
+            break;
+        case ST_CNT:
+            has=sess->m_cnt.contains(code);
+            break;
+        case ST_AVG:
+            has=sess->m_avg.contains(code);
+            break;
+        case ST_WAVG:
+            has=sess->m_wavg.contains(code);
+            break;
+        case ST_CPH:
+            has=sess->m_cph.contains(code);
+            break;
+        case ST_SPH:
+            has=sess->m_sph.contains(code);
+            break;
+        case ST_FIRST:
+            has=sess->m_firstchan.contains(code);
+            break;
+        case ST_LAST:
+            has=sess->m_lastchan.contains(code);
+            break;
+        case ST_SUM:
+            has=sess->m_sum.contains(code);
+            break;
+        default:
+            break;
+        }
+
+        if (has) break;
+    }
+    return has;
+}
+
 EventDataType Day::max(ChannelID code)
 {
     EventDataType max=0;
@@ -345,7 +393,15 @@ bool Day::settingExists(ChannelID id)
 }
 bool Day::channelExists(ChannelID id)
 {
-    return channelHasData(id);
+    bool r=false;
+    for (int i=0;i<sessions.size();i++) {
+        if (sessions[i]->eventlist.contains(id)) {
+            r=true;
+            break;
+        }
+    }
+    return r;
+//    return channelHasData(id);
     //if (machine->hasChannel(id)) return true;
     //return false;
 }
@@ -355,6 +411,7 @@ bool Day::channelHasData(ChannelID id)
     for (int i=0;i<sessions.size();i++) {
         if (sessions[i]->channelExists(id)) {
             r=true;
+            break;
         }
     }
     return r;

SleepLib/day.h

@@ -37,6 +37,8 @@ public:
     EventDataType sum(ChannelID code);
     EventDataType wavg(ChannelID code);
 
+    bool hasData(ChannelID code, SummaryType type);
+
     EventDataType percentile(ChannelID mc,double percent);
 
     // Note, the following convert to doubles without considering the consequences fully.

SleepLib/loader_plugins/prs1_loader.h

@@ -21,7 +21,7 @@ License: GPL
 //********************************************************************************************
 // Please INCREMENT the following value when making changes to this loaders implementation.
 //
-const int prs1_data_version=7;
+const int prs1_data_version=8;
 //
 //********************************************************************************************
 
@@ -54,15 +54,27 @@ protected:
     QHash<QString,Machine *> PRS1List;
     int OpenMachine(Machine *m,QString path,Profile *profile);
     bool ParseProperties(Machine *m,QString filename);
-    bool OpenSummary(Session *session,QString filename);
+    //bool OpenSummary(Session *session,QString filename);
-    bool OpenEvents(Session *session,QString filename);
+    //bool OpenEvents(Session *session,QString filename);
-    bool OpenWaveforms(Session *session,QString filename);
+    bool OpenWaveforms(SessionID sid, QString filename);
-    bool Parse002(Session *session,unsigned char *buffer,int size,qint64 timestamp);
+    bool ParseWaveform(Machine *mach, qint32 sequence, quint32 timestamp, unsigned char *data, quint16 size, quint16 duration, quint16 num_signals, quint16 interleave, quint8 sample_format);
-    bool Parse002ASV(Session *session,unsigned char *buffer,int size,qint64 timestamp);
+    bool ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp, unsigned char *data, quint16 size, char version);
-    void CalcRespiratoryRate(Session *);
+    bool Parse002(Machine *mach, qint32 sequence, quint32 timestamp, unsigned char *data, quint16 size);
-    void filterFlow(EventList *in, EventList *out);
+    bool Parse002v5(Machine *mach, qint32 sequence, quint32 timestamp, unsigned char *data, quint16 size);
+
+    bool OpenFile(Machine *mach, QString filename);
+    //bool Parse002(Session *session,unsigned char *buffer,int size,qint64 timestamp,long fpos);
+    //bool Parse002ASV(Session *session,unsigned char *buffer,int size,qint64 timestamp,long fpos);
     unsigned char * m_buffer;
     QHash<SessionID, Session *> extra_session;
+    QHash<SessionID, Session *> new_sessions;
+    qint32 summary_duration;
+};
+
+struct WaveHeaderList {
+    quint16 interleave;
+    quint8  sample_format;
+    WaveHeaderList(quint16 i,quint8 f){ interleave=i; sample_format=f; }
 };
 
 #endif // PRS1LOADER_H

SleepLib/machine.h

@@ -7,6 +7,7 @@
 #ifndef MACHINE_H
 #define MACHINE_H
 
+
 #include <QString>
 #include <QVariant>
 #include <QDateTime>
@@ -26,6 +27,7 @@
 
 #include "SleepLib/day.h"
 
+
 class Day;
 class Session;
 class Profile;

SleepLib/machine_common.h

@@ -29,6 +29,8 @@ const quint32 magic=0xC73216AB; // Magic number for Sleepyhead Data Files.. Don'
 //const int max_number_event_fields=10;
 
 
+enum SummaryType { ST_CNT, ST_SUM, ST_AVG, ST_WAVG, ST_90P, ST_MIN, ST_MAX, ST_CPH, ST_SPH, ST_FIRST, ST_LAST, ST_HOURS, ST_SESSIONS, ST_SETMIN, ST_SETAVG, ST_SETMAX, ST_SETWAVG, ST_SETSUM };
+
 enum MachineType { MT_UNKNOWN=0,MT_CPAP,MT_OXIMETER,MT_SLEEPSTAGE,MT_JOURNAL };
 //void InitMapsWithoutAwesomeInitializerLists();
 

SleepLib/session.cpp

@@ -500,8 +500,10 @@ EventDataType Session::min(ChannelID id)
     QVector<EventList *> & evec=j.value();
 
     bool first=true;
-    EventDataType min,t1;
+    EventDataType min=0,t1;
     for (int i=0;i<evec.size();i++) {
+        if (evec[i]->count()==0)
+            continue;
         t1=evec[i]->min();
         if (t1==0 && t1==evec[i]->max()) continue;
         if (first) {
@@ -511,6 +513,9 @@ EventDataType Session::min(ChannelID id)
             if (min>t1) min=t1;
         }
     }
+    if (min>10000) {
+        int i=5;
+    }
     m_min[id]=min;
     return min;
 }
@@ -528,8 +533,9 @@ EventDataType Session::max(ChannelID id)
     QVector<EventList *> & evec=j.value();
 
     bool first=true;
-    EventDataType max,t1;
+    EventDataType max=0,t1;
     for (int i=0;i<evec.size();i++) {
+        if (evec[i]->count()==0) continue;
         t1=evec[i]->max();
         if (t1==0 && t1==evec[i]->min()) continue;
         if (first) {
@@ -897,6 +903,9 @@ EventDataType Session::wavg(ChannelID id)
        s1+=i.key()*s0;
        s2+=s0;
     }
+    if (s2==0) {
+        return m_wavg[id]=0;
+    }
     double j=double(s1)/double(s2);
     EventDataType v=j*gain;
     if (v>32768*gain) {

SleepLib/session.h

@@ -18,7 +18,6 @@
 //class EventList;
 class Machine;
 
-enum SummaryType { ST_CNT, ST_SUM, ST_AVG, ST_WAVG, ST_90P, ST_MIN, ST_MAX, ST_CPH, ST_SPH, ST_FIRST, ST_LAST, ST_HOURS, ST_SESSIONS, ST_SETMIN, ST_SETAVG, ST_SETMAX, ST_SETWAVG, ST_SETSUM };
 
 class Session
 {

daily.cpp

@@ -366,7 +366,8 @@ void Daily::ReloadGraphs()
     if (previous_date.isValid()) {
         d=previous_date;
         Unload(d);
-    } else d=PROFILE.LastDay();
+    } //else
+    d=PROFILE.LastDay();
     if (!d.isValid()) {
         d=ui->calendar->selectedDate();
     }
@@ -646,7 +647,14 @@ void Daily::Load(QDate date)
     CPAPMode mode=MODE_UNKNOWN;
     PRTypes pr;
     QString a;
+    bool isBrick=false;
     if (cpap) {
+        if (GraphView->isEmpty()) {
+            GraphView->setEmptyText("Brick Machine :(");
+            isBrick=true;
+        } else {
+            GraphView->setEmptyText("No Data");
+        }
         mode=(CPAPMode)cpap->settings_max(CPAP_Mode);
         pr=(PRTypes)cpap->settings_max(PRS1_FlexMode);
         if (pr==PR_NONE)
@@ -698,107 +706,114 @@ void Daily::Load(QDate date)
                 .arg(QString().sprintf("%02i:%02i:%02i",h,m,s));
 
         QString cs;
-        if (cpap->machine->GetClass()=="ResMed") {
+        if (!isBrick) {
-            cs="4 width='100%' align=center>";
+            if (cpap->machine->GetClass()=="ResMed") {
-        } else cs="2 width='50%'>";
+                cs="4 width='100%' align=center>";
-        html+="<tr><td colspan="+cs+"<table cellspacing=0 cellpadding=1 border=0 width='100%'>"
+            } else cs="2 width='50%'>";
-        "<tr><td align='right' bgcolor='#F88017'><b><font color='black'><a href='nothing' title='"+schema::channel[CPAP_AHI].description()+"'>"+tr("AHI")+"</a></font></b></td><td width=20% bgcolor='#F88017'><b><font color='black'>"+QString().sprintf("%.2f",ahi)+"</font></b></td></tr>\n"
+            html+="<tr><td colspan="+cs+"<table cellspacing=0 cellpadding=1 border=0 width='100%'>"
-        "<tr><td align='right' bgcolor='#4040ff'><b><font color='white'>&nbsp;<a href='event="+CPAP_Hypopnea+"' title='"+schema::channel[CPAP_Hypopnea].description()+"'>"+tr("Hypopnea")+"</a></font></b></td><td bgcolor='#4040ff'><font color='white'>"+QString().sprintf("%.2f",hi)+"</font></td></tr>\n";
+            "<tr><td align='right' bgcolor='#F88017'><b><font color='black'><a href='nothing' title='"+schema::channel[CPAP_AHI].description()+"'>"+tr("AHI")+"</a></font></b></td><td width=20% bgcolor='#F88017'><b><font color='black'>"+QString().sprintf("%.2f",ahi)+"</font></b></td></tr>\n"
-        if (cpap->machine->GetClass()=="ResMed") {
+            "<tr><td align='right' bgcolor='#4040ff'><b><font color='white'>&nbsp;<a href='event="+CPAP_Hypopnea+"' title='"+schema::channel[CPAP_Hypopnea].description()+"'>"+tr("Hypopnea")+"</a></font></b></td><td bgcolor='#4040ff'><font color='white'>"+QString().sprintf("%.2f",hi)+"</font></td></tr>\n";
-            html+="<tr><td align='right' bgcolor='#208020'><b>&nbsp;<a href='event="+CPAP_Apnea+"' title='"+schema::channel[CPAP_Apnea].description()+"'>"+tr("Unspecified Apnea")+"</a></b></td><td bgcolor='#208020'>"+QString().sprintf("%.2f",uai)+"</td></tr>\n";
+            if (cpap->machine->GetClass()=="ResMed") {
-        }
+                html+="<tr><td align='right' bgcolor='#208020'><b>&nbsp;<a href='event="+CPAP_Apnea+"' title='"+schema::channel[CPAP_Apnea].description()+"'>"+tr("Unspecified Apnea")+"</a></b></td><td bgcolor='#208020'>"+QString().sprintf("%.2f",uai)+"</td></tr>\n";
-        html+="<tr><td align='right' bgcolor='#40afbf'><b>&nbsp;<a href='event="+CPAP_Obstructive+"' title='"+schema::channel[CPAP_Obstructive].description()+"'>"+tr("Obstructive")+"</a></b></td><td bgcolor='#40afbf'>"+QString().sprintf("%.2f",oai)+"</td></tr>\n"
+            }
-        "<tr><td align='right' bgcolor='#b254cd'><b>&nbsp;<a href='event="+CPAP_ClearAirway+"' title='"+schema::channel[CPAP_ClearAirway].description()+"'>"+tr("Clear Airway")+"</a></b></td><td bgcolor='#b254cd'>"+QString().sprintf("%.2f",cai)+"</td></tr>\n"
+            html+="<tr><td align='right' bgcolor='#40afbf'><b>&nbsp;<a href='event="+CPAP_Obstructive+"' title='"+schema::channel[CPAP_Obstructive].description()+"'>"+tr("Obstructive")+"</a></b></td><td bgcolor='#40afbf'>"+QString().sprintf("%.2f",oai)+"</td></tr>\n"
-        "</table></td>";
+            "<tr><td align='right' bgcolor='#b254cd'><b>&nbsp;<a href='event="+CPAP_ClearAirway+"' title='"+schema::channel[CPAP_ClearAirway].description()+"'>"+tr("Clear Airway")+"</a></b></td><td bgcolor='#b254cd'>"+QString().sprintf("%.2f",cai)+"</td></tr>\n"
-
-        if (cpap->machine->GetClass()=="PRS1") {
-            html+="<td colspan=2><table cellspacing=0 cellpadding=1 border=0 width='100%'>"
-            "<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event="+CPAP_RERA+"' title='"+schema::channel[CPAP_RERA].description()+"'>"+tr("RERA")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",rei)+"</td></tr>\n"
-            "<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event="+CPAP_FlowLimit+"' title='"+schema::channel[CPAP_FlowLimit].description()+"'>"+tr("Flow Limit")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",fli)+"</font></td></tr>\n"
-            "<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event="+CPAP_VSnore+"'title=' "+schema::channel[CPAP_VSnore].description()+"'>"+tr("Vsnore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
-                    "<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event="+CPAP_CSR+"' title='"+schema::channel[CPAP_CSR].description()+"'>"+tr("PB/CSR")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",csr)+"%</td></tr>\n"
-            "</table></td>";
-        } else if (cpap->machine->GetClass()=="Intellipap") {
-            html+="<td colspan=2><table cellspacing=0 cellpadding=2 border=0 width='100%'>"
-            "<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event="+CPAP_NRI+"'>"+tr("NRI")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",nri)+"</td></tr>\n"
-            "<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event="+CPAP_Leak+"'>"+tr("Leak Idx")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",lki)+"</font></td></tr>\n"
-            "<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event="+CPAP_VSnore+"'>"+tr("V.Snore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
-            "<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event="+CPAP_ExP+"'>"+tr("Exh.&nbsp;Puff")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",exp)+"</td></tr>\n"
             "</table></td>";
 
-        }
+            if (cpap->machine->GetClass()=="PRS1") {
+                html+="<td colspan=2><table cellspacing=0 cellpadding=1 border=0 width='100%'>"
+                    "<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event="+CPAP_RERA+"' title='"+schema::channel[CPAP_RERA].description()+"'>"+tr("RERA")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",rei)+"</td></tr>\n"
+                "<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event="+CPAP_FlowLimit+"' title='"+schema::channel[CPAP_FlowLimit].description()+"'>"+tr("Flow Limit")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",fli)+"</font></td></tr>\n"
+                "<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event="+CPAP_VSnore+"'title=' "+schema::channel[CPAP_VSnore].description()+"'>"+tr("Vsnore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
+                        "<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event="+CPAP_CSR+"' title='"+schema::channel[CPAP_CSR].description()+"'>"+tr("PB/CSR")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",csr)+"%</td></tr>\n"
+                "</table></td>";
+            } else if (cpap->machine->GetClass()=="Intellipap") {
+                html+="<td colspan=2><table cellspacing=0 cellpadding=2 border=0 width='100%'>"
+                "<tr><td align='right' bgcolor='#ffff80'><b>&nbsp;<a href='event="+CPAP_NRI+"'>"+tr("NRI")+"</a></b></td><td width=20% bgcolor='#ffff80'>"+QString().sprintf("%.2f",nri)+"</td></tr>\n"
+                "<tr><td align='right' bgcolor='#404040'><b>&nbsp;<font color='white'><a href='event="+CPAP_Leak+"'>"+tr("Leak Idx")+"</a></font></b></td><td bgcolor='#404040'><font color='white'>"+a.sprintf("%.2f",lki)+"</font></td></tr>\n"
+                "<tr><td align='right' bgcolor='#ff4040'><b>&nbsp;<a href='event="+CPAP_VSnore+"'>"+tr("V.Snore")+"</a></b></td><td bgcolor='#ff4040'>"+QString().sprintf("%.2f",vsi)+"</td></tr>\n"
+                "<tr><td align='right' bgcolor='#80ff80'><b>&nbsp;<a href='event="+CPAP_ExP+"'>"+tr("Exh.&nbsp;Puff")+"</a></b></td><td bgcolor='#80ff80'>"+QString().sprintf("%.2f",exp)+"</td></tr>\n"
+                "</table></td>";
 
-
-        // Note, this may not be a problem since Qt bug 13622 was discovered
-        // as it only relates to text drawing, which the Pie chart does not do
-        // ^^ Scratch that.. pie now includes text..
-
-        if (PROFILE["EnableGraphSnapshots"].toBool()) {  // AHI Pie Chart
-            if (ahi+rei+fli>0) {
-                html+="</tr>\n"; //<tr><td colspan=4 align=center><i>"+tr("Event Breakdown")+"</i></td></tr>\n";
-                //G_AHI->setFixedSize(gwwidth,120);
-                //mainwin->snapshotGraph()->setPrintScaleX(1);
-                //mainwin->snapshotGraph()->setPrintScaleY(1);
-                QPixmap pixmap=snapGV->renderPixmap(172,172);
-                QByteArray byteArray;
-                QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
-                buffer.open(QIODevice::WriteOnly);
-                pixmap.save(&buffer, "PNG");
-                html += "<tr><td colspan=4 align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\"></td></tr>\n";
-            } else {
-                html += "<tr><td colspan=4 align=center><img src=\"qrc:/docs/0.0.gif\"></td></tr>\n";
             }
-        }
-    }
-    html+="</table>";
-    html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
-    if (cpap || oxi) {
-        html+="<tr height='2'><td colspan=5 height='2'><hr></td></tr>\n";
 
-        //html+=("<tr><td colspan=4 align=center>&nbsp;</td></tr>\n");
 
-        html+=("<tr><td> </td><td><b>Min</b></td><td><b>Avg</b></td><td><b>90%</b></td><td><b>Max</b></td></tr>");
+            // Note, this may not be a problem since Qt bug 13622 was discovered
-        ChannelID chans[]={
+            // as it only relates to text drawing, which the Pie chart does not do
-            CPAP_Pressure,CPAP_EPAP,CPAP_IPAP,CPAP_PS,CPAP_PTB,
+            // ^^ Scratch that.. pie now includes text..
-            CPAP_MinuteVent,CPAP_AHI, CPAP_RespRate, CPAP_RespEvent,CPAP_FLG,
-            CPAP_Leak, CPAP_LeakTotal, CPAP_Snore,CPAP_IE,CPAP_Ti,CPAP_Te, CPAP_TgMV,
-            CPAP_TidalVolume, OXI_Pulse, OXI_SPO2
-        };
-        int numchans=sizeof(chans)/sizeof(ChannelID);
-        int suboffset=0;
-        for (int i=0;i<numchans;i++) {
 
-            ChannelID code=chans[i];
+            if (PROFILE["EnableGraphSnapshots"].toBool()) {  // AHI Pie Chart
-            if (cpap && cpap->channelHasData(code)) {
+                if (ahi+rei+fli>0) {
-                //if (code==CPAP_LeakTotal) suboffset=PROFILE["IntentionalLeak"].toDouble(); else suboffset=0;
+                    html+="</tr>\n"; //<tr><td colspan=4 align=center><i>"+tr("Event Breakdown")+"</i></td></tr>\n";
-                QString tooltip=schema::channel[code].description();
+                    //G_AHI->setFixedSize(gwwidth,120);
-                if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")";
+                    //mainwin->snapshotGraph()->setPrintScaleX(1);
-                html+="<tr><td align=left><a href='graph="+code+"' title='"+tooltip+"'>"+schema::channel[code].label()+"</a>";
+                    //mainwin->snapshotGraph()->setPrintScaleY(1);
-                html+="</td><td>"+a.sprintf("%.2f",cpap->min(code)-suboffset);
+                    QPixmap pixmap=snapGV->renderPixmap(172,172);
-                html+="</td><td>"+a.sprintf("%.2f",cpap->wavg(code)-suboffset);
+                    QByteArray byteArray;
-                html+="</td><td>"+a.sprintf("%.2f",cpap->p90(code)-suboffset);
+                    QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
-                html+="</td><td>"+a.sprintf("%.2f",cpap->max(code)-suboffset);
+                    buffer.open(QIODevice::WriteOnly);
-                html+="</td><tr>";
+                    pixmap.save(&buffer, "PNG");
+                    html += "<tr><td colspan=4 align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\"></td></tr>\n";
+                } else {
+                    html += "<tr><td colspan=4 align=center><img src=\"qrc:/docs/0.0.gif\"></td></tr>\n";
+                }
             }
-            if (oxi && oxi->channelHasData(code)) {
-                QString tooltip=schema::channel[code].description();
-                if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")";
-                html+="<tr><td align=left><a href='graph="+code+"' title='"+tooltip+"'>"+schema::channel[code].label()+"</a>";
-                html+="</td><td>"+a.sprintf("%.2f",oxi->min(code));
-                html+="</td><td>"+a.sprintf("%.2f",oxi->wavg(code));
-                html+="</td><td>"+a.sprintf("%.2f",oxi->p90(code));
-                html+="</td><td>"+a.sprintf("%.2f",oxi->max(code));
-                html+="</td><tr>";
-            }
-        }
 
+            html+="</table>";
+            html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
+            if (cpap || oxi) {
+                html+="<tr height='2'><td colspan=5 height='2'><hr></td></tr>\n";
+
+                //html+=("<tr><td colspan=4 align=center>&nbsp;</td></tr>\n");
+
+                html+=("<tr><td> </td><td><b>Min</b></td><td><b>Avg</b></td><td><b>90%</b></td><td><b>Max</b></td></tr>");
+                ChannelID chans[]={
+                    CPAP_Pressure,CPAP_EPAP,CPAP_IPAP,CPAP_PS,CPAP_PTB,
+                    CPAP_MinuteVent,CPAP_AHI, CPAP_RespRate, CPAP_RespEvent,CPAP_FLG,
+                    CPAP_Leak, CPAP_LeakTotal, CPAP_Snore,CPAP_IE,CPAP_Ti,CPAP_Te, CPAP_TgMV,
+                    CPAP_TidalVolume, OXI_Pulse, OXI_SPO2
+                };
+                int numchans=sizeof(chans)/sizeof(ChannelID);
+                int suboffset=0;
+                for (int i=0;i<numchans;i++) {
+
+                    ChannelID code=chans[i];
+                    if (cpap && cpap->channelHasData(code)) {
+                        //if (code==CPAP_LeakTotal) suboffset=PROFILE["IntentionalLeak"].toDouble(); else suboffset=0;
+                        QString tooltip=schema::channel[code].description();
+                        if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")";
+                        html+="<tr><td align=left><a href='graph="+code+"' title='"+tooltip+"'>"+schema::channel[code].label()+"</a>";
+                        html+="</td><td>"+a.sprintf("%.2f",cpap->min(code)-suboffset);
+                        html+="</td><td>"+a.sprintf("%.2f",cpap->wavg(code)-suboffset);
+                        html+="</td><td>"+a.sprintf("%.2f",cpap->p90(code)-suboffset);
+                        html+="</td><td>"+a.sprintf("%.2f",cpap->max(code)-suboffset);
+                        html+="</td><tr>";
+                    }
+                    if (oxi && oxi->channelHasData(code)) {
+                        QString tooltip=schema::channel[code].description();
+                        if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")";
+                        html+="<tr><td align=left><a href='graph="+code+"' title='"+tooltip+"'>"+schema::channel[code].label()+"</a>";
+                        html+="</td><td>"+a.sprintf("%.2f",oxi->min(code));
+                        html+="</td><td>"+a.sprintf("%.2f",oxi->wavg(code));
+                        html+="</td><td>"+a.sprintf("%.2f",oxi->p90(code));
+                        html+="</td><td>"+a.sprintf("%.2f",oxi->max(code));
+                        html+="</td><tr>";
+                    }
+                }
+            }
+        } else {
+            html+="<tr><td colspan='5' align='center'><b><h2>"+tr("BRICK :(")+"</h2></b></td></tr>";
+            html+="<tr><td colspan='5' align='center'><i>Sorry, your machine does not record data.</i></td></tr>\n";
+            html+="<tr><td colspan='5' align='center'><i>Complain to your Equipment Provider!</i></td></tr>\n";
+            html+="<tr><td colspan='5'>&nbsp;</td></tr>\n";
+        }
     } else {
         html+="<tr><td colspan=5 align=center><i>"+tr("No data available")+"</i></td></tr>";
         html+="<tr><td colspan=5>&nbsp;</td></tr>\n";
 
     }
     html+="</table>";
-    html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
+    //html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
 
     if (cpap) {
       //  if ((*profile)["EnableGraphSnapshots"].toBool()) {
@@ -833,9 +848,10 @@ void Daily::Load(QDate date)
                 pixmap.save(&buffer, "PNG");
                 html+="<tr><td colspan=4 align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\"></td></tr>\n";
             } */
+        html+="</table><hr height=2>";
 
         //}
-        html+="</table><hr height=2><table cellpadding=0 cellspacing=0 border=0 width=100%>";
+        html+="<table cellpadding=0 cellspacing=0 border=0 width=100%>";
         QDateTime fd,ld;
         bool corrupted_waveform=false;
         QString tooltip;
@@ -893,7 +909,7 @@ void Daily::Load(QDate date)
     ui->bookmarkTable->setHorizontalHeaderLabels(sl);
     ui->weightSpinBox->setValue(0);
     ui->ouncesSpinBox->setValue(0);
-    ui->ZombieMeter->setValue(50);
+    ui->ZombieMeter->setValue(5);
     ui->BMI->display(0);
     ui->BMI->setVisible(false);
     ui->BMIlabel->setVisible(false);
@@ -1024,7 +1040,7 @@ void Daily::Unload(QDate date)
             journal->settings["BMI"]=bmi;
             journal->SetChanged(true);
         }
-        if ((!journal->settings.contains("ZombieMeter") && (ui->ZombieMeter->value()!=50)) || (journal->settings["ZombieMeter"].toDouble(&ok)!=ui->ZombieMeter->value())) {
+        if ((!journal->settings.contains("ZombieMeter") && (ui->ZombieMeter->value()!=5)) || (journal->settings["ZombieMeter"].toDouble(&ok)!=ui->ZombieMeter->value())) {
             journal->settings["ZombieMeter"]=ui->ZombieMeter->value();
             journal->SetChanged(true);
         }

daily.ui

@@ -248,7 +248,7 @@
         </size>
        </property>
        <property name="currentIndex">
-        <number>3</number>
+        <number>2</number>
        </property>
        <property name="movable">
         <bool>true</bool>
@@ -572,8 +572,14 @@
               </item>
               <item row="1" column="0" colspan="8">
                <widget class="QSlider" name="ZombieMeter">
+                <property name="maximum">
+                 <number>10</number>
+                </property>
+                <property name="pageStep">
+                 <number>5</number>
+                </property>
                 <property name="value">
-                 <number>50</number>
+                 <number>5</number>
                 </property>
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
@@ -582,7 +588,7 @@
                  <enum>QSlider::TicksAbove</enum>
                 </property>
                 <property name="tickInterval">
-                 <number>5</number>
+                 <number>1</number>
                 </property>
                </widget>
               </item>

docs/channels.xml

@@ -91,7 +91,7 @@ One id code per item
   <channel id="0x0804" class="data" scope="!day" name="Height" details="Height" label="Height" unit="cm" color="blue"/>
   <channel id="0x0805" class="data" name="Bookmark" details="Session Bookmark" label="Bookmark" unit="duration" color="orange"/>
   <channel id="0x0806" class="data" name="BMI" details="Body Mass Index" label="BMI" unit="kg/m2" color="orange"/>
-  <channel id="0x0807" class="data" name="ZombieMeter" details="How good you feel." label="Alive" unit="%" color="orange"/>
+  <channel id="0x0807" class="data" name="ZombieMeter" details="How good you feel." label="Alive" unit="0-10" color="orange"/>
   <channel id="0xd000" class="data" scope="!day" unique="true" name="Journal" details="Journal Notes" label="Journal" type="richtext"/>
  </group>
  <group name="PRS1">

mainwindow.cpp

@@ -557,7 +557,21 @@ void MainWindow::on_action_Screenshot_triggered()
 }
 void MainWindow::DelayedScreenshot()
 {
+//#ifdef Q_WS_MAC
+//    CGImageRef windowImage = CGWindowListCreateImage(imageBounds, singleWindowListOptions, windowID, imageOptions);
+//    originalPixmap = new QPixmap(QPixmap::fromMacCGImageRef(windowImage));
+
+
+//    CGImageRef img = CGDisplayCreateImageForRect(displayID, *rect);
+//    CFMutableDataRef imgData = CFDataCreateMutable(0, 0);
+//    CGImageDestinationRef imgDst = CGImageDestinationCreateWithData(imgData, kUTTypeJPEG2000, 1, 0);
+//    CGImageDestinationAddImage(imgDst, img, 0);
+//    CGImageDestinationFinalize(imgDst);
+//    CFRelease(imgDst);
+//    QPixmap pixmap=QPixmap::fromMacCGImageRef(img);
+//#else
     QPixmap pixmap = QPixmap::grabWindow(this->winId());
+//#endif
     QString a=PREF.Get("{home}")+"/Screenshots";
     QDir dir(a);
     if (!dir.exists()){

newprofile.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>607</width>
-    <height>392</height>
+    <height>395</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -24,7 +24,7 @@
        <item>
         <widget class="QStackedWidget" name="stackedWidget">
          <property name="currentIndex">
-          <number>2</number>
+          <number>3</number>
          </property>
          <widget class="QWidget" name="welcomePage">
           <layout class="QVBoxLayout" name="verticalLayout_8">
@@ -591,7 +591,11 @@ p, li { white-space: pre-wrap; }
                </widget>
               </item>
               <item row="1" column="1">
-               <widget class="QDoubleSpinBox" name="untreatedAHIEdit"/>
+               <widget class="QDoubleSpinBox" name="untreatedAHIEdit">
+                <property name="maximum">
+                 <double>999.990000000000009</double>
+                </property>
+               </widget>
               </item>
               <item row="2" column="0">
                <widget class="QLabel" name="label_20">