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

Barchart corner pixel fix, plus killed the rounded selection box

Browse Source
This commit is contained in:
Mark Watkins 2011-07-19 20:48:25 +10:00
parent 4f6eeaa5fb
commit b4c324ef98
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Graphs/gBarChart.cpp
View File

@ -117,10 +117,11 @@ void gBarChart::Plot(gGraphWindow & w,float scrx,float scry)
glColor4ub(0,0,0,255); glColor4ub(0,0,0,255);
glLineWidth (1); glLineWidth (1);
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
glVertex2f(rect.x(), rect.y()+rect.height()); glVertex2f(rect.x(), rect.y()+rect.height()+.5);
glVertex2f(rect.x(), rect.y()); glVertex2f(rect.x(), rect.y());
glVertex2f(rect.x()+rect.width(),rect.y()); glVertex2f(rect.x()+rect.width(),rect.y());
glVertex2f(rect.x()+rect.width(), rect.y()+rect.height()); glVertex2f(rect.x()+rect.width(), rect.y()+rect.height()+.5);
//glVertex2f(rect.x(), rect.y()+rect.height());
glEnd(); glEnd();
if (!draw_xticks_instead) { if (!draw_xticks_instead) {

4
Graphs/gSessionTime.cpp
View File

@ -122,10 +122,10 @@ void gSessionTime::Plot(gGraphWindow & w,float scrx,float scry)
glColor4ub(0,0,0,255); glColor4ub(0,0,0,255);
glLineWidth (1); glLineWidth (1);
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
glVertex2f(rect.x(), rect.y()+rect.height()); glVertex2f(rect.x(), rect.y()+rect.height()+.5);
glVertex2f(rect.x(), rect.y()); glVertex2f(rect.x(), rect.y());
glVertex2f(rect.x()+rect.width(),rect.y()); glVertex2f(rect.x()+rect.width(),rect.y());
glVertex2f(rect.x()+rect.width(), rect.y()+rect.height()); glVertex2f(rect.x()+rect.width(), rect.y()+rect.height()+.5);
glEnd(); glEnd();
if (!draw_xticks_instead) { if (!draw_xticks_instead) {
if (datedrawn.find(dy)==datedrawn.end()) { if (datedrawn.find(dy)==datedrawn.end()) {

15
Graphs/graphwindow.cpp
View File

@ -868,8 +868,19 @@ void gGraphWindow::paintGL()
if (m_mouseLDown) { if (m_mouseLDown) {
if (m_mouseRBrect.width()>0) if (m_mouseRBrect.width()>0)
//glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
RoundedRectangle(m_mouseRBrect.x(),m_mouseRBrect.y(),m_mouseRBrect.width(),m_mouseRBrect.height(),5,QColor(50,50,200,64)); glColor4ub(50,50,200,64);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBegin(GL_QUADS);
glVertex2f(m_mouseRBrect.x(),m_mouseRBrect.y());
glVertex2f(m_mouseRBrect.x()+m_mouseRBrect.width(),m_mouseRBrect.y());
glVertex2f(m_mouseRBrect.x()+m_mouseRBrect.width(),m_mouseRBrect.y()+m_mouseRBrect.height());
glVertex2f(m_mouseRBrect.x(),m_mouseRBrect.y()+m_mouseRBrect.height());
glEnd();
glDisable(GL_BLEND);
//RoundedRectangle(m_mouseRBrect.x(),m_mouseRBrect.y(),m_mouseRBrect.width(),m_mouseRBrect.height(),5,QColor(50,50,200,64));
//glEnable(GL_DEPTH_TEST); //glEnable(GL_DEPTH_TEST);
} }
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);