Added Usage Session Summary graph, Preferences cleanup test, YAxis timescale improvements

Graphs/gLineChart.cpp

@@ -170,7 +170,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
 
 
             square_plot=m_square_plot;
-            if (accel || num_points>5000) { // Don't square plot if too many points or waveform
+            if (accel || num_points>20000) { // Don't square plot if too many points or waveform
                 square_plot=false;
             }
 

Graphs/gSummaryChart.cpp

@@ -23,6 +23,14 @@ SummaryChart::SummaryChart(QString label,GraphType type)
     m_empty=true;
     hl_day=-1;
     m_machinetype=MT_CPAP;
+
+    QDateTime d=QDateTime::currentDateTime();
+    QTime t1=d.time();
+    QTime t2=d.toUTC().time();
+
+    tz_offset=t2.secsTo(t1);
+    tz_hours=tz_offset/3600.0;
+
 }
 SummaryChart::~SummaryChart()
 {
@@ -33,24 +41,25 @@ void SummaryChart::SetDay(Day * nullday)
     Layer::SetDay(day);
 
     m_values.clear();
+    m_times.clear();
     m_days.clear();
-    m_miny=9999999;
+    m_hours.clear();
-    m_maxy=-9999999;
+    m_miny=999999999;
+    m_maxy=-999999999;
     m_minx=0;
     m_maxx=0;
 
     int dn;
-    EventDataType tmp,total;
+    EventDataType tmp,tmp2,total;
     ChannelID code;
 
     m_fday=0;
-    qint64 tt;
+    qint64 tt,zt;
     m_empty=true;
     int suboffset;
     SummaryType type;
     for (QMap<QDate,QVector<Day *> >::iterator d=PROFILE.daylist.begin();d!=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;
@@ -58,60 +67,89 @@ void SummaryChart::SetDay(Day * nullday)
 
         total=0;
         bool fnd=false;
-        for (int j=0;j<m_codes.size();j++) {
+        if (m_graphtype==GT_SESSIONS) {
-            code=m_codes[j];
+            for (int i=0;i<d.value().size();i++) { // for each day
-            if (code==CPAP_Leak) suboffset=PROFILE["IntentionalLeak"].toDouble(); else suboffset=0;
-            type=m_type[j];
-            for (int i=0;i<d.value().size();i++) {
                 day=d.value()[i];
-                if (day->machine_type()!=m_machinetype) continue;
+                if  (!day) continue;
-                if (type==ST_HOURS || type==ST_SESSIONS || day->channelHasData(code) || day->settingExists(code)) { // too many lookups happening here.. stop the crap..
+                for (int s=0;s<day->size();s++) {
-                    m_days[dn]=day;
+                    tmp=(*day)[s]->hours();
-                    switch(m_type[j]) {
+                    m_values[dn][s]=tmp;
-                        case ST_AVG: tmp=day->avg(code); break;
+                    total+=tmp;
-                        case ST_SUM: tmp=day->sum(code); break;
+                    zt=(*day)[s]->first()/1000;
-                        case ST_WAVG: tmp=day->wavg(code); break;
+                    zt+=tz_offset;
-                        case ST_90P: tmp=day->p90(code); break;
+                    zt %= 86400;
-                        case ST_MIN: tmp=day->min(code); break;
+                    tmp2=zt/3600.0;
-                        case ST_MAX: tmp=day->max(code); break;
+                    if (tmp2+tmp<16) {
-                        case ST_CNT: tmp=day->count(code); break;
+                        m_times[dn][s]=(tmp2+12);
-                        case ST_CPH: tmp=day->cph(code); break;
+                    } else {
-                        case ST_SPH: tmp=day->sph(code); break;
+                        m_times[dn][s]=(tmp2)-12;
-                        case ST_HOURS: tmp=day->hours(); break;
-                        case ST_SESSIONS: tmp=day->size(); break;
-                        case ST_SETMIN: tmp=day->settings_min(code); break;
-                        case ST_SETMAX: tmp=day->settings_max(code); break;
-                        case ST_SETAVG: tmp=day->settings_avg(code); break;
-                        case ST_SETWAVG: tmp=day->settings_wavg(code); break;
-                        case ST_SETSUM: tmp=day->settings_sum(code); break;
-                    default:    break;
                     }
-                    if (suboffset>0) {
-                        tmp-=suboffset;
-                        if (tmp<0) tmp=0;
-                    }
-                    //if (tmp>0) {
-                        fnd=true;
-                        total+=tmp;
-                        m_values[dn][j+1]=tmp;
-                        if (tmp<m_miny) m_miny=tmp;
-                        if (tmp>m_maxy) m_maxy=tmp;
-                        break;
-                   // }
 
+                    if (tmp2 < m_miny) m_miny=tmp2;
+                    if (tmp2+tmp > m_maxy) m_maxy=tmp2+tmp;
+                }
+                if (total>0) {
+                    m_days[dn]=day;
+                    m_hours[dn]=total;
+                    m_empty=false;
                 }
             }
-        }
+        } else {
-        if (fnd) {
+            for (int j=0;j<m_codes.size();j++) { // for each code slice
-            if (!m_fday) m_fday=dn;
+                code=m_codes[j];
-            m_values[dn][0]=total;
+                if (code==CPAP_Leak) suboffset=PROFILE["IntentionalLeak"].toDouble(); else suboffset=0;
-            m_hours[dn]=day->hours();
+                type=m_type[j];
-            if (m_graphtype==GT_BAR) {
+                for (int i=0;i<d.value().size();i++) { // for each day
-                if (total<m_miny) m_miny=total;
+                    day=d.value()[i];
-                if (total>m_maxy) m_maxy=total;
+                    if (day->machine_type()!=m_machinetype) continue;
+                    if (type==ST_HOURS || type==ST_SESSIONS || day->channelHasData(code) || day->settingExists(code)) { // too many lookups happening here.. stop the crap..
+                        m_days[dn]=day;
+                        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->cph(code); break;
+                            case ST_SPH: tmp=day->sph(code); break;
+                            case ST_HOURS: tmp=day->hours(); break;
+                            case ST_SESSIONS: tmp=day->size(); break;
+                            case ST_SETMIN: tmp=day->settings_min(code); break;
+                            case ST_SETMAX: tmp=day->settings_max(code); break;
+                            case ST_SETAVG: tmp=day->settings_avg(code); break;
+                            case ST_SETWAVG: tmp=day->settings_wavg(code); break;
+                            case ST_SETSUM: tmp=day->settings_sum(code); break;
+                        default:    break;
+                        }
+                        if (suboffset>0) {
+                            tmp-=suboffset;
+                            if (tmp<0) tmp=0;
+                        }
+                        //if (tmp>0) {
+                            fnd=true;
+                            total+=tmp;
+                            m_values[dn][j+1]=tmp;
+                            if (tmp<m_miny) m_miny=tmp;
+                            if (tmp>m_maxy) m_maxy=tmp;
+                            break;
+                       // }
+
+                    }
+                }
             }
-            m_empty=false;
+            if (fnd) {
-       } else m_hours[dn]=0;
+                if (!m_fday) m_fday=dn;
+                m_values[dn][0]=total;
+                m_hours[dn]=day->hours();
+                if (m_graphtype==GT_BAR) {
+                    if (total<m_miny) m_miny=total;
+                    if (total>m_maxy) m_maxy=total;
+                }
+                m_empty=false;
+           } else m_hours[dn]=0;
+        }
     }
     if (m_graphtype==GT_BAR) {
         m_miny=0;
@@ -187,7 +225,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
     EventDataType total;
 
     int daynum=0;
-    EventDataType h,tmp;
+    EventDataType h,tmp,tmp2;
 
 
     l_offset=(minx) % 86400000L;
@@ -263,39 +301,21 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
             if (x2<x1) continue;
             ChannelID code;
 
-            total=d.value()[0];
+            if (m_graphtype==GT_SESSIONS) {
-            //if (total>0) {
+                int j;
-            if (day) {
+                QHash<int,QHash<short,EventDataType> >::iterator times=m_times.find(zd);
-                total_val+=total;
-                total_days++;
-            }
-            //}
-            py=top+height;
-            for (QHash<short,EventDataType>::iterator g=d.value().begin();g!=d.value().end();g++) {
-                short j=g.key();
-                if (!j) continue;
-                j--;
-                QColor col=m_colors[j];
-                if (zd==hl_day) {
-                    col=QColor("gold");
-                }
 
-                tmp=g.value();
+                for (j=0;j<d.value().size();j++) {
-                //if (!tmp) continue;
+                    QColor col=m_colors[0];
-                if (m_type[j]==ST_MAX) {
+                    if (zd==hl_day) {
-                    if (tmp>totalvalues[j]) totalvalues[j]=tmp;
+                        col=QColor("gold");
-                } else if (m_type[j]==ST_MIN) {
+                    }
-                    if (tmp<totalvalues[j]) totalvalues[j]=tmp;
+                    tmp2=times.value()[j];
-                } else {
+                    py=top+height-(tmp2*ymult);
-                    totalvalues[j]+=tmp*hours;
-                }
-                //if (tmp) {
-                    totalcounts[j]+=hours;
-                //}
-                tmp-=miny;
-                h=tmp*ymult; // height in pixels
 
-                if (m_graphtype==GT_BAR) {
+                    tmp=d.value()[j]; // length
+                    //tmp-=miny;
+                    h=tmp*ymult;
                     QColor col2=brighten(col);
 
                     quads->add(x1,py,x1,py-h,col);
@@ -306,24 +326,79 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
                         outlines->add(x1,py,x2,py,blk);
                         outlines->add(x2,py,x2,py-h,blk);
                     } // if (bar
-                    py-=h;
+                    //py-=h;
-                } else if (m_graphtype==GT_LINE) { // if (m_graphtype==GT_BAR
+                    totalvalues[0]+=tmp;
-                    col.setAlpha(128);
-                    short px2=px+barw;
-                    short py2=top+height-1-h;
-                    py2+=j;
-                    if (lastdaygood) {
-                        lines->add(lastX[j],lastY[j],px,py2,m_colors[j]);
-                        lines->add(px,py2,px2,py2,col);
-                    } else {
-                        lines->add(x1,py2,x2,py2,col);
-                    }
-                    lastX[j]=px2;
-                    lastY[j]=py2;
-
-                    //}
                 }
-            }  // for(QHash<short
+                totalcounts[0]++;
+                totalvalues[1]+=j;
+                totalcounts[1]++;
+                total_val+=hours;
+                total_days++;
+            } else {
+                total=d.value()[0];
+                //if (total>0) {
+                if (day) {
+                    total_val+=total;
+                    total_days++;
+                }
+                py=top+height;
+
+                //}
+                for (QHash<short,EventDataType>::iterator g=d.value().begin();g!=d.value().end();g++) {
+                    short j=g.key();
+                    if (!j) continue;
+                    j--;
+
+                    QColor col=m_colors[j];
+                    if (zd==hl_day) {
+                        col=QColor("gold");
+                    }
+
+                    tmp=g.value();
+                    //if (!tmp) continue;
+                    if (m_type[j]==ST_MAX) {
+                        if (tmp>totalvalues[j]) totalvalues[j]=tmp;
+                    } else if (m_type[j]==ST_MIN) {
+                        if (tmp<totalvalues[j]) totalvalues[j]=tmp;
+                    } else {
+                        totalvalues[j]+=tmp*hours;
+                    }
+                    //if (tmp) {
+                        totalcounts[j]+=hours;
+                    //}
+                    tmp-=miny;
+                    h=tmp*ymult; // height in pixels
+
+                    if (m_graphtype==GT_BAR) {
+                        QColor col2=brighten(col);
+
+                        quads->add(x1,py,x1,py-h,col);
+                        quads->add(x2,py-h,x2,py,col2);
+                        if (barw>2) {
+                            outlines->add(x1,py,x1,py-h,blk);
+                            outlines->add(x1,py-h,x2,py-h,blk);
+                            outlines->add(x1,py,x2,py,blk);
+                            outlines->add(x2,py,x2,py-h,blk);
+                        } // if (bar
+                        py-=h;
+                    } else if (m_graphtype==GT_LINE) { // if (m_graphtype==GT_BAR
+                        col.setAlpha(128);
+                        short px2=px+barw;
+                        short py2=top+height-1-h;
+                        py2+=j;
+                        if (lastdaygood) {
+                            lines->add(lastX[j],lastY[j],px,py2,m_colors[j]);
+                            lines->add(px,py2,px2,py2,col);
+                        } else {
+                            lines->add(x1,py2,x2,py2,col);
+                        }
+                        lastX[j]=px2;
+                        lastY[j]=py2;
+
+                        //}
+                    }
+                }  // for(QHash<short
+            }
             lastdaygood=true;
             if (Q>maxx+extra) break;
         } else lastdaygood=false;
@@ -407,6 +482,31 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
     w.renderText(a,left,top-3);
 }
 
+QString formatTime(EventDataType v, bool show_seconds=false, bool duration=false,bool show_12hr=false)
+{
+    int h=int(v+12);
+
+    if (!duration) {
+        h%=24;
+    } else show_12hr=false;
+
+    int m=int(v*60) % 60;
+    int s=int(v*3600) % 60;
+
+    char pm[3]={"am"};
+
+    if (show_12hr) {
+        h>=12 ? pm[0]='p' : pm[0]='a'; // yes, inverted..
+        h %= 12;
+    } else {
+        pm[0]=0;
+    }
+    if (show_seconds)
+        return QString().sprintf("%i:%02i:%02i%s",h,m,s,pm);
+    else
+        return QString().sprintf("%i:%02i%s",h,m,pm);
+}
+
 bool SummaryChart::mouseMoveEvent(QMouseEvent *event)
 {
     int x=event->x()-l_left;
@@ -452,7 +552,31 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event)
             // Day * day=m_days[hl_day];
             //EventDataType val;
             QString val;
-            if (m_graphtype==GT_BAR) {
+            if (m_graphtype==GT_SESSIONS) {
+                if (m_type[0]==ST_HOURS) {
+
+                    int t=day->hours()*3600.0;
+                    int h=t/3600;
+                    int m=(t / 60) % 60;
+                    //int s=t % 60;
+                    val.sprintf("%02i:%02i",h,m);
+                } else
+                    val=QString::number(d.value()[0],'f',2);
+                z+="\r\n"+m_label+"="+val;
+
+                if (m_type[1]==ST_SESSIONS){
+                    z+=" (Sess="+QString::number(day->size(),'f',0)+")";
+                }
+
+                EventDataType v=m_times[zd][0];
+                int lastt=m_times[zd].size()-1;
+                if (lastt<0) lastt=0;
+                z+="\r\nBedtime="+formatTime(v,false,false,true);
+                v=m_times[zd][lastt]+m_values[zd][lastt];
+                z+="\r\nWaketime="+formatTime(v,false,false,true);
+
+            } else
+            if (m_graphtype==GT_BAR){
                 if (m_type[0]==ST_HOURS) {
                     int t=d.value()[0]*3600.0;
                     int h=t/3600;

Graphs/gSummaryChart.h

@@ -11,7 +11,7 @@
 #include "gGraphView.h"
 #include "gXAxis.h"
 
-enum GraphType { GT_BAR, GT_LINE };
+enum GraphType { GT_BAR, GT_LINE, GT_SESSIONS };
 
 class SummaryChart:public Layer
 {
@@ -35,6 +35,7 @@ class SummaryChart:public Layer
         QVector<ChannelID> m_codes;
         QVector<SummaryType> m_type;
         QHash<int,QHash<short,EventDataType> > m_values;
+        QHash<int,QHash<short,EventDataType> > m_times;
         QHash<int,EventDataType> m_hours;
         QHash<int,Day *> m_days;
 
@@ -53,6 +54,8 @@ class SummaryChart:public Layer
         gGraph * graph;
         GraphType m_graphtype;
         MachineType m_machinetype;
+        int tz_offset;
+        float tz_hours;
 
         virtual bool keyPressEvent(QKeyEvent * event);
         virtual bool mouseMoveEvent(QMouseEvent * event);

Graphs/gYAxis.cpp

@@ -48,7 +48,7 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
     GetTextExtent(fd,x,y);
 
     double max_yticks=round(height / (y+15.0)); // plus spacing between lines
-    double yt=1/max_yticks;
+    //double yt=1/max_yticks;
 
     double mxy=MAX(fabs(maxy),fabs(miny));
     double mny=miny;
@@ -56,6 +56,22 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height)
         mny=-mxy;
     }
     double rxy=mxy-mny;
+
+    int myt;
+    bool fnd=false;
+    for (myt=max_yticks;myt>=1;myt--) {
+        float v=rxy/float(myt);
+        if (float(v)==int(v)) {
+            fnd=true;
+            break;
+        }
+    }
+    if (fnd) max_yticks=myt;
+    else {
+        max_yticks=2;
+    }
+    double yt=1/max_yticks;
+
     double ymult=height/rxy;
 
     double min_ytick=rxy*yt;
@@ -116,6 +132,8 @@ gYAxis::~gYAxis()
 }
 void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
 {
+    if (height<0) return;
+
     int x,y;
     int labelW=0;
 
@@ -130,16 +148,10 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
 
     EventDataType dy=maxy-miny;
 
-    //if ((w.max_x-w.min_x)==0)
+    static QString fd="0";
-    //    return;
-
-    if (height<0) return;
-
-    QString fd="0";
     GetTextExtent(fd,x,y);
 
-    double max_yticks=round(height / (y+15.0)); // plus spacing between lines
+    double max_yticks=round(height / (y+7.0)); // plus spacing between lines
-    double yt=1/max_yticks;
 
     double mxy=MAX(fabs(maxy),fabs(miny));
     double mny=miny;
@@ -148,10 +160,30 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
     }
 
     double rxy=mxy-mny;
+
+    int myt;
+    bool fnd=false;
+    for (myt=max_yticks;myt>2;myt--) {
+        float v=rxy/float(myt);
+        if (v==int(v)) {
+            fnd=true;
+            break;
+        }
+    }
+    if (fnd) max_yticks=myt;
+    double yt=1/max_yticks;
+
     double ymult=height/rxy;
 
     double min_ytick=rxy*yt;
 
+
+    //if (dy>5) {
+    //    min_ytick=round(min_ytick);
+    //} else {
+
+    //}
+
     float ty,h;
 
     if (min_ytick<=0) {
@@ -163,18 +195,20 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
     }
     lines=w.backlines();
 
+
     for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
         ty=(i - miny) * ymult;
         if (dy<5) {
-            fd=QString().sprintf("%.2f",i*m_yaxis_scale);
+            fd=Format(i*m_yaxis_scale,2);
         } else {
-            fd=QString().sprintf("%.1f",i*m_yaxis_scale);
+            fd=Format(i*m_yaxis_scale,1);
         }
 
         GetTextExtent(fd,x,y); // performance bottleneck..
 
         if (x>labelW) labelW=x;
         h=top+height-ty;
+        if (h<top) continue;
         w.renderText(fd,left+width-8-x,(h+(y/2.0)),0,m_text_color);
 
         lines->add(left+width-4,h,left+width,h,m_line_color);
@@ -196,6 +230,9 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
         }
     }
 }
+const QString gYAxis::Format(EventDataType v, int dp) {
+   return QString::number(v,'f',dp);
+}
 
 bool gYAxis::mouseMoveEvent(QMouseEvent * event)
 {
@@ -205,3 +242,31 @@ bool gYAxis::mouseMoveEvent(QMouseEvent * event)
     //qDebug() << "Hover at " << x << y;
     return false;
 }
+
+gYAxisTime::gYAxisTime(QColor col):
+    gYAxis("",col)
+{
+    show_12hr=true;
+}
+
+gYAxisTime::~gYAxisTime()
+{
+}
+
+const QString gYAxisTime::Format(EventDataType v, int dp)
+{
+    int h=int(v+12) % 24;
+    int m=int(v*60) % 60;
+    int s=int(v*3600) % 60;
+
+    char pm[3]={"am"};
+
+    if (show_12hr) {
+        h>=12 ? pm[0]='p' : pm[0]='a'; // yes, inverted..
+        h %= 12;
+    } else {
+        pm[0]=0;
+    }
+    if (dp>2) return QString().sprintf("%02i:%02i:%02i%s",h,m,s,pm);
+    return QString().sprintf("%i:%02i%s",h,m,pm);
+}

Graphs/gYAxis.h

@@ -56,7 +56,7 @@ class gYAxis:public Layer
         void SetShowMajorTicks(bool b) { m_show_major_ticks=b; }
         bool ShowMinorTicks() { return m_show_minor_ticks; }
         bool ShowMajorTicks() { return m_show_major_ticks; }
-        virtual const QString Format(double v) { return QString().sprintf("%.1f",v); }
+        virtual const QString Format(EventDataType v, int dp);
         static const int Margin=50; // Left margin space
 
         void SetScale(float f) { m_yaxis_scale=f; } // Scale yaxis ticker values (only what's displayed)
@@ -76,4 +76,14 @@ class gYAxis:public Layer
 
 };
 
