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

Pixmap caching wasn't using correct fonts

Browse Source
This commit is contained in:
Mark Watkins 2013-10-19 16:58:16 +10:00
parent aced743226
commit 44d2117580
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sleepyhead/Graphs/gXAxis.cpp
View File

@ -65,6 +65,7 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
m_image.fill(Qt::transparent); m_image.fill(Qt::transparent);
painter.begin(&m_image); painter.begin(&m_image);
painter.setPen(Qt::black); painter.setPen(Qt::black);
painter.setFont(*defaultfont);
} }
double px,py; double px,py;
@ -229,7 +230,7 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
if (m_utcfix) if (m_utcfix)
tx+=step_pixels/2.0; tx+=step_pixels/2.0;
if ((tx+x)<(left+width)) { if ((tx+x)<(left+width)) {
if (!usepixmap) w.renderText(tmpstr,tx,texttop); if (!usepixmap) w.renderText(tmpstr,tx,texttop,0,Qt::black,defaultfont);
else painter.drawText(tx-left+20,texttop-top,tmpstr); else painter.drawText(tx-left+20,texttop-top,tmpstr);
} }
py=px; py=px;

2
sleepyhead/Graphs/gYAxis.cpp
View File

@ -340,7 +340,7 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
if (x>labelW) labelW=x; if (x>labelW) labelW=x;
h=top+height-ty; h=top+height-ty;
if (h<top) continue; if (h<top) continue;
w.renderText(fd,left+width-8-x,(h+(y/2.0)),0,m_text_color); w.renderText(fd,left+width-8-x,(h+(y/2.0)),0,m_text_color,defaultfont);
lines->add(left+width-4,h,left+width,h,line_color); lines->add(left+width-4,h,left+width,h,line_color);