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

SummaryChart lines appearing to thick

Browse Source
This commit is contained in:
Mark Watkins 2011-12-28 18:47:02 +10:00
parent 08654561fd
commit 7e71366d4e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Graphs/gGraphView.cpp
View File

@ -1852,8 +1852,10 @@ gGraphView::gGraphView(QWidget *parent, gGraphView * shared) :
quads=new GLShortBuffer(1024,GL_QUADS); // big fat shared line list quads=new GLShortBuffer(1024,GL_QUADS); // big fat shared line list
quads->forceAntiAlias(true); quads->forceAntiAlias(true);
stippled=new GLShortBuffer(20000,GL_LINES,true); stippled=new GLShortBuffer(20000,GL_LINES,true);
stippled->setSize(1); stippled->setSize(1.5);
stippled->forceAntiAlias(false); stippled->forceAntiAlias(false);
//lines->setSize(1.5);
//backlines->setSize(1.5);
setFocusPolicy(Qt::StrongFocus); setFocusPolicy(Qt::StrongFocus);
m_showsplitter=true; m_showsplitter=true;

11
Graphs/gSummaryChart.cpp
View File

@ -18,7 +18,7 @@ SummaryChart::SummaryChart(QString label,GraphType type)
addGLBuf(quads=new GLShortBuffer(20000,GL_QUADS)); addGLBuf(quads=new GLShortBuffer(20000,GL_QUADS));
addGLBuf(lines=new GLShortBuffer(20000,GL_LINES)); addGLBuf(lines=new GLShortBuffer(20000,GL_LINES));
quads->forceAntiAlias(true); quads->forceAntiAlias(true);
lines->setSize(2); lines->setSize(1.5);
lines->setBlendFunc(GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA); lines->setBlendFunc(GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA);
lines->forceAntiAlias(false); lines->forceAntiAlias(false);
@ -360,6 +360,8 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
int incompliant=0; int incompliant=0;
Day * day; Day * day;
EventDataType hours; EventDataType hours;
short px2,py2;
for (qint64 Q=minx;Q<=maxx+86400000L;Q+=86400000L) { for (qint64 Q=minx;Q<=maxx+86400000L;Q+=86400000L) {
zd=Q/86400000L; zd=Q/86400000L;
d=m_values.find(zd); d=m_values.find(zd);
@ -470,11 +472,12 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
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); col.setAlpha(128);
short px2=px+barw; px2=px+barw;
short py2=(top+height-2)-h; py2=(top+height-2)-h;
py2+=j; py2+=j;
if (lastdaygood) { if (lastdaygood) {
lines->add(lastX[j],lastY[j],px,py2,m_colors[j]); if (lastY[j]!=py2) // vertical line
lines->add(lastX[j],lastY[j],px,py2,m_colors[j]);
lines->add(px,py2,px2+1,py2,col); lines->add(px,py2,px2+1,py2,col);
} else { } else {
lines->add(x1,py2,x2+1,py2,col); lines->add(x1,py2,x2+1,py2,col);