+class gYAxisTime:public gYAxis
+{
+public:
+    gYAxisTime(QColor col=Qt::black);
+    virtual ~gYAxisTime();
+protected:
+    virtual const QString Format(EventDataType v, int dp);
+    bool show_12hr;
+};
+
 #endif // GYAXIS_H

SleepLib/calcs.cpp

@@ -267,12 +267,14 @@ int CalcAHIGraph::calculate(Session *session)
 
     EventDataType ahi;
 
-    for (qint64 ti=first;ti<=last;ti+=winsize) {
+    qint64 ti;
+    for (ti=first;ti<=last;ti+=winsize) {
         f=ti-3600000L;
         ahi=calcAHI(session,f,ti);
         AHI->AddEvent(ti,ahi);
         ti+=winsize;
     }
+    AHI->AddEvent(ti,ahi);
 
     return AHI->count();
 }
@@ -375,7 +377,7 @@ int calcSPO2Drop(Session *session)
     EventDataType lv=0;
     int li=0;
 
-    const int ringsize=10;
+    const unsigned ringsize=10;
     EventDataType ring[ringsize];
     int rp=0;
 
@@ -386,14 +388,15 @@ int calcSPO2Drop(Session *session)
             val=el.data(i);
             if (!val) continue;
             ring[rp]=val;
