Replaced gBarChart with SummaryChart, which does lines too

Graphs/gBarChart.cpp

@@ -11,32 +11,129 @@
 #include "gBarChart.h"
 
 extern QLabel * qstatus2;
-gBarChart::gBarChart(ChannelID code,QColor color,Qt::Orientation o)
+SummaryChart::SummaryChart(Profile *p,QString label,GraphType type)
-:Layer(code),m_orientation(o)
+:Layer(EmptyChannel),m_profile(p),m_label(label),m_graphtype(type)
 {
+    QColor color=Qt::black;
     addGLBuf(quads=new GLBuffer(color,20000,GL_QUADS));
+    addGLBuf(lines=new GLBuffer(color,20000,GL_LINES));
     quads->forceAntiAlias(true);
     m_empty=true;
     hl_day=-1;
 }
-gBarChart::~gBarChart()
+SummaryChart::~SummaryChart()
 {
-    //delete Xaxis;
 }
-void gBarChart::SetDay(Day * day)
+void SummaryChart::SetDay(Day * nullday)
 {
-    m_maxx=m_minx=0;
+    if (!m_profile) {
-    m_maxy=m_miny=0;
+        qWarning() << "Forgot to set profile for gBarChart dummy!";
+        m_day=NULL;
+        return;
+    }
+    Day * day=nullday;
+    Layer::SetDay(day);
+
+    m_values.clear();
+    m_miny=9999999;
+    m_maxy=-9999999;
+    m_minx=0;
+    m_maxx=0;
+
+    int dn;
+    EventDataType tmp,total;
+    ChannelID code;
+
+    m_fday=0;
+    qint64 tt;
     m_empty=true;
+
+    SummaryType type;
+    for (QMap<QDate,QVector<Day *> >::iterator d=m_profile->daylist.begin();d!=m_profile->daylist.end();d++) {
+        tt=QDateTime(d.key(),QTime(0,0,0),Qt::UTC).toTime_t();
+        //tt=QDateTime(d.key(),QTime(12,0,0)).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;
+
+
+        total=0;
+        bool fnd=false;
+        for (int j=0;j<m_codes.size();j++) {
+            code=m_codes[j];
+            type=m_type[j];
+            for (int i=0;i<d.value().size();i++) {
+                day=d.value()[i];
+                if (type==ST_HOURS || day->channelExists(code)) { // too many lookups happening here.. stop the crap..
+                    switch(m_type[j]) {
+                        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_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->count(code)/day->hours(); break;
+                        case ST_SPH: tmp=day->sum(code)/day->hours(); break;
+                        case ST_HOURS: tmp=day->hours(); break;
+                    default:    break;
+                    }
+                    //if (tmp>0) {
+                        fnd=true;
+                        total+=tmp;
+                        m_values[dn][j+1]=tmp;
+                        break;
+                   // }
+
+                }
+            }
+        }
+        if (fnd) {
+            if (!m_fday) m_fday=dn;
+            m_values[dn][0]=total;
+            if (total<m_miny) m_miny=total;
+            if (total>m_maxy) m_maxy=total;
+            m_empty=false;
+       }
+    }
+    m_miny=0;
+
+   // m_minx=qint64(QDateTime(m_profile->FirstDay(),QTime(0,0,0),Qt::UTC).toTime_t())*1000L;
+    m_maxx=qint64(QDateTime(m_profile->LastDay().addDays(1),QTime(0,0,0),Qt::UTC).toTime_t())*1000L;
+
 }
 
