chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added SummaryChart GT_POINTS plot mode

Browse Source
This commit is contained in:
Mark Watkins 2013-11-09 10:26:44 +10:00
parent 5f9869082c
commit 8f21f7e303
3 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sleepyhead/Graphs/gSummaryChart.cpp
View File

@ -17,7 +17,10 @@ SummaryChart::SummaryChart(QString label,GraphType type)
//QColor color=Qt::black; //QColor color=Qt::black;
addVertexBuffer(quads=new gVertexBuffer(20000,GL_QUADS)); addVertexBuffer(quads=new gVertexBuffer(20000,GL_QUADS));
addVertexBuffer(lines=new gVertexBuffer(20000,GL_LINES)); addVertexBuffer(lines=new gVertexBuffer(20000,GL_LINES));
addVertexBuffer(points=new gVertexBuffer(20000,GL_POINTS));
quads->forceAntiAlias(true); quads->forceAntiAlias(true);
points->setSize(10);
lines->setSize(1.5); lines->setSize(1.5);
//lines->setBlendFunc(GL_SRC_COLOR, GL_ZERO); //lines->setBlendFunc(GL_SRC_COLOR, GL_ZERO);
//lines->forceAntiAlias(false); //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)); barw=(float(width)/float(days));
float dpr=w.graphView()->devicePixelRatio();
graph=&w; graph=&w;
float px=left; float px=left;
l_left=w.marginLeft()+gYAxis::Margin; l_left=w.marginLeft()+gYAxis::Margin;
@ -360,6 +365,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
QVector<bool> goodcodes; QVector<bool> goodcodes;
goodcodes.resize(m_goodcodes.size()); goodcodes.resize(m_goodcodes.size());
points->setSize(5.0*dpr);
lastdaygood=true; lastdaygood=true;
for (int i=0;i<numcodes;i++) { for (int i=0;i<numcodes;i++) {
totalcounts[i]=0; totalcounts[i]=0;
@ -543,12 +549,10 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
} // if (bar } // if (bar
py-=h; py-=h;
} else if (m_graphtype==GT_LINE) { // if (m_graphtype==GT_BAR } else if (m_graphtype==GT_LINE) { // if (m_graphtype==GT_BAR
//col.setAlpha(128);
GLuint col1=col.rgba(); GLuint col1=col.rgba();
GLuint col2=m_colors[j].rgba(); GLuint col2=m_colors[j].rgba();
px2=px+barw; px2=px+barw;
py2=(top+height-2)-h; py2=(top+height-2)-h;
//py2+=j;
// If more than 1 day between records, skip the vertical crud. // If more than 1 day between records, skip the vertical crud.
if ((px2-lastX[j])>barw+1) { if ((px2-lastX[j])>barw+1) {
@ -564,7 +568,24 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
} }
lastX[j]=px2; lastX[j]=px2;
lastY[j]=py2; 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<short } // for(QHash<short
} }
@ -581,7 +602,6 @@ jumpnext:
//lastQ=Q; //lastQ=Q;
} }
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= 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); lines->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width+1)*dpr,(height+1)*dpr);
#else #else
lines->scissor(left,w.flipY(top+height+2),width+1,height+2); lines->scissor(left,w.flipY(top+height+2),width+1,height+2);

3
sleepyhead/Graphs/gSummaryChart.h
View File

