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

Use QPainter to horizontal text

Browse Source
This commit is contained in:
Mark Watkins 2011-08-07 10:53:33 +10:00
parent edd0f2d4f3
commit 2876103f77
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Graphs/gFlagsLine.cpp
View File

@ -137,9 +137,9 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
// Draw text label // Draw text label
float x,y; float x,y;
GetTextExtent(m_label,x,y); GetTextExtent(m_label,x,y);
w.qglColor(Qt::black); //w.qglColor(Qt::black);
w.renderText(start_px-x-10,(scry-line_top)-(line_h/2)+(y/2),m_label); //w.renderText(start_px-x-10,(scry-line_top)-(line_h/2)+(y/2),m_label);
//DrawText(w,m_label,start_px-x-10,(scry-line_top)-(line_h/2)+(y/2)); DrawText(w,m_label,start_px-x-10,(scry-line_top)-(line_h/2)+(y/2));
float x1,x2; float x1,x2;
float top=floor(line_top)+2; float top=floor(line_top)+2;

4
Graphs/gXAxis.cpp
View File

@ -165,8 +165,8 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry)
} }
} }
w.renderText(px-(x/2),scry-(w.GetBottomMargin()-18),tmpstr); //w.renderText(px-(x/2),scry-(w.GetBottomMargin()-18),tmpstr);
//DrawText(w,tmpstr,px-(x/2),scry-(w.GetBottomMargin()-18),0); DrawText(w,tmpstr,px-(x/2),scry-(w.GetBottomMargin()-18),0);
py=px; py=px;
for (int j=1;j<10;j++) { for (int j=1;j<10;j++) {
py+=step_pixels; py+=step_pixels;

4
Graphs/gYAxis.cpp
View File

@ -150,8 +150,8 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
GetTextExtent(fd,x,y); GetTextExtent(fd,x,y);
if (x>labelW) labelW=x; if (x>labelW) labelW=x;
h=start_py+ty; h=start_py+ty;
w.renderText(start_px-12-x,scry-(h-(y/2.0)),fd); //w.renderText(start_px-12-x,scry-(h-(y/2.0)),fd);
//DrawText(w,fd,start_px-12-x,scry-(h-(y/2.0)),0,m_text_color); DrawText(w,fd,start_px-12-x,scry-(h-(y/2.0)),0,m_text_color);
vertarray[vertcnt++]=start_px-4; vertarray[vertcnt++]=start_px-4;
vertarray[vertcnt++]=h; vertarray[vertcnt++]=h;

7
Graphs/glcommon.cpp
View File

@ -136,13 +136,14 @@ void DrawTextQueue(gGraphWindow & wid)
void DrawText(gGraphWindow &wid,QString text, int x, int y, float angle, QColor color,QFont *font) void DrawText(gGraphWindow &wid,QString text, int x, int y, float angle, QColor color,QFont *font)
{ {
if (angle!=0) { if (angle!=0) {
//TextBuffer *b=new TextBuffer(text,x,y,angle,color,font);
TextQueRot.push_back(TextBuffer(text,x,y,angle,color,font)); TextQueRot.push_back(TextBuffer(text,x,y,angle,color,font));
} else { } else {
TextQue.push_back(TextBuffer(text,x,y,0,color,font)); //TextQue.push_back(TextBuffer(text,x,y,0,color,font));
//wid.qglColor(color); //wid.qglColor(color);
//wid.renderText(x,wid.GetScrY()-y,0,text,*font); //wid.renderText(x,wid.GetScrY()-y,0,text,*font);
//TextQue.push_back(b); QPainter painter(&wid);
RDrawText(painter,text,x,y,0,color,font);
painter.end();
} }
} }