-void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
+QColor brighten(QColor color)
+{
+    int cr,cg,cb;
+
+    cr=color.red();
+    cg=color.green();
+    cb=color.blue();
+
+    if (cr<64) cr=64;
+    if (cg<64) cg=64;
+    if (cb<64) cb=64;
+
+    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)
 {
     if (!m_visible) return;
-    //if (!m_day) return;
 
     rtop=top;
-    GLBuffer *lines=w.lines();
+    //GLBuffer *lines=w.lines();
     QColor blk=Qt::black;
     lines->add(left, top, left, top+height, blk);
     lines->add(left, top+height, left+width,top+height, blk);
@@ -70,7 +167,7 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
     EventDataType total;
 
     int daynum=0;
-    float h,tmp;
+    EventDataType h,tmp;
 
 
     l_offset=(minx) % 86400000L;
@@ -81,13 +178,57 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
     l_minx=minx;
     l_maxx=maxx+86400000L;
 
+    //QHash<short, EventDataType> lastvalues;
     int total_days=0;
     double total_val=0;
+    qint64 lastQ=0;
+    bool lastdaygood=false;
+    QVector<int> totalcounts;
+    QVector<EventDataType> totalvalues;
+    QVector<EventDataType> lastvalues;
+    QVector<float> lastX;
+    QVector<short> lastY;
+    int numcodes=m_codes.size();
+    totalcounts.resize(numcodes);
+    totalvalues.resize(numcodes);
+    lastvalues.resize(numcodes);
+    lastX.resize(numcodes);
+    lastY.resize(numcodes);
+    int zd=minx/86400000L;
+    zd--;
+    QHash<int,QHash<short,EventDataType> >::iterator d=m_values.find(zd);
+    if (d==m_values.end()) {
+        d=m_values.find(zd--);
+    }
+    lastdaygood=true;
+    for (int i=0;i<numcodes;i++) {
+        totalcounts[i]=0;
+        totalvalues[i]=0;
+        lastvalues[i]=0;
+        lastX[i]=px;
+        if (d!=m_values.end()) {
+            tmp=d.value()[i+1];
+            h=tmp*ymult;
+        } else {
+            lastdaygood=false;
+            h=0;
+        }
+        lastY[i]=top+height-1-h;
+    }
+
+    if (m_graphtype==GT_LINE) {
+//        minx-=86400000L;
+        //px-=barw;
+    }
     for (qint64 Q=minx;Q<=maxx+86400000L;Q+=86400000L) {
-        int zd=Q/86400000L;
+        zd=Q/86400000L;
         QHash<int,QHash<short,EventDataType> >::iterator d=m_values.find(zd);
+        qint64 extra=86400000;
+        if (m_graphtype==GT_LINE) {
+         //   extra*=2;
+            //extra=0;
+        }
         if (Q<minx) continue;
-        if (Q>maxx+86400000) continue;  // break; // out of order if I end up using a hash instead.??
         if (d!=m_values.end()) {
             int x1=px,x2=px+barw;
 
@@ -95,9 +236,8 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
             if (x2>left+width) x2=left+width;
             if (x2<x1) continue;
             ChannelID code;
+
             total=d.value()[0];
-
-
             if (total>0) {
                 total_val+=total;
                 total_days++;
@@ -106,50 +246,54 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
             for (QHash<short,EventDataType>::iterator g=d.value().begin();g!=d.value().end();g++) {
                 short j=g.key();
                 if (!j) continue;
-                QColor col=m_colors[j-1];
+                j--;
-
+                QColor col=m_colors[j];
-                int cr,cg,cb;
-
-                cr=col.red();
-                cg=col.green();
-                cb=col.blue();
-
-                if (cr<64) cr=64;
-                if (cg<64) cg=64;
-                if (cb<64) cb=64;
-
-                cr*=2;
-                cg*=2;
-                cb*=2;
-
-                if (cr>255) cr=255;
-                if (cg>255) cg=255;
-                if (cb>255) cb=255;
-
                 if (zd==hl_day) {
                     col=QColor("gold");
                 }
-                QColor col2=QColor(cr,cg,cb,255);
-                //col2=QColor(220,220,220,255);
 
                 tmp=g.value(); //(g.value()/float(total));
+                totalvalues[j]+=tmp;
                 h=tmp*ymult; //(float(total)*ymult); // height of chunk
-                quads->add(x1,py,col);
+
-                quads->add(x1,py-h,col);
+                if (m_graphtype==GT_BAR) {
-                quads->add(x2,py-h,col2);
+                    QColor col2=brighten(col);
-                quads->add(x2,py,col2);
+
-                if (barw>2) {
+                    quads->add(x1,py,col);
-                    lines->add(x1,py,x1,py-h,blk);
+                    quads->add(x1,py-h,col);
-                    lines->add(x1,py-h,x2,py-h,blk);
+                    quads->add(x2,py-h,col2);
-                    lines->add(x1,py,x2,py,blk);
+                    quads->add(x2,py,col2);
-                    lines->add(x2,py,x2,py-h,blk);
+                    if (barw>2) {
+                        lines->add(x1,py,x1,py-h,blk);
+                        lines->add(x1,py-h,x2,py-h,blk);
+                        lines->add(x1,py,x2,py,blk);
+                        lines->add(x2,py,x2,py-h,blk);
+                    } // if (bar
+                    py-=h;
+                } else if (m_graphtype==GT_LINE) { // if (m_graphtype==GT_BAR
+                    short px2=px+barw;//lastX[j]+ceil(barw);
+                    short py2=top+height-1-h;
+                    if (lastdaygood) {
+                        lines->add(lastX[j],lastY[j],px2,py2,col);
+                    } else {
+                        lines->add(x1,py2,x2,py2,col);
+                    }
+                    lastX[j]=px2;
+                    lastY[j]=py2;
+
+                    //}
                 }
-                py-=h;
+            }  // for(QHash<short
-            }
+            lastdaygood=true;
-        }
+            if (Q>maxx+extra) break;
+        } else lastdaygood=false;
         px+=barw;
         daynum++;
+        lastQ=Q;
     }
+
+    lines->scissor(left,w.flipY(top+height+2),width+1,height+1);
+
     if (total_days>0) {
         float val=total_val/float(total_days);
         QString z=m_label+"="+QString::number(val,'f',2)+" days="+QString::number(total_days,'f',0);
@@ -157,7 +301,7 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
         // val = AHI for selected area.
     }
 }