-            rp=++rp % ringsize;
+            rp++;
+            rp=rp % ringsize;
             if (i<ringsize)  {
-                for (int j=i;j<ringsize;j++) {
+                for (unsigned j=i;j<ringsize;j++) {
                     ring[j]=val;
                 }
             }
             tmp=0;
-            for (int j=0;j<ringsize;j++) {
+            for (unsigned j=0;j<ringsize;j++) {
                 tmp+=ring[j];
             }
             tmp/=EventDataType(ringsize);

SleepLib/loader_plugins/prs1_loader.cpp

@@ -148,7 +148,6 @@ bool isdigit(QChar c)
 }
 int PRS1Loader::Open(QString & path,Profile *profile)
 {
-
     QString newpath,pseries="P-Series";
     qDebug() << "PRS1Loader::Open path=" << newpath;
     if (path.endsWith(QDir::separator()+pseries)) {

SleepLib/loader_plugins/resmed_loader.cpp

@@ -250,7 +250,7 @@ int ResmedLoader::Open(QString & path,Profile *profile)
 
     QString dirtag="DATALOG";
     if (path.endsWith(QDir::separator()+dirtag)) {
-        return 0; // id10t user..
+        return 0;
         //newpath=path;
     } else {
         newpath=path+QDir::separator()+dirtag;

SleepLib/preferences.cpp

@@ -61,6 +61,34 @@ const QString & GetAppRoot()
     return HomeAppRoot;
 }
 
+Preference::Preference(Preferences * pref,QString code, PrefType type, QString label, QString tooltip, QVariant default_value) :
+    m_pref(pref), m_code(code), m_type(type), m_label(label),m_tooltip(tooltip), m_defaultValue(default_value)
+{
+}
+void Preference::setValue(QVariant v)
+{
+    if (!m_pref) {
+        qDebug() << "Bad Preferences object";
+        return;
+    }
+    if (m_pref)
+        (*m_pref)[m_code]=v;
+}
+QVariant & Preference::value() {
+    if (!m_pref) {
+        qDebug() << "Bad Preferences object";
+        return m_defaultValue;
+    }
+    QHash<QString,QVariant>::iterator i=m_pref->find(m_code);
+    if (i==m_pref->end()) {
+        (*m_pref)[m_code]=m_defaultValue;
+        return (*m_pref)[m_code];
+    }
+
+    return i.value();
+}
+
+
 Preferences::Preferences()
 {
     p_name="Preferences";

SleepLib/preferences.h

@@ -26,7 +26,7 @@ extern const QString & GetAppRoot(); //returns app root path plus trailing path
 inline QString PrefMacro(QString s)
 {
     return "{"+s+"}";
-};
+}
 
 const QString & getUserName();
 
@@ -83,7 +83,12 @@ public:
 
     void SetComment(const QString & str) {
         p_comment=str;
-    };
+    }
+
+    inline QHash<QString,QVariant>::iterator find(QString key) { return p_preferences.find(key); }
+    inline QHash<QString,QVariant>::iterator end() { return p_preferences.end(); }
+    inline QHash<QString,QVariant>::iterator begin() { return p_preferences.begin(); }
+
     //int  GetCode(QString name); // For registering/looking up new preference code.
 
     QHash<QString,QVariant> p_preferences;
@@ -95,6 +100,43 @@ protected:
     QString p_path;
 };
 
+enum PrefType { PT_Checkbox, PT_Integer, PT_Number, PT_Date, PT_Time, PT_DateTime, PT_LineEdit, PT_TextEdit, PT_Dropdown };
+class Preference
+{
+public:
+    Preference() {
+        m_pref=NULL;
+    }
+    Preference(const Preference & copy) {
+        m_pref=copy.m_pref;
+        m_code=copy.m_code;
+        m_type=copy.m_type;
+        m_label=copy.m_label;
+        m_tooltip=copy.m_tooltip;
+        m_defaultValue=copy.m_defaultValue;
+    }
+    Preference(Preferences * pref, QString code, PrefType type, QString label, QString tooltip, QVariant default_value);
+    ~Preference() {}
+
+    QString code() { return m_code; }
+
+    void setValue(QVariant v);
+    QVariant & value();
+
+    PrefType type() { return m_type; }
+    QString label() { return m_label; }
+    QString tooltip() { return m_tooltip; }
+    QVariant defaultValue() { return m_defaultValue; }
+protected:
+    Preferences * m_pref;
+    QString m_code;
+    PrefType m_type;
+    QString m_label;
+    QString m_tooltip;
+    QVariant m_defaultValue;
+};
+
+Q_DECLARE_METATYPE(Preference)
 
 extern Preferences PREF;
 extern Preferences LAYOUT;

SleepLib/profiles.cpp

@@ -241,6 +241,9 @@ int Profile::Import(QString path)
 {
     int c=0;
     qDebug() << "Importing " << path;
+    path=path.replace("\\","/");
+    if (path.endsWith("/")) path.chop(1);
+
     QVector<MachineLoader *>loaders=GetLoaders();
     for (QVector<MachineLoader *>::iterator i=loaders.begin(); i!=loaders.end(); i++) {
         if (c+=(*i)->Open(path,this)) break;

SleepLib/schema.cpp

@@ -219,7 +219,7 @@ bool ChannelList::Load(QString filename)
             chan=new Channel(id,type,scope,name,details,label,unit,datatype,color,linkid);
             channels[id]=chan;
             names[name]=chan;
-            qDebug() << "Channel" << id << name << label;
+            //qDebug() << "Channel" << id << name << label;
             groups[group][name]=chan;
             if (linkid>0) {
                 if (channels.contains(linkid)) {

daily.cpp

@@ -89,11 +89,13 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
     TE=new gGraph(GraphView,"Te",default_height);
     TI=new gGraph(GraphView,"Ti",default_height);
     TgMV=new gGraph(GraphView,"TgMV",default_height);
-    INTPULSE=new gGraph(GraphView,"R-Pulse",default_height,1);
+    INTPULSE=new gGraph(GraphView,"R-Pulse",default_height);
-    INTSPO2=new gGraph(GraphView,"R-SPO2",default_height,1);
+    INTSPO2=new gGraph(GraphView,"R-SPO2",default_height);
-    PULSE=new gGraph(GraphView,"Pulse",default_height,1);
+
-    SPO2=new gGraph(GraphView,"SPO2",default_height,1);
+    int oxigrp=PROFILE.ExistsAndTrue("SyncOximetry") ? 0 : 1;
-    PLETHY=new gGraph(GraphView,"Plethy",default_height,1);
+    PULSE=new gGraph(GraphView,"Pulse",default_height,oxigrp);
+    SPO2=new gGraph(GraphView,"SpO2",default_height,oxigrp);
+    PLETHY=new gGraph(GraphView,"Plethy",default_height,oxigrp);
 
     // Event Pie Chart (for snapshot purposes)
     // TODO: Convert snapGV to generic for snapshotting multiple graphs (like reports does)
@@ -186,8 +188,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
     PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IPAP,Qt::yellow,square)));
     PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IPAPHi,Qt::red,square)));
 
