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

Removed the extra texture cache code for Graph vertical titles

Browse Source
This commit is contained in:
Mark Watkins 2013-01-18 05:11:10 +10:00
parent 67f0cf443b
commit a6478ca3e3
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Graphs/gGraphView.cpp
View File

@ -1206,7 +1206,7 @@ void gGraph::paint(int originX, int originY, int width, int height)
int x=0,y=0; int x=0,y=0;
if (m_showTitle) { if (m_showTitle) {
int title_x,yh; int title_x,yh;
if (titleImage.isNull()) { /* if (titleImage.isNull()) {
// Render the title to a texture so we don't have to draw the vertical text every time.. // Render the title to a texture so we don't have to draw the vertical text every time..
GetTextExtent("Wy@",x,yh,mediumfont); // This gets a better consistent height. should be cached. GetTextExtent("Wy@",x,yh,mediumfont); // This gets a better consistent height. should be cached.
@ -1219,7 +1219,7 @@ void gGraph::paint(int originX, int originY, int width, int height)
tpm.fill(Qt::transparent); //empty it tpm.fill(Qt::transparent); //empty it
QPainter pmp(&tpm); QPainter pmp(&tpm);
pmp.setRenderHint(QPainter::Antialiasing, true); pmp.setRenderHint(QPainter::TextAntialiasing, true);
QBrush brush2(Qt::black); // text color QBrush brush2(Qt::black); // text color
pmp.setBrush(brush2); pmp.setBrush(brush2);
@ -1254,8 +1254,16 @@ void gGraph::paint(int originX, int originY, int width, int height)
glDisable(GL_BLEND); glDisable(GL_BLEND);
// All that to replace this little, but -hideously- slow line of text.. // All that to replace this little, but -hideously- slow line of text..
*/
//renderText(title(),marginLeft()+title_x,originY+height/2,90,Qt::black,mediumfont);
GetTextExtent("Wy@",x,yh,mediumfont); // This gets a better consistent height. should be cached.
y=yh;
GetTextExtent(title(),x,y,mediumfont);
title_x=yh*2;
renderText(title(),marginLeft()+title_x+4,originY+height/2,90,Qt::black,mediumfont);
left+=title_x; left+=title_x;
} else left=0; } else left=0;
@ -2167,7 +2175,7 @@ gGraphView::~gGraphView()
void gGraphView::DrawTextQue() void gGraphView::DrawTextQue()
{ {
const qint64 expire_after_ms=4000; // expire string pixmap after this many milliseconds const qint64 expire_after_ms=4000; // expire string pixmaps after this many milliseconds
const bool use_pixmap_cache=true; const bool use_pixmap_cache=true;
quint64 ti=0; quint64 ti=0;
int w,h; int w,h;
@ -2186,6 +2194,8 @@ void gGraphView::DrawTextQue()
expire.push_back(it.key()); expire.push_back(it.key());
} }
} }
// TODO: Don't bother expiring if less than a memory threshold is used..
for (int i=0;i<expire.count();i++) { for (int i=0;i<expire.count();i++) {
const QString key=expire.at(i); const QString key=expire.at(i);
// unbind the texture // unbind the texture
@ -2241,6 +2251,10 @@ void gGraphView::DrawTextQue()
painter.begin(pm); painter.begin(pm);
// Hmmm.. Maybe I need to be able to turn this on/off?
painter.setRenderHint(QPainter::TextAntialiasing, true);
QBrush b(q.color); QBrush b(q.color);
painter.setBrush(b); painter.setBrush(b);
painter.setFont(*q.font); painter.setFont(*q.font);