-bool gBarChart::mouseMoveEvent(QMouseEvent *event)
+bool SummaryChart::mouseMoveEvent(QMouseEvent *event)
 {
     int x=event->x()-l_left;
     int y=event->y()-l_top;
@@ -168,11 +312,13 @@ bool gBarChart::mouseMoveEvent(QMouseEvent *event)
     }
 
     double xx=l_maxx-l_minx;
+
     double xmult=xx/double(l_width+barw);
 
     qint64 mx=ceil(xmult*double(x-offset));
     mx+=l_minx;
     mx=mx+l_offset;//-86400000L;
+   // if (m_graphtype==GT_LINE) mx+=86400000L;
     int zd=mx/86400000L;
     //if (hl_day!=zd)
     {
@@ -209,19 +355,19 @@ bool gBarChart::mouseMoveEvent(QMouseEvent *event)
     return false;
 }
 
-bool gBarChart::mousePressEvent(QMouseEvent * event)
+bool SummaryChart::mousePressEvent(QMouseEvent * event)
 {
     return false;
 }
 
-bool gBarChart::mouseReleaseEvent(QMouseEvent * event)
+bool SummaryChart::mouseReleaseEvent(QMouseEvent * event)
 {
     hl_day=-1;
     graph->timedRedraw(2000);
     return false;
 }
 