-    AHI->AddLayer(AddCPAP(new gLineChart(CPAP_AHI,QColor("light green"),square)));
+    //AHI->AddLayer(AddCPAP(new gLineChart(CPAP_AHI,QColor("light green"),square)));
-    AHI->AddLayer(AddCPAP(new AHIChart(QColor("dark green"))));
+    AHI->AddLayer(AddCPAP(new AHIChart(QColor("#37a24b"))));
     LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak,Qt::darkYellow,square)));
     LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_MaxLeak,Qt::darkRed,square)));
     SNORE->AddLayer(AddCPAP(new gLineChart(CPAP_Snore,Qt::darkGray,true)));

main.cpp

@@ -99,6 +99,7 @@ int main(int argc, char *argv[])
     ResmedLoader::Register();
     IntellipapLoader::Register();
     Profiles::Scan();
+    qRegisterMetaType<Preference>("Preference");
     PREF["AppName"]="SleepyHead";
     bool skip_login=(PREF.ExistsAndTrue("SkipLoginScreen"));
     if (force_login_screen) skip_login=false;

overview.cpp

@@ -18,6 +18,7 @@
 #include "Graphs/gXAxis.h"
 #include "Graphs/gLineChart.h"
 #include "Graphs/gYAxis.h"
+#include "Graphs/gSessionTime.h"
 
 Overview::Overview(QWidget *parent,gGraphView * shared) :
     QWidget(parent),