@ -16,7 +16,7 @@
\value GT_LINE Display as a line plot \value GT_LINE Display as a line plot
\value GT_SESSIONS Display type for session times chart \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 /*! \class SummaryChart
\brief The main overall chart type layer used in Overview page \brief The main overall chart type layer used in Overview page
@ -77,6 +77,7 @@ class SummaryChart:public Layer
gVertexBuffer *quads; gVertexBuffer *quads;
gVertexBuffer *lines; gVertexBuffer *lines;
gVertexBuffer *points;
bool m_empty; bool m_empty;
int m_fday; int m_fday;
QString m_label; QString m_label;

16
sleepyhead/overview.cpp
View File

@ -135,22 +135,22 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
BMI=createGraph(STR_TR_BMI,tr("Body\nMass\nIndex")); BMI=createGraph(STR_TR_BMI,tr("Body\nMass\nIndex"));
ZOMBIE=createGraph(STR_TR_Zombie,tr("How you felt\n(0-10)")); // Rename this Energy? 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_Blue,ST_MAX);
ahihr->addSlice(ahicode,COLOR_Orange,ST_WAVG); ahihr->addSlice(ahicode,COLOR_Orange,ST_WAVG);
AHIHR->AddLayer(ahihr); AHIHR->AddLayer(ahihr);
weight=new SummaryChart(STR_TR_Weight,GT_LINE); weight=new SummaryChart(STR_TR_Weight,GT_POINTS);
weight->setMachineType(MT_JOURNAL); weight->setMachineType(MT_JOURNAL);
weight->addSlice(Journal_Weight,COLOR_Black,ST_SETAVG); weight->addSlice(Journal_Weight,COLOR_Black,ST_SETAVG);
WEIGHT->AddLayer(weight); WEIGHT->AddLayer(weight);
bmi=new SummaryChart(STR_TR_BMI,GT_LINE); bmi=new SummaryChart(STR_TR_BMI,GT_POINTS);
bmi->setMachineType(MT_JOURNAL); bmi->setMachineType(MT_JOURNAL);
bmi->addSlice(Journal_BMI,COLOR_DarkBlue,ST_SETAVG); bmi->addSlice(Journal_BMI,COLOR_DarkBlue,ST_SETAVG);
BMI->AddLayer(bmi); BMI->AddLayer(bmi);
zombie=new SummaryChart(tr("Zombie Meter"),GT_LINE); zombie=new SummaryChart(tr("Zombie Meter"),GT_POINTS);
zombie->setMachineType(MT_JOURNAL); zombie->setMachineType(MT_JOURNAL);
zombie->addSlice(Journal_ZombieMeter,COLOR_DarkRed,ST_SETAVG); zombie->addSlice(Journal_ZombieMeter,COLOR_DarkRed,ST_SETAVG);
ZOMBIE->AddLayer(zombie); ZOMBIE->AddLayer(zombie);
@ -182,7 +182,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
us->addSlice(NoChannel, COLOR_Blue, ST_SESSIONS); us->addSlice(NoChannel, COLOR_Blue, ST_SESSIONS);
US->AddLayer(us); 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->addSlice(NoChannel, COLOR_Blue, ST_SESSIONS);
SES->AddLayer(ses); SES->AddLayer(ses);
@ -199,7 +199,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
} }
AHI->AddLayer(bc); AHI->AddLayer(bc);
set=new SummaryChart("",GT_LINE); set=new SummaryChart("",GT_POINTS);
//set->addSlice(PRS1_SysOneResistSet,COLOR_Gray,ST_SETAVG); //set->addSlice(PRS1_SysOneResistSet,COLOR_Gray,ST_SETAVG);
set->addSlice(CPAP_HumidSetting, COLOR_Blue, ST_SETWAVG); set->addSlice(CPAP_HumidSetting, COLOR_Blue, ST_SETWAVG);
set->addSlice(CPAP_PresReliefSet, COLOR_Red, 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->addSlice(INTP_SmartFlex,COLOR_Purple,ST_SETWAVG);
SET->AddLayer(set); 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_LightBlue, ST_MIN);
rr->addSlice(CPAP_RespRate, COLOR_Blue, ST_mid,0.5); rr->addSlice(CPAP_RespRate, COLOR_Blue, ST_mid,0.5);
rr->addSlice(CPAP_RespRate, COLOR_LightGreen, ST_PERC,percentile); rr->addSlice(CPAP_RespRate, COLOR_LightGreen, ST_PERC,percentile);
@ -248,7 +248,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
// Added in summarychart.. Slightly annoying.. // Added in summarychart.. Slightly annoying..
PR->AddLayer(pr); 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_LightBlue,ST_mid,0.5);
lk->addSlice(CPAP_Leak,COLOR_DarkGray,ST_PERC,percentile); lk->addSlice(CPAP_Leak,COLOR_DarkGray,ST_PERC,percentile);
//lk->addSlice(CPAP_Leak,COLOR_DarkBlue,ST_WAVG); //lk->addSlice(CPAP_Leak,COLOR_DarkBlue,ST_WAVG);