From 52bb03eb52562a0d34236d2670125eff39eed1db Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 30 Nov 2011 16:01:38 +1000 Subject: [PATCH] Added Usage Session Summary graph, Preferences cleanup test, YAxis timescale improvements --- Graphs/gLineChart.cpp | 2 +- Graphs/gSummaryChart.cpp | 330 ++- Graphs/gSummaryChart.h | 5 +- Graphs/gYAxis.cpp | 87 +- Graphs/gYAxis.h | 12 +- SleepLib/calcs.cpp | 13 +- SleepLib/loader_plugins/prs1_loader.cpp | 1 - SleepLib/loader_plugins/resmed_loader.cpp | 2 +- SleepLib/preferences.cpp | 28 + SleepLib/preferences.h | 46 +- SleepLib/profiles.cpp | 3 + SleepLib/schema.cpp | 2 +- daily.cpp | 16 +- main.cpp | 1 + overview.cpp | 14 + overview.h | 4 +- preferencesdialog.cpp | 185 +- preferencesdialog.h | 15 +- preferencesdialog.ui | 2206 ++++++++++++--------- profileselect.cpp | 4 +- 20 files changed, 1855 insertions(+), 1121 deletions(-) diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index 7bcb8a78..4a828418 100644 --- a/Graphs/gLineChart.cpp +++ b/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; } diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index 9c0ce8e9..39212c89 100644 --- a/Graphs/gSummaryChart.cpp +++ b/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_maxy=-9999999; + m_hours.clear(); + 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 >::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 || ttmachine_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 (!day) continue; + for (int s=0;ssize();s++) { + tmp=(*day)[s]->hours(); + m_values[dn][s]=tmp; + total+=tmp; + zt=(*day)[s]->first()/1000; + zt+=tz_offset; + zt %= 86400; + tmp2=zt/3600.0; + if (tmp2+tmp<16) { + m_times[dn][s]=(tmp2+12); + } else { + m_times[dn][s]=(tmp2)-12; } - if (suboffset>0) { - tmp-=suboffset; - if (tmp<0) tmp=0; - } - //if (tmp>0) { - fnd=true; - total+=tmp; - m_values[dn][j+1]=tmp; - if (tmpm_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; } } - } - if (fnd) { - if (!m_fday) m_fday=dn; - m_values[dn][0]=total; - m_hours[dn]=day->hours(); - if (m_graphtype==GT_BAR) { - if (totalm_maxy) m_maxy=total; + } else { + for (int j=0;jmachine_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 (tmpm_maxy) m_maxy=tmp; + break; + // } + + } + } } - m_empty=false; - } else m_hours[dn]=0; + if (fnd) { + if (!m_fday) m_fday=dn; + m_values[dn][0]=total; + m_hours[dn]=day->hours(); + if (m_graphtype==GT_BAR) { + if (totalm_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 (x20) { - if (day) { - total_val+=total; - total_days++; - } - //} - py=top+height; - for (QHash::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"); - } + if (m_graphtype==GT_SESSIONS) { + int j; + QHash >::iterator times=m_times.find(zd); - 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 (tmpadd(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; - } 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; - - //} + //py-=h; + totalvalues[0]+=tmp; } - } // for(QHash0) { + if (day) { + total_val+=total; + total_days++; + } + py=top+height; + + //} + for (QHash::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 (tmpadd(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(QHashmaxx+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; diff --git a/Graphs/gSummaryChart.h b/Graphs/gSummaryChart.h index 66c3de48..c6ca5476 100644 --- a/Graphs/gSummaryChart.h +++ b/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 m_codes; QVector m_type; QHash > m_values; + QHash > m_times; QHash m_hours; QHash 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); diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp index 7a94a164..42159391 100644 --- a/Graphs/gYAxis.cpp +++ b/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) - // return; - - if (height<0) return; - - QString fd="0"; + static QString fd="0"; GetTextExtent(fd,x,y); - double max_yticks=round(height / (y+15.0)); // plus spacing between lines - double yt=1/max_yticks; + double max_yticks=round(height / (y+7.0)); // plus spacing between lines 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 (hadd(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); +} diff --git a/Graphs/gYAxis.h b/Graphs/gYAxis.h index 834634d3..00a41411 100644 --- a/Graphs/gYAxis.h +++ b/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 diff --git a/SleepLib/calcs.cpp b/SleepLib/calcs.cpp index 19cc546c..ac956503 100644 --- a/SleepLib/calcs.cpp +++ b/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::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"; diff --git a/SleepLib/preferences.h b/SleepLib/preferences.h index 2ce22b5f..602bb4a2 100644 --- a/SleepLib/preferences.h +++ b/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::iterator find(QString key) { return p_preferences.find(key); } + inline QHash::iterator end() { return p_preferences.end(); } + inline QHash::iterator begin() { return p_preferences.begin(); } + //int GetCode(QString name); // For registering/looking up new preference code. QHash 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; diff --git a/SleepLib/profiles.cpp b/SleepLib/profiles.cpp index 988a61a6..f7d50fb1 100644 --- a/SleepLib/profiles.cpp +++ b/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); + QVectorloaders=GetLoaders(); for (QVector::iterator i=loaders.begin(); i!=loaders.end(); i++) { if (c+=(*i)->Open(path,this)) break; diff --git a/SleepLib/schema.cpp b/SleepLib/schema.cpp index ced1a3e4..0a329570 100644 --- a/SleepLib/schema.cpp +++ b/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)) { diff --git a/daily.cpp b/daily.cpp index fa8b0f79..46a346c3 100644 --- a/daily.cpp +++ b/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); - INTSPO2=new gGraph(GraphView,"R-SPO2",default_height,1); - PULSE=new gGraph(GraphView,"Pulse",default_height,1); - SPO2=new gGraph(GraphView,"SPO2",default_height,1); - PLETHY=new gGraph(GraphView,"Plethy",default_height,1); + INTPULSE=new gGraph(GraphView,"R-Pulse",default_height); + INTSPO2=new gGraph(GraphView,"R-SPO2",default_height); + + int oxigrp=PROFILE.ExistsAndTrue("SyncOximetry") ? 0 : 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 AHIChart(QColor("dark green")))); + //AHI->AddLayer(AddCPAP(new gLineChart(CPAP_AHI,QColor("light green"),square))); + 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))); diff --git a/main.cpp b/main.cpp index 3fd4558a..6e37bfd5 100644 --- a/main.cpp +++ b/main.cpp @@ -99,6 +99,7 @@ int main(int argc, char *argv[]) ResmedLoader::Register(); IntellipapLoader::Register(); Profiles::Scan(); + qRegisterMetaType("Preference"); PREF["AppName"]="SleepyHead"; bool skip_login=(PREF.ExistsAndTrue("SkipLoginScreen")); if (force_login_screen) skip_login=false; diff --git a/overview.cpp b/overview.cpp index db2b3a6a..ba24c296 100644 --- a/overview.cpp +++ b/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); diff --git a/overview.h b/overview.h index fbda305f..ede5a964 100644 --- a/overview.h +++ b/overview.h @@ -36,8 +36,8 @@ public: gGraph * createGraph(QString name); - gGraph *AHI,*UC,*PR,*LK,*NPB,*SET,*SES,*RR; - SummaryChart *bc,*uc,*pr,*lk,*npb,*set,*ses,*rr; + gGraph *AHI,*UC, *US, *PR,*LK,*NPB,*SET,*SES,*RR; + SummaryChart *bc,*uc, *us, *pr,*lk,*npb,*set,*ses,*rr; QVector OverviewCharts; public slots: diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index cc6e95c4..032ace44 100644 --- a/preferencesdialog.cpp +++ b/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;imaskTypeCombo->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; - ui->skipEmptyDays->setChecked((*profile)["SkipEmptyDays"].toBool()); + //if (!(*profile).Exists("SkipEmptyDays")) (*profile)["SkipEmptyDays"]=true; + //ui->skipEmptyDays->setChecked((*profile)["SkipEmptyDays"].toBool()); - if (!(*profile).Exists("SquareWavePlots")) (*profile)["SquareWavePlots"]=true; - ui->squareWavePlots->setChecked((*profile)["SquareWavePlots"].toBool()); + general.clear(); + 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;isetToolTip(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->useGraphSnapshots->setChecked((*profile)["EnableGraphSnapshots"].toBool()); - ui->intentionalLeakEdit->setValue((*profile)["IntentionalLeak"].toDouble()); - ui->useMultithreading->setChecked((*profile)["EnableMultithreading"].toBool()); + + //ui->memoryHogCheckbox->setChecked((*profile)["MemoryHog"].toBool()); + + //ui->intentionalLeakEdit->setValue((*profile)["IntentionalLeak"].toDouble()); + //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(); - //(*profile)["TimeZone"]=ui->timeZoneCombo->currentText(); + for (int i=0;igenOpWidget->count();i++) { + QListWidgetItem *item=ui->genOpWidget->item(i); + bool checked=item->checkState() == Qt::Checked; + QVariant data=item->data(Qt::UserRole); + + Preference p=data.value(); + + 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)["MemoryHog"]=ui->memoryHogCheckbox->isChecked(); - (*profile)["EnableGraphSnapshots"]=ui->useGraphSnapshots->isChecked(); - (*profile)["IntentionalLeak"]=ui->intentionalLeakEdit->value(); - (*profile)["EnableMultithreading"]=ui->useMultithreading->isChecked(); + //(*profile)["UseAntiAliasing"]=ui->genOpWidget->item(0)->checkState()==Qt::Checked; + //(*profile)["MemoryHog"]=ui->memoryHogCheckbox->isChecked(); + //(*profile)["EnableGraphSnapshots"]=ui->genOpWidget->item(2)->checkState()==Qt::Checked; + + + //(*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()) { - needs_restart=true; - } - (*profile)["SquareWavePlots"]=ui->squareWavePlots->isChecked(); + //ui->genOpWidget->item(1)->checkState()==Qt::Checked ? true : false; + //if ((ui->genOpWidget->item(1)->checkState()==Qt::Checked) != (*profile)["SquareWavePlots"].toBool()) { + //needs_restart=true; + //} + //(*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 (indexleakProfile->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); + } + } +} diff --git a/preferencesdialog.h b/preferencesdialog.h index 96623739..f6ef08af 100644 --- a/preferencesdialog.h +++ b/preferencesdialog.h @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -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 general; }; diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 28127c5d..bf44a6bf 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -9,8 +9,8 @@ 0 0 - 637 - 330 + 640 + 396 @@ -38,391 +38,549 @@ - 4 + 5 - + - &CPAP/Visual + &Import - - - - - - 0 - 0 - + + + 6 + + + 5 + + + + + Session Settings - - Intentional Leak - - - - - - - - 0 - 0 - - - - Overlay Flags - - - - - - - - 0 - 0 - - - - Unit System - - - - - - - - 0 - 0 - - - - Intentional Leak value for your Mask type in Litres/Minute. -(ResMed machines only report unintentional leaks and don't need this) + + + 0 + + + 0 + + + 4 + + + 0 + + + 0 + + + + + + + Combine Close Sessions + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Minutes + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + 0 + 0 + + + + Multiple sessions closer together than this value will be kept on the same day. - - - - - - - - - - The visual method of displaying waveform overlay flags. - - - - Standard Bars - - - - - Top & Bottom Markers - - - - - - - - - Metric - - - - - Dark Ages - - - - - - - - Qt::Vertical - - - - 264 - 108 - - - - - - - - - 0 - 0 - - - - The Pie Chart in the Daily Views left panel. -This takes extra space, and has been known to cause problems on certain computer configurations, hence it's turned off by default. - - - Event B/down Piechart - - - - - - - - 0 - 0 - - - - Reduces the jagged edges on lines a little. - - - Use Anti-Aliasing - - - - - - - Square Wave Plots - - - - - - - Skip empty days with Prev & Next buttons above daily view calendar - - - Skip Empty Days - - - - - - - - &Sessions - - - - - - - - Day Split Time - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Sessions starting before this time will go to the previous calendar day. - - - QAbstractSpinBox::UpDownArrows - - - - 12 - 0 - 0 - 2000 - 1 - 1 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Turn this off if your worried about SleepyHead consuming too much memory. -It will be faster changing to days you've already been to if you leave it on. - - - Cache event data in memory - - - - - - - - - - - Combine Close Sessions - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Minutes - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - 0 - 0 - - - - Multiple sessions closer together than this value will be kept on the same day. - - - - 0 - - - 240 - - - 10 - - - 60 - - - 0 - - - Qt::Horizontal - - - false - - - false - - - QSlider::TicksAbove - - - 30 - - - - - - - QFrame::Box - - - 5 - - - QLCDNumber::Flat - - - - - - - - - - - Ignore Short Sessions - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Minutes - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + 0 + + + 240 + + + 10 + + + 60 + + + 0 + + + Qt::Horizontal + + + false + + + false + + + QSlider::TicksAbove + + + 30 + + + + + + + QFrame::Box + + + 5 + + + QLCDNumber::Flat + + + + + + + + + + + Ignore Short Sessions + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Minutes + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Sessions shorter in duration than this will not be displayed<span style=" font-style:italic;">.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-style:italic;"></p></body></html> - - - 90 - - - 5 - - - Qt::Horizontal - - - QSlider::TicksAbove - - - 5 - - - - - - - QFrame::Box - - - QLCDNumber::Flat - - - - + + + 90 + + + 5 + + + Qt::Horizontal + + + QSlider::TicksAbove + + + 5 + + + + + + + QFrame::Box + + + QLCDNumber::Flat + + + + + + + + + + + Day Split Time + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Sessions starting before this time will go to the previous calendar day. + + + QAbstractSpinBox::UpDownArrows + + + + 12 + 0 + 0 + 2000 + 1 + 1 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + - + - Qt::Vertical + Qt::Horizontal - - - 20 - 30 - + + + + + + Import Locations - + + + 0 + + + 0 + + + 4 + + + 0 + + + 0 + + + + + QAbstractItemView::NoEditTriggers + + + + + + + + + + Add + + + + + + + Remove + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + removeImportLocation + addImportLocation + verticalSpacer_5 + + + + + + + label + label_3 + groupBox_6 + groupBox_3 + line + + + + &Mask + + + + + + Qt::Horizontal + + + + + + + CPAP Mask Information + + + false + + + + 0 + + + 4 + + + 0 + + + 0 + + + 4 + + + + + Mask Type + + + + + + + + + + + + + + + + + 0 + 0 + + + + Leak mode + + + + + + + + Total Leaks + + + + + Unintentional Leaks + + + + + + + + + + + + 0 + 0 + + + + Description + + + + + + + + 0 + 0 + + + + true + + + + + + + Date + + + + + + + + 0 + 0 + + + + Current + + + + + + + + Start + + + + + End + + + + + Name + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Mask History + + + + + + + + 0 + 0 + + + + &New Mask + + + + + + + + + + + + + + + 75 + true + + + + Leak Profile + + + + + + + true + + + false + + + + Pressure + + + + + Leak + + + + + + + @@ -541,322 +699,6 @@ p, li { white-space: pre-wrap; } - - - &Fonts - - - - 0 - - - 4 - - - 0 - - - 0 - - - 0 - - - - - Application Fonts - - - - - - - - - 6 - - - 30 - - - 10 - - - - - - - - - - 6 - - - 40 - - - 11 - - - - - - - - - - 6 - - - 40 - - - 14 - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - Qt::LeftToRight - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - Size - - - - - - - - 0 - 0 - - - - Bold - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - Italic - - - - - - - - 0 - 0 - - - - Font - - - - - - - - 0 - 0 - - - - Graph Text - - - - - - - - 0 - 0 - - - - Graph Titles - - - - - - - Big Text - - - - - - - 6 - - - 72 - - - 18 - - - - - - - - 0 - 0 - - - - Application - - - - - - - - &Oximetry @@ -916,11 +758,11 @@ p, li { white-space: pre-wrap; } - Sync with CPAP where possible + Link Oximetry and CPAP graphs - + Qt::Vertical @@ -933,7 +775,7 @@ p, li { white-space: pre-wrap; } - + Flag changes in oximetry stats @@ -1014,6 +856,13 @@ p, li { white-space: pre-wrap; } + + + + Qt::Horizontal + + + @@ -1040,203 +889,58 @@ p, li { white-space: pre-wrap; } - + &General - - - - - 0 - 0 - - - - Automatically Check For Updates - - - true - - - - - - - 0 - 0 - - - - Check for new version every - - - - - - - 90 - - - - - - - - 0 - 0 - - - - days. - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - 0 - 0 - - - - Last Checked For Updates: - - - - - - - - 0 - 0 - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - 0 - 0 - 255 - - - - - - - - - 0 - 0 - 255 - - - - - - - - - 118 - 118 - 117 - - - - - - - - - 50 - false - false - true - - - - &Check for Updates now - - - Qt::ToolButtonTextOnly - - - true - - - - General Preferences + General Settings - - - - - - 0 - 0 - - + + + - You may need to disable this if your experiencing crashes. -It has no effect on single cpu machines. + Bypass the login screen and load the most recent User Profile - Use Multi-Threading + Skip Login Screen - - + + + + Allow use of multiple CPU cores where available to improve performance. May cause problems. + - Skip Login Screen + Enable Multithreading + + + + + + + Keep session data in memory to speed up revisiting days. + + + Cache Session Data + + + + + + + Allows graphs to be "screenshotted" for display purposes. +The Event Breakdown PIE chart uses this method, as does +the printing code. +Unfortunately some older computers/versions of Qt can cause +this application to be unstable with this feature enabled. + + + Enable Graph Snapshots @@ -1256,82 +960,708 @@ It has no effect on single cpu machines. + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + Automatically Check For Updates + + + true + + + + + + + + + 0 + 0 + + + + Check for new version every + + + + + + + 90 + + + + + + + + 0 + 0 + + + + days. + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + 0 + 0 + 255 + + + + + + + + + 0 + 0 + 255 + + + + + + + + + 118 + 118 + 117 + + + + + + + + + 50 + false + false + true + + + + &Check for Updates now + + + Qt::ToolButtonTextOnly + + + true + + + + + + + + + + + + 0 + 0 + + + + Last Checked For Updates: + + + + + + + + 0 + 0 + + + + TextLabel + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + - + - Import + &Appearance - - - 4 - - - 4 - + - - - Automatically scan these locations during import. + + + 0 - - - 0 - + + 0 + + + + + General Settings + + + + 0 + + + 4 + + + 4 + + + 0 + + + 0 + + + + + + + + 0 + 0 + + + + Overlay Flags + + + + + + + + 0 + 0 + + + + The visual method of displaying waveform overlay flags. + + + + Standard Bars + + + + + Top & Bottom Markers + + + + + + + + Graph Height + + + + + + + + 0 + 0 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + Qt::Vertical + + + + + + + Settings + + + + 0 + + + 0 + + + 4 + + + 0 + + + 0 + + + + + true + + + + + + + + + + + + Qt::Horizontal + + + + + + + Application Fonts + + + false + + 0 - - 4 - 0 - - 0 - - - - QAbstractItemView::NoEditTriggers - - + + + + + + 0 + 0 + + + + + 75 + true + + + + Font + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Size + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Bold + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Italic + + + + + + + + 0 + 0 + + + + Application + + + + + + + + + + + 80 + 16777215 + + + + 6 + + + 30 + + + 10 + + + + + + + + 0 + 0 + + + + Qt::LeftToRight + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + Graph Text + + + + + + + + + + + 80 + 16777215 + + + + 6 + + + 40 + + + 11 + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + Graph Titles + + + + + + + + + + + 80 + 16777215 + + + + 6 + + + 40 + + + 14 + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + Big Text + + + + + + + + + + + 80 + 16777215 + + + + 6 + + + 72 + + + 18 + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 75 + true + + + + Details + + + + - - - - - - Add - - - - - - - Remove - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - removeImportLocation - addImportLocation - verticalSpacer_5 - + + + Qt::Vertical + + + + 20 + 40 + + + @@ -1390,8 +1720,8 @@ It has no effect on single cpu machines. accept() - 444 - 303 + 632 + 387 157 @@ -1406,8 +1736,8 @@ It has no effect on single cpu machines. reject() - 154 - 303 + 541 + 387 286 diff --git a/profileselect.cpp b/profileselect.cpp index 4d76762b..1d70a281 100644 --- a/profileselect.cpp +++ b/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()));