@@ -82,6 +83,14 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     // The following code (to the closing marker) is crap --->
     AHI=createGraph("AHI");
     UC=createGraph("Usage");
+
+    US=new gGraph(GraphView,"Session Usage",default_height,0);
+    US->AddLayer(new gYAxisTime(),LayerLeft,gYAxis::Margin);
+    gXAxis *x=new gXAxis();
+    x->setUtcFix(true);
+    US->AddLayer(x,LayerBottom,0,gXAxis::Margin);
+    US->AddLayer(new gXGrid());
+
     PR=createGraph("Pressure");
     SET=createGraph("Settings");
     LK=createGraph("Leaks");
@@ -93,6 +102,11 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     uc->addSlice("",QColor("green"),ST_HOURS);
     UC->AddLayer(uc);
 
+    us=new SummaryChart("Hours",GT_SESSIONS);
+    us->addSlice("",QColor("#c0c0ff"),ST_HOURS);
+    us->addSlice("",QColor("blue"),ST_SESSIONS);
+    US->AddLayer(us);
+
     ses=new SummaryChart("Sessions",GT_LINE);
     ses->addSlice("",QColor("blue"),ST_SESSIONS);
     SES->AddLayer(ses);

overview.h

@@ -36,8 +36,8 @@ public:
     gGraph * createGraph(QString name);
 
 