-
+/*
 UsageChart::UsageChart(Profile *profile)
     :gBarChart()
 {
@@ -291,67 +437,8 @@ AHIChart::AHIChart(Profile *profile)
     m_profile=profile;
 }
 
-void AHIChart::SetDay(Day * day)
+void AHIChart::SetDay(Day * nullday)
 {
-    if (!m_profile) {
-        qWarning() << "Forgot to set profile for gBarChart dummy!";
-        m_day=NULL;
-        return;
-    }
-    Layer::SetDay(day);
-
-    m_values.clear();
-    m_miny=9999999;
-    m_maxy=-9999999;
-    m_minx=0;
-    m_maxx=0;
-
-    int dn;
-    EventDataType tmp,total;
-    ChannelID code;
-
-    m_fday=0;
-    qint64 tt;
-
-    for (QMap<QDate,QVector<Day *> >::iterator d=m_profile->daylist.begin();d!=m_profile->daylist.end();d++) {
-        tt=QDateTime(d.key(),QTime(0,0,0),Qt::UTC).toTime_t();
-        //tt=QDateTime(d.key(),QTime(12,0,0)).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;
-
-
-        total=0;
-        bool fnd=false;
-        for (int j=0;j<m_codes.size();j++) {
-            code=m_codes[j];
-            for (int i=0;i<d.value().size();i++) {
-                Day *day=d.value()[i];
-                if (day->channelExists(code)) { // too many lookups happening here.. stop the crap..
-                    tmp=day->count(code)/day->hours();
-                    if (tmp>0) {
-                        fnd=true;
-                        total+=tmp;
-                        m_values[dn][j+1]=tmp;
-                        break;
-                    }
-                }
-            }
-        }
-        if (fnd) {
-            if (!m_fday) m_fday=dn;
-            m_values[dn][0]=total;
-            if (total<m_miny) m_miny=total;
-            if (total>m_maxy) m_maxy=total;
-       }
-    }
-    m_miny=0;
-
-   // m_minx=qint64(QDateTime(m_profile->FirstDay(),QTime(0,0,0),Qt::UTC).toTime_t())*1000L;
-    m_maxx=qint64(QDateTime(m_profile->LastDay().addDays(1),QTime(0,0,0),Qt::UTC).toTime_t())*1000L;
-
-    m_empty=m_values.size()==0;
 }
 
 
@@ -427,3 +514,4 @@ void AvgChart::SetDay(Day * day)
     m_empty=m_values.size()==0;
 }
 
+*/

Graphs/gBarChart.h

@@ -11,25 +11,28 @@
 #include "gGraphView.h"
 #include "gXAxis.h"
 
-class gBarChart:public Layer
+enum GraphType { GT_BAR, GT_LINE };
+
+class SummaryChart:public Layer
 {
     public:
-        gBarChart(ChannelID code=EmptyChannel,QColor color=QColor("blue"),Qt::Orientation o=Qt::Horizontal);
+        SummaryChart(Profile *profile, QString label, GraphType type=GT_BAR);
-        virtual ~gBarChart();
+        virtual ~SummaryChart();
 
         void setProfile(Profile *profile) { m_profile=profile; }
         virtual void paint(gGraph & w,int left, int top, int width, int height);
-        virtual void SetDay(Day * day);
+        virtual void SetDay(Day * day=NULL);
         virtual bool isEmpty() { return m_empty; }
-        void addSlice(ChannelID code, QColor color) { m_codes.push_back(code); m_colors.push_back(color); }
+        void addSlice(ChannelID code, QColor color, SummaryType type) { m_codes.push_back(code); m_colors.push_back(color); m_type.push_back(type); }
     protected:
         Qt::Orientation m_orientation;
 
         QVector<QColor> m_colors;
         QVector<ChannelID> m_codes;
+        QVector<SummaryType> m_type;
         QHash<int,QHash<short,EventDataType> > m_values;
         Profile * m_profile;
-        GLBuffer *quads;
+        GLBuffer *quads,*lines;
         bool m_empty;
         int m_fday;
         QString m_label;
@@ -42,12 +45,14 @@ class gBarChart:public Layer
         qint64 l_minx,l_maxx;
         int hl_day;
         gGraph * graph;
+        GraphType m_graphtype;
         virtual bool mouseMoveEvent(QMouseEvent * event);
         virtual bool mousePressEvent(QMouseEvent * event);
         virtual bool mouseReleaseEvent(QMouseEvent * event);
 
 };
 
+/*
 class AHIChart:public gBarChart
 {
 public:
@@ -66,6 +71,6 @@ class AvgChart:public gBarChart
 public:
     AvgChart(Profile *profile);
     virtual void SetDay(Day * day);
-};
+};*/
 
 #endif // GBARCHART_H

SleepLib/loader_plugins/prs1_loader.cpp

