From 8f21f7e303866010174ddcf79d4779aecb980cfa Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 9 Nov 2013 10:26:44 +1000 Subject: [PATCH] Added SummaryChart GT_POINTS plot mode --- sleepyhead/Graphs/gSummaryChart.cpp | 28 ++++++++++++++++++++++++---- sleepyhead/Graphs/gSummaryChart.h | 3 ++- sleepyhead/overview.cpp | 16 ++++++++-------- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/sleepyhead/Graphs/gSummaryChart.cpp b/sleepyhead/Graphs/gSummaryChart.cpp index 34b4649b..2f4b766f 100644 --- a/sleepyhead/Graphs/gSummaryChart.cpp +++ b/sleepyhead/Graphs/gSummaryChart.cpp @@ -17,7 +17,10 @@ SummaryChart::SummaryChart(QString label,GraphType type) //QColor color=Qt::black; addVertexBuffer(quads=new gVertexBuffer(20000,GL_QUADS)); addVertexBuffer(lines=new gVertexBuffer(20000,GL_LINES)); + addVertexBuffer(points=new gVertexBuffer(20000,GL_POINTS)); quads->forceAntiAlias(true); + + points->setSize(10); lines->setSize(1.5); //lines->setBlendFunc(GL_SRC_COLOR, GL_ZERO); //lines->forceAntiAlias(false); @@ -319,6 +322,8 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) barw=(float(width)/float(days)); + float dpr=w.graphView()->devicePixelRatio(); + graph=&w; float px=left; l_left=w.marginLeft()+gYAxis::Margin; @@ -360,6 +365,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) QVector goodcodes; goodcodes.resize(m_goodcodes.size()); + points->setSize(5.0*dpr); lastdaygood=true; for (int i=0;ibarw+1) { @@ -564,7 +568,24 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) } lastX[j]=px2; lastY[j]=py2; - //} + } else if (m_graphtype==GT_POINTS) { + GLuint col1=col.rgba(); + GLuint col2=m_colors[j].rgba(); + px2=px+barw; + py2=(top+height-2)-h; + + // If more than 1 day between records, skip the vertical crud. + if ((px2-lastX[j])>barw+1) { + lastdaygood=false; + } + points->add(px2-barw/2,py2,col1); + if (lastdaygood) { + lines->add(lastX[j]-barw/2,lastY[j],px2-barw/2,py2,col2); + } else { +// lines->add(x1-1,py2,x2+1,py2,col1); + } + lastX[j]=px2; + lastY[j]=py2; } } // for(QHash= QT_VERSION_CHECK(5,0,0) - float dpr=w.graphView()->devicePixelRatio(); lines->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width+1)*dpr,(height+1)*dpr); #else lines->scissor(left,w.flipY(top+height+2),width+1,height+2); diff --git a/sleepyhead/Graphs/gSummaryChart.h b/sleepyhead/Graphs/gSummaryChart.h index 538c16e3..def7d179 100644 --- a/sleepyhead/Graphs/gSummaryChart.h +++ b/sleepyhead/Graphs/gSummaryChart.h @@ -16,7 +16,7 @@ \value GT_LINE Display as a line plot \value GT_SESSIONS Display type for session times chart */ -enum GraphType { GT_BAR, GT_LINE, GT_SESSIONS }; +enum GraphType { GT_BAR, GT_LINE, GT_POINTS, GT_SESSIONS }; /*! \class SummaryChart \brief The main overall chart type layer used in Overview page @@ -77,6 +77,7 @@ class SummaryChart:public Layer gVertexBuffer *quads; gVertexBuffer *lines; + gVertexBuffer *points; bool m_empty; int m_fday; QString m_label; diff --git a/sleepyhead/overview.cpp b/sleepyhead/overview.cpp index 2f968c96..f9bc59d1 100644 --- a/sleepyhead/overview.cpp +++ b/sleepyhead/overview.cpp @@ -135,22 +135,22 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : BMI=createGraph(STR_TR_BMI,tr("Body\nMass\nIndex")); ZOMBIE=createGraph(STR_TR_Zombie,tr("How you felt\n(0-10)")); // Rename this Energy? - ahihr=new SummaryChart(tr("Events/Hr"),GT_LINE); + ahihr=new SummaryChart(tr("Events/Hr"),GT_POINTS); ahihr->addSlice(ahicode,COLOR_Blue,ST_MAX); ahihr->addSlice(ahicode,COLOR_Orange,ST_WAVG); AHIHR->AddLayer(ahihr); - weight=new SummaryChart(STR_TR_Weight,GT_LINE); + weight=new SummaryChart(STR_TR_Weight,GT_POINTS); weight->setMachineType(MT_JOURNAL); weight->addSlice(Journal_Weight,COLOR_Black,ST_SETAVG); WEIGHT->AddLayer(weight); - bmi=new SummaryChart(STR_TR_BMI,GT_LINE); + bmi=new SummaryChart(STR_TR_BMI,GT_POINTS); bmi->setMachineType(MT_JOURNAL); bmi->addSlice(Journal_BMI,COLOR_DarkBlue,ST_SETAVG); BMI->AddLayer(bmi); - zombie=new SummaryChart(tr("Zombie Meter"),GT_LINE); + zombie=new SummaryChart(tr("Zombie Meter"),GT_POINTS); zombie->setMachineType(MT_JOURNAL); zombie->addSlice(Journal_ZombieMeter,COLOR_DarkRed,ST_SETAVG); ZOMBIE->AddLayer(zombie); @@ -182,7 +182,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : us->addSlice(NoChannel, COLOR_Blue, ST_SESSIONS); US->AddLayer(us); - ses=new SummaryChart(STR_TR_Sessions,GT_LINE); + ses=new SummaryChart(STR_TR_Sessions,GT_POINTS); ses->addSlice(NoChannel, COLOR_Blue, ST_SESSIONS); SES->AddLayer(ses); @@ -199,7 +199,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : } AHI->AddLayer(bc); - set=new SummaryChart("",GT_LINE); + set=new SummaryChart("",GT_POINTS); //set->addSlice(PRS1_SysOneResistSet,COLOR_Gray,ST_SETAVG); set->addSlice(CPAP_HumidSetting, COLOR_Blue, ST_SETWAVG); set->addSlice(CPAP_PresReliefSet, COLOR_Red, ST_SETWAVG); @@ -207,7 +207,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : //set->addSlice(INTP_SmartFlex,COLOR_Purple,ST_SETWAVG); SET->AddLayer(set); - rr=new SummaryChart(tr("breaths/min"),GT_LINE); + rr=new SummaryChart(tr("breaths/min"),GT_POINTS); rr->addSlice(CPAP_RespRate, COLOR_LightBlue, ST_MIN); rr->addSlice(CPAP_RespRate, COLOR_Blue, ST_mid,0.5); rr->addSlice(CPAP_RespRate, COLOR_LightGreen, ST_PERC,percentile); @@ -248,7 +248,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : // Added in summarychart.. Slightly annoying.. PR->AddLayer(pr); - lk=new SummaryChart(STR_TR_Leaks,GT_LINE); + lk=new SummaryChart(STR_TR_Leaks,GT_POINTS); lk->addSlice(CPAP_Leak,COLOR_LightBlue,ST_mid,0.5); lk->addSlice(CPAP_Leak,COLOR_DarkGray,ST_PERC,percentile); //lk->addSlice(CPAP_Leak,COLOR_DarkBlue,ST_WAVG);