-    gGraph *AHI,*UC,*PR,*LK,*NPB,*SET,*SES,*RR;
+    gGraph *AHI,*UC, *US, *PR,*LK,*NPB,*SET,*SES,*RR;
-    SummaryChart *bc,*uc,*pr,*lk,*npb,*set,*ses,*rr;
+    SummaryChart *bc,*uc, *us, *pr,*lk,*npb,*set,*ses,*rr;
     QVector<SummaryChart *> OverviewCharts;
 
 public slots:

preferencesdialog.cpp

@@ -19,12 +19,44 @@ extern QFont * mediumfont;
 extern QFont * bigfont;
 extern MainWindow * mainwin;
 
+MaskProfile masks[]={
+    {"Unspecified",{{4,25},{8,25},{12,25},{16,25},{20,25}}},
+    {"Nasal Pillows",{{4,20},{8,29},{12,37},{16,43},{20,49}}},
+    {"Hybrid F/F Mask",{{4,20},{8,29},{12,37},{16,43},{20,49}}},
+    {"Nasal Interface",{{4,20},{8,29},{12,37},{16,43},{20,49}}},
+    {"Full-Face Mask",{{4,20},{8,29},{12,37},{16,43},{20,49}}},
+};
+const int num_masks=sizeof(masks)/sizeof(MaskProfile);
+
+void PreferencesDialog::resizeEvent(QResizeEvent *e)
+{
+}
+
+
 PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
     QDialog(parent),
     ui(new Ui::PreferencesDialog),
     profile(_profile)
 {
     ui->setupUi(this);
+    ui->leakProfile->setRowCount(5);
+    ui->leakProfile->setColumnCount(2);
+    ui->leakProfile->horizontalHeader()->setStretchLastSection(true);
+    ui->leakProfile->setColumnWidth(0,100);
+    ui->maskTypeCombo->clear();
+
+    QString masktype="Nasal Pillows";
+    //masktype=PROFILE["MaskType"].toString();
+    for (int i=0;i<num_masks;i++) {
+        ui->maskTypeCombo->addItem(masks[i].name);
+
+        if (masktype==masks[i].name) {
+            ui->maskTypeCombo->setCurrentIndex(i);
+            on_maskTypeCombo_activated(i);
+        }
+    }
+
+    //ui->leakProfile->setColumnWidth(1,ui->leakProfile->width()/2);
 
     {
         QString filename=PROFILE.Get("{DataFolder}/ImportLocations.txt");
@@ -49,9 +81,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
 
     Q_ASSERT(profile!=NULL);
     ui->tabWidget->setCurrentIndex(0);
-    int i=ui->unitCombo->findText((*profile)["UnitSystem"].toString());
-    if (i<0) i=0;
-    ui->unitCombo->setCurrentIndex(i);
 
     //i=ui->timeZoneCombo->findText((*profile)["TimeZone"].toString());
     //ui->timeZoneCombo->setCurrentIndex(i);
@@ -81,39 +110,59 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
         ui->combineLCD->display(val);
     } else ui->combineLCD->display(tr("OFF"));
 
-
     val=(*profile)["IgnoreShorterSessions"].toInt();
     ui->IgnoreSlider->setValue(val);
 
     ui->applicationFont->setCurrentFont(QApplication::font());
-    ui->applicationFont->setFont(QApplication::font());
+    //ui->applicationFont->setFont(QApplication::font());
     ui->applicationFontSize->setValue(QApplication::font().pointSize());
     ui->applicationFontBold->setChecked(QApplication::font().weight()==QFont::Bold);
     ui->applicationFontItalic->setChecked(QApplication::font().italic());
 
     ui->graphFont->setCurrentFont(*defaultfont);
-    ui->graphFont->setFont(*defaultfont);
+    //ui->graphFont->setFont(*defaultfont);
     ui->graphFontSize->setValue(defaultfont->pointSize());
     ui->graphFontBold->setChecked(defaultfont->weight()==QFont::Bold);
     ui->graphFontItalic->setChecked(defaultfont->italic());
 
     ui->titleFont->setCurrentFont(*mediumfont);
-    ui->titleFont->setFont(*mediumfont);
+    //ui->titleFont->setFont(*mediumfont);
     ui->titleFontSize->setValue(mediumfont->pointSize());
     ui->titleFontBold->setChecked(mediumfont->weight()==QFont::Bold);
     ui->titleFontItalic->setChecked(mediumfont->italic());
 
     ui->bigFont->setCurrentFont(*bigfont);
-    ui->bigFont->setFont(*bigfont);
+    //ui->bigFont->setFont(*bigfont);
     ui->bigFontSize->setValue(bigfont->pointSize());
     ui->bigFontBold->setChecked(bigfont->weight()==QFont::Bold);
     ui->bigFontItalic->setChecked(bigfont->italic());
 
-    if (!(*profile).Exists("SkipEmptyDays")) (*profile)["SkipEmptyDays"]=true;
+    //if (!(*profile).Exists("SkipEmptyDays")) (*profile)["SkipEmptyDays"]=true;
-    ui->skipEmptyDays->setChecked((*profile)["SkipEmptyDays"].toBool());
+    //ui->skipEmptyDays->setChecked((*profile)["SkipEmptyDays"].toBool());
 
-    if (!(*profile).Exists("SquareWavePlots")) (*profile)["SquareWavePlots"]=true;
+    general.clear();
-    ui->squareWavePlots->setChecked((*profile)["SquareWavePlots"].toBool());
+    general.push_back(Preference(p_profile,"UseAntiAliasing",PT_Checkbox,"Use Anti-Aliasing","Enable Graphical smoothing. Doesn't always look pretty.",false));
+    general.push_back(Preference(p_profile,"SquareWavePlots",PT_Checkbox,"Square Wave Plots","Try to use Square Wave plots where possible",true));
+    general.push_back(Preference(p_profile,"EnableGraphSnapshots",PT_Checkbox,"Event Breakdown Piechart","Shows Event Breakdown in Daily view. This may cause problems on older computers.",true));
+    general.push_back(Preference(p_pref,"SkipLoginScreen",PT_Checkbox,"Skip Login Screen","Bypass the login screen at startup",false));
+    general.push_back(Preference(p_profile,"SkipEmptyDays",PT_Checkbox,"Skip Empty Days","Skip over calendar days that don't have any data",true));
+    general.push_back(Preference(p_profile,"EnableMultithreading",PT_Checkbox,"Enable Multithreading","Try to use extra processor cores where possible",false));
+    general.push_back(Preference(p_profile,"MemoryHog",PT_Checkbox,"Cache Session Data","Keep session data in memory to improve load speed revisiting the date.",false));
+
+    ui->genOpWidget->clear();
+    for (int i=0;i<general.size();i++) {
+        Preference & p=general[i];
+        QListWidgetItem *wi=new QListWidgetItem(p.label());
+        wi->setToolTip(p.tooltip());
+
+        bool b=p.value().toBool();
+        wi->setCheckState(b ? Qt::Checked : Qt::Unchecked);
+        QVariant t;
+        t.setValue(p);
+        wi->setData(Qt::UserRole,t);
+        ui->genOpWidget->addItem(wi);
+    }
+    ui->genOpWidget->sortItems();
 
     if (!PREF.Exists("Updates_AutoCheck")) PREF["Updates_AutoCheck"]=true;
     ui->automaticallyCheckUpdates->setChecked(PREF["Updates_AutoCheck"].toBool());
@@ -132,11 +181,11 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
     } else ui->IgnoreLCD->display(tr("OFF"));
 
     ui->overlayFlagsCombo->setCurrentIndex((*profile)["AlwaysShowOverlayBars"].toInt());