@@ -98,9 +98,8 @@ bool isdigit(QChar c)
 int PRS1Loader::Open(QString & path,Profile *profile)
 {
 
-    QString newpath;
+    QString newpath,pseries="P-Series";
-
+    qDebug() << "PRS1Loader::Open path=" << newpath;
-    QString pseries="P-Series";
     if (path.endsWith("/"+pseries)) {
         newpath=path;
     } else {
@@ -113,7 +112,6 @@ int PRS1Loader::Open(QString & path,Profile *profile)
         return 0;
 
 
-    //qDebug() << "PRS1Loader::Open newpath=" << newpath;
     dir.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks);
     dir.setSorting(QDir::Name);
     QFileInfoList flist=dir.entryInfoList();

SleepLib/session.cpp

@@ -416,6 +416,8 @@ void Session::UpdateSummaries()
             //sum(id); // avg calculates this and cnt.
             min(id);
             max(id);
+            cph(id);
+            sph(id);
             avg(id);
             wavg(id);
             p90(id);

SleepLib/session.h

@@ -17,6 +17,8 @@
 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 };
+
 class Session
 {
 public:

overview.cpp

@@ -58,7 +58,8 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     PR=new gGraph(GraphView,"Pressure",default_height,0);
     LK=new gGraph(GraphView,"Leaks",default_height,0);
 
-    uc=new UsageChart(profile);
+    uc=new SummaryChart(profile,"Hours",GT_BAR);
+    uc->addSlice(EmptyChannel,QColor("green"),ST_HOURS);
     UC->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
     gXAxis *gx=new gXAxis();
     gx->setUtcFix(true);
@@ -67,11 +68,11 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     UC->AddLayer(new gXGrid());
 
 
-    bc=new AHIChart(profile);
+    bc=new SummaryChart(profile,"AHI",GT_LINE);
-    bc->addSlice(CPAP_Hypopnea,QColor("blue"));
+    bc->addSlice(CPAP_Hypopnea,QColor("blue"),ST_CPH);
-    bc->addSlice(CPAP_Apnea,QColor("dark green"));
+    bc->addSlice(CPAP_Apnea,QColor("dark green"),ST_CPH);
-    bc->addSlice(CPAP_Obstructive,QColor("#40c0ff"));
+    bc->addSlice(CPAP_Obstructive,QColor("#40c0ff"),ST_CPH);
-    bc->addSlice(CPAP_ClearAirway,QColor("purple"));
+    bc->addSlice(CPAP_ClearAirway,QColor("purple"),ST_CPH);
     AHI->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
     gx=new gXAxis();
     gx->setUtcFix(true);
@@ -80,10 +81,12 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     AHI->AddLayer(new gXGrid());
 
 
-    pr=new AvgChart(profile);
+    pr=new SummaryChart(profile,"cmH2O",GT_LINE);
-    pr->addSlice(CPAP_Pressure,QColor("dark green"));
+
-    //pr->addSlice(CPAP_EPAP,QColor("dark yellow"));
+    pr->addSlice(CPAP_Pressure,QColor("dark green"),ST_WAVG);
-    //pr->addSlice(CPAP_IPAP,QColor("red"));
+    pr->addSlice(CPAP_Pressure,QColor("orange"),ST_AVG);
+    //pr->addSlice(CPAP_Pressure,QColor("red"),ST_MAX);
+
     PR->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
     gx=new gXAxis();
     gx->setUtcFix(true);
@@ -91,8 +94,8 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     PR->AddLayer(pr);
     PR->AddLayer(new gXGrid());
 
-    lk=new AvgChart(profile);
+    lk=new SummaryChart(profile,"Avg Leak",GT_LINE);
-    lk->addSlice(CPAP_Leak,QColor("gold"));
+    lk->addSlice(CPAP_Leak,QColor("dark grey"),ST_WAVG);
     //lk->addSlice(CPAP_Leak,QColor("dark yellow"));
     //pr->addSlice(CPAP_IPAP,QColor("red"));
     LK->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);

overview.h

@@ -52,10 +52,10 @@ private:
 
     //SessionTimes *session_times;
     gGraph *AHI,*UC,*PR,*LK;
-    AHIChart *bc;
+    SummaryChart *bc;
-    UsageChart *uc;
+    SummaryChart *uc;
-    AvgChart *pr;
+    SummaryChart *pr;
-    AvgChart *lk;
+    SummaryChart *lk;
     //,*PRESSURE,*LEAK,*SESSTIMES;
 
     //Layer *prmax,*prmin,*iap,*eap,*pr,*sesstime;