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

Fix SummaryChart clipping to early

Browse Source
This commit is contained in:
Mark Watkins 2013-11-09 14:03:29 +10:00
parent d6c357f6c4
commit eba087315b
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sleepyhead/Graphs/gSummaryChart.cpp
View File

@ -17,6 +17,7 @@ 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(outlines=new gVertexBuffer(20000,GL_LINES));
addVertexBuffer(points=new gVertexBuffer(20000,GL_POINTS)); addVertexBuffer(points=new gVertexBuffer(20000,GL_POINTS));
quads->forceAntiAlias(true); quads->forceAntiAlias(true);
@ -25,6 +26,8 @@ SummaryChart::SummaryChart(QString label,GraphType type)
lines->setSize(4); lines->setSize(4);
} else } else
lines->setSize(1.5); lines->setSize(1.5);
outlines->setSize(1);
//lines->setBlendFunc(GL_SRC_COLOR, GL_ZERO); //lines->setBlendFunc(GL_SRC_COLOR, GL_ZERO);
//lines->forceAntiAlias(false); //lines->forceAntiAlias(false);
@ -296,10 +299,10 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
if (!m_visible) return; if (!m_visible) return;
rtop=top; rtop=top;
gVertexBuffer *outlines=w.lines(); gVertexBuffer *outlines2=w.lines();
outlines->setColor(Qt::black); // outlines2->setColor(Qt::black);
outlines->add(left, top, left, top+height, left, top+height, left+width,top+height); outlines2->add(left, top, left, top+height, left, top+height, left+width,top+height,QColor("black").rgba());
outlines->add(left+width,top+height, left+width, top, left+width, top, left, top); outlines2->add(left+width,top+height, left+width, top, left+width, top, left, top,QColor("black").rgba());
//if (outlines->full()) qDebug() << "WTF??? Outlines full in SummaryChart::paint()"; //if (outlines->full()) qDebug() << "WTF??? Outlines full in SummaryChart::paint()";
qint64 minx=w.min_x, maxx=w.max_x; qint64 minx=w.min_x, maxx=w.max_x;
@ -410,11 +413,11 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
//EventStoreType * dptr; //EventStoreType * dptr;
short px2,py2; short px2,py2;
for (qint64 Q=minx;Q<=maxx+86400000L;Q+=86400000L) { qint64 ms_per_day=86400000L;
zd=Q/86400000L; for (qint64 Q=minx;Q<=maxx+ms_per_day;Q+=ms_per_day) {
zd=Q/ms_per_day;
d=m_values.find(zd); d=m_values.find(zd);
qint64 extra=86400000;
if (Q<minx) if (Q<minx)
goto jumpnext; goto jumpnext;
@ -431,8 +434,8 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
if (x1<left) x1=left; if (x1<left) x1=left;
if (x2>left+width) x2=left+width; if (x2>left+width) x2=left+width;
if (x2<x1) // if (x2<x1)
goto jumpnext; // goto jumpnext;
if (zd==hl_day) { if (zd==hl_day) {
@ -453,7 +456,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
} }
GLuint col1=col.rgba(); GLuint col1=col.rgba();
GLuint col2=brighten(col).rgba(); GLuint col2=brighten(col).rgba();
outlines->setColor(Qt::black); //outlines->setColor(Qt::black);
int np=d.value().size(); int np=d.value().size();
if (np > 0) { if (np > 0) {
@ -472,8 +475,8 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
quads->add(x1,py,x1,py-h,x2,py-h,x2,py,col1,col2); quads->add(x1,py,x1,py-h,x2,py-h,x2,py,col1,col2);
if (h>0 && barw>2) { if (h>0 && barw>2) {
outlines->add(x1,py,x1,py-h,x1,py-h,x2,py-h); outlines->add(x1,py,x1,py-h,x1,py-h,x2,py-h,QColor("black").rgba());
outlines->add(x1,py,x2,py,x2,py,x2,py-h); outlines->add(x1,py,x2,py,x2,py,x2,py-h,QColor("black").rgba());
} }
totalvalues[0]+=hours*tmp; totalvalues[0]+=hours*tmp;
} }
@ -547,8 +550,8 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
quads->add(x1,py,x1,py-h,col1); quads->add(x1,py,x1,py-h,col1);
quads->add(x2,py-h,x2,py,col2); quads->add(x2,py-h,x2,py,col2);
if (h>0 && barw>2) { if (h>0 && barw>2) {
outlines->add(x1,py,x1,py-h,x1,py-h,x2,py-h); outlines->add(x1,py,x1,py-h,x1,py-h,x2,py-h,QColor("black").rgba());
outlines->add(x1,py,x2,py,x2,py,x2,py-h); outlines->add(x1,py,x2,py,x2,py,x2,py-h,QColor("black").rgba());
if (outlines->full()) qDebug() << "WTF??? Outlines full in SummaryChart::paint()"; if (outlines->full()) qDebug() << "WTF??? Outlines full in SummaryChart::paint()";
} // if (bar } // if (bar
py-=h; py-=h;
@ -583,9 +586,10 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
lastdaygood=false; lastdaygood=false;
} }
if (zd==hl_day) { if (zd==hl_day) {
points->add(px2-barw/2,py2,QColor("red").rgba()); points->add(px2-barw/2,py2,QColor("red").rgba());
} }
if (lastdaygood) { if (lastdaygood) {
lines->add(lastX[j]-barw/2,lastY[j],px2-barw/2,py2,col2); lines->add(lastX[j]-barw/2,lastY[j],px2-barw/2,py2,col2);
} else { } else {
@ -597,21 +601,28 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
} // for(QHash<short } // for(QHash<short
} }
lastdaygood=true; lastdaygood=true;
if (Q>maxx+extra) break; // if (Q>maxx+extra) break;
} else { } else {
if (Q<maxx) if (Q<maxx)
incompliant++; incompliant++;
lastdaygood=false; lastdaygood=false;
} }
jumpnext: jumpnext:
if (px>=left+width+barw)
break;
px+=barw; px+=barw;
daynum++; daynum++;
//lastQ=Q; //lastQ=Q;
} }
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
quads->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width)*dpr,(height+1)*dpr);
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);
outlines->scissor(left*dpr,w.flipY(top+height+2)*dpr,(width)*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);
outlines->scissor(left,w.flipY(top+height+2),width,height+2);
quads->scissor(left,w.flipY(top+height+2),width,height+2);
#endif #endif
// Draw Ledgend // Draw Ledgend
px=left+width-3; px=left+width-3;

1
sleepyhead/Graphs/gSummaryChart.h
View File

@ -77,6 +77,7 @@ class SummaryChart:public Layer
gVertexBuffer *quads; gVertexBuffer *quads;
gVertexBuffer *lines; gVertexBuffer *lines;
gVertexBuffer *outlines;
gVertexBuffer *points; gVertexBuffer *points;
bool m_empty; bool m_empty;
int m_fday; int m_fday;