-    ui->useAntiAliasing->setChecked((*profile)["UseAntiAliasing"].toBool());
+
-    ui->memoryHogCheckbox->setChecked((*profile)["MemoryHog"].toBool());
+    //ui->memoryHogCheckbox->setChecked((*profile)["MemoryHog"].toBool());
-    ui->useGraphSnapshots->setChecked((*profile)["EnableGraphSnapshots"].toBool());
+
-    ui->intentionalLeakEdit->setValue((*profile)["IntentionalLeak"].toDouble());
+    //ui->intentionalLeakEdit->setValue((*profile)["IntentionalLeak"].toDouble());
-    ui->useMultithreading->setChecked((*profile)["EnableMultithreading"].toBool());
+    //ui->useMultithreading->setChecked((*profile)["EnableMultithreading"].toBool());
 
     ui->oximetryGroupBox->setChecked((*profile)["EnableOximetry"].toBool());
     ui->oximetrySync->setChecked((*profile)["SyncOximetry"].toBool());
@@ -185,11 +234,8 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
     graphFilterModel->setFilterKeyColumn(0);
     ui->graphView->setModel(graphFilterModel);
 
-
-
     resetGraphModel();
 //    tree->sortByColumn(0,Qt::AscendingOrder);
-
 }
 
 
@@ -224,8 +270,21 @@ void PreferencesDialog::Save()
 {
     bool needs_restart=false;
 
-    (*profile)["UnitSystem"]=ui->unitCombo->currentText();
+    for (int i=0;i<ui->genOpWidget->count();i++) {
-    //(*profile)["TimeZone"]=ui->timeZoneCombo->currentText();
+        QListWidgetItem *item=ui->genOpWidget->item(i);
+        bool checked=item->checkState() == Qt::Checked;
+        QVariant data=item->data(Qt::UserRole);
+
+        Preference p=data.value<Preference>();
+
+        if (p.value().toBool()!=checked) {
+            p.setValue(checked);
+            if (p.code()=="SquareWavePlots") {
+                needs_restart=true;
+            }
+        }
+    }
+
 
     if ((*profile)["CombineCloserSessions"].toInt()!=ui->combineSlider->value()) needs_restart=true;
     if ((*profile)["IgnoreShorterSessions"].toInt()!=ui->IgnoreSlider->value()) needs_restart=true;
@@ -233,20 +292,37 @@ void PreferencesDialog::Save()
     (*profile)["CombineCloserSessions"]=ui->combineSlider->value();
     (*profile)["IgnoreShorterSessions"]=ui->IgnoreSlider->value();
 
-    (*profile)["MemoryHog"]=ui->memoryHogCheckbox->isChecked();
+    //(*profile)["MemoryHog"]=ui->memoryHogCheckbox->isChecked();
 
     if ((*profile)["DaySplitTime"].toTime()!=ui->timeEdit->time()) needs_restart=true;
 
     (*profile)["DaySplitTime"]=ui->timeEdit->time();
 
     (*profile)["AlwaysShowOverlayBars"]=ui->overlayFlagsCombo->currentIndex();
-    (*profile)["UseAntiAliasing"]=ui->useAntiAliasing->isChecked();
+    //(*profile)["UseAntiAliasing"]=ui->genOpWidget->item(0)->checkState()==Qt::Checked;
-    (*profile)["MemoryHog"]=ui->memoryHogCheckbox->isChecked();
+    //(*profile)["MemoryHog"]=ui->memoryHogCheckbox->isChecked();
-    (*profile)["EnableGraphSnapshots"]=ui->useGraphSnapshots->isChecked();
+    //(*profile)["EnableGraphSnapshots"]=ui->genOpWidget->item(2)->checkState()==Qt::Checked;
-    (*profile)["IntentionalLeak"]=ui->intentionalLeakEdit->value();
+
-    (*profile)["EnableMultithreading"]=ui->useMultithreading->isChecked();
+
+    //(*profile)["IntentionalLeak"]=ui->intentionalLeakEdit->value();
+    //(*profile)["EnableMultithreading"]=ui->useMultithreading->isChecked();
     (*profile)["EnableOximetry"]=ui->oximetryGroupBox->isChecked();
     (*profile)["SyncOximetry"]=ui->oximetrySync->isChecked();
+    int oxigrp=ui->oximetrySync->isChecked() ? 0 : 1;
+    gGraphView *gv=mainwin->getDaily()->graphView();
+    gGraph *g=gv->findGraph("Pulse");
+    if (g) {
+        g->setGroup(oxigrp);
+    }
+    g=gv->findGraph("SpO2");
+    if (g) {
+        g->setGroup(oxigrp);
+    }
+    g=gv->findGraph("Plethy");
+    if (g) {
+        g->setGroup(oxigrp);
+    }
+
     (*profile)["OximeterType"]=ui->oximetryType->currentText();
 
     (*profile)["SPO2DropPercentage"]=ui->spo2Drop->value();
@@ -254,14 +330,15 @@ void PreferencesDialog::Save()
     (*profile)["PulseChangeBPM"]=ui->pulseChange->value();
     (*profile)["PulseChangeDuration"]=ui->pulseChangeTime->value();
 
-    PREF["SkipLoginScreen"]=ui->skipLoginScreen->isChecked();
+    //PREF["SkipLoginScreen"]=ui->skipLoginScreen->isChecked();
 
-    if (ui->squareWavePlots->isChecked() != (*profile)["SquareWavePlots"].toBool()) {
+    //ui->genOpWidget->item(1)->checkState()==Qt::Checked ? true : false;
-        needs_restart=true;
+    //if ((ui->genOpWidget->item(1)->checkState()==Qt::Checked) != (*profile)["SquareWavePlots"].toBool()) {
-    }
+    //needs_restart=true;
-    (*profile)["SquareWavePlots"]=ui->squareWavePlots->isChecked();
+    //}
+    //(*profile)["SquareWavePlots"]=ui->genOpWidget->item(1)->checkState()==Qt::Checked;
 
-    (*profile)["SkipEmptyDays"]=ui->skipEmptyDays->isChecked();
+    //(*profile)["SkipEmptyDays"]=ui->skipEmptyDays->isChecked();
     PREF["Updates_AutoCheck"]=ui->automaticallyCheckUpdates->isChecked();
     PREF["Updates_CheckFrequency"]=ui->updateCheckEvery->value();
 
@@ -380,15 +457,6 @@ void PreferencesDialog::on_IgnoreSlider_valueChanged(int position)
     } else ui->IgnoreLCD->display(tr("OFF"));
 }
 
