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

Thickened LineChart lines so AntiAliasing can work on Intel GFX cards..

Browse Source
This commit is contained in:
Mark Watkins 2011-07-29 01:08:16 +10:00
parent 2e4eb2f3f2
commit 3a757082b3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Graphs/gLineChart.cpp
View File

@ -428,15 +428,15 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glLineWidth (1);
bool antialias=pref["UseAntiAliasing"].toBool(); bool antialias=pref["UseAntiAliasing"].toBool();
if (antialias) { if (antialias) {
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); //SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); //SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_LINE_SMOOTH); glEnable(GL_LINE_SMOOTH);
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
glLineWidth (1.5);
} } else glLineWidth(1);
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_SHORT, 0, vertarray); glVertexPointer(2, GL_SHORT, 0, vertarray);

4
Graphs/gpiechart.cpp
View File

@ -76,12 +76,13 @@ void gPieChart::Plot(gGraphWindow & w,float scrx,float scry)
glVertex2f(px,py); glVertex2f(px,py);
glEnd(); glEnd();
glPolygonMode(GL_BACK,GL_LINE);
w.qglColor(m_outline_color); w.qglColor(m_outline_color);
if (m_total>m->second) { // Draw the center point first if (m_total>m->second) { // Draw the center point first
glPolygonMode(GL_BACK,GL_LINE);
glBegin(GL_POLYGON); glBegin(GL_POLYGON);
glVertex2f(start_px+radius+4, start_py+radius+4); glVertex2f(start_px+radius+4, start_py+radius+4);
} else { // Only one entry, so just draw the circle } else { // Only one entry, so just draw the circle
//glBegin(GL_POLYGON);
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
} }
for (q=sum;q<sum+j;q+=step) { for (q=sum;q<sum+j;q+=step) {
@ -94,7 +95,6 @@ void gPieChart::Plot(gGraphWindow & w,float scrx,float scry)
py=start_py+radius+4+cos(q*2*M_PI)*radius; py=start_py+radius+4+cos(q*2*M_PI)*radius;
glVertex2f(px,py); glVertex2f(px,py);
glEnd(); glEnd();
sum=q; sum=q;
} }
glDisable(GL_BLEND); glDisable(GL_BLEND);