From f9796306ca8d129bfe768e2f5e7cf0b011f36553 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 27 Jul 2011 19:21:53 +1000 Subject: [PATCH] Event System Mega Overhaul --- Graphs/gBarChart.cpp | 8 +- Graphs/gBarChart.h | 6 +- Graphs/gCandleStick.cpp | 8 +- Graphs/gCandleStick.h | 2 +- Graphs/gFlagsLine.cpp | 61 +- Graphs/gFlagsLine.h | 12 +- Graphs/gFooBar.cpp | 2 +- Graphs/gLineChart.cpp | 612 ++++++++++------- Graphs/gLineChart.h | 22 +- Graphs/gLineOverlay.cpp | 141 ++-- Graphs/gLineOverlay.h | 12 +- Graphs/gSessionTime.cpp | 8 +- Graphs/gSessionTime.h | 6 +- Graphs/gTitle.cpp | 5 +- Graphs/gXAxis.cpp | 44 +- Graphs/gYAxis.cpp | 41 +- Graphs/glcommon.cpp | 6 +- Graphs/gpiechart.cpp | 8 +- Graphs/gpiechart.h | 4 +- Graphs/graphdata.cpp | 3 +- Graphs/graphdata.h | 4 +- Graphs/graphdata_custom.cpp | 28 +- Graphs/graphdata_custom.h | 3 +- Graphs/graphlayer.cpp | 179 ++--- Graphs/graphlayer.h | 67 +- Graphs/graphwindow.cpp | 345 +++------- Graphs/graphwindow.h | 72 +- SleepLib/day.cpp | 170 ++--- SleepLib/day.h | 33 +- SleepLib/event.cpp | 188 ++++- SleepLib/event.h | 72 +- SleepLib/loader_plugins/cms50_loader.cpp | 24 +- SleepLib/loader_plugins/prs1_loader.cpp | 793 +++++++++++----------- SleepLib/loader_plugins/resmed_loader.cpp | 245 ++++--- SleepLib/loader_plugins/resmed_loader.h | 24 +- SleepLib/loader_plugins/zeo_loader.cpp | 2 + SleepLib/machine.h | 1 - SleepLib/machine_common.h | 4 +- SleepLib/preferences.cpp | 3 - SleepLib/session.cpp | 765 +++++++++------------ SleepLib/session.h | 47 +- SleepLib/waveform.cpp | 20 - SleepLib/waveform.h | 61 -- SleepyHeadQT.pro | 2 - daily.cpp | 290 ++++---- daily.h | 19 +- mainwindow.cpp | 26 +- mainwindow.h | 6 +- overview.cpp | 3 +- overview.h | 4 +- oximetry.cpp | 55 +- oximetry.h | 4 +- 52 files changed, 2257 insertions(+), 2313 deletions(-) delete mode 100644 SleepLib/waveform.cpp delete mode 100644 SleepLib/waveform.h diff --git a/Graphs/gBarChart.cpp b/Graphs/gBarChart.cpp index 5ec414bc..9321fb9c 100644 --- a/Graphs/gBarChart.cpp +++ b/Graphs/gBarChart.cpp @@ -8,8 +8,8 @@ #include #include "gBarChart.h" -gBarChart::gBarChart(gPointData *d,QColor col,Qt::Orientation o) -:gLayer(d),m_orientation(o) +gBarChart::gBarChart(MachineCode code,QColor col,Qt::Orientation o) +:gLayer(code),m_orientation(o) { color.clear(); color.push_back(col); @@ -24,7 +24,7 @@ gBarChart::~gBarChart() void gBarChart::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; - if (!data) return; + /*if (!data) return; if (!data->IsReady()) return; int start_px=w.GetLeftMargin(); @@ -168,6 +168,6 @@ void gBarChart::Plot(gGraphWindow & w,float scrx,float scry) //glVertex2f (start_px,start_py); //glVertex2f (start_px+width, start_py); glEnd (); - +*/ } diff --git a/Graphs/gBarChart.h b/Graphs/gBarChart.h index 3e964f40..980889e8 100644 --- a/Graphs/gBarChart.h +++ b/Graphs/gBarChart.h @@ -12,7 +12,7 @@ class gBarChart:public gLayer { public: - gBarChart(gPointData *d=NULL,QColor col=QColor("blue"),Qt::Orientation o=Qt::Horizontal); + gBarChart(MachineCode code=MC_UNKNOWN,QColor col=QColor("blue"),Qt::Orientation o=Qt::Horizontal); virtual ~gBarChart(); virtual void Plot(gGraphWindow & w,float scrx,float scry); @@ -22,10 +22,10 @@ class gBarChart:public gLayer // d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors - virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromMSecsSinceEpoch(v*86400000.0); t=d.toString("MMM dd"); return t; }; + virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromMSecsSinceEpoch(v*86400000.0); t=d.toString("MMM dd"); return t; } //virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(vi*86400000.0); t=d.Format(wxT("HH:mm")); return t; }; //virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; - virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; }; + virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; } gXAxis *Xaxis; }; diff --git a/Graphs/gCandleStick.cpp b/Graphs/gCandleStick.cpp index ecc76b30..816607fa 100644 --- a/Graphs/gCandleStick.cpp +++ b/Graphs/gCandleStick.cpp @@ -7,8 +7,8 @@ #include #include "gCandleStick.h" -gCandleStick::gCandleStick(gPointData *d,Qt::Orientation o) -:gLayer(d) +gCandleStick::gCandleStick(MachineCode code,Qt::Orientation o) +:gLayer(code) { m_orientation=o; } @@ -18,7 +18,7 @@ gCandleStick::~gCandleStick() void gCandleStick::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; - if (!data) return; + /*if (!data) return; if (!data->IsReady()) return; int start_px=w.GetLeftMargin(); @@ -113,6 +113,6 @@ void gCandleStick::Plot(gGraphWindow & w,float scrx,float scry) } } } // for (int i - glFlush(); + glFlush(); */ } diff --git a/Graphs/gCandleStick.h b/Graphs/gCandleStick.h index d43bb030..7e3df15d 100644 --- a/Graphs/gCandleStick.h +++ b/Graphs/gCandleStick.h @@ -12,7 +12,7 @@ class gCandleStick:public gLayer { public: - gCandleStick(gPointData *d=NULL,Qt::Orientation o=Qt::Horizontal); + gCandleStick(MachineCode code=MC_UNKNOWN,Qt::Orientation o=Qt::Horizontal); virtual ~gCandleStick(); virtual void Plot(gGraphWindow & w,float scrx,float scry); diff --git a/Graphs/gFlagsLine.cpp b/Graphs/gFlagsLine.cpp index 72c22a1c..876acef1 100644 --- a/Graphs/gFlagsLine.cpp +++ b/Graphs/gFlagsLine.cpp @@ -15,30 +15,45 @@ gFlagsGroup::gFlagsGroup() gFlagsGroup::~gFlagsGroup() { } +qint64 gFlagsGroup::Minx() +{ + if (m_day) { + return m_day->first(); + } + return 0; +} +qint64 gFlagsGroup::Maxx() +{ + if (m_day) { + return m_day->last(); + } + return 0; +} void gFlagsGroup::Plot(gGraphWindow &w, float scrx, float scry) { if (!m_visible) return; + //if (!m_day) return; int start_px=w.GetLeftMargin(); int start_py=w.GetBottomMargin(); int width=scrx-(w.GetLeftMargin()+w.GetRightMargin())-1; int height=scry-(w.GetTopMargin()+w.GetBottomMargin()); - vector visible; + vector lvisible; for (unsigned i=0;i(layers[i]); if (!f) continue; if (!f->isEmpty() || f->isAlwaysVisible()) { - visible.push_back(f); + lvisible.push_back(f); } } - int vis=visible.size(); - for (unsigned i=0;iline_num=i; - visible[i]->total_lines=vis; - visible[i]->Plot(w,scrx,scry); + int vis=lvisible.size(); + for (unsigned i=0;iline_num=i; + lvisible[i]->total_lines=vis; + lvisible[i]->Plot(w,scrx,scry); } glColor3f (0.0F, 0.0F, 0.0F); glLineWidth (1); @@ -52,12 +67,11 @@ void gFlagsGroup::Plot(gGraphWindow &w, float scrx, float scry) } -gFlagsLine::gFlagsLine(gPointData *d,QColor col,QString _label,bool always_visible) -:gLayer(d),label(_label),m_always_visible(always_visible) +gFlagsLine::gFlagsLine(MachineCode code,QColor col,QString _label,bool always_visible,FLT_Type flt) +:gLayer(code),label(_label),m_always_visible(always_visible),m_flt(flt) { color.clear(); color.push_back(col); - } gFlagsLine::~gFlagsLine() { @@ -65,8 +79,7 @@ gFlagsLine::~gFlagsLine() void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; - if (!data) return; - if (!data->IsReady()) return; + if (!m_day) return; double minx; double maxx; @@ -132,21 +145,25 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry) float top=floor(line_top)+2; float bottom=top+floor(line_h)-3; - for (int n=0;nVC();n++) { - if (!data->np[n]) continue; + qint64 X,Y; + for (vector::iterator s=m_day->begin();s!=m_day->end(); s++) { + if ((*s)->eventlist.find(m_code)==(*s)->eventlist.end()) continue; - for (int i=0;inp[n];i++) { - QPointD & rp=data->point[n][i]; - if (rp.y() < minx) continue; - if (rp.x() > maxx) break; - x1=(rp.x() - minx) * xmult + w.GetLeftMargin(); - if (rp.x()==rp.y()) { + EventList & el=*((*s)->eventlist[m_code][0]); + + for (int i=0;i maxx) break; + x1=(X - minx) * xmult + w.GetLeftMargin(); + if (m_flt==FLT_Bar) { vertarray[vertcnt++]=x1; vertarray[vertcnt++]=top; vertarray[vertcnt++]=x1; vertarray[vertcnt++]=bottom; - } else { - x2=(rp.y()-minx)*xmult+w.GetLeftMargin(); + } else if (m_flt==FLT_Span) { + x2=(Y-minx)*xmult+w.GetLeftMargin(); //w1=x2-x1; quadarray[quadcnt++]=x1; quadarray[quadcnt++]=top; diff --git a/Graphs/gFlagsLine.h b/Graphs/gFlagsLine.h index bc27319a..2909ca33 100644 --- a/Graphs/gFlagsLine.h +++ b/Graphs/gFlagsLine.h @@ -11,11 +11,13 @@ class gFlagsGroup; +enum FLT_Type { FLT_Bar, FLT_Span, FLT_Dot }; + class gFlagsLine:public gLayer { friend class gFlagsGroup; public: - gFlagsLine(gPointData *d=NULL,QColor col=Qt::black,QString _label="",bool always_visible=false); + gFlagsLine(MachineCode code,QColor col=Qt::black,QString _label="",bool always_visible=false,FLT_Type flt=FLT_Bar); virtual ~gFlagsLine(); virtual void Plot(gGraphWindow & w,float scrx,float scry); @@ -23,12 +25,13 @@ class gFlagsLine:public gLayer void setAlwaysVisible(bool b) { m_always_visible=b; } QString Label() { return label; } void Label(QString s) { label=s; } - void setTotalLines(int i) { total_lines=i; }; - void setLineNum(int i) { line_num=i; }; + void setTotalLines(int i) { total_lines=i; } + void setLineNum(int i) { line_num=i; } protected: QString label; bool m_always_visible; int total_lines,line_num; + FLT_Type m_flt; }; class gFlagsGroup:public gLayerGroup @@ -38,6 +41,9 @@ public: virtual ~gFlagsGroup(); virtual void Plot(gGraphWindow &w, float scrx, float scry); + virtual qint64 Minx(); + virtual qint64 Maxx(); + }; #endif // GFLAGSLINE_H diff --git a/Graphs/gFooBar.cpp b/Graphs/gFooBar.cpp index dd72b15e..ad9d8e20 100644 --- a/Graphs/gFooBar.cpp +++ b/Graphs/gFooBar.cpp @@ -7,7 +7,7 @@ #include "gFooBar.h" gFooBar::gFooBar(int offset,QColor col1,QColor col2,bool funkbar) -:gLayer(NULL),m_funkbar(funkbar),m_offset(offset) +:gLayer(MC_UNKNOWN),m_funkbar(funkbar),m_offset(offset) { color.clear(); color.push_back(col2); diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index c3a161a8..0e3e20b1 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -11,42 +11,71 @@ #include "gLineChart.h" #define EXTRA_ASSERTS 1 -gLineChart::gLineChart(gPointData *d,QColor col,int dlsize,bool _accelerate,bool _hide_axes,bool _square_plot) -:gLayer(d),m_accelerate(_accelerate),m_drawlist_size(dlsize),m_hide_axes(_hide_axes),m_square_plot(_square_plot) +gLineChart::gLineChart(MachineCode code,QColor col,bool _square_plot) +:gLayer(code),m_square_plot(_square_plot) { - m_drawlist=new QPointD [dlsize]; color.clear(); color.push_back(col); m_report_empty=false; } gLineChart::~gLineChart() { - delete [] m_drawlist; } + // Time Domain Line Chart void gLineChart::Plot(gGraphWindow & w,float scrx,float scry) { + const int max_drawlist_size=4096; + static QPoint m_drawlist[max_drawlist_size]; + if (!m_visible) return; - if (!data) + if (!m_day) return; - if (!data->IsReady()) - return; - if (w.Title()=="Plethysomogram") { - int q=0; + int start_px=w.GetLeftMargin(); + int start_py=w.GetBottomMargin(); + int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); + int height=scry-(w.GetTopMargin()+w.GetBottomMargin())-2; + double miny,maxy,minx,maxx; + miny=w.min_y, maxy=w.max_y, maxx=w.max_x, minx=w.min_x; + + int m; + if (maxy>500) { + m=ceil(maxy/100.0); + maxy=m*100; + m=floor(miny/100.0); + miny=m*100; + } else if (maxy>150) { + m=ceil(maxy/50.0); + maxy=m*50; + m=floor(miny/50.0); + miny=m*50; + } else if (maxy>80) { + m=ceil(maxy/20.0); + maxy=m*20; + m=floor(miny/20.0); + miny=m*20; + } else if (maxy>30) { + m=ceil(maxy/10.0); + maxy=m*10; + m=floor(miny/10.0); + miny=m*10; + } else if (maxy>5) { + m=ceil(maxy/5.0); + maxy=m*5; + m=floor(miny/5.0); + miny=m*5; } else { -// qDebug() << w.Title(); + maxy=ceil(maxy); + if (maxy<1) maxy=1; + + miny=floor(miny); + //if (miny<1) miny=0; } - int start_px=w.GetLeftMargin(), start_py=w.GetBottomMargin(); - - int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); - int height=scry-(w.GetTopMargin()+w.GetBottomMargin()); - - double minx=w.min_x, miny=w.min_y, maxx=w.max_x, maxy=w.max_y; double xx=maxx-minx, yy=maxy-miny; - float xmult=width/xx, ymult=height/yy; // time to pixel conversion multiplier + float xmult=width/xx, ymult=(height)/yy; // time to pixel conversion multiplier // Return on screwy min/max conditions if ((xx<0) || (yy<0)) @@ -54,43 +83,27 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry) if ((yy==0) && (miny==0)) return; - int num_points=0; - for (int z=0;zVC();z++) num_points+=data->np[z]; // how many points all up? + float lastpx,lastpy; + float px,py; + int idx,idxend,np; + bool done,first; + double x0,x1,xL; + double sr; + int sam; + int minz,maxz; - // Draw bounding box if something else will be drawn. - if (!(!m_report_empty && !num_points)) { - glColor3f (0.1F, 0.1F, 0.1F); + // Draw bounding box + { + glColor3f (0.0, 0.0, 0.0); glLineWidth (1); glBegin (GL_LINE_LOOP); glVertex2f (start_px, start_py); - glVertex2f (start_px, start_py+height); - glVertex2f (start_px+width,start_py+height); + glVertex2f (start_px, start_py+height+2); + glVertex2f (start_px+width,start_py+height+2); glVertex2f (start_px+width, start_py); glEnd (); } - width--; - if (!num_points) { // No Data? - if (m_report_empty) { - QString msg="No Waveform Available"; - float x,y; - //TextMarkup... - GetTextExtent(msg,x,y,bigfont); - //w.renderText(start_px+(width/2.0)-(x/2.0),start_py+(height/2.0)-(y/2.0),msg,*bigfont); - DrawText(msg,start_px+(width/2.0)-(x/2.0),scry-w.GetBottomMargin()-height/2.0+y/2.0,0,Qt::gray,bigfont);//-(y/2.0) - } - return; - } - bool square_plot=m_square_plot; - if (num_points>500) { - square_plot=false; - } - bool accel=m_accelerate; - double sr; - int dp,sam; - - QColor & col=color[0]; - // Selected the plot line color qint32 vertcnt=0; GLshort * vertarray=vertex_array[0]; @@ -99,246 +112,333 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry) return; } - float lastpx,lastpy; - float px,py; - int idx,idxend,np; - bool done,first; - double x0,x1,xL; + // Selected the plot line color + QColor & col=color[0]; + int num_points=0; int visible_points=0; + int total_points=0; + int total_visible=0; + bool square_plot,accel; - for (int n=0;nVC();n++) { // for each segment + for (vector::iterator s=m_day->begin(); s!=m_day->end(); s++) { + vector & evec=(*s)->eventlist[m_code]; + if (evec.size()==0) continue; // not possible - int siz=data->np[n]; - if (siz<=1) continue; // Don't bother drawing 1 point or less. + num_points=0; + for (unsigned i=0;icount(); - QPointD * point=data->point[n]; + if (!num_points) continue; - x0=point[0].x(); - xL=point[siz-1].x(); + total_points+=num_points; - if (maxxxL) { - if (siz==2) { // this happens on CPAP - QPointD t=point[0]; - point[0]=point[siz-1]; - point[siz-1]=t; - x0=point[0].x(); - } else { - qDebug() << "Reversed order sample fed to gLineChart - ignored."; - continue; - //assert(x10)"; - return; - } - //assert(sr>0); - // double qx=xL-x0; // Full time range of this segment - //double gx=xx/qx; // ratio of how much of the whole data set this represents - //double segwidth=width*gx; - double XR=xx/sr; - double Z1=MAX(x0,minx); - double Z2=MIN(xL,maxx); - double ZD=Z2-Z1; - double ZR=ZD/sr; - double ZQ=ZR/XR; - double ZW=ZR/(width*ZQ); - const int num_averages=15; // Max n umber of samples taken from samples per pixel for better min/max values - visible_points+=ZR*ZQ; - if (accel && n>0) { - sam=1; - } - if (ZWx1) { - double j=minx-x0; // == starting min of first sample in this segment - idx=floor(j/sr); - // Loose the precision - idx-=idx % sam; - - } // else just start from the beginning - - idxend=floor(xx/sr); - idxend/=sam; // devide by number of samples skips - - np=(idxend-idx)+sam; - np /= sam; - } else { - - np=siz; - } - - bool watch_verts_carefully=false; - // better to do it here than in the main loop. - np <<= 2; - - if (!accel && square_plot) - np <<= 1; // double it again - - if (np>=maxverts) { - watch_verts_carefully=true; - //assert(np=sam) i-=sam; // Start with the previous sample (which will be in clipping area) + square_plot=m_square_plot; + if (accel || num_points>500) { // Don't square plot if too many points or waveform + square_plot=false; } - px=1+((point[i].x() - minx) * xmult); // Scale the time scale X to pixel scale X + int siz=evec[n]->count(); + if (siz<=1) continue; // Don't bother drawing 1 point or less. + x0=el.time(0); + xL=el.time(siz-1); - if (!accel) { - py=1+((point[i].y() - miny) * ymult); // Same for Y scale - if (firstpx) { - firstpx=false; + if (maxxxL) { + /*if (siz==2) { // this happens on CPAP + + QPointD t=point[0]; + point[0]=point[siz-1]; + point[siz-1]=t; + x0=point[0].x(); + } else { */ + qDebug() << "Reversed order sample fed to gLineChart - ignored."; + continue; + //assert(x10)"; + continue; + } + + double XR=xx/sr; + double Z1=MAX(x0,minx); + double Z2=MIN(xL,maxx); + double ZD=Z2-Z1; + double ZR=ZD/sr; + double ZQ=ZR/XR; + double ZW=ZR/(width*ZQ); + const int num_averages=15; // Max n umber of samples taken from samples per pixel for better min/max values + visible_points+=ZR*ZQ; + if (accel && n>0) { + sam=1; + } + if (ZWx1) { + double j=minx-x0; // == starting min of first sample in this segment + idx=floor(j/sr); + // Loose the precision + idx-=idx % sam; + + } // else just start from the beginning + + idxend=floor(xx/sr); + idxend/=sam; // devide by number of samples skips + + np=(idxend-idx)+sam; + np /= sam; + } else { + + np=siz; + } + + //bool watch_verts_carefully=false; + // better to do it here than in the main loop. + np <<= 2; + + if (square_plot) + np <<= 1; // double it again + + if (np>=maxverts) { + // watch_verts_carefully=true; + //assert(np & dat=el.getData(); + const vector & tim=el.getTime(); + + bool firstpx=true; + if (el.type()==EVL_Waveform) { // Waveform Plot + time=el.time(idx); + qint64 rate=sr*sam; + + if (accel) { + + for (int i=idx;imaxz) maxz=z; // maxz=Last pixel + + // Update the Y pixel bounds. + if (pym_drawlist[z].y()) m_drawlist[z].setY(py); + + if (time > maxx) { + done=true; // Let this iteration finish.. (This point will be in far clipping) + break; + } + } + // Plot compressed accelerated vertex list + for (int i=minz;i=maxverts) break; } - vertarray[vertcnt++]=start_px+px; - vertarray[vertcnt++]=start_py+py; + } else { // Zoomed in Waveform + for (int i=idx;i=maxverts) break; - //#if defined(EXTRA_ASSERTS) - //assert(vertcnt=maxverts) { + done=true; + break; + } + if (time > maxx) { + //done=true; // Let this iteration finish.. (This point will be in far clipping) + break; + } + lastpx=px; + lastpy=py; + } } - lastpx=start_px+px; - lastpy=start_py+py; - //if (lastpx>start_px+width) done=true; - } else { - // In accel mode, each pixel has a min/max Y value. - // m_drawlist's index is the pixel index for the X pixel axis. + } else { // Standard events/zoomed in Plot + for (int i=idx;i=sam) i-=sam; // Start with the previous sample (which will be in clipping area) + } + data=dat[i]*gain; // + //data=el.data(i); // raw access is faster - int y1=1+(point[i].y()-miny)*ymult; + px=xst+((time - minx) * xmult); // Scale the time scale X to pixel scale X + //py=yst+((data - ymin) * nmult); // Same for Y scale with precomputed gain + py=yst+((data - miny) * ymult); // Same for Y scale with precomputed gain - int z=floor(px); // Hmmm... round may screw this up. - if (zmaxz) maxz=z; // maxz=Last pixel + if (firstpx) { + firstpx=false; + } else { + if (m_square_plot) { + vertarray[vertcnt++]=lastpx; + vertarray[vertcnt++]=lastpy; + vertarray[vertcnt++]=px; + vertarray[vertcnt++]=lastpy; + vertarray[vertcnt++]=px; + vertarray[vertcnt++]=lastpy; + } else { + vertarray[vertcnt++]=lastpx; + vertarray[vertcnt++]=lastpy; + } - // Update the Y pixel bounds. - if (y1m_drawlist[z].y()) m_drawlist[z].setY(y1); - //if (z>width) done=true; + vertarray[vertcnt++]=px; + vertarray[vertcnt++]=py; + if (vertcnt>=maxverts) { + done=true; + break; + } + } + lastpx=px; + lastpy=py; + //if (lastpx>start_px+width) done=true; + if (time > maxx) { + //done=true; // Let this iteration finish.. (This point will be in far clipping) + break; + } + } } - if (point[i].x() > maxx) done=true; // Let this iteration finish.. (This point will be in far clipping) if (done) break; } - if (accel) { - dp=0; - // Plot compressed accelerated vertex list - for (int i=minz;i=maxverts) break; - //#if defined(EXTRA_ASSERTS) - //assert(vertcnt>1); + glDisableClientState(GL_VERTEX_ARRAY); + + if (antialias) { + glDisable(GL_LINE_SMOOTH); + glDisable(GL_BLEND); + } + glDisable(GL_SCISSOR_TEST); } - - - - /*QString b; - long j=vertcnt/2; - if (accel) j/=2; - b.sprintf("%i %i %i %li",visible_points,sam,num_points,j); - float x,y; - GetTextExtent(b,x,y); - DrawText(b,scrx-w.GetRightMargin()-x-15,scry-w.GetBottomMargin()-10); */ - - glColor4ub(col.red(),col.green(),col.blue(),255); - - // Crop to inside the margins. - glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height); - glEnable(GL_SCISSOR_TEST); - glDisable(GL_TEXTURE_2D); - glDisable(GL_DEPTH_TEST); - //glAlphaFunc(GL_LESS,0.8); - glLineWidth (1); - bool antialias=pref["UseAntiAliasing"].toBool(); - if (antialias) { - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); //SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - //glBlendFunc(GL_ONE, GL_SRC_ALPHA); - glEnable(GL_LINE_SMOOTH); - glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); - - } - - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(2, GL_SHORT, 0, vertarray); - glDrawArrays(GL_LINES, 0, vertcnt>>1); - glDisableClientState(GL_VERTEX_ARRAY); - - if (antialias) { - glDisable(GL_LINE_SMOOTH); - glDisable(GL_BLEND); - } - glDisable(GL_SCISSOR_TEST); } diff --git a/Graphs/gLineChart.h b/Graphs/gLineChart.h index 145f3609..60f122e4 100644 --- a/Graphs/gLineChart.h +++ b/Graphs/gLineChart.h @@ -7,32 +7,28 @@ #ifndef GLINECHART_H #define GLINECHART_H +#include +#include "SleepLib/event.h" +#include "SleepLib/day.h" #include "graphwindow.h" #include "graphlayer.h" class gLineChart:public gLayer { public: - gLineChart(gPointData *d=NULL,const QColor col=QColor("black"),int dlsize=4096,bool accelerate=false,bool _hide_axes=false,bool _square_plot=false); + gLineChart(MachineCode code,const QColor col=QColor("black"), bool _square_plot=false); virtual ~gLineChart(); virtual void Plot(gGraphWindow & w,float scrx,float scry); - void SetSquarePlot(bool b) { m_square_plot=b; }; - bool GetSquarePlot() { return m_square_plot; }; - void ReportEmpty(bool b) { m_report_empty=b; }; - bool GetReportEmpty() { return m_report_empty; }; + void SetSquarePlot(bool b) { m_square_plot=b; } + bool GetSquarePlot() { return m_square_plot; } + void ReportEmpty(bool b) { m_report_empty=b; } + bool GetReportEmpty() { return m_report_empty; } - protected: - bool m_accelerate; - int m_drawlist_size; +protected: bool m_report_empty; - QPointD *m_drawlist; - bool m_hide_axes; bool m_square_plot; - //gYAxis * Yaxis; - //gFooBar *foobar; - }; #endif // GLINECHART_H diff --git a/Graphs/gLineOverlay.cpp b/Graphs/gLineOverlay.cpp index e9eb7905..7c6f90e4 100644 --- a/Graphs/gLineOverlay.cpp +++ b/Graphs/gLineOverlay.cpp @@ -8,8 +8,8 @@ #include "SleepLib/profiles.h" #include "gLineOverlay.h" -gLineOverlayBar::gLineOverlayBar(gPointData *d,QColor col,QString _label,LO_Type _lot) -:gLayer(d),label(_label),lo_type(_lot) +gLineOverlayBar::gLineOverlayBar(MachineCode code,QColor col,QString _label,LO_Type _lot) +:gLayer(code),label(_label),lo_type(_lot) { color.clear(); color.push_back(col); @@ -17,31 +17,11 @@ gLineOverlayBar::gLineOverlayBar(gPointData *d,QColor col,QString _label,LO_Type gLineOverlayBar::~gLineOverlayBar() { } -//nov = number of vertex -//r = radius -void Dot(int nov, float r) -{ - if (nov < 4) nov = 4; - if (nov > 360) nov = 360; - float angle = (360/nov)*(3.142159/180); - float x[360] = {0}; - float y[360] = {0}; - for (int i = 0; i < nov; i++){ - x[i] = cosf(r*cosf(i*angle)); - y[i] = sinf(r*sinf(i*angle)); - glBegin(GL_POLYGON); - for (int i = 0; i < nov; i++){ - glVertex2f(x[i],y[i]); - } - glEnd(); - } - //render to texture and map to GL_POINT_SPRITE -} + void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; - if (!data) return; - if (!data->IsReady()) return; + if (!m_day) return; //int start_px=w.GetLeftMargin(); int start_py=w.GetBottomMargin(); @@ -53,7 +33,7 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry) float x1,x2; - float x,y;//,descent,leading; + float x,y; // Crop to inside the margins. glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height); @@ -72,19 +52,30 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry) float bottom=start_py+25, top=start_py+height-25; QColor & col=color[0]; - for (int n=0;nVC();n++) { + + qint64 X; + qint64 Y; + for (vector::iterator s=m_day->begin();s!=m_day->end(); s++) { + if ((*s)->eventlist.find(m_code)==(*s)->eventlist.end()) continue; + + EventList & el=*((*s)->eventlist[m_code][0]); // bool done=false; - for (int i=0;inp[n];i++) { - QPointD & rp=data->point[n][i]; - //float X=rp.x(); - //float Y=rp.y(); - if (rp.y() < w.min_x) continue; - if (rp.x() > w.max_x) break; + for (int i=0;i w.max_x) break; + } else { + if (X < w.min_x) continue; + if (X > w.max_x) break; + } + + x1=w.x2p(X); + if (lo_type==LOT_Span) { + x2=w.x2p(Y); //double w1=x2-x1; quadarray[quadcnt++]=x1; quadarray[quadcnt++]=start_py; @@ -94,53 +85,49 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry) quadarray[quadcnt++]=start_py+height; quadarray[quadcnt++]=x2; quadarray[quadcnt++]=start_py; - } else { - if (lo_type==LOT_Dot) { - //if (pref["AlwaysShowOverlayBars"].toBool()) { - - if (pref["AlwaysShowOverlayBars"].toBool() || (xx<(3600.0/86400.0))) { - // show the fat dots in the middle - pointarray[pointcnt++]=x1; - pointarray[pointcnt++]=w.y2p(20); - } else { - // thin lines down the bottom - vertarray[vertcnt++]=x1; - vertarray[vertcnt++]=start_py+1; - vertarray[vertcnt++]=x1; - vertarray[vertcnt++]=start_py+1+12; - } - } else if (lo_type==LOT_Bar) { - int z=start_py+height; - if (pref["AlwaysShowOverlayBars"].toBool() || (xx<(3600.0/86400.0))) { - z=top; - - pointarray[pointcnt++]=x1; - pointarray[pointcnt++]=top; //z+2; - vertarray[vertcnt++]=x1; - vertarray[vertcnt++]=top; - vertarray[vertcnt++]=x1; - vertarray[vertcnt++]=bottom; - } else { - vertarray[vertcnt++]=x1; - vertarray[vertcnt++]=z; - vertarray[vertcnt++]=x1; - vertarray[vertcnt++]=z-12; - } - if (xx<(1800.0/86400.0)) { - GetTextExtent(label,x,y); - DrawText(label,x1-(x/2),scry-(start_py+height-30+y)); - //w.renderText(x1-(x/2),scry-(start_py+height-30+y),label); - } + } else if (lo_type==LOT_Dot) { + //if (pref["AlwaysShowOverlayBars"].toBool()) { + if (pref["AlwaysShowOverlayBars"].toBool() || (xx<3600000.0)) { + // show the fat dots in the middle + pointarray[pointcnt++]=x1; + pointarray[pointcnt++]=w.y2p(20); + } else { + // thin lines down the bottom + vertarray[vertcnt++]=x1; + vertarray[vertcnt++]=start_py+1; + vertarray[vertcnt++]=x1; + vertarray[vertcnt++]=start_py+1+12; } - } - if ((vertcnt>=maxverts) || (quadcnt>=maxverts) || (pointcnt>=maxverts)) break; + } else if (lo_type==LOT_Bar) { + int z=start_py+height; + if (pref["AlwaysShowOverlayBars"].toBool() || (xx<3600000)) { + z=top; + + pointarray[pointcnt++]=x1; + pointarray[pointcnt++]=top; //z+2; + vertarray[vertcnt++]=x1; + vertarray[vertcnt++]=top; + vertarray[vertcnt++]=x1; + vertarray[vertcnt++]=bottom; + } else { + vertarray[vertcnt++]=x1; + vertarray[vertcnt++]=z; + vertarray[vertcnt++]=x1; + vertarray[vertcnt++]=z-12; + } + if (xx<(1800000)) { + GetTextExtent(label,x,y); + DrawText(label,x1-(x/2),scry-(start_py+height-30+y)); + //w.renderText(x1-(x/2),scry-(start_py+height-30+y),label); + } + + } } + if ((vertcnt>=maxverts) || (quadcnt>=maxverts) || (pointcnt>=maxverts)) break; + } - //assert (vertcnt0) { glEnableClientState(GL_VERTEX_ARRAY); diff --git a/Graphs/gLineOverlay.h b/Graphs/gLineOverlay.h index 20396cea..770cb9d2 100644 --- a/Graphs/gLineOverlay.h +++ b/Graphs/gLineOverlay.h @@ -1,8 +1,8 @@ -/******************************************************************** +/* gLineOverlayBar Header Copyright (c)2011 Mark Watkins License: GPL -*********************************************************************/ +*/ #ifndef GLINEOVERLAY_H #define GLINEOVERLAY_H @@ -10,15 +10,17 @@ #include "graphlayer.h" #include "graphdata.h" -enum LO_Type { LOT_Bar, LOT_Dot }; +enum LO_Type { LOT_Bar, LOT_Span, LOT_Dot }; class gLineOverlayBar:public gLayer { public: - gLineOverlayBar(gPointData *d=NULL,QColor col=QColor("black"),QString _label="",LO_Type _lot=LOT_Bar); + gLineOverlayBar(MachineCode code,QColor col=QColor("black"),QString _label="",LO_Type _lot=LOT_Bar); virtual ~gLineOverlayBar(); virtual void Plot(gGraphWindow & w,float scrx,float scry); - + virtual EventDataType Miny() { return 0; } + virtual EventDataType Maxy() { return 0; } + virtual bool isEmpty() { return true; } protected: QString label; LO_Type lo_type; diff --git a/Graphs/gSessionTime.cpp b/Graphs/gSessionTime.cpp index f78a3ecb..a338fe33 100644 --- a/Graphs/gSessionTime.cpp +++ b/Graphs/gSessionTime.cpp @@ -27,8 +27,8 @@ const QString & gTimeYAxis::Format(double v) }; -gSessionTime::gSessionTime(gPointData *d,QColor col,Qt::Orientation o) -:gLayer(d),m_orientation(o) +gSessionTime::gSessionTime(MachineCode code,QColor col,Qt::Orientation o) +:gLayer(code),m_orientation(o) { color.clear(); color.push_back(col); @@ -43,7 +43,7 @@ gSessionTime::~gSessionTime() void gSessionTime::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; - if (!data) return; + /*if (!data) return; if (!data->IsReady()) return; int start_px=w.GetLeftMargin(); @@ -157,5 +157,5 @@ void gSessionTime::Plot(gGraphWindow & w,float scrx,float scry) glVertex2f (start_px, start_py+height+1); glVertex2f (start_px,start_py); glVertex2f (start_px+width, start_py); - glEnd (); + glEnd (); */ } diff --git a/Graphs/gSessionTime.h b/Graphs/gSessionTime.h index e11d2ea5..ff8cb6ab 100644 --- a/Graphs/gSessionTime.h +++ b/Graphs/gSessionTime.h @@ -23,7 +23,7 @@ public: class gSessionTime:public gLayer { public: - gSessionTime(gPointData *d=NULL,QColor col=QColor("blue"),Qt::Orientation o=Qt::Horizontal); + gSessionTime(MachineCode=MC_UNKNOWN,QColor col=QColor("blue"),Qt::Orientation o=Qt::Horizontal); virtual ~gSessionTime(); virtual void Plot(gGraphWindow & w,float scrx,float scry); @@ -31,10 +31,10 @@ class gSessionTime:public gLayer protected: Qt::Orientation m_orientation; - virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromMSecsSinceEpoch(v*86400000.0); t=d.toString("MMM dd"); return t; }; + virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromMSecsSinceEpoch(v*86400000.0); t=d.toString("MMM dd"); return t; } //virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(vi*86400000.0); t=d.Format(wxT("HH:mm")); return t; }; //virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; - virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; }; + virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; } gXAxis *Xaxis; }; diff --git a/Graphs/gTitle.cpp b/Graphs/gTitle.cpp index af653ebd..963164ac 100644 --- a/Graphs/gTitle.cpp +++ b/Graphs/gTitle.cpp @@ -7,7 +7,7 @@ #include "gTitle.h" gTitle::gTitle(const QString & _title,QColor color,QFont font) -:gLayer(NULL),m_title(_title),m_color(color),m_font(font) +:gLayer(MC_UNKNOWN),m_title(_title),m_color(color),m_font(font) { } gTitle::~gTitle() @@ -16,10 +16,11 @@ gTitle::~gTitle() void gTitle::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; + scrx=scrx; float width,height; GetTextExtent(m_title,width,height); - int xp=(height/2)+20; + int xp=(height/2)+15; //if (m_alignment==wxALIGN_RIGHT) xp=scrx-4-height; DrawText(m_title,xp,scry-(w.GetBottomMargin()+((scry-w.GetBottomMargin())/2.0)),90.0,m_color,&m_font); diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp index e7c2a9cf..c4f662c3 100644 --- a/Graphs/gXAxis.cpp +++ b/Graphs/gXAxis.cpp @@ -9,7 +9,7 @@ #include "gXAxis.h" gXAxis::gXAxis(QColor col) -:gLayer(NULL) +:gLayer(MC_UNKNOWN) { color.clear(); color.push_back(col); @@ -31,8 +31,8 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry) float width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); // float height=scry-(w.GetTopMargin()+w.GetBottomMargin()); - double minx; - double maxx; + qint64 minx; + qint64 maxx; if (w.BlockZoom()) { minx=w.rmin_x; maxx=w.rmax_x; @@ -47,7 +47,7 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry) double xmult=width/xx; QString fd; - if (xx<1.5) { + if (xx<86400000L) { fd="00:00:00:0000"; } else { fd="XXX"; @@ -70,9 +70,9 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry) bool show_time=true; double min_tick; - if (xx<1.5) { - int rounding[16]={12,24,48,72,96,144,288,720,1440,2880,5760,8640,17280,86400,172800,345600}; // time rounding - + if (xx<86400000) { + //double rounding[16]={12,24,48,72,96,144,288,720,1440,2880,5760,8640,17280,86400,172800,345600}; // time rounding + double rounding[16]={7200000,3600000,1800000,1200000,900000,600000,300000,120000,60000,45000,30000,15000,10000,5000,2000,1000}; int ri; for (ri=0;ri<16;ri++) { st=round(st2*rounding[ri])/rounding[ri]; @@ -80,11 +80,11 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry) q=xx/min_tick; // number of ticks that fits in range if (q<=jj) break; // compared to number of ticks that fit on screen. } - if (ri>8) show_seconds=true; - if (ri>=14) show_milliseconds=true; + if (min_tick<60000) show_seconds=true; + if (min_tick<10000) show_milliseconds=true; - if (min_tick<=0.25/86400.0) - min_tick=0.25/86400; + if (min_tick<=1000) + min_tick=1000; } else { // Day ticks.. show_time=false; st=st2; @@ -101,10 +101,10 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry) } double st3=st; - while (st3>minx) { - st3-=min_tick/10.0; - } - st3+=min_tick/10.0; + //while (st3>minx) { + // st3-=min_tick/10.0; + //} + //st3+=min_tick/10.0; py=w.GetBottomMargin(); @@ -131,9 +131,9 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry) } - while (st=maxverts) { qWarning() << "maxverts exceeded in gYAxis::Plot()"; return; diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp index e19fcf55..3ce93ca4 100644 --- a/Graphs/gYAxis.cpp +++ b/Graphs/gYAxis.cpp @@ -9,7 +9,7 @@ #include "gYAxis.h" gYAxis::gYAxis(QColor col) -:gLayer(NULL) +:gLayer(MC_UNKNOWN) { color.clear(); color.push_back(col); @@ -30,8 +30,45 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry) double miny=w.min_y; double maxy=w.max_y; - if (maxy==miny) + + double dy=maxy-miny; + if (dy<=0) return; + + int m; + if (maxy>500) { + m=ceil(maxy/100.0); + maxy=m*100; + m=floor(miny/100.0); + miny=m*100; + } else if (maxy>150) { + m=ceil(maxy/50.0); + maxy=m*50; + m=floor(miny/50.0); + miny=m*50; + } else if (maxy>80) { + m=ceil(maxy/20.0); + maxy=m*20; + m=floor(miny/20.0); + miny=m*20; + } else if (maxy>30) { + m=ceil(maxy/10.0); + maxy=m*10; + m=floor(miny/10.0); + miny=m*10; + } else if (maxy>5) { + m=ceil(maxy/5.0); + maxy=m*5; + m=floor(miny/5.0); + miny=m*5; + } else { + maxy=ceil(maxy); + if (maxy<1) maxy=1; + miny=floor(miny); + if (miny<1) miny=0; + + } + //if ((w.max_x-w.min_x)==0) // return; diff --git a/Graphs/glcommon.cpp b/Graphs/glcommon.cpp index 6435fedd..42261a8f 100644 --- a/Graphs/glcommon.cpp +++ b/Graphs/glcommon.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include #include "glcommon.h" @@ -63,9 +64,8 @@ inline void RDrawText(QPainter & painter, QString text, int x, int y, float ang //int a=fm.overlinePos(); //ascent(); //LinedRoundedRectangle(x,wid.GetScrY()-y,w,h,0,1,QColor("black")); if (!font) { - qDebug() << "Font Problem. Forgot to call GraphInit() ?"; - abort(); - return; + QMessageBox::critical(NULL,"Critical Error","Font Problem. Forgot to call GraphInit()? Have to abort"); + exit(-1); } // glEnable(GL_TEXTURE_2D); diff --git a/Graphs/gpiechart.cpp b/Graphs/gpiechart.cpp index e76c8fd7..3c1a06f3 100644 --- a/Graphs/gpiechart.cpp +++ b/Graphs/gpiechart.cpp @@ -1,8 +1,8 @@ #include #include "gpiechart.h" -gPieChart::gPieChart(gPointData *d,QColor col) -:gLayer(d) +gPieChart::gPieChart(MachineCode code,QColor col) +:gLayer(code) { color.clear(); color.push_back(col); @@ -14,7 +14,7 @@ gPieChart::~gPieChart() void gPieChart::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; - if (!data) return; + /*if (!data) return; if (!data->IsReady()) return; int start_px=w.GetLeftMargin(); @@ -83,7 +83,7 @@ void gPieChart::Plot(gGraphWindow & w,float scrx,float scry) sum=q; } glDisable(GL_POLYGON_SMOOTH); - glDisable(GL_BLEND); + glDisable(GL_BLEND); */ //glDisable(GL_DEPTH_TEST); //glDisable(GL_TEXTURE_2D); } diff --git a/Graphs/gpiechart.h b/Graphs/gpiechart.h index f2bcc1d8..b5dada20 100644 --- a/Graphs/gpiechart.h +++ b/Graphs/gpiechart.h @@ -5,11 +5,11 @@ class gPieChart : public gLayer { public: - gPieChart(gPointData *d,QColor col=Qt::black); + gPieChart(MachineCode code=MC_UNKNOWN,QColor col=Qt::black); virtual ~gPieChart(); virtual void Plot(gGraphWindow & w,float scrx,float scry); - void AddName(QString name) { m_names.push_back(name); }; + void AddName(QString name) { m_names.push_back(name); } protected: vector m_names; diff --git a/Graphs/graphdata.cpp b/Graphs/graphdata.cpp index aa9ced8c..88feba27 100644 --- a/Graphs/graphdata.cpp +++ b/Graphs/graphdata.cpp @@ -5,7 +5,7 @@ *********************************************************************/ #include "graphdata.h" - +/* gGraphData::gGraphData(int mp,gDataType t) :vc(0),type(t),max_points(mp) { @@ -99,3 +99,4 @@ double gPointData::CalcMaxY() } return max; } +*/ diff --git a/Graphs/graphdata.h b/Graphs/graphdata.h index 182f5749..0b9ee664 100644 --- a/Graphs/graphdata.h +++ b/Graphs/graphdata.h @@ -11,7 +11,7 @@ #include "SleepLib/day.h" #include using namespace std; -enum gDataType { gDT_Point, gDT_Point3D, gDT_Stacked, gDT_Segmented }; +/*enum gDataType { gDT_Point, gDT_Point3D, gDT_Stacked, gDT_Segmented }; class gLayer; @@ -113,5 +113,5 @@ public: vector point; }; - +*/ #endif // GRAPHDATA_H diff --git a/Graphs/graphdata_custom.cpp b/Graphs/graphdata_custom.cpp index 35efcbfa..2dd2de2a 100644 --- a/Graphs/graphdata_custom.cpp +++ b/Graphs/graphdata_custom.cpp @@ -8,7 +8,7 @@ #include #include "graphdata_custom.h" - +/* WaveData::WaveData(MachineCode _code, int _size) :gPointData(_size),code(_code) { @@ -336,14 +336,14 @@ void FlagData::Reload(Day *day) done=true; break; } - /*if (first) { + if (first) { min_y=v1; first=false; } else { if (v1max_x) max_x=v2; */ + if (v2>max_x) max_x=v2; } if (done) break; } @@ -364,20 +364,20 @@ void FlagData::Reload(Day *day) SessionTimes::SessionTimes(Profile * _profile) :HistoryData(_profile,2048) { - /*AddSegment(max_points); - if (profile->LastDay().isValid()) { - QDateTime tmp; - tmp.setDate(profile->FirstDay()); - real_min_x=tmp.toMSecsSinceEpoch()/86400000.0; - tmp.setDate(profile->LastDay()); - real_max_x=(tmp.toMSecsSinceEpoch()/86400000.0)+1; - } - real_min_y=real_max_y=0; */ + //AddSegment(max_points); + //if (profile->LastDay().isValid()) { + // QDateTime tmp; + // tmp.setDate(profile->FirstDay()); + // real_min_x=tmp.toMSecsSinceEpoch()/86400000.0; + // tmp.setDate(profile->LastDay()); + // real_max_x=(tmp.toMSecsSinceEpoch()/86400000.0)+1; + //} + //real_min_y=real_max_y=0; } SessionTimes::~SessionTimes() { } -/*void SessionTimes::ResetDateRange() +void SessionTimes::ResetDateRange() { if (profile->LastDay().isValid()) { QDateTime tmp; @@ -413,7 +413,6 @@ void SessionTimes::SetDateRange(QDate start,QDate end) (*i)->DataChanged(this); } // Do nothing else.. Callers responsibility to Refresh window. } -*/ void SessionTimes::Reload(Day *day) { @@ -650,3 +649,4 @@ double UsageHistoryData::Calc(Day *day) return 0; } +*/ diff --git a/Graphs/graphdata_custom.h b/Graphs/graphdata_custom.h index 8d8a7cdf..5e22215f 100644 --- a/Graphs/graphdata_custom.h +++ b/Graphs/graphdata_custom.h @@ -13,6 +13,7 @@ #include "SleepLib/machine_common.h" #include "graphdata.h" +/* class FlagData:public gPointData { public: @@ -127,5 +128,5 @@ protected: T_UHD uhd; }; - +*/ #endif // GRAPHDATA_CUSTOM_H diff --git a/Graphs/graphlayer.cpp b/Graphs/graphlayer.cpp index 32483463..3e76dcfd 100644 --- a/Graphs/graphlayer.cpp +++ b/Graphs/graphlayer.cpp @@ -6,16 +6,16 @@ #include "graphlayer.h" -gLayer::gLayer(gPointData *d,QString title) -:m_title(title),data(d) +gLayer::gLayer(MachineCode code,QString title) +:m_code(code),m_title(title) { - if (data) { - data->AddLayer(this); - } m_visible = true; m_movable = false; color.push_back(QColor("red")); color.push_back(QColor("green")); + m_day=NULL; + m_miny=m_maxy=0; + m_minx=m_maxx=0; } gLayer::~gLayer() @@ -23,56 +23,47 @@ gLayer::~gLayer() } -//void gLayer::Plot(gGraphWindow & w,float scrx,float scry) -//{ -//} - -void gLayer::DataChanged(gGraphData *src) +void gLayer::SetDay(Day * d) { - for (list::iterator i=m_graph.begin();i!=m_graph.end();i++) { - if (src) { - (*i)->DataChanged(this); - } else { - (*i)->DataChanged(NULL); - } - } - + m_day=d; + if (!d) return; + m_minx=d->first(m_code); + m_maxx=d->last(m_code); + m_miny=d->min(m_code); + m_maxy=d->max(m_code); } -// Notify signal sent from gGraphData.. pass on to the graph so it can que a refresh and update stuff. -void gLayer::SetData(gPointData * gd) { data=gd; }; -gPointData * gLayer::GetData() { return data; }; -double gLayer::MinX() { if (data) return data->MinX(); return 0;}; -double gLayer::MaxX() { if (data) return data->MaxX(); return 0;}; -double gLayer::MinY() { if (data) return data->MinY(); return 0;}; -double gLayer::MaxY() { if (data) return data->MaxY(); return 0;}; -double gLayer::RealMinX() { if (data) return data->RealMinX(); return 0;}; -double gLayer::RealMaxX() { if (data) return data->RealMaxX(); return 0;}; -double gLayer::RealMinY() { if (data) return data->RealMinY(); return 0;}; -double gLayer::RealMaxY() { if (data) return data->RealMaxY(); return 0;}; +bool gLayer::isEmpty() +{ + if (m_day && (m_day->count(m_code)!=0)) + return false; + return true; +} -void gLayer::SetMinX(double v) { if (data) data->SetMinX(v); }; -void gLayer::SetMaxX(double v) { if (data) data->SetMaxX(v); }; -void gLayer::SetMinY(double v) { if (data) data->SetMinY(v); }; -void gLayer::SetMaxY(double v) { if (data) data->SetMaxY(v); }; - -void gLayer::NotifyGraphWindow(gGraphWindow *g) { m_graph.push_back(g); }; - -bool gLayer::isEmpty() { if (!data) return false; return data->isEmpty(); }; - -gLayerGroup::gLayerGroup() +gLayerGroup::gLayerGroup():gLayer(MC_UNKNOWN) { } gLayerGroup::~gLayerGroup() { } -//void gLayerGroup::DataChanged(gGraphData *src); -void gLayerGroup::NotifyGraphWindow(gGraphWindow *g) +bool gLayerGroup::isEmpty() +{ + bool empty=true; + for (unsigned i=0;iisEmpty()) { + empty=false; + break; + } + } + return empty; +} +void gLayerGroup::SetDay(Day * d) { for (unsigned i=0;iNotifyGraphWindow(g); + layers[i]->SetDay(d); } + m_day=d; } void gLayerGroup::AddLayer(gLayer *l) @@ -80,91 +71,65 @@ void gLayerGroup::AddLayer(gLayer *l) layers.push_back(l); } -double gLayerGroup::MinX() +qint64 gLayerGroup::Minx() { bool first=true; - double m=0; + qint64 m=0,t; for (unsigned i=0;iMinx(); + if (!t) continue; if (first) { - m=layers[i]->MinX(); + m=t; first=false; } else - if (m>layers[i]->MinX()) m=layers[i]->MinX(); + if (m>t) m=t; } return m; } -double gLayerGroup::MaxX() +qint64 gLayerGroup::Maxx() { bool first=true; - double m=0; + qint64 m=0,t; for (unsigned i=0;iMaxx(); + if (!t) continue; if (first) { - m=layers[i]->MaxX(); + m=t; first=false; } else - if (mMaxX()) m=layers[i]->MaxX(); + if (mMiny(); + if (t==layers[i]->Minx()) continue; + if (first) { + m=t; + first=false; + } else { + if (m>t) m=t; + } + } + return m; } -double gLayerGroup::MaxY() +EventDataType gLayerGroup::Maxy() { + bool first=true; + EventDataType m=0,t; + for (unsigned i=0;iMaxy(); + if (t==layers[i]->Miny()) continue; + if (first) { + m=t; + first=false; + } else + if (mRealMinX(); - first=false; - } else - if (m>layers[i]->RealMinX()) m=layers[i]->RealMinX(); - } - return m; -} -double gLayerGroup::RealMaxX() -{ - bool first=true; - double m=0; - for (unsigned i=0;iRealMaxX(); - first=false; - } else - if (m>layers[i]->RealMaxX()) m=layers[i]->RealMaxX(); - } - return m; -} -double gLayerGroup::RealMinY() -{ - return 0; -} -double gLayerGroup::RealMaxY() -{ - return 0; -} - -void gLayerGroup::SetMinX(double v) -{ - for (unsigned i=0;iSetMinX(v); -} -void gLayerGroup::SetMaxX(double v) -{ - for (unsigned i=0;iSetMaxX(v); -} -void gLayerGroup::SetMinY(double v) -{ - for (unsigned i=0;iSetMinY(v); -} -void gLayerGroup::SetMaxY(double v) -{ - for (unsigned i=0;iSetMaxY(v); -} diff --git a/Graphs/graphlayer.h b/Graphs/graphlayer.h index f501cba1..0e4eb3a1 100644 --- a/Graphs/graphlayer.h +++ b/Graphs/graphlayer.h @@ -8,6 +8,7 @@ #define GRAPHLAYER_H #include +#include "SleepLib/day.h" #include "graphwindow.h" #include "graphdata.h" @@ -18,43 +19,31 @@ class gPointData; class gLayer { public: - gLayer(gPointData *g=NULL,QString title=""); + gLayer(MachineCode code=MC_UNKNOWN,QString title=""); virtual ~gLayer(); virtual void Plot(gGraphWindow & w,float scrx,float scry)=0; vector color; - virtual void SetData(gPointData * gd);; - virtual gPointData * GetData();; + virtual void SetDay(Day * d); + void SetCode(MachineCode c) { m_code=c; } + virtual qint64 Minx() { if (m_day) return m_day->first(); return m_minx; } + virtual qint64 Maxx() { if (m_day) return m_day->last(); return m_maxx; } + virtual EventDataType Miny() { return m_miny; } + virtual EventDataType Maxy() { return m_maxy; } - virtual void DataChanged(gGraphData *src); - - virtual double MinX(); - virtual double MaxX(); - virtual double MinY(); - virtual double MaxY(); - - virtual double RealMinX(); - virtual double RealMaxX(); - virtual double RealMinY(); - virtual double RealMaxY(); - - virtual void SetMinX(double v); - virtual void SetMaxX(double v); - virtual void SetMinY(double v); - virtual void SetMaxY(double v); - - - virtual void NotifyGraphWindow(gGraphWindow *g); - virtual void SetVisible(bool v) { m_visible=v; }; - virtual bool IsVisible() { return m_visible; }; + virtual void setVisible(bool v) { m_visible=v; } + virtual bool isVisible() { return m_visible; } virtual bool isEmpty(); + inline const MachineCode & code() { return m_code; } protected: bool m_visible; bool m_movable; - QString m_title; - gPointData *data; // Data source - list m_graph; // notify list of graphs that attach this layer. + qint64 m_minx,m_maxx; + EventDataType m_miny,m_maxy; + Day *m_day; + MachineCode m_code; + QString m_title; }; class gLayerGroup:public gLayer @@ -64,24 +53,12 @@ public: virtual ~gLayerGroup(); virtual void AddLayer(gLayer *l); - //virtual void DataChanged(gGraphData *src); - virtual void NotifyGraphWindow(gGraphWindow *g); - - virtual double MinX(); - virtual double MaxX(); - virtual double MinY(); - virtual double MaxY(); - - virtual double RealMinX(); - virtual double RealMaxX(); - virtual double RealMinY(); - virtual double RealMaxY(); - - virtual void SetMinX(double v); - virtual void SetMaxX(double v); - virtual void SetMinY(double v); - virtual void SetMaxY(double v); - + virtual qint64 Minx(); + virtual qint64 Maxx(); + virtual EventDataType Miny(); + virtual EventDataType Maxy(); + virtual bool isEmpty(); + virtual void SetDay(Day * d); protected: vector layers; diff --git a/Graphs/graphwindow.cpp b/Graphs/graphwindow.cpp index a1d9daff..df797da3 100644 --- a/Graphs/graphwindow.cpp +++ b/Graphs/graphwindow.cpp @@ -10,7 +10,10 @@ #include #include "SleepLib/profiles.h" #include "graphwindow.h" -#include "Graphs/gTitle.h" +#include "gTitle.h" +#include "gXAxis.h" +#include "gYAxis.h" +#include "gFooBar.h" extern QLabel *qstatus2; @@ -38,6 +41,8 @@ gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLWidget * s //setAcceptDrops(true); setMouseTracking(true); setFocusPolicy(Qt::StrongFocus); + rmin_x=rmax_x=0; + min_x=max_x=0; } gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLContext * context,Qt::WindowFlags f) @@ -72,9 +77,18 @@ gGraphWindow::~gGraphWindow() layers.clear(); } -#include "gXAxis.h" -#include "gYAxis.h" -#include "gFooBar.h" +bool gGraphWindow::isEmpty() +{ + bool empty=true; + for (list::iterator l=layers.begin();l!=layers.end();l++) { + if (!(*l)->isEmpty()) { + empty=false; + break; + } + } + return empty; +} + void gGraphWindow::AddLayer(gLayer *l) { if (l) { if (dynamic_cast(l)) { @@ -113,34 +127,31 @@ void gGraphWindow::AddLayer(gLayer *l) { m_marginLeft+=gTitle::Margin; gtitle=l; } - l->NotifyGraphWindow(this); + //l->NotifyGraphWindow(this); layers.push_back(l); } }; // Sets a new Min & Max X clipping, refreshing the graph and all it's layers. -void gGraphWindow::SetXBounds(double minx, double maxx) +void gGraphWindow::SetXBounds(qint64 minx, qint64 maxx) { - //min_x=minx; - //max_x=maxx; - SetMinX(minx); - SetMaxX(maxx); + min_x=minx; + max_x=maxx; updateGL(); } -void gGraphWindow::ResetXBounds() +void gGraphWindow::ResetBounds() { - //min_x=minx; - //max_x=maxx; - SetMinX(RealMinX()); - SetMaxX(RealMaxX()); - // updateGL(); + min_x=MinX(); + max_x=MaxX(); + min_y=MinY(); + max_y=MaxY(); } void gGraphWindow::ZoomXPixels(int x1, int x2) { - double rx1=0,rx2=0; + qint64 rx1=0,rx2=0; ZoomXPixels(x1,x2,rx1,rx2); if (pref["LinkGraphMovement"].toBool()) { for (list::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { @@ -150,7 +161,7 @@ void gGraphWindow::ZoomXPixels(int x1, int x2) SetXBounds(rx1,rx2); } -void gGraphWindow::ZoomXPixels(int x1,int x2,double &rx1,double &rx2) +void gGraphWindow::ZoomXPixels(int x1,int x2,qint64 &rx1,qint64 &rx2) { x1-=GetLeftMargin(); x2-=GetLeftMargin(); @@ -159,8 +170,8 @@ void gGraphWindow::ZoomXPixels(int x1,int x2,double &rx1,double &rx2) if (x1>Width()) x1=Width(); if (x2>Width()) x2=Width(); - double min; - double max; + qint64 min; + qint64 max; if (!m_block_zoom) { min=min_x; max=max_x; @@ -175,7 +186,7 @@ void gGraphWindow::ZoomXPixels(int x1,int x2,double &rx1,double &rx2) } // Move x-axis by the amount of space represented by integer i Pixels (negative values moves backwards) -void gGraphWindow::MoveX(int i,double &min, double & max) +void gGraphWindow::MoveX(int i,qint64 &min, qint64 & max) { //if (i==0) return; min=min_x; @@ -198,7 +209,7 @@ void gGraphWindow::MoveX(int i,double &min, double & max) void gGraphWindow::MoveX(int i) { - double min,max; + qint64 min,max; MoveX(i,min,max); /* for (list::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { @@ -222,8 +233,8 @@ void gGraphWindow::ZoomX(double mult,int origin_px) // apply zoom // center on point found in step 1. - double min=min_x; - double max=max_x; + qint64 min=min_x; + qint64 max=max_x; double hardspan=rmax_x-rmin_x; double span=max-min; @@ -234,7 +245,7 @@ void gGraphWindow::ZoomX(double mult,int origin_px) double q=span*mult; if (q>hardspan) q=hardspan; - if (qbuttons() & Qt::RightButton) { MoveX(x - m_mouseRClick.x()); m_mouseRClick.setX(x); - double min=MinX(); - double max=MaxX(); if (pref["LinkGraphMovement"].toBool()) { for (list::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { - (*g)->SetXBounds(min,max); + (*g)->SetXBounds(min_x,max_x); } } } else @@ -393,7 +402,7 @@ void gGraphWindow::mouseMoveEvent(QMouseEvent * event) z=max_x-min_x; } double q=double(t2-t1)/width(); - double f=(q*z)*24.0; + double f=((q*z)/3600000.0); int hours,minutes,seconds; hours=int(f); minutes=int(f*60.0) % 60; @@ -462,11 +471,9 @@ void gGraphWindow::keyPressEvent(QKeyEvent * event) } if (moved) { - double min=MinX(); - double max=MaxX(); if (pref["LinkGraphMovement"].toBool()) { for (list::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { - (*g)->SetXBounds(min,max); + (*g)->SetXBounds(min_x,max_x); } } event->accept(); @@ -499,10 +506,10 @@ void gGraphWindow::OnMouseRightDown(QMouseEvent * event) // m_mouseRDown=true; if (foobar && m_block_zoom && (((y>GetTopMargin())) && (y::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { - (*g)->SetXBounds(min,max); + (*g)->SetXBounds(min_x,max_x); } } } @@ -601,11 +606,8 @@ void gGraphWindow::OnMouseRightRelease(QMouseEvent * event) ZoomX(zoom_fact,x); //event.GetX()); // adds origin to zoom out.. Doesn't look that cool. if (pref["LinkGraphMovement"].toBool()) { - double min=MinX(); - double max=MaxX(); - for (list::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { - (*g)->SetXBounds(min,max); + (*g)->SetXBounds(min_x,max_x); } } //} @@ -645,10 +647,10 @@ void gGraphWindow::OnMouseLeftDown(QMouseEvent * event) m_mouseLClick.setY(y); if (foobar && ((y>(m_scrY-GetBottomMargin())) && (y<(m_scrY)))) { //-GetBottomMargin())+20))) { - double rx=RealMaxX()-RealMinX(); + double rx=rmax_x-rmin_x; double qx=double(width)/rx; - double minx=MinX()-RealMinX(); - double maxx=MaxX()-RealMinX();; + double minx=min_x-rmin_x; + double maxx=max_x-rmin_x; int x1=(qx*minx); int x2=(qx*maxx); // length in pixels @@ -733,10 +735,8 @@ void gGraphWindow::OnMouseLeftRelease(QMouseEvent * event) did_draw=true; } - } - if (!did_draw && hot1.contains(x,y) && !m_drag_foobar && m_mouseLDown) { if (m_block_zoom) { x-=GetLeftMargin(); @@ -744,7 +744,7 @@ void gGraphWindow::OnMouseLeftRelease(QMouseEvent * event) double mx=max_x-min_x; double qx=(rx/width)*double(x); if (mx>=rx) { - mx=1.0/(24.0*15.0); + mx=300000;//1.0/(24.0*15.0); } qx+=rmin_x; qx-=mx/2.0; @@ -777,10 +777,8 @@ void gGraphWindow::OnMouseLeftRelease(QMouseEvent * event) updateGL(); } else { if (pref["LinkGraphMovement"].toBool()) { - double min=MinX(); - double max=MaxX(); for (list::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { - (*g)->SetXBounds(min,max); + (*g)->SetXBounds(min_x,max_x); } } } @@ -788,7 +786,7 @@ void gGraphWindow::OnMouseLeftRelease(QMouseEvent * event) LastGraphLDown=NULL; } -void gGraphWindow::SetMargins(float top, float right, float bottom, float left) +void gGraphWindow::SetMargins(int top, int right, int bottom, int left) { m_marginTop=top; m_marginBottom=bottom; @@ -825,7 +823,7 @@ void gGraphWindow::resizeGL(int w, int h) } -void gGraphWindow::Render(float w, float h) +void gGraphWindow::Render(int w, int h) { if (m_gradient_background) { glBegin(GL_QUADS); @@ -884,241 +882,90 @@ void gGraphWindow::paintGL() swapBuffers(); // Dump to screen. } -double gGraphWindow::MinX() +qint64 gGraphWindow::MinX() { - //static bool f=true; //need a bool for each one, and reset when a layer reports data change. - //if (!f) return min_x; - //f=false; - bool first=true; - double val=0,tmp; + qint64 val=0,tmp; for (list::iterator l=layers.begin();l!=layers.end();l++) { + if ((*l)->isEmpty()) continue; + tmp=(*l)->Minx(); + if (!tmp) continue; if (first) { - val=(*l)->MinX(); - if (!((val==(*l)->MaxX()) && (val==0))) - first=false; + val=tmp; + first=false; } else { - tmp=(*l)->MinX(); - if (!((tmp==(*l)->MaxX()) && (tmp==0))) { - if (tmp < val) val = tmp; - } + if (tmp < val) val = tmp; } } - - return min_x=val; + if (val) rmin_x=val; + return val; } -double gGraphWindow::MaxX() +qint64 gGraphWindow::MaxX() { - //static bool f=true; - //if (!f) return max_x; - //f=false; - bool first=true; - double val=0,tmp; + qint64 val=0,tmp; for (list::iterator l=layers.begin();l!=layers.end();l++) { + if ((*l)->isEmpty()) continue; + tmp=(*l)->Maxx(); + if (!tmp) continue; if (first) { - val=(*l)->MaxX(); - if (!((val==(*l)->MinX()) && (val==0))) - first=false; - + val=tmp; + first=false; } else { - tmp=(*l)->MaxX(); - if (!((tmp==(*l)->MinX()) && (tmp==0))) { - if (tmp > val) val = tmp; - } + if (tmp > val) val = tmp; } } - return max_x=val; + if (val) rmax_x=val; + return val; } -double gGraphWindow::MinY() +EventDataType gGraphWindow::MinY() { - //static bool f=true; - //if (!f) return min_y; - //f=false; - bool first=true; - double val=0,tmp; + EventDataType val=0,tmp; for (list::iterator l=layers.begin();l!=layers.end();l++) { + if ((*l)->isEmpty()) continue; + tmp=(*l)->Miny(); + if (tmp==(*l)->Maxy()) continue; if (first) { - val=(*l)->MinY(); - if (!((val==(*l)->MaxY()) && (val==0))) - first=false; + val=tmp; + first=false; } else { - tmp=(*l)->MinY(); - if (!((tmp==(*l)->MaxY()) && (tmp==0))) { // Ignore this layer if both are 0 - if (tmp < val) val = tmp; - } - } - } - return min_y=val; -} -double gGraphWindow::MaxY() -{ - //static bool f=true; - //if (!f) return max_y; - //f=false; - - bool first=true; - double val=0,tmp; - for (list::iterator l=layers.begin();l!=layers.end();l++) { - if (first) { - val=(*l)->MaxY(); - if (!((val==(*l)->MinY()) && (val==0))) - first=false; - } else { - tmp=(*l)->MaxY(); - if (!((tmp==(*l)->MinY()) && (tmp==0))) { // Ignore this layer if both are 0 - if (tmp > val) val = tmp; - } - } - } - return max_y=val; -} - -double gGraphWindow::RealMinX() -{ - //static bool f=true; - //if (!f) return rmin_x; - //f=false; - - bool first=true; - double val=0,tmp; - for (list::iterator l=layers.begin();l!=layers.end();l++) { - if (first) { - val=(*l)->RealMinX(); - if (!((val==(*l)->RealMaxX()) && (val==0))) - first=false; - } else { - tmp=(*l)->RealMinX(); - if (!((tmp==(*l)->RealMaxX()) && (tmp==0))) { // Ignore this layer if both are 0 - if (tmp < val) val = tmp; - } - } - } - return rmin_x=val; -} -double gGraphWindow::RealMaxX() -{ - //static bool f=true; - //if (!f) return rmax_x; - //f=false; - - bool first=true; - double val=0,tmp; - for (list::iterator l=layers.begin();l!=layers.end();l++) { - if (first) { - val=(*l)->RealMaxX(); - if (!((val==(*l)->RealMinX()) && (val==0))) - first=false; - } else { - tmp=(*l)->RealMaxX(); - if (!((tmp==(*l)->RealMinX()) && (tmp==0))) { // Ignore this layer if both are 0 - if (tmp > val) val = tmp; - } - } - } - return rmax_x=val; -} -double gGraphWindow::RealMinY() -{ - //static bool f=true; - //if (!f) return rmin_y; - //f=false; - - bool first=true; - double val=0,tmp; - for (list::iterator l=layers.begin();l!=layers.end();l++) { - if (first) { - val=(*l)->RealMinY(); - if (!((val==(*l)->RealMaxY()) && (val==0))) - first=false; - } else { - tmp=(*l)->RealMinY(); - if (!((tmp==(*l)->RealMaxY()) && (tmp==0))) { // Ignore this if both are 0 - if (tmp < val) val = tmp; - } + if (tmp < val) val = tmp; } } return rmin_y=val; } -double gGraphWindow::RealMaxY() +EventDataType gGraphWindow::MaxY() { - //static bool f=true; - //if (!f) return rmax_y; - //f=false; - bool first=true; - double val=0,tmp; + EventDataType val=0,tmp; for (list::iterator l=layers.begin();l!=layers.end();l++) { + if ((*l)->isEmpty()) continue; + tmp=(*l)->Maxy(); + if (tmp==(*l)->Miny()) continue; if (first) { - val=(*l)->RealMaxY(); - if (!((val==(*l)->RealMinY()) && (val==0))) // Does this create a loop?? - first=false; + val=tmp; + first=false; } else { - tmp=(*l)->RealMaxY(); - if (!((tmp==(*l)->RealMinY()) && (tmp==0))) { // Ignore this if both are 0 - if (tmp > val) val = tmp; - } + if (tmp > val) val = tmp; } } return rmax_y=val; } -void gGraphWindow::SetMinX(double v) +void gGraphWindow::SetMinX(qint64 v) { min_x=v; - for (list::iterator l=layers.begin();l!=layers.end();l++) { - (*l)->SetMinX(v); - } } -void gGraphWindow::SetMaxX(double v) +void gGraphWindow::SetMaxX(qint64 v) { max_x=v; - for (list::iterator l=layers.begin();l!=layers.end();l++) { - (*l)->SetMaxX(v); - } } -void gGraphWindow::SetMinY(double v) +void gGraphWindow::SetMinY(EventDataType v) { min_y=v; - for (list::iterator l=layers.begin();l!=layers.end();l++) { - (*l)->SetMinY(v); - } } -void gGraphWindow::SetMaxY(double v) +void gGraphWindow::SetMaxY(EventDataType v) { max_y=v; - for (list::iterator l=layers.begin();l!=layers.end();l++) { - (*l)->SetMaxY(v); - } } - -void gGraphWindow::DataChanged(gLayer *layer) -{ - QDateTime n=QDateTime::currentDateTime(); - double t=ti.msecsTo(n); - ti=n; - - if (layer) { - MinX(); MinY(); MaxX(); MaxY(); - RealMinX(); RealMinY(); RealMaxX(); RealMaxY(); - } else { - max_x=min_x=0; - } - - //long l=t.GetMilliseconds().GetLo(); - //wxLogMessage(wxString::Format(wxT("%li"),l)); - if ((t<2) && (layer!=lastlayer)) { - lastlayer=layer; - return; - } - - lastlayer=layer; - // This is possibly evil.. It needs to push one refresh event for all layers - - // Assmption currently is Refresh que does skip - - // updateGL(); -} - - diff --git a/Graphs/graphwindow.h b/Graphs/graphwindow.h index 2f951040..5fdd5e0d 100644 --- a/Graphs/graphwindow.h +++ b/Graphs/graphwindow.h @@ -56,83 +56,83 @@ public: // For mouse to screen use only.. work in OpenGL points where possible const QString & Title(void ) { return m_title; } - void SetMargins(float top, float right, float bottom, float left); // OpenGL width of each corners margin + void SetMargins(int top, int right, int bottom, int left); // OpenGL width of each corners margin - float GetTopMargin(void) const { return m_marginTop; } - float GetBottomMargin(void) const { return m_marginBottom; } - float GetLeftMargin(void) const { return m_marginLeft; } - float GetRightMargin(void) const { return m_marginRight; } + int GetTopMargin(void) const { return m_marginTop; } + int GetBottomMargin(void) const { return m_marginBottom; } + int GetLeftMargin(void) const { return m_marginLeft; } + int GetRightMargin(void) const { return m_marginRight; } - void SetTopMargin(float i) { m_marginTop=i; } - void SetBottomMargin(float i) { m_marginBottom=i; } - void SetLeftMargin(float i) { m_marginLeft=i; } - void SetRightMargin(float i) { m_marginRight=i; } + void SetTopMargin(int i) { m_marginTop=i; } + void SetBottomMargin(int i) { m_marginBottom=i; } + void SetLeftMargin(int i) { m_marginLeft=i; } + void SetRightMargin(int i) { m_marginRight=i; } - inline float Width() { return m_scrX-m_marginLeft-m_marginRight; } // Width of OpenGL main drawing area + inline int Width() { return m_scrX-m_marginLeft-m_marginRight; } // Width of OpenGL main drawing area inline int Height() { return m_scrY-m_marginTop-m_marginBottom; } // Height of ""... void LinkZoom(gGraphWindow *g) { link_zoom.push_back(g); } // Linking graphs changes zoom behaviour.. //void LinkMove(gGraphWindow *g) { link_move.push_back(g); } // Linking graphs changes zoom behaviour.. - virtual double MinX(); - virtual double MaxX(); - virtual double MinY(); - virtual double MaxY(); + virtual qint64 MinX(); + virtual qint64 MaxX(); + virtual EventDataType MinY(); + virtual EventDataType MaxY(); - virtual double RealMinX(); + /* virtual double RealMinX(); virtual double RealMaxX(); virtual double RealMinY(); - virtual double RealMaxY(); + virtual double RealMaxY();*/ - virtual void SetMinX(double v); - virtual void SetMaxX(double v); - virtual void SetMinY(double v); - virtual void SetMaxY(double v); + virtual void SetMinX(qint64 v); + virtual void SetMaxX(qint64 v); + virtual void SetMinY(EventDataType v); + virtual void SetMaxY(EventDataType v); - virtual void ResetXBounds(); - virtual void SetXBounds(double minx, double maxx); + virtual void ResetBounds(); + virtual void SetXBounds(qint64 minx, qint64 maxx); virtual void ZoomX(double mult,int origin_px); virtual void ZoomXPixels(int x1, int x2); // Zoom between two selected points on screen - virtual void ZoomXPixels(int x1,int x2,double &rx1,double &rx2); + virtual void ZoomXPixels(int x1,int x2,qint64 &rx1,qint64 &rx2); virtual void MoveX(int i); // Move x bounds by i Pixels - virtual void MoveX(int i,double &min, double & max); + virtual void MoveX(int i,qint64 &min, qint64 & max); - inline float x2p(double x) { + inline int x2p(qint64 x) { double xx=max_x-min_x; double wid=Width(); - double w=((wid/xx)*(x-min_x)); + double w=((wid/xx)*double(x-min_x)); return w+GetLeftMargin(); } - inline double p2x(float px) { + inline qint64 p2x(int px) { double xx=max_x-min_x; double wx=px-GetLeftMargin(); double ww=wx/Width(); return min_x+(xx*ww); } - inline int y2p(double y) { + inline int y2p(EventDataType y) { double yy=max_y-min_y; - double h=(Height()/yy)*(y-min_y); + double h=(Height()/yy)*double(y-min_y); return h+GetBottomMargin(); } - inline double p2y(float py) { + inline EventDataType p2y(int py) { double yy=max_y-min_y; double hy=py-GetBottomMargin(); double hh=hy/Height(); return min_y+(yy*hh); } - void Render(float scrx,float scry); + void Render(int scrx,int scry); //virtual void Update(); //virtual void Update(); void AddLayer(gLayer *l); - virtual void DataChanged(gLayer *layer); + //virtual void DataChanged(gLayer *layer); - double max_x,min_x,max_y,min_y; - double rmax_x,rmin_x,rmax_y,rmin_y; + qint64 max_x,min_x,max_y,min_y; + qint64 rmax_x,rmin_x,rmax_y,rmin_y; void SetBlockZoom(bool b) { m_block_zoom=b; } //void SetBlockMove(bool b) { m_block_move=b; } @@ -141,7 +141,7 @@ public: //FTFont *texfont; void SetGradientBackground(bool b) { m_gradient_background=b; } bool GradientBackground() { return m_gradient_background; } - + bool isEmpty(); void SetSplitter(QSplitter *s) { splitter=s; } bool isDraggingGraph() { return m_dragGraph; } protected: @@ -165,7 +165,7 @@ public: int m_scrY; QPoint m_mouseLClick,m_mouseRClick,m_mouseRClick_start; - float m_marginTop, m_marginRight, m_marginBottom, m_marginLeft; + int m_marginTop, m_marginRight, m_marginBottom, m_marginLeft; QRect m_mouseRBrect,m_mouseRBlast; bool m_mouseLDown,m_mouseRDown,m_datarefresh; diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp index ccb087e5..6cea728c 100644 --- a/SleepLib/day.cpp +++ b/SleepLib/day.cpp @@ -9,9 +9,7 @@ Day::Day(Machine *m) :machine(m) { - d_firstsession=true; - sessions.clear(); } Day::~Day() { @@ -124,53 +122,7 @@ EventDataType Day::summary_weighted_avg(MachineCode code) } -EventDataType Day::min(MachineCode code,int field) -{ - EventDataType val=0,tmp; - bool fir=true; - // Cache this? - - vector::iterator s; - - for (s=sessions.begin();s!=sessions.end();s++) { - Session & sess=*(*s); - if (sess.events.find(code)!=sess.events.end()) { - tmp=sess.min_event_field(code,field); - if (fir) { - val=tmp; - fir=false; - } else { - if (val>tmp) val=tmp; - } - } - } - return val; -} - -EventDataType Day::max(MachineCode code,int field) -{ - EventDataType val=0,tmp; - bool fir=true; - // Cache this? - - // Don't assume sessions are in order. - vector::iterator s; - for (s=sessions.begin();s!=sessions.end();s++) { - Session & sess=*(*s); - if (sess.events.find(code)!=sess.events.end()) { - tmp=sess.max_event_field(code,field); - if (fir) { - val=tmp; - fir=false; - } else { - if (val::iterator s=sessions.begin();s!=sessions.end();s++) { - Session & sess=*(*s); - if (sess.events.find(code)!=sess.events.end()) { - val+=sess.count_events(code); - } - } - return val; -} -EventDataType Day::weighted_avg(MachineCode code,int field) +EventDataType Day::weighted_avg(MachineCode code) { double s0=0,s1=0,s2=0; for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); - if (sess.events.find(code)!=sess.events.end()) { + if (sess.eventlist.find(code)!=sess.eventlist.end()) { s0=sess.hours(); - s1+=sess.weighted_avg_event_field(code,field)*s0; + s1+=sess.weighted_avg(code)*s0; s2+=s0; } } @@ -233,22 +173,22 @@ EventDataType Day::weighted_avg(MachineCode code,int field) // Total session time in milliseconds qint64 Day::total_time() { - d_totaltime=0; + qint64 d_totaltime=0; for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); d_totaltime+=sess.last()-sess.first(); } return d_totaltime; } -EventDataType Day::percentile(MachineCode code,int field,double percent) +EventDataType Day::percentile(MachineCode code,double percent) { double val=0; int cnt=0; for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); - if (sess.events.find(code)!=sess.events.end()) { - val+=sess.percentile(code,field,percent); + if (sess.eventlist.find(code)!=sess.eventlist.end()) { + val+=sess.percentile(code,percent); cnt++; } } @@ -263,14 +203,12 @@ qint64 Day::first(MachineCode code) qint64 tmp; for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { - Session & sess=*(*s); - if (sess.events.find(code)!=sess.events.end()) { - tmp=sess.events[code][0]->time(); - if (!date) { - date=tmp; - } else { - if (tmpfirst(code); + if (!tmp) continue; + if (!date) { + date=tmp; + } else { + if (tmp::iterator s=sessions.begin();s!=sessions.end();s++) { - Session & sess=*(*s); - if (sess.events.find(code)!=sess.events.end()) { - vector::reverse_iterator i=sess.events[code].rbegin(); - if (i==sess.events[code].rend()) { - qWarning() << "Day::last() i==sess.events[code].rend()"; - continue; - } - //assert(i!=sess.events[code].rend()); - tmp=(*i)->time(); - if (!date) { - date=tmp; - } else { - if (tmp>date) date=tmp; - } + tmp=(*s)->last(code); + if (!tmp) continue; + if (!date) { + date=tmp; + } else { + if (tmp>date) date=tmp; } } return date; } +EventDataType Day::min(MachineCode code) +{ + EventDataType min=0; + EventDataType tmp; + bool first=true; + for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { + if ((*s)->eventlist.find(code)==(*s)->eventlist.end()) continue; + tmp=(*s)->min(code); + if (first) { + min=tmp; + first=false; + } else { + if (tmp::iterator s=sessions.begin();s!=sessions.end();s++) { + if ((*s)->eventlist.find(code)==(*s)->eventlist.end()) continue; + tmp=(*s)->max(code); + if (first) { + max=tmp; + first=false; + } else { + if (tmp>max) max=tmp; + } + } + return max; +} +int Day::count(MachineCode code) +{ + int sum=0; + for (unsigned i=0;icount(code); + } + return sum; +} void Day::OpenEvents() { vector::iterator s; @@ -310,11 +282,3 @@ void Day::OpenEvents() } } -void Day::OpenWaveforms() -{ - vector::iterator s; - - for (s=sessions.begin();s!=sessions.end();s++) { - (*s)->OpenWaveforms(); - } -} diff --git a/SleepLib/day.h b/SleepLib/day.h index b98762c4..3591f7d5 100644 --- a/SleepLib/day.h +++ b/SleepLib/day.h @@ -7,7 +7,9 @@ #ifndef DAY_H #define DAY_H +#include "SleepLib/machine_common.h" #include "SleepLib/machine.h" +#include "SleepLib/event.h" #include "SleepLib/session.h" class OneTypePerDay @@ -25,13 +27,10 @@ public: MachineType machine_type(); - EventDataType min(MachineCode code,int field=0); - EventDataType max(MachineCode code,int field=0); - EventDataType avg(MachineCode code,int field=0); - EventDataType sum(MachineCode code,int field=0); - int count(MachineCode code); - EventDataType weighted_avg(MachineCode code,int field=0); - EventDataType percentile(MachineCode mc,int field,double percent); + EventDataType avg(MachineCode code); + EventDataType sum(MachineCode code); + EventDataType weighted_avg(MachineCode code); + EventDataType percentile(MachineCode mc,double percent); // Note, the following convert to doubles without considering the consequences fully. EventDataType summary_avg(MachineCode code); @@ -40,29 +39,31 @@ public: EventDataType summary_min(MachineCode code); EventDataType summary_max(MachineCode code); + qint64 first() { return d_first; } + qint64 last() { return d_last; } qint64 first(MachineCode code); qint64 last(MachineCode code); - qint64 first() { return d_first; }; - qint64 last() { return d_last; }; + EventDataType min(MachineCode code); + EventDataType max(MachineCode code); + int count(MachineCode code); + qint64 total_time(); // in milliseconds - double hours() { return double(total_time())/3600000.0; }; + double hours() { return double(total_time())/3600000.0; } - Session *operator [](int i) { return sessions[i]; }; + Session *operator [](int i) { return sessions[i]; } - vector::iterator begin() { return sessions.begin(); }; - vector::iterator end() { return sessions.end(); }; + vector::iterator begin() { return sessions.begin(); } + vector::iterator end() { return sessions.end(); } - size_t size() { return sessions.size(); }; + size_t size() { return sessions.size(); } Machine *machine; void OpenEvents(); - void OpenWaveforms(); protected: vector sessions; qint64 d_first,d_last; - qint64 d_totaltime; private: bool d_firstsession; }; diff --git a/SleepLib/event.cpp b/SleepLib/event.cpp index 0246b6b6..458ee56c 100644 --- a/SleepLib/event.cpp +++ b/SleepLib/event.cpp @@ -4,18 +4,192 @@ License: GPL *********************************************************************/ +#include #include "event.h" -Event::Event(qint64 time,MachineCode code, EventDataType * data, int fields) - :e_time(time),e_code(code) +EventList::EventList(MachineCode code,EventListType et,EventDataType gain, EventDataType offset, EventDataType min, EventDataType max,double rate) + :m_code(code),m_type(et),m_gain(gain),m_offset(offset),m_min(min),m_max(max),m_rate(rate) { - e_fields=fields; - for (int i=0; ival) m_min=val; + if (m_maxtime) m_first=time; + if (m_laststart) { + //qWarning() << "Attempted to add waveform with previous timestamp"; + // return; + + // technically start should equal m_last+1 sample.. check this too. + } + if (m_lastval) m_min=val; + if (m_maxstart) { + //qWarning() << "Attempted to add waveform with previous timestamp"; + // return; -}; + // technically start should equal m_last+1 sample.. check this too. + } + if (m_lastval) m_min=val; + if (m_maxstart) { + //qWarning() << "Attempted to add waveform with previous timestamp"; + //return; + + // technically start should equal m_last+1 sample.. check this too. + } + if (m_lastval) m_min=val; + if (m_max +#include "SleepLib/session.h" #include "machine_common.h" -typedef float EventDataType; -class Event +enum EventListType { EVL_Waveform, EVL_Event }; + +class EventList { friend class Session; public: - Event(qint64 time,MachineCode code,EventDataType * data,int fields); - ~Event(); - EventDataType operator[](short i) { - if (i & getData() { return m_data; } + const vector & getTime() { return m_time; } protected: - qint64 e_time; - MachineCode e_code; - short e_fields; - vector e_data; + vector m_time; + vector m_data; + MachineCode m_code; + EventListType m_type; + int m_count; + + EventDataType m_gain; + EventDataType m_offset; + EventDataType m_min; + EventDataType m_max; + EventDataType m_rate; // Waveform sample rate + + qint64 m_first,m_last; + bool m_update_minmax; }; + #endif // EVENT_H diff --git a/SleepLib/loader_plugins/cms50_loader.cpp b/SleepLib/loader_plugins/cms50_loader.cpp index a384dc00..87172717 100644 --- a/SleepLib/loader_plugins/cms50_loader.cpp +++ b/SleepLib/loader_plugins/cms50_loader.cpp @@ -196,9 +196,15 @@ bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile) EventDataType cp,cs; Session *sess=new Session(mach,sessid); - sess->set_first(starttime); - sess->AddEvent(new Event(starttime,OXI_Pulse,&last_pulse,1)); - sess->AddEvent(new Event(starttime,OXI_SPO2,&last_spo2,1)); + sess->UpdateFirst(starttime); + EventList *oxip=new EventList(OXI_Pulse,EVL_Event); + EventList *oxis=new EventList(OXI_SPO2,EVL_Event); + sess->eventlist[OXI_Pulse].push_back(oxip); + sess->eventlist[OXI_SPO2].push_back(oxis); + oxip->AddEvent(starttime,last_pulse); + oxis->AddEvent(starttime,last_spo2); + //sess->AddEvent(new Event(starttime,OXI_Pulse,0,&last_pulse,1)); + //sess->AddEvent(new Event(starttime,OXI_SPO2,0,&last_spo2,1)); EventDataType PMin=0,PMax=0,SMin=0,SMax=0,PAvg=0,SAvg=0; int PCnt=0,SCnt=0; @@ -213,7 +219,8 @@ bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile) cp=buffer[i]; cs=buffer[i+1]; if (last_pulse!=cp) { - sess->AddEvent(new Event(tt,OXI_Pulse,&cp,1)); + oxip->AddEvent(tt,cp); + //sess->AddEvent(new Event(tt,OXI_Pulse,0,&cp,1)); if (tt>lasttime) lasttime=tt; if (cp>0) { if (first_p) { @@ -227,7 +234,8 @@ bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile) } } if (last_spo2!=cs) { - sess->AddEvent(new Event(tt,OXI_SPO2,&cs,1)); + oxis->AddEvent(tt,cs); + //sess->AddEvent(new Event(tt,OXI_SPO2,0,&cs,1)); if (tt>lasttime) lasttime=tt; if (cs>0) { if (first_s) { @@ -246,10 +254,10 @@ bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile) if (SMaxAddEvent(new Event(tt,OXI_Pulse,&cp,1)); - if (cs) sess->AddEvent(new Event(tt,OXI_SPO2,&cs,1)); + if (cp) oxip->AddEvent(tt,cp);//sess->AddEvent(new Event(tt,OXI_Pulse,0,&cp,1)); + if (cs) oxis->AddEvent(tt,cs);//sess->AddEvent(new Event(tt,OXI_SPO2,0,&cs,1)); - sess->set_last(lasttime); + sess->UpdateLast(tt); //double t=sess->last()-sess->first().toTime_t(); //double hours=(t/3600.0); //sess->set_hours(hours); diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index 48f5860b..0b5d60aa 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -13,7 +13,7 @@ License: GPL #include #include #include - +#include #include "prs1_loader.h" #include "SleepLib/session.h" @@ -52,7 +52,7 @@ PRS1::~PRS1() PRS1Loader::PRS1Loader() { - m_buffer=new unsigned char [max_load_buffer_size]; //allocate once and reuse. + m_buffer=NULL; } PRS1Loader::~PRS1Loader() @@ -60,7 +60,6 @@ PRS1Loader::~PRS1Loader() for (map::iterator i=PRS1List.begin(); i!=PRS1List.end(); i++) { delete i->second; } - delete [] m_buffer; } Machine *PRS1Loader::CreateMachine(QString serial,Profile *profile) { @@ -111,6 +110,7 @@ int PRS1Loader::Open(QString & path,Profile *profile) if ((!dir.exists() || !dir.isReadable())) return 0; + //qDebug() << "PRS1Loader::Open newpath=" << newpath; dir.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks); dir.setSorting(QDir::Name); @@ -145,6 +145,7 @@ int PRS1Loader::Open(QString & path,Profile *profile) if (SerialNumbers.empty()) return 0; + m_buffer=new unsigned char [max_load_buffer_size]; //allocate once and reuse. Machine *m; for (sn=SerialNumbers.begin(); sn!=SerialNumbers.end(); sn++) { QString s=*sn; @@ -158,6 +159,7 @@ int PRS1Loader::Open(QString & path,Profile *profile) delete m; } } + delete [] m_buffer; return PRS1List.size(); } @@ -303,52 +305,49 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile) } const double ignore_thresh=300.0/3600.0;// Ignore useless sessions under 5 minute if (sess->hours()<=ignore_thresh) { - //qDebug() << "Ignoring short session" << session << "which is only" << (sess->hours()*60.0) << "minute(s) long"; + qDebug() << "Ignoring short session" << session << "which is only" << (sess->hours()*60.0) << "minute(s) long"; delete sess; continue; } - sess->summary[CPAP_Obstructive]=sess->count_events(CPAP_Obstructive); - sess->summary[CPAP_Hypopnea]=sess->count_events(CPAP_Hypopnea); - sess->summary[CPAP_ClearAirway]=sess->count_events(CPAP_ClearAirway); - sess->summary[CPAP_RERA]=sess->count_events(CPAP_RERA); - sess->summary[CPAP_FlowLimit]=sess->count_events(CPAP_FlowLimit); - sess->summary[CPAP_VSnore]=sess->count_events(CPAP_VSnore); + sess->summary[CPAP_Obstructive]=sess->count(CPAP_Obstructive); + sess->summary[CPAP_Hypopnea]=sess->count(CPAP_Hypopnea); + sess->summary[CPAP_ClearAirway]=sess->count(CPAP_ClearAirway); + sess->summary[CPAP_RERA]=sess->count(CPAP_RERA); + sess->summary[CPAP_FlowLimit]=sess->count(CPAP_FlowLimit); + sess->summary[CPAP_VSnore]=sess->count(CPAP_VSnore); - sess->summary[CPAP_CSR]=sess->sum_event_field(CPAP_CSR,0); - sess->summary[CPAP_Snore]=sess->sum_event_field(CPAP_Snore,0); + sess->summary[CPAP_CSR]=sess->sum(CPAP_CSR); + sess->summary[CPAP_Snore]=sess->sum(CPAP_Snore); - if (sess->count_events(CPAP_IAP)>0) { + if (sess->count(CPAP_IAP)>0) { //sess->summary[CPAP_Mode]!=MODE_ASV) sess->summary[CPAP_Mode]=MODE_BIPAP; - sess->summary[BIPAP_PSAverage]=sess->weighted_avg_event_field(CPAP_PS,0); - sess->summary[BIPAP_PSMin]=sess->min_event_field(CPAP_PS,0); - sess->summary[BIPAP_PSMax]=sess->max_event_field(CPAP_PS,0); + sess->summary[BIPAP_PSAverage]=sess->weighted_avg(CPAP_PS); + sess->summary[BIPAP_PSMin]=sess->min(CPAP_PS); + sess->summary[BIPAP_PSMax]=sess->max(CPAP_PS); if (sess->summary[CPAP_PressureReliefType].toInt()!=PR_NONE) { sess->summary[CPAP_PressureReliefType]=PR_BIFLEX; } - sess->summary[CPAP_PressureMedian]=(sess->avg_event_field(CPAP_EAP,0)+sess->avg_event_field(CPAP_IAP,0))/2.0; - sess->summary[CPAP_PressureAverage]=(sess->weighted_avg_event_field(CPAP_IAP,0)+sess->weighted_avg_event_field(CPAP_EAP,0))/2.0; - sess->summary[CPAP_PressureMinAchieved]=sess->min_event_field(CPAP_IAP,0); - sess->summary[CPAP_PressureMaxAchieved]=sess->max_event_field(CPAP_EAP,0); - - sess->summary[BIPAP_EAPAverage]=sess->weighted_avg_event_field(CPAP_EAP,0); - sess->summary[BIPAP_EAPMin]=sess->min_event_field(CPAP_EAP,0); - sess->summary[BIPAP_EAPMax]=sess->max_event_field(CPAP_EAP,0); - - sess->summary[BIPAP_IAPAverage]=sess->weighted_avg_event_field(CPAP_IAP,0); - sess->summary[BIPAP_IAPMin]=sess->min_event_field(CPAP_IAP,0); - sess->summary[BIPAP_IAPMax]=sess->max_event_field(CPAP_IAP,0); - + sess->summary[CPAP_PressureMedian]=(sess->avg(CPAP_EAP)+sess->avg(CPAP_IAP))/2.0; + sess->summary[CPAP_PressureAverage]=(sess->weighted_avg(CPAP_IAP)+sess->weighted_avg(CPAP_EAP))/2.0; + sess->summary[CPAP_PressureMinAchieved]=sess->min(CPAP_IAP); + sess->summary[CPAP_PressureMaxAchieved]=sess->max(CPAP_EAP); + sess->summary[BIPAP_EAPAverage]=sess->weighted_avg(CPAP_EAP); + sess->summary[BIPAP_EAPMin]=sess->min(CPAP_EAP); + sess->summary[BIPAP_EAPMax]=sess->max(CPAP_EAP); + sess->summary[BIPAP_IAPAverage]=sess->weighted_avg(CPAP_IAP); + sess->summary[BIPAP_IAPMin]=sess->min(CPAP_IAP); + sess->summary[BIPAP_IAPMax]=sess->max(CPAP_IAP); } else { - sess->summary[CPAP_PressureMedian]=sess->weighted_avg_event_field(CPAP_Pressure,0); - sess->summary[CPAP_PressureAverage]=sess->weighted_avg_event_field(CPAP_Pressure,0); - sess->summary[CPAP_PressureMinAchieved]=sess->min_event_field(CPAP_Pressure,0); - sess->summary[CPAP_PressureMaxAchieved]=sess->max_event_field(CPAP_Pressure,0); + sess->summary[CPAP_PressureMedian]=sess->weighted_avg(CPAP_Pressure); + sess->summary[CPAP_PressureAverage]=sess->weighted_avg(CPAP_Pressure); + sess->summary[CPAP_PressureMinAchieved]=sess->min(CPAP_Pressure); + sess->summary[CPAP_PressureMaxAchieved]=sess->max(CPAP_Pressure); if (sess->summary.find(CPAP_PressureMin)==sess->summary.end()) { sess->summary[CPAP_BrokenSummary]=true; //sess->set_last(sess->first()); @@ -366,15 +365,15 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile) sess->summary[CPAP_PressureMax]=sess->summary[CPAP_PressureMin]; } - sess->summary[CPAP_LeakMinimum]=sess->min_event_field(CPAP_Leak,0); - sess->summary[CPAP_LeakMaximum]=sess->max_event_field(CPAP_Leak,0); // should be merged.. - sess->summary[CPAP_LeakMedian]=sess->avg_event_field(CPAP_Leak,0); - sess->summary[CPAP_LeakAverage]=sess->weighted_avg_event_field(CPAP_Leak,0); + sess->summary[CPAP_LeakMinimum]=sess->min(CPAP_Leak); + sess->summary[CPAP_LeakMaximum]=sess->max(CPAP_Leak); // should be merged.. + sess->summary[CPAP_LeakMedian]=sess->avg(CPAP_Leak); + sess->summary[CPAP_LeakAverage]=sess->weighted_avg(CPAP_Leak); - sess->summary[CPAP_SnoreMinimum]=sess->min_event_field(CPAP_Snore,0); - sess->summary[CPAP_SnoreMaximum]=sess->max_event_field(CPAP_Snore,0); - sess->summary[CPAP_SnoreMedian]=sess->avg_event_field(CPAP_Snore,0); - sess->summary[CPAP_SnoreAverage]=sess->weighted_avg_event_field(CPAP_Snore,0); + sess->summary[CPAP_SnoreMinimum]=sess->min(CPAP_Snore); + sess->summary[CPAP_SnoreMaximum]=sess->max(CPAP_Snore); + sess->summary[CPAP_SnoreMedian]=sess->avg(CPAP_Snore); + sess->summary[CPAP_SnoreAverage]=sess->weighted_avg(CPAP_Snore); //Printf(sess->start().Format()+wxT(" avgsummary=%.3f avgmine=%.3f\n"),sess->summary[CPAP_PressureAverage].GetDouble(),sess->weighted_avg_event_field(CPAP_Pressure,0)); sess->SetChanged(true); @@ -530,8 +529,11 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,qint64 }; int ncodes=sizeof(Codes)/sizeof(MachineCode); + EventList * Code[0x20]={NULL}; + EventDataType data[10]; + session->UpdateFirst(timestamp); //qint64 start=timestamp; qint64 t=timestamp; qint64 tt; @@ -556,62 +558,134 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,qint64 //qDebug()<< d.toString("yyyy-MM-dd HH:mm:ss") << ": " << hex << pos+15 << " " << hex << int(code) << int(delta); t+=delta*1000; } - MachineCode cpapcode=Codes[(int)code]; + //MachineCode cpapcode=Codes[(int)code]; tt=t; cnt++; //int fc=0; switch (code) { - case 0x01: // Unknown - session->AddEvent(new Event(t,cpapcode, data,0)); + case 0x00: // Unknown 00 + if (!Code[0]) { + Code[0]=new EventList(PRS1_Unknown00,EVL_Event); + session->eventlist[PRS1_Unknown00].push_back(Code[0]); + } + Code[0]->AddEvent(t,buffer[pos++]); break; - case 0x00: // Unknown (ASV Pressure value) // could this be RLE? - // offset? - data[0]=buffer[pos++]; - session->AddEvent(new Event(t,cpapcode, data,1)); + case 0x01: // Unknown + if (!Code[1]) { + Code[1]=new EventList(PRS1_Unknown01,EVL_Event); + session->eventlist[PRS1_Unknown01].push_back(Code[1]); + } + Code[1]->AddEvent(t,0); break; case 0x02: // Pressure - data[0]=buffer[pos++]/10.0; - session->AddEvent(new Event(t,cpapcode, data,1)); + if (!Code[2]) { + Code[2]=new EventList(CPAP_Pressure,EVL_Event,0.1); + session->eventlist[CPAP_Pressure].push_back(Code[2]); + } + Code[2]->AddEvent(t,buffer[pos++]); break; case 0x03: // BIPAP Pressure - data[0]=buffer[pos++]; - data[1]=buffer[pos++]; - data[0]/=10.0; - data[1]/=10.0; - session->AddEvent(new Event(t,CPAP_EAP, data, 1)); - session->AddEvent(new Event(t,CPAP_IAP, &data[1], 1)); - data[1]-=data[0]; - session->AddEvent(new Event(t,CPAP_PS, &data[1], 1)); + if (!Code[3]) { + Code[3]=new EventList(CPAP_EAP,EVL_Event,0.1); + session->eventlist[CPAP_EAP].push_back(Code[3]); + Code[4]=new EventList(CPAP_IAP,EVL_Event,0.1); + session->eventlist[CPAP_IAP].push_back(Code[4]); + Code[5]=new EventList(CPAP_PS,EVL_Event,0.1); + session->eventlist[CPAP_PS].push_back(Code[5]); + } + Code[3]->AddEvent(t,data[0]=buffer[pos++]); + Code[4]->AddEvent(t,data[1]=buffer[pos++]); + Code[5]->AddEvent(t,data[1]-data[0]); break; case 0x04: // Pressure Pulse - data[0]=buffer[pos++]; - session->AddEvent(new Event(t,cpapcode, data,1)); + if (!Code[6]) { + Code[6]=new EventList(PRS1_PressurePulse,EVL_Event); + session->eventlist[PRS1_PressurePulse].push_back(Code[6]); + } + Code[6]->AddEvent(t,buffer[pos++]); //qDebug() << hex << data[0]; break; case 0x05: // RERA + data[0]=buffer[pos++]; + tt-=data[0]*1000; // Subtract Time Offset + if (!Code[7]) { + Code[7]=new EventList(CPAP_RERA,EVL_Event); + session->eventlist[CPAP_RERA].push_back(Code[7]); + } + Code[7]->AddEvent(tt,data[0]); + break; + case 0x06: // Obstructive Apoanea + data[0]=buffer[pos++]; + tt-=data[0]*1000; // Subtract Time Offset + if (!Code[8]) { + Code[8]=new EventList(CPAP_Obstructive,EVL_Event); + session->eventlist[CPAP_Obstructive].push_back(Code[8]); + } + Code[8]->AddEvent(tt,data[0]); + break; case 0x07: // Clear Airway + data[0]=buffer[pos++]; + tt-=data[0]*1000; // Subtract Time Offset + if (!Code[9]) { + Code[9]=new EventList(CPAP_ClearAirway,EVL_Event); + session->eventlist[CPAP_ClearAirway].push_back(Code[9]); + } + Code[9]->AddEvent(tt,data[0]); + break; case 0x0a: // Hypopnea + data[0]=buffer[pos++]; + tt-=data[0]*1000; // Subtract Time Offset + if (!Code[10]) { + Code[10]=new EventList(CPAP_Hypopnea,EVL_Event); + session->eventlist[CPAP_Hypopnea].push_back(Code[10]); + } + Code[10]->AddEvent(tt,data[0]); + break; case 0x0c: // Flow Limitation data[0]=buffer[pos++]; tt-=data[0]*1000; // Subtract Time Offset - session->AddEvent(new Event(tt,cpapcode,data,1)); + if (!Code[11]) { + Code[11]=new EventList(CPAP_FlowLimit,EVL_Event); + session->eventlist[CPAP_FlowLimit].push_back(Code[11]); + } + Code[11]->AddEvent(tt,data[0]); break; - case 0x0b: // ASV Codes + + case 0x0b: // Hypopnea related code data[0]=buffer[pos++]; data[1]=buffer[pos++]; - session->AddEvent(new Event(tt,cpapcode,data,2)); + if (!Code[12]) { + Code[12]=new EventList(PRS1_Unknown0B,EVL_Event); + session->eventlist[PRS1_Unknown0B].push_back(Code[12]); + } + // FIXME + Code[12]->AddEvent(t,data[0]); break; case 0x0d: // Vibratory Snore - session->AddEvent(new Event(t,cpapcode, data,0)); + if (!Code[13]) { + Code[13]=new EventList(CPAP_VSnore,EVL_Event); + session->eventlist[CPAP_VSnore].push_back(Code[13]); + } + Code[13]->AddEvent(t,0); break; - case 0x11: // Leak Rate + case 0x11: // Leak Rate & Snore Graphs data[0]=buffer[pos++]; data[1]=buffer[pos++]; - session->AddEvent(new Event(t,cpapcode, data,1)); - session->AddEvent(new Event(t,CPAP_Snore,&data[1],1)); + if (!Code[14]) { + Code[14]=new EventList(CPAP_Leak,EVL_Event); + session->eventlist[CPAP_Leak].push_back(Code[14]); + Code[15]=new EventList(CPAP_Snore,EVL_Event); + session->eventlist[CPAP_Snore].push_back(Code[15]); + } + Code[14]->AddEvent(t,data[0]); + Code[15]->AddEvent(t,data[1]); if (data[1]>0) { - session->AddEvent(new Event(t,PRS1_VSnore2, &data[1],1)); + if (!Code[16]) { + Code[16]=new EventList(PRS1_VSnore2,EVL_Event); + session->eventlist[PRS1_VSnore2].push_back(Code[16]); + } + Code[16]->AddEvent(t,data[1]); } break; case 0x0e: // Unknown @@ -620,8 +694,14 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,qint64 //data[0]/=10.0; //pos+=2; data[2]=buffer[pos++]; + + if (!Code[17]) { + Code[17]=new EventList(PRS1_Unknown0E,EVL_Event); + session->eventlist[PRS1_Unknown0E].push_back(Code[17]); + } + Code[17]->AddEvent(t,data[0]); //qDebug() << hex << data[0] << data[1] << data[2]; - session->AddEvent(new Event(t,cpapcode, data, 3)); + //session->AddEvent(new Event(t,cpapcode, 0, data, 3)); //tt-=data[1]*1000; //session->AddEvent(new Event(t,CPAP_CSR, data, 2)); break; @@ -629,21 +709,33 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,qint64 data[0]=buffer[pos++]; // << 8) | buffer[pos]; data[1]=buffer[pos++]; data[2]=buffer[pos++]; - session->AddEvent(new Event(t,cpapcode, data, 3)); + if (!Code[20]) { + Code[20]=new EventList(PRS1_Unknown10,EVL_Event); + session->eventlist[PRS1_Unknown10].push_back(Code[20]); + } + Code[20]->AddEvent(t,data[0]); break; case 0x0f: // Cheyne Stokes Respiration data[0]=buffer[pos+1]<<8 | buffer[pos]; pos+=2; data[1]=buffer[pos++]; tt-=data[1]*1000; - session->AddEvent(new Event(tt,cpapcode, data, 2)); + if (!Code[23]) { + Code[23]=new EventList(CPAP_CSR,EVL_Event); + session->eventlist[CPAP_CSR].push_back(Code[23]); + } + Code[23]->AddEvent(tt,data[0]); break; case 0x12: // Summary data[0]=buffer[pos++]; data[1]=buffer[pos++]; data[2]=buffer[pos+1]<<8 | buffer[pos]; pos+=2; - session->AddEvent(new Event(t,cpapcode, data,3)); + if (!Code[24]) { + Code[24]=new EventList(PRS1_Unknown12,EVL_Event); + session->eventlist[PRS1_Unknown12].push_back(Code[24]); + } + Code[24]->AddEvent(t,data[0]); break; default: // ERROR!!! @@ -651,19 +743,26 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,qint64 return false; } } + session->UpdateLast(t); + return true; } bool PRS1Loader::Parse002ASV(Session *session,unsigned char *buffer,int size,qint64 timestamp) { MachineCode Codes[]={ - PRS1_Unknown00, PRS1_Unknown01, CPAP_Pressure, CPAP_EAP, PRS1_PressurePulse, CPAP_Obstructive, CPAP_ClearAirway, CPAP_Hypopnea, - PRS1_Unknown08, CPAP_FlowLimit, PRS1_Unknown0A, CPAP_CSR, PRS1_Unknown0C, CPAP_VSnore, PRS1_Unknown0E, PRS1_Unknown0F, PRS1_Unknown10, + PRS1_Unknown00, PRS1_Unknown01, CPAP_Pressure, CPAP_EAP, PRS1_PressurePulse, CPAP_Obstructive, + CPAP_ClearAirway, CPAP_Hypopnea, PRS1_Unknown08, CPAP_FlowLimit, PRS1_Unknown0A, CPAP_CSR, + PRS1_Unknown0C, CPAP_VSnore, PRS1_Unknown0E, PRS1_Unknown0F, PRS1_Unknown10, CPAP_Leak, PRS1_Unknown12 }; int ncodes=sizeof(Codes)/sizeof(MachineCode); + EventList * Code[0x20]={NULL}; + //for (int i=0;i<0x20;i++) Code[i]=NULL; + + session->UpdateFirst(timestamp); EventDataType data[10]; //qint64 start=timestamp; @@ -695,10 +794,8 @@ bool PRS1Loader::Parse002ASV(Session *session,unsigned char *buffer,int size,qin tt=t; cnt++; int fc=0; + switch (code) { - case 0x01: // Unknown - session->AddEvent(new Event(t,cpapcode, data,0)); - break; case 0x00: // Unknown (ASV Pressure value) // offset? data[0]=buffer[pos++]; @@ -711,111 +808,218 @@ bool PRS1Loader::Parse002ASV(Session *session,unsigned char *buffer,int size,qin data[2]=buffer[pos++]; fc++; } - session->AddEvent(new Event(t,cpapcode, data,2)); break; + case 0x01: // Unknown + if (!Code[1]) { + Code[1]=new EventList(cpapcode,EVL_Event,0.1); + session->eventlist[cpapcode].push_back(Code[1]); + } + Code[1]->AddEvent(t,0); + break; + case 0x02: // Pressure - data[0]=buffer[pos++]/10.0; // crappy EPAP pressure value. - //session->AddEvent(new Event(t,cpapcode, data,1)); + data[0]=buffer[pos++]; + if (!Code[2]) { + Code[2]=new EventList(cpapcode,EVL_Event,0.1); + session->eventlist[cpapcode].push_back(Code[2]); + } + Code[2]->AddEvent(t,data[0]); break; case 0x04: // Pressure Pulse data[0]=buffer[pos++]; - session->AddEvent(new Event(t,cpapcode, data,1)); + if (!Code[3]) { + Code[3]=new EventList(cpapcode,EVL_Event); + session->eventlist[cpapcode].push_back(Code[3]); + } + Code[3]->AddEvent(t,data[0]); + break; + + case 0x05: + data[0]=buffer[pos++]; + tt-=data[0]*1000; // Subtract Time Offset + if (!Code[4]) { + Code[4]=new EventList(cpapcode,EVL_Event); + session->eventlist[cpapcode].push_back(Code[4]); + } + Code[4]->AddEvent(tt,data[0]); + break; + + case 0x06: + data[0]=buffer[pos++]; + tt-=data[0]*1000; // Subtract Time Offset + if (!Code[5]) { + Code[5]=new EventList(cpapcode,EVL_Event); + session->eventlist[cpapcode].push_back(Code[5]); + } + Code[5]->AddEvent(tt,data[0]); + break; + case 0x07: + data[0]=buffer[pos++]; + tt-=data[0]*1000; // Subtract Time Offset + if (!Code[6]) { + Code[6]=new EventList(cpapcode,EVL_Event); + session->eventlist[cpapcode].push_back(Code[6]); + } + Code[6]->AddEvent(tt,data[0]); + break; + case 0x08: // ASV Codes + data[0]=buffer[pos++]; + tt-=data[0]*1000; // Subtract Time Offset + if (!Code[10]) { + Code[10]=new EventList(cpapcode,EVL_Event); + session->eventlist[cpapcode].push_back(Code[10]); + } + Code[10]->AddEvent(tt,data[0]); + break; + case 0x09: // ASV Codes + data[0]=buffer[pos++]; + tt-=data[0]*1000; // Subtract Time Offset + if (!Code[11]) { + Code[11]=new EventList(cpapcode,EVL_Event); + session->eventlist[cpapcode].push_back(Code[11]); + } + Code[11]->AddEvent(tt,data[0]); + break; case 0x0a: - code=0x0a; - case 0x05: - case 0x06: - case 0x07: + data[0]=buffer[pos++]; + tt-=data[0]*1000; // Subtract Time Offset + if (!Code[7]) { + Code[7]=new EventList(cpapcode,EVL_Event); + session->eventlist[cpapcode].push_back(Code[7]); + } + Code[7]->AddEvent(tt,data[0]); + break; + case 0x0c: data[0]=buffer[pos++]; tt-=data[0]*1000; // Subtract Time Offset - session->AddEvent(new Event(tt,cpapcode,data,1)); + if (!Code[8]) { + Code[8]=new EventList(cpapcode,EVL_Event); + session->eventlist[cpapcode].push_back(Code[8]); + } + Code[8]->AddEvent(tt,data[0]); break; + + case 0x0b: // Cheyne Stokes data[0]=((unsigned char *)buffer)[pos+1]<<8 | ((unsigned char *)buffer)[pos]; - data[0]*=2; + //data[0]*=2; pos+=2; data[1]=((unsigned char *)buffer)[pos]; //|buffer[pos+1] << 8 pos+=1; //tt-=delta; tt-=data[1]*1000; - session->AddEvent(new Event(tt,cpapcode, data, 2)); - //tt+=delta; - break; - case 0x08: // ASV Codes - case 0x09: // ASV Codes - data[0]=buffer[pos]; - tt-=buffer[pos++]*1000; // Subtract Time Offset - session->AddEvent(new Event(tt,cpapcode,data,1)); + if (!Code[9]) { + Code[9]=new EventList(cpapcode,EVL_Event,2.0); + session->eventlist[cpapcode].push_back(Code[9]); + } + Code[9]->AddEvent(tt,data[0]); + //session->AddEvent(new Event(tt,cpapcode, data[0], data, 2)); break; case 0x0d: // All the other ASV graph stuff. - d=QDateTime::fromMSecsSinceEpoch(t); - data[0]=buffer[pos++]/10.0; - session->AddEvent(new Event(t,CPAP_IAP,&data[0],1)); //correct - data[1]=buffer[pos++]/10.0; // Low IPAP - session->AddEvent(new Event(t,CPAP_IAPLO,&data[1],1)); //correct - data[2]=buffer[pos++]/10.0; // Hi IPAP - session->AddEvent(new Event(t,CPAP_IAPHI,&data[2],1)); //correct - data[3]=buffer[pos++];//Leak - session->AddEvent(new Event(t,CPAP_Leak,&data[3],1)); // correct - data[4]=buffer[pos++];//Breaths Per Minute - session->AddEvent(new Event(t,CPAP_RespiratoryRate,&data[4],1)); //correct - data[5]=buffer[pos++];//Patient Triggered Breaths - session->AddEvent(new Event(t,CPAP_PatientTriggeredBreaths,&data[5],1)); //correct - data[6]=buffer[pos++];//Minute Ventilation - session->AddEvent(new Event(t,CPAP_MinuteVentilation,&data[6],1)); //correct - data[7]=buffer[pos++]*10.0; // Tidal Volume - session->AddEvent(new Event(t,CPAP_TidalVolume,&data[7],1)); //correct - data[8]=buffer[pos++]; - session->AddEvent(new Event(t,CPAP_Snore,&data[8],1)); //correct - if (data[8]>0) { - session->AddEvent(new Event(t,CPAP_VSnore,&data[8],1)); //correct - } - data[9]=buffer[pos++]/10.0; // EPAP - session->AddEvent(new Event(t,CPAP_EAP,&data[9],1)); //correct + if (!Code[12]) { + Code[12]=new EventList(CPAP_IAP,EVL_Event,0.1); + session->eventlist[CPAP_IAP].push_back(Code[12]); - data[2]-=data[9]; // Pressure Support - session->AddEvent(new Event(t,CPAP_PS,&data[2],1)); //correct - //qDebug()<< d.toString("yyyy-MM-dd HH:mm:ss") << hex << session->session() << pos+15 << hex << int(code) << ": " << hex << int(data[0]) << " " << int(data[1]) << " " << int(data[2]) << " " << int(data[3]) << " " << int(data[4]) << " " << int(data[5])<< " " << int(data[6]) << " " << int(data[7]) << " " << int(data[8]) << " " << int(data[9]); + Code[13]=new EventList(CPAP_IAPLO,EVL_Event,0.1); + session->eventlist[CPAP_IAPLO].push_back(Code[13]); + + Code[14]=new EventList(CPAP_IAPHI,EVL_Event,0.1); + session->eventlist[CPAP_IAPHI].push_back(Code[14]); + + Code[15]=new EventList(CPAP_Leak,EVL_Event); + session->eventlist[CPAP_Leak].push_back(Code[15]); + + Code[16]=new EventList(CPAP_RespiratoryRate,EVL_Event); + session->eventlist[CPAP_RespiratoryRate].push_back(Code[16]); + + Code[17]=new EventList(CPAP_PatientTriggeredBreaths,EVL_Event); + session->eventlist[CPAP_PatientTriggeredBreaths].push_back(Code[17]); + + Code[18]=new EventList(CPAP_MinuteVentilation,EVL_Event); + session->eventlist[CPAP_MinuteVentilation].push_back(Code[18]); + + Code[19]=new EventList(CPAP_TidalVolume,EVL_Event,10.0); + session->eventlist[CPAP_TidalVolume].push_back(Code[19]); + + Code[20]=new EventList(CPAP_Snore,EVL_Event); + session->eventlist[CPAP_Snore].push_back(Code[20]); + + Code[22]=new EventList(CPAP_EAP,EVL_Event,0.1); + session->eventlist[CPAP_EAP].push_back(Code[22]); + + Code[23]=new EventList(CPAP_PS,EVL_Event,0.1); + session->eventlist[CPAP_PS].push_back(Code[23]); + + } + Code[12]->AddEvent(t,data[0]=buffer[pos++]); // IAP + Code[13]->AddEvent(t,buffer[pos++]); // IAP Low + Code[14]->AddEvent(t,buffer[pos++]); // IAP High + Code[15]->AddEvent(t,buffer[pos++]); // LEAK + Code[16]->AddEvent(t,buffer[pos++]); // Breaths Per Minute + Code[17]->AddEvent(t,buffer[pos++]); // Patient Triggered Breaths + Code[18]->AddEvent(t,buffer[pos++]); // Minute Ventilation + Code[19]->AddEvent(t,buffer[pos++]); // Tidal Volume + Code[20]->AddEvent(t,data[2]=buffer[pos++]); // Snore + if (data[2]>0) { + if (!Code[21]) { + Code[21]=new EventList(CPAP_VSnore,EVL_Event); + session->eventlist[CPAP_VSnore].push_back(Code[21]); + } + Code[21]->AddEvent(t,0); //data[2]); // VSnore + } + Code[22]->AddEvent(t,data[1]=buffer[pos++]); // EPAP + Code[23]->AddEvent(t,data[0]-data[1]); // Pressure Support break; case 0x03: // BIPAP Pressure + qDebug() << "0x03 Observed in ASV data!!????"; + data[0]=buffer[pos++]; data[1]=buffer[pos++]; - data[0]/=10.0; + /*data[0]/=10.0; data[1]/=10.0; - session->AddEvent(new Event(t,CPAP_EAP, data, 1)); - session->AddEvent(new Event(t,CPAP_IAP, &data[1], 1)); + session->AddEvent(new Event(t,CPAP_EAP, 0, data, 1)); + session->AddEvent(new Event(t,CPAP_IAP, 0, &data[1], 1)); */ break; - case 0x11: // Leak Rate - data[0]=buffer[pos++]; - session->AddEvent(new Event(t,cpapcode, data,1)); + case 0x11: // Not Leak Rate + qDebug() << "0x11 Observed in ASV data!!????"; + //if (!Code[24]) { + // Code[24]=new EventList(cpapcode,EVL_Event); + //} + //Code[24]->AddEvent(t,buffer[pos++]); break; case 0x0e: // Unknown + qDebug() << "0x0E Observed in ASV data!!????"; data[0]=buffer[pos++]; // << 8) | buffer[pos]; - session->AddEvent(new Event(t,cpapcode, data, 1)); + //session->AddEvent(new Event(t,cpapcode, 0, data, 1)); break; case 0x10: // Unknown + qDebug() << "0x10 Observed in ASV data!!????"; data[0]=buffer[pos++]; // << 8) | buffer[pos]; data[1]=buffer[pos++]; data[2]=buffer[pos++]; - session->AddEvent(new Event(t,cpapcode, data, 3)); + //session->AddEvent(new Event(t,cpapcode, 0, data, 3)); break; case 0x0f: + qDebug() << "0x0f Observed in ASV data!!????"; + data[0]=buffer[pos+1]<<8 | buffer[pos]; pos+=2; data[1]=buffer[pos]; //|buffer[pos+1] << 8 pos+=1; tt-=data[1]*1000; - session->AddEvent(new Event(tt,cpapcode, data, 2)); + //session->AddEvent(new Event(tt,cpapcode, 0, data, 2)); break; case 0x12: // Summary + qDebug() << "0x12 Observed in ASV data!!????"; data[0]=buffer[pos++]; data[1]=buffer[pos++]; data[2]=buffer[pos+1]<<8 | buffer[pos]; pos+=2; - session->AddEvent(new Event(t,cpapcode, data,3)); + //session->AddEvent(new Event(t,cpapcode, 0, data,3)); break; default: // ERROR!!! @@ -823,6 +1027,17 @@ bool PRS1Loader::Parse002ASV(Session *session,unsigned char *buffer,int size,qin return false; } } + /*EventList *a; + for (int i=0;i<24;i++){ + a=Code[i]; + if (a) { + int v=ceil(a->max()/5); + a->setMax(v*5); + v=floor(a->min()/5); + a->setMin(v*5); + } + }*/ + session->UpdateLast(t); return true; } @@ -918,8 +1133,11 @@ bool PRS1Loader::OpenWaveforms(Session *session,QString filename) qWarning() << "Not correct waveform format" << filename; return false; } - quint8 version=m_buffer[4]; + //quint8 version=m_buffer[4]; quint32 start=m_buffer[0xb] | m_buffer[0xc] << 8 | m_buffer[0xd] << 16 | m_buffer[0x0e] << 24; + + session->UpdateFirst(qint64(start)*1000L); + quint16 num_signals=m_buffer[0x12] | m_buffer[0x13] << 8; if (num_signals>2) { qWarning() << "More than 2 Waveforms in " << filename; @@ -946,13 +1164,19 @@ bool PRS1Loader::OpenWaveforms(Session *session,QString filename) int corrupt=0; char waveform[num_signals][500000]; int wlength[num_signals]; - int wdur[num_signals]; + qint64 wdur[num_signals]; + //EventList *evl[num_signals]; for (int i=0;i0 && wlength[0]>0) { - qDebug() << "Timestamp restarts" << block << diff << corrupt << duration << timestamp-lasttimestamp << filename; + qDebug() << "Timestamp resync" << block << diff << corrupt << duration << timestamp-lasttimestamp << filename; for (int i=0;iAddWaveform(qint64(start)*1000L,(unsigned char *)waveform[i],wlength[i],qint64(wdur[i])*1000L); + else { + a->AddWaveform(qint64(start)*1000L,(char *)waveform[i],wlength[i],qint64(wdur[i])*1000L); } - Waveform *w=new Waveform(qint64(start)*1000L,wc[i],wf[i],wlength[i],qint64(wdur[i])*1000L,-128,128); //FlowRate - session->AddWaveform(w); + if (wc[i]==CPAP_FlowRate) { + a->setMax(120); + a->setMin(-120); + } else if (wc[i]==CPAP_MaskPressure) { + /* int v=ceil(a->max()/5); + a->setMax(v*5); + v=floor(a->min()/5); + a->setMin(v*5); */ + } + + session->eventlist[wc[i]].push_back(a); + session->UpdateLast(start+(qint64(wdur[i])*1000L)); wlength[i]=0; wdur[i]=0; } @@ -1037,259 +1273,30 @@ bool PRS1Loader::OpenWaveforms(Session *session,QString filename) } while (posAddWaveform(qint64(start)*1000L,(unsigned char *)waveform[i],wlength[i],qint64(wdur[i])*1000L); + else { + a->AddWaveform(qint64(start)*1000L,(char *)waveform[i],wlength[i],qint64(wdur[i])*1000L); } - Waveform *w=new Waveform(qint64(start)*1000L,wc[i],wf[i],wlength[i],qint64(wdur[i])*1000L,-128,128); //FlowRate - session->AddWaveform(w); + if (wc[i]==CPAP_FlowRate) { + a->setMax(120); + a->setMin(-120); + } else if (wc[i]==CPAP_MaskPressure) { + /*int v=ceil(a->max()/5); + a->setMax(v*5); + v=floor(a->min()/5); + a->setMin(v*5); */ + } + session->eventlist[wc[i]].push_back(a); + session->UpdateLast(start+qint64(wdur[i])*1000L); } return true; } -/*bool PRS1Loader::OpenWaveforms(Session *session,QString filename) -{ - int size,sequence,seconds,br,htype,version,numsignals; - unsigned cnt=0; - qint32 lastts,ts1; - qint64 timestamp; - - qint64 start=0; - unsigned char header[20]; - unsigned char ext; - - QFile f(filename); - if (!f.open(QIODevice::ReadOnly)) - return false; - - const int max_signals=16; - static qint16 interleave[max_signals]={0}; - static char sampletype[max_signals]={0}; - - int hl=0; - long samples=0; - qint64 duration=0; - char * buffer=(char *)m_buffer; - //bool first2=true; - long fpos=0; - //int bsize=0; - int lasthl=0; - qint32 expected_timestamp=0; - while (true) { - lasthl=hl; - hl=20; - br=f.read((char *)header,hl); - fpos+=hl; - if (brsummary[CPAP_BrokenWaveform]=true; - // read the damn bytes anyway.. - - br=f.read((char *)header,lasthl-hl+1); // last bit of the header - if (br=max_signals) { - qWarning() << "PRS1Loader::OpenWaveforms() numsignals >= max_signals"; - return false; - } - char buf[3]; - for (int i=0;iabs(diff)) { - duration+=diff; // really Subtracting.. - samples+=diff*5; - } else { - qWarning() << "Waveform out of sync beyond the first entry" << sequence << duration << diff; - } - } else if (diff>0) { - qDebug() << "Fixing up Waveform sync" << sequence; - for (int i=0;i=max_load_buffer_size) { - qWarning("max_load_buffer_size is too small in PRS1 Loader"); - if (cnt==0) - return false; - break; - } - br=f.read((char *)&buffer[samples],size); - if (brc) min[s]=c; - if (max[s]AddWaveform(w); - if (numsignals>1) { - Waveform *w=new Waveform(start,CPAP_MaskPressure,data[1],pos[1],duration,min[1],max[1]); - session->AddWaveform(w); - } - return true; -} */ void InitModelMap() { diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index b3ca3cfa..10494da9 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -13,7 +13,7 @@ License: GPL #include #include #include -#include +#include #include "resmed_loader.h" #include "SleepLib/session.h" @@ -100,6 +100,7 @@ bool EDFParser::Parse() num_data_records=QString::fromAscii(header.num_data_records,8).toLong(&ok); if (!ok) return false; + dur_data_record=QString::fromAscii(header.dur_data_records,8).toDouble(&ok)*1000.0; if (!ok) return false; @@ -121,11 +122,18 @@ bool EDFParser::Parse() } for (int i=0;itransducer_type=Read(80); + for (int i=0;iphysical_dimension=Read(8); - for (int i=0;iphysical_minimum=Read(8).toLong(&ok); - for (int i=0;iphysical_maximum=Read(8).toLong(&ok); - for (int i=0;idigital_minimum=Read(8).toLong(&ok); - for (int i=0;idigital_maximum=Read(8).toLong(&ok); + for (int i=0;iphysical_minimum=Read(8).toDouble(&ok); + for (int i=0;iphysical_maximum=Read(8).toDouble(&ok); + for (int i=0;idigital_minimum=Read(8).toDouble(&ok); + for (int i=0;iprefiltering=Read(80); for (int i=0;inr=Read(8).toLong(&ok); for (int i=0;ireserved=Read(32); @@ -349,26 +357,26 @@ int ResmedLoader::Open(QString & path,Profile *profile) m->AddSession(sess,profile); // Adding earlier than I really like here.. } if (!done && sess) { - sess->summary[CPAP_PressureMedian]=sess->avg_event_field(CPAP_Pressure,0); - sess->summary[CPAP_PressureAverage]=sess->weighted_avg_event_field(CPAP_Pressure,0); - sess->summary[CPAP_PressureMinAchieved]=sess->min_event_field(CPAP_Pressure,0); - sess->summary[CPAP_PressureMaxAchieved]=sess->max_event_field(CPAP_Pressure,0); + sess->summary[CPAP_PressureMedian]=sess->avg(CPAP_Pressure); + sess->summary[CPAP_PressureAverage]=sess->weighted_avg(CPAP_Pressure); + sess->summary[CPAP_PressureMinAchieved]=sess->min(CPAP_Pressure); + sess->summary[CPAP_PressureMaxAchieved]=sess->max(CPAP_Pressure); sess->summary[CPAP_PressureMin]=sess->summary[CPAP_PressureMinAchieved]; sess->summary[CPAP_PressureMax]=sess->summary[CPAP_PressureMaxAchieved]; - sess->summary[CPAP_LeakMinimum]=sess->min_event_field(CPAP_Leak,0); - sess->summary[CPAP_LeakMaximum]=sess->max_event_field(CPAP_Leak,0); // should be merged.. - sess->summary[CPAP_LeakMedian]=sess->avg_event_field(CPAP_Leak,0); - sess->summary[CPAP_LeakAverage]=sess->weighted_avg_event_field(CPAP_Leak,0); + sess->summary[CPAP_LeakMinimum]=sess->min(CPAP_Leak); + sess->summary[CPAP_LeakMaximum]=sess->max(CPAP_Leak); // should be merged.. + sess->summary[CPAP_LeakMedian]=sess->avg(CPAP_Leak); + sess->summary[CPAP_LeakAverage]=sess->weighted_avg(CPAP_Leak); - sess->summary[CPAP_Snore]=sess->sum_event_field(CPAP_Snore,0); - sess->summary[CPAP_SnoreMinimum]=sess->min_event_field(CPAP_Snore,0); - sess->summary[CPAP_SnoreMaximum]=sess->max_event_field(CPAP_Snore,0); - sess->summary[CPAP_SnoreMedian]=sess->avg_event_field(CPAP_Snore,0); - sess->summary[CPAP_SnoreAverage]=sess->weighted_avg_event_field(CPAP_Snore,0); - sess->summary[CPAP_Obstructive]=sess->count_events(CPAP_Obstructive); - sess->summary[CPAP_Hypopnea]=sess->count_events(CPAP_Hypopnea); - sess->summary[CPAP_ClearAirway]=sess->count_events(CPAP_ClearAirway); + sess->summary[CPAP_Snore]=sess->sum(CPAP_Snore); + sess->summary[CPAP_SnoreMinimum]=sess->min(CPAP_Snore); + sess->summary[CPAP_SnoreMaximum]=sess->max(CPAP_Snore); + sess->summary[CPAP_SnoreMedian]=sess->avg(CPAP_Snore); + sess->summary[CPAP_SnoreAverage]=sess->weighted_avg(CPAP_Snore); + sess->summary[CPAP_Obstructive]=sess->count(CPAP_Obstructive); + sess->summary[CPAP_Hypopnea]=sess->count(CPAP_Hypopnea); + sess->summary[CPAP_ClearAirway]=sess->count(CPAP_ClearAirway); sess->summary[CPAP_Mode]=MODE_APAP; } @@ -381,21 +389,23 @@ int ResmedLoader::Open(QString & path,Profile *profile) bool ResmedLoader::LoadEVE(Session *sess,EDFParser &edf) { + // EVEnt records have useless duration record. + QString t; long recs; - double totaldur,duration; + double duration; char * data; char c; long pos; bool sign,ok; double d; double tt; - EventDataType fields[3]; MachineCode code; //Event *e; - totaldur=edf.GetNumDataRecords()*edf.GetDuration(); + //totaldur=edf.GetNumDataRecords()*edf.GetDuration(); - //sess->set_first(edf.startdate); + EventList *EL[4]={NULL}; + sess->UpdateFirst(edf.startdate); //if (edf.enddate>edf.startdate) sess->set_last(edf.enddate); for (int s=0;snr*edf.GetNumDataRecords()*2; @@ -404,6 +414,7 @@ bool ResmedLoader::LoadEVE(Session *sess,EDFParser &edf) data=(char *)edf.edfsignals[s]->data; pos=0; tt=edf.startdate; + sess->UpdateFirst(tt); duration=0; while (posAddEvent(new Event(tt,code,fields,1)); + //code=MC_UNKNOWN; + if (t=="obstructive apnea") { + code=CPAP_Obstructive; + if (!EL[0]) { + EL[0]=new EventList(code,EVL_Event); + sess->eventlist[code].push_back(EL[0]); + } + EL[0]->AddEvent(tt,duration); + } else if (t=="hypopnea") { + code=CPAP_Hypopnea; + if (!EL[1]) { + EL[1]=new EventList(code,EVL_Event); + sess->eventlist[code].push_back(EL[1]); + } + EL[1]->AddEvent(tt,duration); + } else if (t=="apnea") { + code=CPAP_Apnea; + if (!EL[2]) { + EL[2]=new EventList(code,EVL_Event); + sess->eventlist[code].push_back(EL[2]); + } + EL[2]->AddEvent(tt,duration); + } else if (t=="central apnea") { + code=CPAP_ClearAirway; + if (!EL[3]) { + EL[3]=new EventList(code,EVL_Event); + sess->eventlist[code].push_back(EL[3]); + } + EL[3]->AddEvent(tt,duration); } else { if (t!="recording starts") { qDebug() << "Unknown ResMed annotation field: " << t; @@ -478,6 +510,7 @@ bool ResmedLoader::LoadEVE(Session *sess,EDFParser &edf) while ((data[pos]==0) && pos=recs) break; } + sess->UpdateLast(tt); // qDebug(data); } return true; @@ -485,49 +518,73 @@ bool ResmedLoader::LoadEVE(Session *sess,EDFParser &edf) bool ResmedLoader::LoadBRP(Session *sess,EDFParser &edf) { QString t; - sess->set_first(edf.startdate); - sess->set_last(edf.enddate); + sess->UpdateFirst(edf.startdate); qint64 duration=edf.GetNumDataRecords()*edf.GetDuration(); + sess->UpdateLast(edf.startdate+duration); for (int s=0;snr*edf.GetNumDataRecords(); MachineCode code; - if (edf.edfsignals[s]->label=="Flow") code=CPAP_FlowRate; - else if (edf.edfsignals[s]->label=="Mask Pres") { + if (edf.edfsignals[s]->label=="Flow") { + code=CPAP_FlowRate; + } else if (edf.edfsignals[s]->label=="Mask Pres") { code=CPAP_MaskPressure; //for (int i=0;idata[i]/=50.0; } else { qDebug() << "Unknown Signal " << edf.edfsignals[s]->label; continue; } - Waveform *w=new Waveform(edf.startdate,code,edf.edfsignals[s]->data,recs,duration,edf.edfsignals[s]->digital_minimum,edf.edfsignals[s]->digital_maximum); - edf.edfsignals[s]->data=NULL; // so it doesn't get deleted when edf gets trashed. - sess->AddWaveform(w); + double rate=double(duration)/double(recs); + //es.gain=1; + EventList *a=new EventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate); + + a->AddWaveform(edf.startdate,es.data,recs,duration); + + if (code==CPAP_MaskPressure) { + /*int v=ceil(a->max()/1); + a->setMax(v*1); + v=floor(a->min()/1); + a->setMin(v*1); */ + } else if (code==CPAP_FlowRate) { + a->setMax(1); + a->setMin(-1); + } + sess->eventlist[code].push_back(a); + //delete edf.edfsignals[s]->data; + //edf.edfsignals[s]->data=NULL; // so it doesn't get deleted when edf gets trashed. } return true; } -void ResmedLoader::ToTimeDelta(Session *sess,EDFParser &edf, qint16 *data, MachineCode code, long recs, qint64 duration,EventDataType divisor) +EventList * ResmedLoader::ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal & es, MachineCode code, long recs, qint64 duration,EventDataType min,EventDataType max) { bool first=true; double rate=(duration/recs); // milliseconds per record double tt=edf.startdate; + //sess->UpdateFirst(tt); EventDataType c,last; + //if (gain==0) gain=1; + EventList *el=new EventList(code,EVL_Event,es.gain,es.offset,min,max); + sess->eventlist[code].push_back(el); for (int i=0;iAddEvent(new Event(tt,code,&c,1)); + el->AddEvent(tt,c); first=false; } else { if (last!=c) { - sess->AddEvent(new Event(tt,code,&c,1)); + el->AddEvent(tt,c); } } tt+=rate; last=c; } - sess->AddEvent(new Event(tt,code,&c,1)); // add one at the end.. + el->AddEvent(tt,c); + sess->UpdateLast(tt); + return el; } bool ResmedLoader::LoadSAD(Session *sess,EDFParser &edf) { @@ -542,66 +599,86 @@ bool ResmedLoader::LoadPLD(Session *sess,EDFParser &edf) // Is it save to assume the order does not change here? enum PLDType { MaskPres=0, TherapyPres, ExpPress, Leak, RR, Vt, Mv, SnoreIndex, FFLIndex, U1, U2 }; - sess->set_first(edf.startdate); - sess->set_last(edf.enddate); + sess->UpdateFirst(edf.startdate); qint64 duration=edf.GetNumDataRecords()*edf.GetDuration(); + sess->UpdateLast(edf.startdate+duration); QString t; int emptycnt=0; for (int s=0;snr*edf.GetNumDataRecords(); + EDFSignal & es=*edf.edfsignals[s]; + long recs=es.nr*edf.GetNumDataRecords(); + double rate=double(duration)/double(recs); + //qDebug() << "EVE:" << es.digital_maximum << es.digital_minimum << es.physical_maximum << es.physical_minimum << es.gain; MachineCode code; - // if (s==TherapyPres) { -// for (int i=0;idata[i]); -// } else - if (edf.edfsignals[s]->label=="Snore Index") { + if (es.label=="Snore Index") { code=CPAP_Snore; - ToTimeDelta(sess,edf,edf.edfsignals[s]->data, code,recs,duration); - } else if (edf.edfsignals[s]->label=="Therapy Pres") { + + //EventList *a=new EventList(code,EVL_Waveform,es.gain,es.offset,es.physical_minimum,es.physical_maximum,rate); + //sess->eventlist[code].push_back(a); + //a->AddWaveform(edf.startdate,es.data,recs,duration); + EventList *a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); + a->setMax(1); + a->setMin(0); + } else if (es.label=="Therapy Pres") { code=CPAP_TherapyPressure; - ToTimeDelta(sess,edf,edf.edfsignals[s]->data, code,recs,duration,50.0); //50.0 - } else if (edf.edfsignals[s]->label=="MV") { + //EventList *a=new EventList(code,EVL_Waveform,es.gain,es.offset,es.physical_minimum,es.physical_maximum,rate); + //sess->eventlist[code].push_back(a); + //a->AddWaveform(edf.startdate,es.data,recs,duration); + EventList *a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); + } else if (es.label=="MV") { code=CPAP_MinuteVentilation; - ToTimeDelta(sess,edf,edf.edfsignals[s]->data, code,recs,duration); - //Waveform *w=new Waveform(edf.startdate,code,edf.edfsignals[s]->data,recs,duration,edf.edfsignals[s]->digital_minimum,edf.edfsignals[s]->digital_maximum); - //edf.edfsignals[s]->data=NULL; // so it doesn't get deleted when edf gets trashed. - //sess->AddWaveform(w); - } else if (edf.edfsignals[s]->label=="RR") { + //EventList *a=new EventList(code,EVL_Waveform,es.gain,es.offset,es.physical_minimum,es.physical_maximum,rate); + //sess->eventlist[code].push_back(a); + //a->AddWaveform(edf.startdate,es.data,recs,duration); + EventList *a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); + } else if (es.label=="RR") { code=CPAP_RespiratoryRate; - ToTimeDelta(sess,edf,edf.edfsignals[s]->data, code,recs,duration); - //Waveform *w=new Waveform(edf.startdate,code,edf.edfsignals[s]->data,recs,duration,edf.edfsignals[s]->digital_minimum,edf.edfsignals[s]->digital_maximum); - //edf.edfsignals[s]->data=NULL; // so it doesn't get deleted when edf gets trashed. - //sess->AddWaveform(w); - } else if (edf.edfsignals[s]->label=="Vt") { + EventList *a=new EventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate); + sess->eventlist[code].push_back(a); + a->AddWaveform(edf.startdate,es.data,recs,duration); + //ToTimeDelta(sess,edf,es, code,recs,duration); + } else if (es.label=="Vt") { code=CPAP_TidalVolume; - ToTimeDelta(sess,edf,edf.edfsignals[s]->data, code,recs,duration); - //Waveform *w=new Waveform(edf.startdate,code,edf.edfsignals[s]->data,recs,duration,edf.edfsignals[s]->digital_minimum,edf.edfsignals[s]->digital_maximum); - //edf.edfsignals[s]->data=NULL; // so it doesn't get deleted when edf gets trashed. - //sess->AddWaveform(w); - } else if (edf.edfsignals[s]->label=="Leak") { + //EventList *a=new EventList(code,EVL_Waveform,es.gain,es.offset,es.physical_minimum,es.physical_maximum,rate); + //sess->eventlist[code].push_back(a); + //a->AddWaveform(edf.startdate,es.data,recs,duration); + es.physical_maximum=es.physical_minimum=0; + es.gain*=1000.0; + EventList *a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); + } else if (es.label=="Leak") { code=CPAP_Leak; - ToTimeDelta(sess,edf,edf.edfsignals[s]->data, code,recs,duration,1.0); - } else if (edf.edfsignals[s]->label=="FFL Index") { + // es.gain*=100.0; + //es.gain=1;//10.0; + es.offset=-0.5; + EventList *a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); + a->setMax(1); + a->setMin(0); + } else if (es.label=="FFL Index") { code=CPAP_FlowLimitGraph; - ToTimeDelta(sess,edf,edf.edfsignals[s]->data, code,recs,duration,1.0); - } else if (edf.edfsignals[s]->label=="Mask Pres") { + //es.gain=1;//10.0; + EventList *a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); + a->setMax(1); + a->setMin(0); + } else if (es.label=="Mask Pres") { code=CPAP_Pressure; - ToTimeDelta(sess,edf,edf.edfsignals[s]->data, code,recs,duration,50.0); - } else if (edf.edfsignals[s]->label=="Exp Press") { + //es.gain=1; + EventList *a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); + } else if (es.label=="Exp Press") { code=CPAP_ExpPressure; - ToTimeDelta(sess,edf,edf.edfsignals[s]->data, code,recs,duration,50.0); - } else if (edf.edfsignals[s]->label=="") { + EventList *a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); + } else if (es.label=="") { if (emptycnt==0) { code=ResMed_Empty1; - ToTimeDelta(sess,edf,edf.edfsignals[s]->data, code,recs,duration,1.0); + ToTimeDelta(sess,edf,es, code,recs,duration); } else if (emptycnt==1) { code=ResMed_Empty2; - ToTimeDelta(sess,edf,edf.edfsignals[s]->data, code,recs,duration,1.0); + ToTimeDelta(sess,edf,es, code,recs,duration); } else { - qDebug() << "Unobserved Empty Signal " << edf.edfsignals[s]->label; + qDebug() << "Unobserved Empty Signal " << es.label; } emptycnt++; } else { - qDebug() << "Unobserved Signal " << edf.edfsignals[s]->label; + qDebug() << "Unobserved Signal " << es.label; } } return true; diff --git a/SleepLib/loader_plugins/resmed_loader.h b/SleepLib/loader_plugins/resmed_loader.h index 978dbde1..03998f61 100644 --- a/SleepLib/loader_plugins/resmed_loader.h +++ b/SleepLib/loader_plugins/resmed_loader.h @@ -45,10 +45,12 @@ public: QString label; QString transducer_type; QString physical_dimension; - long physical_minimum; - long physical_maximum; - long digital_minimum; - long digital_maximum; + double physical_minimum; + double physical_maximum; + double digital_minimum; + double digital_maximum; + double gain; + double offset; QString prefiltering; long nr; QString reserved; @@ -68,10 +70,10 @@ public: vector edfsignals; - long GetNumSignals() { return num_signals; }; - long GetNumDataRecords() { return num_data_records; }; - double GetDuration() { return dur_data_record; }; - QString GetPatient() { return patientident; }; + long GetNumSignals() { return num_signals; } + long GetNumDataRecords() { return num_data_records; } + qint64 GetDuration() { return dur_data_record; } + QString GetPatient() { return patientident; } bool Parse(); char *buffer; EDFHeader header; @@ -101,9 +103,9 @@ public: virtual ~ResmedLoader(); virtual int Open(QString & path,Profile *profile); - virtual int Version() { return resmed_data_version; }; - virtual const QString & ClassName() { return resmed_class_name; }; - void ToTimeDelta(Session *sess,EDFParser &edf, qint16 *data, MachineCode code, long recs,qint64 duration,EventDataType divisor=1); + virtual int Version() { return resmed_data_version; } + virtual const QString & ClassName() { return resmed_class_name; } + EventList * ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal & es, MachineCode code, long recs,qint64 duration,EventDataType min=0,EventDataType max=0); Machine *CreateMachine(QString serial,Profile *profile); diff --git a/SleepLib/loader_plugins/zeo_loader.cpp b/SleepLib/loader_plugins/zeo_loader.cpp index 359c7767..f0cac264 100644 --- a/SleepLib/loader_plugins/zeo_loader.cpp +++ b/SleepLib/loader_plugins/zeo_loader.cpp @@ -28,6 +28,8 @@ ZEOLoader::~ZEOLoader() } int ZEOLoader::Open(QString & path,Profile *profile) { + profile=profile; + path=path; // ZEO folder structure detection stuff here. return 0; // number of machines affected diff --git a/SleepLib/machine.h b/SleepLib/machine.h index ad5ec505..dd00dfc3 100644 --- a/SleepLib/machine.h +++ b/SleepLib/machine.h @@ -19,7 +19,6 @@ #include "SleepLib/machine_common.h" #include "SleepLib/event.h" -#include "SleepLib/waveform.h" #include "SleepLib/session.h" #include "SleepLib/day.h" diff --git a/SleepLib/machine_common.h b/SleepLib/machine_common.h index c326cdd8..6ca591c0 100644 --- a/SleepLib/machine_common.h +++ b/SleepLib/machine_common.h @@ -93,7 +93,7 @@ extern map CPAPModeNames; enum MCDataType//:wxInt8 { MC_bool=0, MC_int, MC_long, MC_float, MC_double, MC_string, MC_datetime }; - - +typedef float EventDataType; +typedef qint16 EventStoreType; #endif // MACHINE_COMMON_H diff --git a/SleepLib/preferences.cpp b/SleepLib/preferences.cpp index 6858fa66..48e013c9 100644 --- a/SleepLib/preferences.cpp +++ b/SleepLib/preferences.cpp @@ -19,8 +19,6 @@ License: GPL #include "preferences.h" -//const QString AppName="SleepyHead"; - const QString & getUserName() { static QString userName; @@ -29,7 +27,6 @@ const QString & getUserName() if (userName.isEmpty()) { userName="Windows User"; - // FIXME: I DONT KNOW QT'S WINDOWS DEFS #if defined (Q_WS_WIN32) #if defined(UNICODE) if ( qWinVersion() & Qt::WV_NT_based ) { diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index 5ed30eab..fb8d5047 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -9,6 +9,7 @@ #include "math.h" #include #include +#include #include #include @@ -23,263 +24,42 @@ Session::Session(Machine * m,SessionID session) s_session=session; s_changed=false; s_events_loaded=false; - s_waves_loaded=false; _first_session=true; s_first=s_last=0; - s_wavefile=""; s_eventfile=""; } Session::~Session() { TrashEvents(); - TrashWaveforms(); -} -double Session::min_event_field(MachineCode mc,int field) -{ - if (events.find(mc)==events.end()) return 0; - - bool first=true; - double min=0; - vector::iterator i; - - for (i=events[mc].begin(); i!=events[mc].end(); i++) { - if (field>=(*i)->e_fields) { - qWarning() << "Invalid Event field in Session::min_event_field"; - return 0; - } - if (first) { - first=false; - min=(*(*i))[field]; - } else { - if (min>(*(*i))[field]) min=(*(*i))[field]; - } - } - return min; -} -double Session::max_event_field(MachineCode mc,int field) -{ - if (events.find(mc)==events.end()) return 0; - - bool first=true; - double max=0; - vector::iterator i; - for (i=events[mc].begin(); i!=events[mc].end(); i++) { - if (field>=(*i)->e_fields) { - qWarning() << "Invalid Event field in Session::max_event_field"; - return 0; - } - if (first) { - first=false; - max=(*(*i))[field]; - } else { - if (max<(*(*i))[field]) max=(*(*i))[field]; - } - } - return max; } -double Session::sum_event_field(MachineCode mc,int field) -{ - if (events.find(mc)==events.end()) return 0; - - double sum=0; - vector::iterator i; - - for (i=events[mc].begin(); i!=events[mc].end(); i++) { - if (field>=(*i)->e_fields) { - qWarning() << "Invalid Event field in Session::sum_event_field"; - return 0; - } - sum+=(*(*i))[field]; - } - return sum; -} -double Session::avg_event_field(MachineCode mc,int field) -{ - if (events.find(mc)==events.end()) return 0; - - double sum=0; - int cnt=0; - vector::iterator i; - - for (i=events[mc].begin(); i!=events[mc].end(); i++) { - if (field>=(*i)->e_fields) { - qWarning() << "Invalid Event field in Session::avg_event_field"; - return 0; - } - sum+=(*(*i))[field]; - cnt++; - } - - return sum/cnt; -} - -bool sortfunction (double i,double j) { return (i array; - - vector::iterator e; - - for (e=events[mc].begin(); e!=events[mc].end(); e++) { - Event & ev = *(*e); - array.push_back(ev[field]); - } - std::sort(array.begin(),array.end(),sortfunction); - int size=array.size(); - double i=size*percent; - double t; - double q=modf(i,&t); - int j=t; - if (j>=size-1) return array[j]; - - double a=array[j-1]; - double b=array[j]; - if (a==b) return a; - //double c=(b-a); - //double d=c*q; - return a;//array[j]+q; -} - -double Session::weighted_avg_event_field(MachineCode mc,int field) -{ - if (events.find(mc)==events.end()) return 0; - - int cnt=0; - - bool first=true; - qint64 last; - int lastval=0,val; - const int max_slots=2600; - qint64 vtime[max_slots]={0}; - - - double mult; - if ((mc==CPAP_Pressure) || (mc==CPAP_EAP) || (mc==CPAP_IAP) | (mc==CPAP_PS)) { - mult=10.0; - - } else mult=10.0; - - vector::iterator i; - - for (i=events[mc].begin(); i!=events[mc].end(); i++) { - Event & e =(*(*i)); - val=e[field]*mult; - if (field>=(*i)->e_fields) { - qWarning() << "Invalid Event field in Session::weighted_avg_event_field"; - return 0; - } - if (first) { - first=false; - } else { - int d=(e.e_time-last)/1000L; - if (lastval>max_slots) { - qWarning("max_slots to small in Session::weighted_avg_event_fied()"); - return 0; - } - - vtime[lastval]+=d; - - } - cnt++; - last=e.e_time; - lastval=val; - } - - qint64 total=0; - for (int i=0; i 0) { - s0=vtime[i]; - s1+=i*s0; - s2+=s0; - } - } - double j=double(s1)/double(total); - return j/mult; -} - -void Session::AddEvent(Event * e) -{ - events[e->code()].push_back(e); - if (s_first) { - if (e->time()time(); - if (e->time()>s_last) s_last=e->time(); - } else { - s_first=s_last=e->time(); - //_first_session=false; - } -} -void Session::AddWaveform(Waveform *w) -{ - waveforms[w->code()].push_back(w); - if (s_last) { - if (w->start()start(); - if (w->end()>s_last) s_last=w->end(); - } else { - s_first=w->start(); - s_last=w->end(); - } - - // Could parse the flow data for Breaths per minute info here.. -} void Session::TrashEvents() // Trash this sessions Events and release memory. { - map >::iterator i; - vector:: iterator j; - for (i=events.begin(); i!=events.end(); i++) { + map >::iterator i; + vector::iterator j; + for (i=eventlist.begin(); i!=eventlist.end(); i++) { for (j=i->second.begin(); j!=i->second.end(); j++) { delete *j; } } - events.clear(); + eventlist.clear(); } -void Session::TrashWaveforms() -// Trash this sessions Waveforms and release memory. -{ - map >::iterator i; - vector:: iterator j; - for (i=waveforms.begin(); i!=waveforms.end(); i++) { - for (j=i->second.begin(); j!=i->second.end(); j++) { - delete *j; - } - } - waveforms.clear(); -} - //const int max_pack_size=128; bool Session::OpenEvents() { - if(s_events_loaded) + if (s_events_loaded) return true; bool b; b=LoadEvents(s_eventfile); if (!b) { qWarning() << "Error Unkpacking Events" << s_eventfile; + return false; } - s_events_loaded=b; - return b; -}; -bool Session::OpenWaveforms() { - if (s_waves_loaded) - return true; - bool b; - b=LoadWaveforms(s_wavefile); - if (!b) { - qWarning() << "Error Unkpacking Wavefile" << s_wavefile; - } - s_waves_loaded=b; - return b; + + return s_events_loaded=true; }; bool Session::Store(QString path) @@ -297,10 +77,8 @@ bool Session::Store(QString path) bool a; a=StoreSummary(base+".000"); // if actually has events //qDebug() << " Summary done"; - if (events.size()>0) StoreEvents(base+".001"); + if (eventlist.size()>0) StoreEvents(base+".001"); //qDebug() << " Events done"; - if (waveforms.size()>0) StoreWaveforms(base+".002"); - //qDebug() << " Waveform done"; if (a) { s_changed=false; } @@ -318,6 +96,7 @@ bool IsPlatformLittleEndian() bool Session::StoreSummary(QString filename) { + QFile file(filename); file.open(QIODevice::WriteOnly); @@ -343,21 +122,23 @@ bool Session::StoreSummary(QString filename) for (i=summary.begin(); i!=summary.end(); i++) { MachineCode mc=i->first; - QVariant::Type type=i->second.type(); // Urkk.. this is a mess. - if (type==QVariant::Bool) { + QMetaType::Type type=(QMetaType::Type)i->second.type(); // Urkk.. this is a mess. + if (type==QMetaType::Bool) { mctype[mc]=MC_bool; - } else if (type==QVariant::Int) { + } else if (type==QMetaType::Int) { mctype[mc]=MC_int; - } else if (type==QVariant::LongLong) { + } else if (type==QMetaType::LongLong) { mctype[mc]=MC_long; - } else if (type==QVariant::Double) { + } else if (type==QMetaType::Double) { mctype[mc]=MC_double; - } else if (type==QVariant::String) { + } else if (type==QMetaType::Float) { + mctype[mc]=MC_float; + } else if (type==QMetaType::QString) { mctype[mc]=MC_string; - } else if (type==QVariant::DateTime) { + } else if (type==QMetaType::QDateTime) { mctype[mc]=MC_datetime; } else { - QString t=i->second.typeToName(type); + QString t=i->second.typeToName((QVariant::Type)type); qWarning() << "Error in Session->StoreSummary: Can't pack variant type " << t; return false; //exit(1); @@ -376,6 +157,9 @@ bool Session::StoreSummary(QString filename) out << (qint64)i->second.toLongLong(); } else if (mctype[mc]==MC_double) { out << (double)i->second.toDouble(); + } else if (mctype[mc]==MC_float) { + float f=(float)i->second.toDouble(); // check me. + out << f; } else if (mctype[mc]==MC_string) { out << i->second.toString(); } else if (mctype[mc]==MC_datetime) { @@ -460,6 +244,10 @@ bool Session::LoadSummary(QString filename) double dl; in >> dl; summary[mc]=(double)dl; + } else if (mctype[mc]==MC_float) { + float fl; + in >> fl; + summary[mc]=(float)fl; } else if (mctype[mc]==MC_string) { QString s; in >> s; @@ -488,50 +276,56 @@ bool Session::StoreEvents(QString filename) out << (quint16)1; // File type 1 == Event out << (quint16)0; // File Version - quint32 starttime=s_first/1000L; - quint32 duration=(s_last-s_first)/1000L; + out << s_first; + out << s_last; - out << starttime; - out << duration; - - out << (qint16)events.size(); // Number of event categories + out << (qint16)eventlist.size(); // Number of event categories - map >::iterator i; - vector::iterator j; + map >::iterator i; + vector::iterator j; - for (i=events.begin(); i!=events.end(); i++) { - out << (qint16)i->first; // MachineID - out << (qint16)i->second.size(); // count of events in this category - j=i->second.begin(); - out << (qint8)(*j)->fields(); // number of data fields in this event type - } - bool first; - EventDataType tf; - qint64 last=0,eventtime,delta; - - for (i=events.begin(); i!=events.end(); i++) { - first=true; - for (j=i->second.begin(); j!=i->second.end(); j++) { - eventtime=(*j)->time(); - if (first) { - out << (*j)->time(); - first=false; - } else { - delta=eventtime-last; - if (delta>0xffffffff) { - qDebug("StoreEvent: Delta too big.. needed to use bigger value"); - return false; - } - out << (quint32)delta; - } - for (int k=0; k<(*j)->fields(); k++) { - tf=(*(*j))[k]; - out << tf; - } - last=eventtime; + for (i=eventlist.begin(); i!=eventlist.end(); i++) { + out << (qint16)i->first; // MachineCode + out << (qint16)i->second.size(); + for (unsigned j=0;jsecond.size();j++) { + EventList &e=*i->second[j]; + out << e.first(); + out << e.last(); + out << (qint32)e.count(); + out << (qint8)e.type(); + out << e.rate(); + out << e.gain(); + out << e.offset(); + //if (!e.update_minmax()) { + out << e.min(); + out << e.max(); + //} else { + // out << (EventDataType)0; + // out << (EventDataType)0; + //} } } + qint64 t,last; + quint32 x; + for (i=eventlist.begin(); i!=eventlist.end(); i++) { + for (unsigned j=0;jsecond.size();j++) { + EventList &e=*i->second[j]; + for (int c=0;c> t32; // Magic Number if (t32!=magic) { qWarning() << "Wrong Magic number in " << filename; @@ -573,187 +365,268 @@ bool Session::LoadEvents(QString filename) in >> t16; // File Version // dont give a crap yet.. - in >> t32; // Start time - s_first=qint64(t32)*1000L; - in >> t32; // Duration // (16bit==Limited to 18 hours) - s_last=s_first+qint64(t32)*1000L; + in >> s_first; + in >> s_last; - qint16 evsize; - in >> evsize; // Summary size (number of Machine Code lists) + qint16 mcsize; + in >> mcsize; // Summary size (number of Machine Code lists) - map mcsize; - map mcfields; + MachineCode code; + qint64 ts1,ts2; + qint32 evcount; + EventListType elt; + EventDataType rate,gain,offset,mn,mx; + qint16 size2; vector mcorder; + vector sizevec; + for (int i=0;i> t16; + code=(MachineCode)t16; + mcorder.push_back(code); + in >> size2; + sizevec.push_back(size2); + for (int j=0;j> ts1; + //UpdateFirst(ts1); + in >> ts2; + //UpdateLast(ts2); + in >> evcount; + in >> t8; + elt=(EventListType)t8; + in >> rate; + in >> gain; + in >> offset; + in >> mn; + in >> mx; + EventList *elist=new EventList(code,elt,gain,offset,mn,mx,rate); - MachineCode mc; - for (int i=0; i> t16; // MachineCode - mc=(MachineCode)t16; - mcorder.push_back(mc); - in >> t16; // Count of this Event - mcsize[mc]=t16; - in >> t8; // Type - mcfields[mc]=t8; + eventlist[code].push_back(elist); + elist->m_count=evcount; + elist->m_first=ts1; + elist->m_last=ts2; + } } - for (int i=0; i> t; + evec.m_data[c]=t; + } + last=evec.first(); + if (evec.type()!=EVL_Waveform) { + evec.m_time.resize(evec.m_count); + for (int c=0;c> x; + last+=x; + evec.m_time[c]=last; + } + } + } + } + return true; +} + + + +EventDataType Session::min(MachineCode code) +{ + if (eventlist.find(code)==eventlist.end()) + return 0; + vector & evec=eventlist[code]; + bool first=true; + EventDataType min,t1; + for (unsigned i=0;imin(); + if (t1==evec[i]->max()) continue; + if (first) { + min=t1; + first=false; + } else { + if (min>t1) min=t1; + } + } + return min; +} +EventDataType Session::max(MachineCode code) +{ + if (eventlist.find(code)==eventlist.end()) + return 0; + vector & evec=eventlist[code]; + bool first=true; + EventDataType max,t1; + for (unsigned i=0;imax(); + if (t1==evec[i]->min()) continue; + if (first) { + max=t1; + first=false; + } else { + if (max & evec=eventlist[code]; + bool first=true; + qint64 min,t1; + for (unsigned i=0;ifirst(); + if (first) { + min=t1; + first=false; + } else { + if (min>t1) min=t1; + } + } + return min; +} +qint64 Session::last(MachineCode code) +{ + if (eventlist.find(code)==eventlist.end()) + return 0; + vector & evec=eventlist[code]; + bool first=true; + qint64 max,t1; + for (unsigned i=0;ilast(); + if (first) { + max=t1; + first=false; + } else { + if (max & evec=eventlist[code]; + int sum=0; + for (unsigned i=0;icount(); + } + return sum; +} +double Session::sum(MachineCode mc) +{ + if (eventlist.find(mc)==eventlist.end()) return 0; + + vector & evec=eventlist[mc]; + double sum=0; + for (unsigned i=0;icount();j++) { + sum+=evec[i]->data(j); + } + } + return sum; +} +EventDataType Session::avg(MachineCode mc) +{ + if (eventlist.find(mc)==eventlist.end()) return 0; + + double cnt=count(mc); + if (cnt==0) return 0; + EventDataType val=sum(mc)/cnt; + + return val; +} + +bool sortfunction (double i,double j) { return (i array; + + vector & evec=eventlist[mc]; + for (unsigned i=0;icount();j++) { + array.push_back(evec[i]->data(j)); + } + } + std::sort(array.begin(),array.end(),sortfunction); + int size=array.size(); + if (!size) return 0; + double i=size*percent; + double t; + modf(i,&t); + int j=t; + + //if (j>=size-1) return array[j]; + + return array[j]; +} + +EventDataType Session::weighted_avg(MachineCode mc) +{ + if (eventlist.find(mc)==eventlist.end()) return 0; + + int cnt=0; + + bool first=true; + qint64 last; + int lastval=0,val; + const int max_slots=4096; + qint64 vtime[max_slots]={0}; + + + double mult=10.0; + //if ((mc==CPAP_Pressure) || (mc==CPAP_EAP) || (mc==CPAP_IAP) | (mc==CPAP_PS)) { + // mult=10.0; + //} else mult=10.0; + + // vector::iterator i; + + vector & evec=eventlist[mc]; + for (unsigned i=0;icount();j++) { + val=evec[i]->data(j)*mult; if (first) { - in >> d; // Timestamp first=false; } else { - in >> t32; // Time Delta - d=d+t32; + int d=(evec[i]->time(j)-last)/1000L; + if (lastval>max_slots) { + qWarning("max_slots to small in Session::weighted_avg()"); + return 0; + } + vtime[lastval]+=d; } - EventDataType ED[max_number_event_fields]; - for (int c=0; c> ED[c]; // Data Fields in float format - } - Event *ev=new Event(d,mc,ED,mcfields[mc]); - - AddEvent(ev); + cnt++; + last=evec[i]->time(j); + lastval=val; } } - return true; -} + qint64 total=0; + for (int i=0; iid(); // Machine ID - out << (quint32)s_session; // This session's ID - out << (quint16)2; // File type 2 == Waveform - out << (quint16)0; // File Version - - quint32 starttime=s_first/1000L; - quint32 duration=(s_last-s_first)/1000L; - - out << starttime; - out << duration; - - out << (qint16)waveforms.size(); // Number of different waveforms - - map >::iterator i; - vector::iterator j; - for (i=waveforms.begin(); i!=waveforms.end(); i++) { - //qDebug() << "Storing Waveform" << zz++ << filename; - out << (quint16)i->first; // Machine Code - t16=i->second.size(); - out << t16; // Number of (hopefully non-linear) waveform chunks - for (j=i->second.begin(); j!=i->second.end(); j++) { - //qDebug() << "Storing Waveform Chunk" << chnk++; - - Waveform &w=*(*j); - // 64bit number.. - out << (qint64)w.start(); // Start time of first waveform chunk - - //qint32 samples; - //double seconds; - - out << (qint32)w.samples(); // Total number of samples - out << (qint64)w.duration(); // Total number of seconds - out << (SampleFormat)w.min(); - out << (SampleFormat)w.max(); - out << (qint8)sizeof(SampleFormat); // Bytes per sample - out << (qint8)0; // signed.. all samples for now are signed 16bit. - //t8=0; // 0=signed, 1=unsigned, 2=float - - // followed by sample data. - //qDebug() << "Writing " << (*j)->samples() << "samples"; - for (int k=0; k<(*j)->samples(); k++) out << w[k]; + qint64 s0=0,s1=0,s2=0; + if (total==0) return 0; + for (int i=0; i 0) { + s0=vtime[i]; + s1+=i*s0; + s2+=s0; } } - return true; + double j=double(s1)/double(total); + return j/mult; } - -bool Session::LoadWaveforms(QString filename) -{ - if (filename.isEmpty()) return false; - QFile file(filename); - if (!file.open(QIODevice::ReadOnly)) { - qDebug() << "Couldn't open file" << filename; - return false; - } - QDataStream in(&file); - in.setVersion(QDataStream::Qt_4_6); - - quint32 t32; - quint16 t16; - quint8 t8; - - in >>t32; // Magic Number - if (t32!=magic) { - qDebug() << "Wrong magic in " << filename; - return false; - } - - in >> t32; // MachineID - - in >> t32; // Sessionid; - s_session=t32; - - in >> t16; // File Type - if (t16!=2) { - qDebug() << "Wrong File Type in " << filename; - return false; - } - - in >> t16; // File Version - // dont give a crap yet.. - - in >> t32; // Start time - s_first=qint64(t32)*1000; - - in >> t32; // Duration // (16bit==Limited to 18 hours) - s_last=s_first+qint64(t32)*1000; - - quint16 wvsize; - in >> wvsize; // Number of waveforms - - MachineCode mc; - qint64 date; - qint64 seconds; - qint32 samples; - int chunks; - SampleFormat min,max; - for (int i=0; i> t16; // Machine Code - mc=(MachineCode)t16; - in >> t16; // Number of waveform Chunks - chunks=t16; - - for (int i=0; i> date; // Waveform DateTime - in >> samples; // Number of samples - in >> seconds; // Duration in seconds - in >> min; // Min value - in >> max; // Min value - in >> t8; // sample size in bytes - in >> t8; // Number of samples (?? what did I mean by this) - - SampleFormat *data=new SampleFormat [samples]; - - - for (int k=0; k> data[k]; // Individual Samples; - } - Waveform *w=new Waveform(date,mc,data,samples,seconds,min,max); - AddWaveform(w); - } - } - return true; -} diff --git a/SleepLib/session.h b/SleepLib/session.h index b59f9e46..ae761585 100644 --- a/SleepLib/session.h +++ b/SleepLib/session.h @@ -9,31 +9,27 @@ #define SESSION_H #include -#include "SleepLib/machine.h" +#include "SleepLib/machine.h" +#include "SleepLib/event.h" +class EventList; class Machine; + class Session { public: Session(Machine *,SessionID); virtual ~Session(); - void AddEvent(Event *e); - void AddWaveform(Waveform *w); - bool Store(QString path); bool StoreSummary(QString filename); bool StoreEvents(QString filename); - bool StoreWaveforms(QString filename); //bool Load(QString path); bool LoadSummary(QString filename); bool LoadEvents(QString filename); - bool LoadWaveforms(QString filename); bool OpenEvents(); - bool OpenWaveforms(); void TrashEvents(); - void TrashWaveforms(); const SessionID & session() { return s_session; @@ -64,16 +60,6 @@ public: double t=(s_last-s_first)/3600000.0; return t; }; - int count_events(MachineCode mc) { - if (events.find(mc)==events.end()) return 0; - return events[mc].size(); - }; - double min_event_field(MachineCode mc,int field); - double max_event_field(MachineCode mc,int field); - double sum_event_field(MachineCode mc,int field); - double avg_event_field(MachineCode mc,int field); - double weighted_avg_event_field(MachineCode mc,int field); - double percentile(MachineCode mc,int field,double percentile); map summary; void SetChanged(bool val) { @@ -84,13 +70,26 @@ public: bool IsChanged() { return s_changed; }; - map > events; - map > waveforms; - bool IsLoneSession() { return s_lonesession; }; - void SetLoneSession(bool b) { s_lonesession=b; }; - void SetEventFile(QString & filename) { s_eventfile=filename; }; - void SetWaveFile(QString & filename) { s_wavefile=filename; }; + map > eventlist; + + bool IsLoneSession() { return s_lonesession; } + void SetLoneSession(bool b) { s_lonesession=b; } + void SetEventFile(QString & filename) { s_eventfile=filename; } + void SetWaveFile(QString & filename) { s_wavefile=filename; } + + inline void UpdateFirst(qint64 v) { if (!s_first) s_first=v; else if (s_first>v) s_first=v; } + inline void UpdateLast(qint64 v) { if (!s_last) s_last=v; else if (s_last - License: GPL -*********************************************************************/ - -#include "waveform.h" - -Waveform::Waveform(qint64 time,MachineCode code, SampleFormat *data,int samples,qint64 duration,SampleFormat min, SampleFormat max) - :w_time(time),w_code(code),w_data(data),w_samples(samples),w_duration(duration) -{ - w_totalspan=duration; - w_samplespan=duration/samples; - Min=min; - Max=max; -} -Waveform::~Waveform() -{ - delete [] w_data; -} diff --git a/SleepLib/waveform.h b/SleepLib/waveform.h deleted file mode 100644 index 48a89afe..00000000 --- a/SleepLib/waveform.h +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************** - SleepLib Waveform Header - This stuff contains the base calculation smarts - Copyright (c)2011 Mark Watkins - License: GPL -*********************************************************************/ - -#ifndef WAVEFORM_H -#define WAVEFORM_H - -#include -#include "machine_common.h" - -typedef qint16 SampleFormat; - -class Waveform -{ - friend class Session; -public: - Waveform(qint64 time,MachineCode code,SampleFormat * data,int samples,qint64 duration,SampleFormat min, SampleFormat max); - ~Waveform(); - SampleFormat operator[](int i) { - if (i #include #include +#include #include "SleepLib/session.h" #include "Graphs/graphdata_custom.h" -#include "Graphs/gLineChart.h" #include "Graphs/gLineOverlay.h" #include "Graphs/gFlagsLine.h" #include "Graphs/gFooBar.h" @@ -35,8 +35,8 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) : QString prof=pref["Profile"].toString(); profile=Profiles::Get(prof); if (!profile) { - qWarning("Couldn't get profile.. Have to abort!"); - abort(); + QMessageBox::critical(this,"Profile Error",QString("Couldn't get profile '%1'.. Have to abort!").arg(pref["Profile"].toString())); + exit(-1); } gSplitter=new QSplitter(Qt::Vertical,ui->scrollArea); @@ -44,7 +44,7 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) : gSplitter->setHandleWidth(2); ui->graphSizer->addWidget(gSplitter); - SF=new gGraphWindow(gSplitter,tr("Event Flags"),shared); + SF=new gGraphWindow(gSplitter,tr("Event Flags"),shared); FRW=new gGraphWindow(gSplitter,tr("Flow Rate"),SF); PRD=new gGraphWindow(gSplitter,tr("Pressure"),SF); LEAK=new gGraphWindow(gSplitter,tr("Leaks"),SF); @@ -57,6 +57,11 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) : PTB=new gGraphWindow(gSplitter,tr("Patient Trig Breaths"),SF); PULSE=new gGraphWindow(gSplitter,tr("Pulse & SpO2"),SF); + TAP=new gGraphWindow(NULL,"",(QGLWidget* )NULL); + TAP_EAP=new gGraphWindow(NULL,"",(QGLWidget* )NULL); + TAP_IAP=new gGraphWindow(NULL,"",(QGLWidget* )NULL); + G_AHI=new gGraphWindow(NULL,"",(QGLWidget* )NULL); + /*QGLFormat fmt; fmt.setDepth(false); fmt.setDirectRendering(false); @@ -66,23 +71,6 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) : //fmt.setDefaultFormat(fmt); offscreen_context=new QGLContext(fmt); */ - AddCPAPData(flags[0]=new FlagData(CPAP_CSR,1,0)); - AddCPAPData(flags[1]=new FlagData(CPAP_ClearAirway)); - AddCPAPData(flags[2]=new FlagData(CPAP_Obstructive)); - AddCPAPData(flags[3]=new FlagData(CPAP_Hypopnea)); - AddCPAPData(flags[4]=new FlagData(CPAP_FlowLimit)); - AddCPAPData(flags[5]=new FlagData(CPAP_VSnore)); - AddCPAPData(flags[6]=new FlagData(CPAP_RERA)); - AddCPAPData(flags[7]=new FlagData(PRS1_PressurePulse)); - AddCPAPData(flags[8]=new FlagData(PRS1_Unknown0E)); - AddCPAPData(flags[9]=new FlagData(CPAP_Apnea)); - AddCPAPData(flags[10]=new FlagData(CPAP_Snore)); - - TAP=new gGraphWindow(NULL,"",(QGLWidget* )NULL); - TAP_EAP=new gGraphWindow(NULL,"",(QGLWidget* )NULL); - TAP_IAP=new gGraphWindow(NULL,"",(QGLWidget* )NULL); - G_AHI=new gGraphWindow(NULL,"",(QGLWidget* )NULL); - SF->SetLeftMargin(SF->GetLeftMargin()+gYAxis::Margin); SF->SetBlockZoom(true); @@ -90,159 +78,133 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) : SF->setMinimumHeight(160); fg=new gFlagsGroup(); - fg->AddLayer(new gFlagsLine(flags[0],QColor("light green"),"CSR")); - fg->AddLayer(new gFlagsLine(flags[1],QColor("purple"),"CA",true)); - fg->AddLayer(new gFlagsLine(flags[2],QColor("#40c0ff"),"OA",true)); - fg->AddLayer(new gFlagsLine(flags[3],QColor("blue"),"H",true)); - fg->AddLayer(new gFlagsLine(flags[4],QColor("black"),"FL")); - fg->AddLayer(new gFlagsLine(flags[6],QColor("gold"),"RE")); - fg->AddLayer(new gFlagsLine(flags[5],QColor("red"),"VS")); - fg->AddLayer(new gFlagsLine(flags[8],QColor("dark green"),"U0E")); - fg->AddLayer(new gFlagsLine(flags[9],QColor("dark green"),"A")); - //fg->AddLayer(new gFlagsLine(flags[10],QColor("red"),"VS2")); + fg->AddLayer(new gFlagsLine(CPAP_CSR,QColor("light green"),"CSR",false,FLT_Span)); + fg->AddLayer(new gFlagsLine(CPAP_ClearAirway,QColor("purple"),"CA",true)); + fg->AddLayer(new gFlagsLine(CPAP_Obstructive,QColor("#40c0ff"),"OA",true)); + fg->AddLayer(new gFlagsLine(CPAP_Hypopnea,QColor("blue"),"H",true)); + fg->AddLayer(new gFlagsLine(CPAP_FlowLimit,QColor("black"),"FL")); + fg->AddLayer(new gFlagsLine(CPAP_RERA,QColor("gold"),"RE")); + fg->AddLayer(new gFlagsLine(CPAP_VSnore,QColor("red"),"VS")); + //fg->AddLayer(AddCPAP(new gFlagsLine(flags[8],QColor("dark green"),"U0E")); + fg->AddLayer(new gFlagsLine(CPAP_Apnea,QColor("dark green"),"A")); + //fg->AddLayer(AddCPAP(new gFlagsLine(flags[10],QColor("red"),"VS2")); - SF->AddLayer(fg); + SF->AddLayer(AddCPAP(fg)); // SF Foobar must go last SF->AddLayer(new gFooBar(10,QColor("orange"),QColor("dark grey"),true)); - AddCPAPData(pressure_iap=new EventData(CPAP_IAP)); - AddCPAPData(pressure_eap=new EventData(CPAP_EAP)); - AddCPAPData(prd=new EventData(CPAP_Pressure)); - //pressure_eap->ForceMinY(0); - //pressure_eap->ForceMaxY(30); PRD->AddLayer(new gXAxis()); PRD->AddLayer(new gYAxis()); //PRD->AddLayer(new gFooBar()); bool square=true; - PRD->AddLayer(new gLineChart(prd,QColor("dark green"),4096,false,false,square)); - PRD->AddLayer(new gLineChart(pressure_iap,Qt::blue,4096,false,true,square)); - PRD->AddLayer(new gLineChart(pressure_eap,Qt::red,4096,false,true,square)); + PRD->AddLayer(AddCPAP(new gLineChart(CPAP_Pressure,QColor("dark green"),square))); + PRD->AddLayer(AddCPAP(new gLineChart(CPAP_EAP,Qt::blue,square))); + PRD->AddLayer(AddCPAP(new gLineChart(CPAP_IAP,Qt::red,square))); PRD->setMinimumHeight(150); - AddCPAPData(leak=new EventData(CPAP_Leak,0)); LEAK->AddLayer(new gXAxis()); LEAK->AddLayer(new gYAxis()); //LEAK->AddLayer(new gFooBar()); - LEAK->AddLayer(new gLineChart(leak,QColor("purple"),65536,false,false,true)); + LEAK->AddLayer(AddCPAP(new gLineChart(CPAP_Leak,QColor("purple"),true))); LEAK->setMinimumHeight(150); - AddCPAPData(mp=new WaveData(CPAP_MaskPressure,1000000)); //FlowRate - gYAxis *y=new gYAxis(); - y->SetScale(1.0/50.0); - MP->AddLayer(y); + MP->AddLayer(new gYAxis()); MP->AddLayer(new gXAxis()); - gLineChart *g=new gLineChart(mp,Qt::blue,4000,true); + gLineChart *g=new gLineChart(CPAP_MaskPressure,Qt::blue,false); + AddCPAP(g); g->ReportEmpty(true); MP->AddLayer(g); - MP->setMinimumHeight(120); + MP->setMinimumHeight(150); - AddCPAPData(frw=new WaveData(CPAP_FlowRate,1000000)); //FlowRate - // Holy crap resmed stuff is huge.. //FRW->AddLayer(new gFooBar()); FRW->AddLayer(new gYAxis()); FRW->AddLayer(new gXAxis()); - FRW->AddLayer(new gLineOverlayBar(flags[0],QColor("light green"),"CSR")); - // FRW->AddLayer(new gLineChart(mpw,Qt::blue,700000,true)); - g=new gLineChart(frw,Qt::black,4000,true); + FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_CSR,QColor("light green"),"CSR",LOT_Span))); + g=new gLineChart(CPAP_FlowRate,Qt::black,false); g->ReportEmpty(true); + AddCPAP(g); FRW->AddLayer(g); - FRW->AddLayer(new gLineOverlayBar(flags[3],QColor("blue"),"H")); - FRW->AddLayer(new gLineOverlayBar(flags[7],QColor("red"),"PR",LOT_Dot)); - FRW->AddLayer(new gLineOverlayBar(flags[6],QColor("gold"),"RE")); - //FRW->AddLayer(new gLineOverlayBar(flags[9],QColor("dark green"),"U0E")); - FRW->AddLayer(new gLineOverlayBar(flags[5],QColor("red"),"VS")); - FRW->AddLayer(new gLineOverlayBar(flags[4],QColor("black"),"FL")); - FRW->AddLayer(new gLineOverlayBar(flags[2],QColor("#40c0ff"),"OA")); - FRW->AddLayer(new gLineOverlayBar(flags[1],QColor("purple"),"CA")); + FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Hypopnea,QColor("blue"),"H"))); + FRW->AddLayer(AddCPAP(new gLineOverlayBar(PRS1_PressurePulse,QColor("red"),"PR",LOT_Dot))); + FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_RERA,QColor("gold"),"RE"))); + //FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Unknown0E,QColor("dark green"),"U0E"))); + FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_VSnore,QColor("red"),"VS"))); + FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_FlowLimit,QColor("black"),"FL"))); + FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_Obstructive,QColor("#40c0ff"),"OA"))); + FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_ClearAirway,QColor("purple"),"CA"))); - FRW->setMinimumHeight(150); + FRW->setMinimumHeight(180); - AddCPAPData(snore=new EventData(CPAP_Snore,0)); SNORE->AddLayer(new gXAxis()); SNORE->AddLayer(new gYAxis()); - SNORE->AddLayer(new gLineChart(snore,Qt::black,4096,false,false,true)); + SNORE->AddLayer(AddCPAP(new gLineChart(CPAP_Snore,Qt::black,true))); SNORE->setMinimumHeight(150); - AddCPAPData(flg=new EventData(CPAP_FlowLimitGraph,0)); FLG->AddLayer(new gXAxis()); FLG->AddLayer(new gYAxis()); - FLG->AddLayer(new gLineChart(flg,Qt::black,4096,false,false,true)); + FLG->AddLayer(AddCPAP(new gLineChart(CPAP_FlowLimitGraph,Qt::black,true))); FLG->setMinimumHeight(150); - - AddCPAPData(mv=new EventData(CPAP_MinuteVentilation)); MV->AddLayer(new gXAxis()); MV->AddLayer(new gYAxis()); - MV->AddLayer(new gLineChart(mv,QColor(0x20,0x20,0x7f),65536,false,false,true)); + MV->AddLayer(AddCPAP(new gLineChart(CPAP_MinuteVentilation,QColor(0x20,0x20,0x7f),true))); MV->setMinimumHeight(150); - AddCPAPData(tv=new EventData(CPAP_TidalVolume)); TV->AddLayer(new gXAxis()); TV->AddLayer(new gYAxis()); - TV->AddLayer(new gLineChart(tv,QColor(0x7f,0x20,0x20),65536,false,false,true)); + TV->AddLayer(AddCPAP(new gLineChart(CPAP_TidalVolume,QColor(0x7f,0x20,0x20),true))); TV->setMinimumHeight(150); - AddCPAPData(rr=new EventData(CPAP_RespiratoryRate)); RR->AddLayer(new gXAxis()); RR->AddLayer(new gYAxis()); - RR->AddLayer(new gLineChart(rr,Qt::gray,65536,false,false,true)); + RR->AddLayer(AddCPAP(new gLineChart(CPAP_RespiratoryRate,Qt::gray,true))); RR->setMinimumHeight(150); - AddCPAPData(ptb=new EventData(CPAP_PatientTriggeredBreaths )); PTB->AddLayer(new gXAxis()); PTB->AddLayer(new gYAxis()); - PTB->AddLayer(new gLineChart(ptb,Qt::gray,65536,false,false,true)); + PTB->AddLayer(AddCPAP(new gLineChart(CPAP_PatientTriggeredBreaths,Qt::gray,true))); PTB->setMinimumHeight(150); - - AddOXIData(pulse=new EventData(OXI_Pulse,0,65536,true)); - //pulse->ForceMinY(40); - //pulse->ForceMaxY(120); PULSE->AddLayer(new gXAxis()); PULSE->AddLayer(new gYAxis()); // PULSE->AddLayer(new gFooBar()); - PULSE->AddLayer(new gLineChart(pulse,Qt::red,65536,false,false,true)); + PULSE->AddLayer(AddOXI(new gLineChart(OXI_Pulse,Qt::red,true))); PULSE->setMinimumHeight(150); - AddOXIData(spo2=new EventData(OXI_SPO2,0,65536,true)); - //spo2->ForceMinY(60); - //spo2->ForceMaxY(100); // SPO2=new gGraphWindow(gSplitter,tr("SpO2"),SF); // SPO2->AddLayer(new gXAxis()); // SPO2->AddLayer(new gYAxis()); // SPO2->AddLayer(new gFooBar()); - PULSE->AddLayer(new gLineChart(spo2,Qt::blue,65536,false,false,true)); + PULSE->AddLayer(AddOXI(new gLineChart(OXI_SPO2,Qt::blue,true))); // SPO2->setMinimumHeight(150); // SPO2->LinkZoom(PULSE); // PULSE->LinkZoom(SPO2); // SPO2->hide(); PULSE->hide(); - AddCPAPData(tap_eap=new TAPData(CPAP_EAP)); - AddCPAPData(tap_iap=new TAPData(CPAP_IAP)); - AddCPAPData(tap=new TAPData(CPAP_Pressure)); - - + //AddCPAPData(tap_eap=new TAPData(CPAP_EAP)); + //AddCPAPData(tap_iap=new TAPData(CPAP_IAP)); + //AddCPAPData(tap=new TAPData(CPAP_Pressure)); //TAP->SetMargins(20,15,5,50); - TAP->SetMargins(0,0,0,0); - TAP->AddLayer(new gCandleStick(tap)); + //TAP->SetMargins(0,0,0,0); + //TAP->AddLayer(new gCandleStick(tap)); //TAP->AddLayer(new gPieChart(tap)); - TAP_EAP->SetMargins(0,0,0,0); - TAP_EAP->AddLayer(new gCandleStick(tap_eap)); + //TAP_EAP->SetMargins(0,0,0,0); + //TAP_EAP->AddLayer(new gCandleStick(tap_eap)); - TAP_IAP->SetMargins(0,0,0,0); - TAP_IAP->AddLayer(new gCandleStick(tap_iap)); + //TAP_IAP->SetMargins(0,0,0,0); + //TAP_IAP->AddLayer(new gCandleStick(tap_iap)); - G_AHI->SetMargins(0,0,0,0); - AddCPAPData(g_ahi=new AHIData()); + //G_AHI->SetMargins(0,0,0,0); + //AddCPAPData(g_ahi=new AHIData()); //gCandleStick *l=new gCandleStick(g_ahi); - gPieChart *l=new gPieChart(g_ahi); + /*gPieChart *l=new gPieChart(g_ahi); l->AddName(tr("H")); l->AddName(tr("OA")); l->AddName(tr("CA")); @@ -261,6 +223,11 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) : //G_AHI->setMaximumSize(2000,30); //TAP->setMaximumSize(2000,30); + G_AHI->hide(); + TAP->hide(); + TAP_IAP->hide(); + TAP_EAP->hide(); */ + NoData=new QLabel(tr("No data"),gSplitter); NoData->setAlignment(Qt::AlignCenter); QFont font("FreeSans",20); //NoData->font(); @@ -268,12 +235,6 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) : NoData->setFont(font); NoData->hide(); - G_AHI->hide(); - TAP->hide(); - TAP_IAP->hide(); - TAP_EAP->hide(); - - gSplitter->addWidget(NoData); gGraphWindow * graphs[]={SF,FRW,MP,MV,TV,PTB,RR,PRD,LEAK,FLG,SNORE}; @@ -347,6 +308,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) tree->clear(); if (!day) return; + return; tree->setColumnCount(1); // 1 visible common.. (1 hidden) QTreeWidgetItem *root=NULL;//new QTreeWidgetItem((QTreeWidget *)0,QStringList("Stuff")); @@ -354,13 +316,14 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) map mccnt; int total_events=0; + for (vector::iterator s=day->begin();s!=day->end();s++) { - map >::iterator m; + map >::iterator m; //QTreeWidgetItem * sroot; - for (m=(*s)->events.begin();m!=(*s)->events.end();m++) { + for (m=(*s)->eventlist.begin();m!=(*s)->eventlist.end();m++) { MachineCode code=m->first; if (code==CPAP_Leak) continue; if (code==CPAP_RespiratoryRate) continue; @@ -388,24 +351,19 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) } else { mcr=mcroot[code]; } - for (vector::iterator e=(*s)->events[code].begin();e!=(*s)->events[code].end();e++) { - qint64 t=(*e)->time(); - if (code==CPAP_CSR) { - t-=((*(*e))[0]/2)*1000; + for (unsigned z=0;zsecond.size();z++) { + for (int o=0;osecond[z]->count();o++) { + qint64 t=m->second[z]->time(o); + if (code==CPAP_CSR) { + t-=(m->second[z]->data(o)/2)*1000; + } + QStringList a; + QDateTime d=QDateTime::fromMSecsSinceEpoch(t); + QString s=QString("#%1: %2").arg((int)mccnt[code],(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss")); + a.append(s); + a.append(d.toString("yyyy-MM-dd HH:mm:ss")); + mcr->addChild(new QTreeWidgetItem(a)); } - QStringList a; - QDateTime d=QDateTime::fromMSecsSinceEpoch(t); - QString s=QString("#%1: %2").arg((int)++mccnt[code],(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss")); - if ((code==PRS1_Unknown0E) || (code==PRS1_Unknown10) || (code==PRS1_Unknown0B)) { - s.append(" "+QString::number((*(*e))[0])); - s.append(" "+QString::number((*(*e))[1])); - } - if ((code==PRS1_Unknown0E) || (code==PRS1_Unknown10)) { - s.append(" "+QString::number((*(*e))[2])); - } - a.append(s); - a.append(d.toString("yyyy-MM-dd HH:mm:ss")); - mcr->addChild(new QTreeWidgetItem(a)); } } } @@ -464,13 +422,33 @@ void Daily::Load(QDate date) "" "\n"; QString tmp; - const int gwwidth=240; const int gwheight=25; UpdateOXIGraphs(oxi); UpdateCPAPGraphs(cpap); UpdateEventsTree(ui->treeWidget,cpap); + for (unsigned i=0;iisEmpty()) { + Graphs[i]->hide(); + } else { + Graphs[i]->show(); + } + } + if (!cpap && !oxi) { + NoData->setText(tr("No data for ")+date.toString(Qt::SystemLocaleLongDate)); + NoData->show(); + SF->hide(); + + } else { + NoData->hide(); + SF->show(); + } + + gSplitter->layout(); + gSplitter->update(); + RedrawGraphs(); + QString epr,modestr; float iap90,eap90; CPAPMode mode=MODE_UNKNOWN; @@ -495,9 +473,9 @@ void Daily::Load(QDate date) float vsi=cpap->count(CPAP_VSnore)/cpap->hours(); float fli=cpap->count(CPAP_FlowLimit)/cpap->hours(); - float p90=cpap->percentile(CPAP_Pressure,0,0.9); - eap90=cpap->percentile(CPAP_EAP,0,0.9); - iap90=cpap->percentile(CPAP_IAP,0,0.9); + float p90=cpap->percentile(CPAP_Pressure,0.9); + eap90=cpap->percentile(CPAP_EAP,0.9); + iap90=cpap->percentile(CPAP_IAP,0.9); QString submodel=tr("Unknown Model"); //html+="\n"; @@ -542,13 +520,13 @@ void Daily::Load(QDate date) html+="\n\n"; if (1) { - G_AHI->setFixedSize(gwwidth,gwheight); + /* G_AHI->setFixedSize(gwwidth,gwheight); QPixmap pixmap=G_AHI->renderPixmap(120,120,false); //gwwidth,gwheight,false); QByteArray byteArray; QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray buffer.open(QIODevice::WriteOnly); pixmap.save(&buffer, "PNG"); - html += "\n"; + html += "\n"; */ } html+="
"+tr("Machine Information")+"
"+tr("Event Breakdown")+"
" "\n" @@ -595,12 +573,12 @@ void Daily::Load(QDate date) html+=""); - FRW->show(); + /*FRW->show(); PRD->show(); LEAK->show(); SF->show(); SNORE->show(); - MP->show(); + MP->show(); */ } else { @@ -610,33 +588,23 @@ void Daily::Load(QDate date) //TAP_EAP->Show(false); //TAP_IAP->Show(false); //G_AHI->Show(false); - FRW->hide(); + /*FRW->hide(); PRD->hide(); LEAK->hide(); SF->hide(); SNORE->hide(); - MP->hide(); + MP->hide(); */ } // Instead of doing this, check whether any data exists.. // and show based on this factor. - mv->isEmpty() ? MV->hide() : MV->show(); - tv->isEmpty() ? TV->hide() : TV->show(); - rr->isEmpty() ? RR->hide() : RR->show(); - flg->isEmpty() ? FLG->hide() : FLG->show(); - mp->isEmpty() ? MP->hide() : MP->show(); - frw->isEmpty() ? FRW->hide() : FRW->show(); - prd->isEmpty() && pressure_iap->isEmpty() ? PRD->hide() : PRD->show(); - leak->isEmpty() ? LEAK->hide() : LEAK->show(); - snore->isEmpty() ? SNORE->hide() : SNORE->show(); - ptb->isEmpty() ? PTB->hide() : PTB->show(); bool merge_oxi_graphs=true; if (!merge_oxi_graphs) { - spo2->isEmpty() ? SPO2->hide() : SPO2->show(); - pulse->isEmpty() ? PULSE->hide() : PULSE->show(); + //spo2->isEmpty() ? SPO2->hide() : SPO2->show(); + //pulse->isEmpty() ? PULSE->hide() : PULSE->show(); } else { - pulse->isEmpty() && spo2->isEmpty() ? PULSE->hide() : PULSE->show(); + //pulse->isEmpty() && spo2->isEmpty() ? PULSE->hide() : PULSE->show(); } if (oxi) { @@ -658,25 +626,20 @@ void Daily::Load(QDate date) //PULSE->hide(); //SPO2->hide(); } - if (!cpap && !oxi) { - NoData->setText(tr("No data for ")+date.toString(Qt::SystemLocaleLongDate)); - NoData->show(); - } else - NoData->hide(); if (cpap) { if (mode==MODE_BIPAP) { } else if (mode==MODE_APAP) { html+=("\n"); - TAP->setFixedSize(gwwidth,gwheight); + /* TAP->setFixedSize(gwwidth,gwheight); QPixmap pixmap=TAP->renderPixmap(gwwidth,gwheight,false); QByteArray byteArray; QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray buffer.open(QIODevice::WriteOnly); pixmap.save(&buffer, "PNG"); - html+="\n"; + html+="\n"; */ } html+="
"+a.sprintf("%.2f",cpap->summary_min(CPAP_SnoreMinimum)); html+=""+a.sprintf("%.2f",cpap->summary_avg(CPAP_SnoreAverage)); html+=""+a.sprintf("%.2f",cpap->summary_max(CPAP_SnoreMaximum))+("
")+tr("Time@Pressure")+("
"; html+=""; @@ -703,7 +666,6 @@ void Daily::Load(QDate date) if (journal) { ui->JournalNotes->setHtml(journal->summary[GEN_Notes].toString()); } - RedrawGraphs(); } void Daily::Unload(QDate date) @@ -853,10 +815,9 @@ void Daily::UpdateCPAPGraphs(Day *day) //if (!day) return; if (day) { day->OpenEvents(); - day->OpenWaveforms(); } - for (list::iterator g=CPAPData.begin();g!=CPAPData.end();g++) { - (*g)->Update(day); + for (list::iterator g=CPAPData.begin();g!=CPAPData.end();g++) { + (*g)->SetDay(day); } }; @@ -865,20 +826,16 @@ void Daily::UpdateOXIGraphs(Day *day) //if (!day) return; if (day) { day->OpenEvents(); - day->OpenWaveforms(); } - for (list::iterator g=OXIData.begin();g!=OXIData.end();g++) { - (*g)->Update(day); + for (list::iterator g=OXIData.begin();g!=OXIData.end();g++) { + (*g)->SetDay(day); } } void Daily::RedrawGraphs() { - - // could recall Min & Max stuff here to reset cache - // instead of using the dodgy notify calls. - for (unsigned i=0;iResetBounds(); Graphs[i]->updateGL(); } } @@ -891,8 +848,8 @@ void Daily::on_treeWidget_itemSelectionChanged() QDateTime d; if (!item->text(1).isEmpty()) { d=d.fromString(item->text(1),"yyyy-MM-dd HH:mm:ss"); - double st=(d.addSecs(-180)).toMSecsSinceEpoch()/86400000.0; - double et=(d.addSecs(180)).toMSecsSinceEpoch()/86400000.0; + double st=(d.addSecs(-180)).toMSecsSinceEpoch(); + double et=(d.addSecs(180)).toMSecsSinceEpoch(); FRW->SetXBounds(st,et); MP->SetXBounds(st,et); SF->SetXBounds(st,et); @@ -903,7 +860,6 @@ void Daily::on_treeWidget_itemSelectionChanged() TV->SetXBounds(st,et); RR->SetXBounds(st,et); FLG->SetXBounds(st,et); - } } diff --git a/daily.h b/daily.h index 68c13165..ed438d04 100644 --- a/daily.h +++ b/daily.h @@ -18,6 +18,7 @@ #include #include #include +#include "Graphs/gLineChart.h" #include namespace Ui { class Daily; @@ -32,7 +33,7 @@ public: ~Daily(); void ReloadGraphs(); void RedrawGraphs(); - QGLWidget *SharedWidget() { return SF; }; + QGLWidget *SharedWidget() { return SF; } private slots: @@ -57,25 +58,25 @@ private: void UpdateCalendarDay(QDate date); void UpdateEventsTree(QTreeWidget * tree,Day *day); - gPointData *tap,*tap_eap,*tap_iap,*g_ahi,*frw,*prd,*leak,*pressure_iap,*pressure_eap,*snore; - gPointData *pulse,*spo2,*rr,*mv,*tv,*mp,*flg,*ptb; + //gLineChart *frw,*prd,*leak,*pr_ipap,*pr_epap,*snore,*pulse,*spo2,*rr,*mv,*tv,*mp,*flg,*ptb; + + //gPointData *tap,*tap_eap,*tap_iap,*g_ahi,*frw,*prd,*leak,*pressure_iap,*pressure_eap,*snore; + //gPointData *pulse,*spo2,*rr,*mv,*tv,*mp,*flg,*ptb; gFlagsGroup *fg; gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP,*PULSE,*SPO2,*SNORE,*RR,*MP,*MV,*TV,*FLG,*PTB; - list OXIData; - list CPAPData; + list OXIData; + list CPAPData; vector Graphs; QGLContext *offscreen_context; - void AddCPAPData(gPointData *d) { CPAPData.push_back(d); } - void AddOXIData(gPointData *d) { OXIData.push_back(d); } + gLayer * AddCPAP(gLayer *d) { CPAPData.push_back(d); return d; } + gLayer * AddOXI(gLayer *d) { OXIData.push_back(d); return d; } void AddGraph(gGraphWindow *w); void UpdateCPAPGraphs(Day *day); void UpdateOXIGraphs(Day *day); - gPointData *flags[11]; - Ui::Daily *ui; Profile *profile; QDate previous_date; diff --git a/mainwindow.cpp b/mainwindow.cpp index 0b796459..dac847f7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -60,8 +60,8 @@ MainWindow::MainWindow(QWidget *parent) : //shared_context->create(shared_context); daily=NULL; - overview=NULL; - oximetry=NULL; + //overview=NULL; + //oximetry=NULL; qstatusbar=ui->statusbar; qprogress=new QProgressBar(this); @@ -111,11 +111,11 @@ MainWindow::MainWindow(QWidget *parent) : daily=new Daily(ui->tabWidget); ui->tabWidget->insertTab(1,daily,tr("Daily")); - overview=new Overview(ui->tabWidget,daily->SharedWidget()); - ui->tabWidget->insertTab(2,overview,tr("Overview")); + //overview=new Overview(ui->tabWidget,daily->SharedWidget()); + //ui->tabWidget->insertTab(2,overview,tr("Overview")); - oximetry=new Oximetry(ui->tabWidget,daily->SharedWidget()); - ui->tabWidget->insertTab(3,oximetry,tr("Oximetry")); + //oximetry=new Oximetry(ui->tabWidget,daily->SharedWidget()); + //ui->tabWidget->insertTab(3,oximetry,tr("Oximetry")); ui->tabWidget->setCurrentWidget(ui->welcome); @@ -127,14 +127,14 @@ MainWindow::~MainWindow() daily->close(); delete daily; } - if (overview) { + /*if (overview) { overview->close(); delete overview; } if (oximetry) { oximetry->close(); delete oximetry; - } + }*/ DoneGraphs(); Profiles::Done(); mainwin=NULL; @@ -153,11 +153,11 @@ void MainWindow::Startup() if (daily) daily->ReloadGraphs(); - if (overview) { + /*if (overview) { overview->ReloadGraphs(); overview->UpdateGraphs(); - } + }*/ qprogress->hide(); qstatus->setText(tr("Ready")); @@ -189,11 +189,11 @@ void MainWindow::on_action_Import_Data_triggered() profile->Save(); if (daily) daily->ReloadGraphs(); - if (overview) { + /*if (overview) { overview->ReloadGraphs(); overview->UpdateGraphs(); - } + } */ //qDebug() << "overview->ReloadGraphs();"; } qstatus->setText(tr("Ready")); @@ -253,7 +253,7 @@ void MainWindow::on_dailyButton_clicked() void MainWindow::on_overviewButton_clicked() { - ui->tabWidget->setCurrentWidget(overview); + //ui->tabWidget->setCurrentWidget(overview); } void MainWindow::on_webView_loadFinished(bool arg1) diff --git a/mainwindow.h b/mainwindow.h index 59623021..ed44f63a 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -16,7 +16,7 @@ const int major_version=0; const int minor_version=8; -const int revision_number=1; +const int revision_number=2; namespace Ui { class MainWindow; @@ -77,8 +77,8 @@ private slots: private: Ui::MainWindow *ui; Daily * daily; - Overview * overview; - Oximetry * oximetry; + //Overview * overview; + //Oximetry * oximetry; bool first_load; Profile *profile; }; diff --git a/overview.cpp b/overview.cpp index 944fa80c..d9bc7cb0 100644 --- a/overview.cpp +++ b/overview.cpp @@ -18,7 +18,7 @@ #include "Graphs/gFooBar.h" #include "Graphs/gSessionTime.h" -Overview::Overview(QWidget *parent,QGLWidget * shared) : +/*Overview::Overview(QWidget *parent,QGLWidget * shared) : QWidget(parent), ui(new Ui::Overview) { @@ -269,3 +269,4 @@ void Overview::on_rbDateRange_clicked() { UpdateGraphs(); } +*/ diff --git a/overview.h b/overview.h index 008be949..e1e0819f 100644 --- a/overview.h +++ b/overview.h @@ -7,7 +7,7 @@ #ifndef OVERVIEW_H #define OVERVIEW_H -#include +/*#include #include #include #include @@ -61,5 +61,5 @@ private: QSplitter *gSplitter; QLabel *NoData; }; - +*/ #endif // OVERVIEW_H diff --git a/oximetry.cpp b/oximetry.cpp index 790218a1..93593452 100644 --- a/oximetry.cpp +++ b/oximetry.cpp @@ -2,7 +2,7 @@ #include #include -#include "oximetry.h" +/*#include "oximetry.h" #include "ui_oximetry.h" #include "qextserialport/qextserialenumerator.h" #include "SleepLib/loader_plugins/cms50_loader.h" @@ -374,17 +374,17 @@ void Oximetry::onReadyRead() if (redraw_spo2) SPO2->updateGL(); - /*if (bytes.size()==3) { - } else if (bytes.size()==2) { // Data bytes in live mode + //if (bytes.size()==3) { + //} else if (bytes.size()==2) { // Data bytes in live mode // Plethy data - } else { + //} else { //qDebug() << "Got " << bytes.size() << " bytes"; - }*/ - /*QString aa=QString::number(bytes.size(),16)+"bytes: "; - for (int i=0;iAddEvent(new Event(tt,OXI_Pulse,&data,1)); + sess->AddEvent(new Event(tt,OXI_Pulse,0,&data,1)); //qDebug() << "Pulse: " << int(pulse); } if (spo2 != 0 && spo2!=lastspo2) { data=spo2; - sess->AddEvent(new Event(tt,OXI_SPO2,&data,1)); + sess->AddEvent(new Event(tt,OXI_SPO2,0,&data,1)); //qDebug() << "SpO2: " << int(spo2); } @@ -598,9 +598,9 @@ void Oximetry::on_ImportButton_clicked() tt+=1000; } data=pulse; - sess->AddEvent(new Event(tt,OXI_Pulse,&data,1)); + sess->AddEvent(new Event(tt,OXI_Pulse,0,&data,1)); data=spo2; - sess->AddEvent(new Event(tt,OXI_SPO2,&data,1)); + sess->AddEvent(new Event(tt,OXI_SPO2,0,&data,1)); sess->summary[OXI_PulseMin]=sess->min_event_field(OXI_Pulse,0); sess->summary[OXI_PulseMax]=sess->max_event_field(OXI_Pulse,0); sess->summary[OXI_PulseAverage]=sess->weighted_avg_event_field(OXI_Pulse,0); @@ -621,3 +621,4 @@ void Oximetry::on_ImportButton_clicked() ui->SerialPortsCombo->setEnabled(true); qstatus->setText("Ready"); } +*/ diff --git a/oximetry.h b/oximetry.h index 318ed025..1d981409 100644 --- a/oximetry.h +++ b/oximetry.h @@ -1,6 +1,6 @@ #ifndef OXIMETRY_H #define OXIMETRY_H - +/* #include #include @@ -61,5 +61,5 @@ private: int lastpulse, lastspo2; }; - +*/ #endif // OXIMETRY_H
SessionIDDateStartEnd