-void PreferencesDialog::on_useGraphSnapshots_toggled(bool checked)
-{
-    if (checked
-        && !(*profile)["EnableGraphSnapshots"].toBool()
-        && QMessageBox::question(this,"Warning","The Graph Snapshots feature (used by the Pie Chart in Daily stats panel) has been known to not work on some older computers.\n\nIf you experience a crash because of it, you will have to remove your SleepApp folder and recreate your profile.\n\n(I'm fairly sure this Qt bug is fixed now, but this has not been tested enough. If you have previously seen the pie chart, it's perfectly ok.)\n\nAre you sure you want to enable it?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::No) {
-        ui->useGraphSnapshots->setChecked(false);
-    }
-}
-
 #include "mainwindow.h"
 extern MainWindow * mainwin;
 void PreferencesDialog::RefreshLastChecked()
@@ -649,3 +717,34 @@ void PreferencesDialog::on_resetGraphButton_clicked()
         ui->graphView->update();
     }
  }
+
+
+void PreferencesDialog::on_genOpWidget_itemActivated(QListWidgetItem *item)
+{
+    item->setCheckState(item->checkState()==Qt::Checked ? Qt::Unchecked : Qt::Checked);
+}
+
+
+void PreferencesDialog::on_maskTypeCombo_activated(int index)
+{
+    if (index<num_masks) {
+        QTableWidgetItem *item;
+        for (int i=0;i<5;i++) {
+            MaskProfile & mp=masks[index];
+
+            item=ui->leakProfile->item(i,0);
+            QString val=QString::number(mp.pflow[i][0],'f',2);
+            if (!item) {
+                item=new QTableWidgetItem(val);
+                ui->leakProfile->setItem(i,0,item);
+            } else item->setText(val);
+
+            val=QString::number(mp.pflow[i][1],'f',2);
+            item=ui->leakProfile->item(i,1);
+            if (!item) {
+                item=new QTableWidgetItem(val);
+                ui->leakProfile->setItem(i,1,item);
+            } else item->setText(val);
+        }
+    }
+}

preferencesdialog.h

@@ -9,6 +9,7 @@
 
 #include <QDialog>
 #include <QModelIndex>
+#include <QListWidgetItem>
 #include <QStringListModel>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
@@ -29,6 +30,12 @@ protected:
 
 };
 
+struct MaskProfile {
+    QString name;
+    EventDataType pflow[5][2];
+};
+
+
 class PreferencesDialog : public QDialog
 {
     Q_OBJECT
@@ -44,8 +51,6 @@ private slots:
 
     void on_IgnoreSlider_valueChanged(int value);
 
-    void on_useGraphSnapshots_toggled(bool checked);
-
     void on_checkForUpdatesButton_clicked();
 
     void on_addImportLocation_clicked();
@@ -60,7 +65,12 @@ private slots:
 
     void on_resetGraphButton_clicked();
 
+    void on_genOpWidget_itemActivated(QListWidgetItem *item);
+
+    void on_maskTypeCombo_activated(int index);
+
 private:
+    virtual void resizeEvent(QResizeEvent *);
     void resetGraphModel();
     Ui::PreferencesDialog *ui;
     Profile * profile;
@@ -69,6 +79,7 @@ private:
     QStringListModel *importModel;
     MySortFilterProxyModel *graphFilterModel;
     QStandardItemModel *graphModel;
+    QVector<Preference> general;
 
 };
 

profileselect.cpp

@@ -50,13 +50,13 @@ ProfileSelect::ProfileSelect(QWidget *parent) :
     if (sel>=0) ui->listView->setCurrentIndex(model->item(sel)->index());
     m_tries=0;
 
-    PREF["SkipLogin"]=false;
+    /*PREF["SkipLogin"]=false;
     if ((i==1) && PREF["SkipLogin"].toBool()) {
         if (!Profiles::profiles.contains(name))
             PREF["Profile"]=name;
         QTimer::singleShot(0,this,SLOT(earlyExit()));
         hide();
-    }
+    } */
     popupMenu=new QMenu(this);
     popupMenu->addAction("Open Profile",this,SLOT(openProfile()));
     popupMenu->addAction("Edit Profile",this,SLOT(editProfile()));