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

Fixed runaway font memory leaks

Browse Source
This commit is contained in:
Mark Watkins 2011-08-06 22:46:27 +10:00
parent df1c0f42b2
commit b9c755970e
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Graphs/gFlagsLine.cpp
View File

@ -137,7 +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);
DrawText(w,m_label,start_px-x-10,(scry-line_top)-(line_h/2)+(y/2)); w.qglColor(Qt::black);
w.renderText(start_px-x-10,(line_top)+(line_h/2)-(y/2),0,m_label);
//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;

5
Graphs/gXAxis.cpp
View File

@ -141,6 +141,7 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry)
vertarray[vertcnt++]=py; vertarray[vertcnt++]=py;
vertarray[vertcnt++]=start_py-4; vertarray[vertcnt++]=start_py-4;
} }
w.qglColor(Qt::black);
for (qint64 i=aligned_start;i<maxx;i+=step) { for (qint64 i=aligned_start;i<maxx;i+=step) {
px=double(i-minx)*xmult; px=double(i-minx)*xmult;
px+=start_px; px+=start_px;
@ -163,7 +164,9 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry)
tmpstr=QString("%1:%2:%3:%4").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0')).arg(ms,3,10,QChar('0')); tmpstr=QString("%1:%2:%3:%4").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0')).arg(ms,3,10,QChar('0'));
} }
} }
DrawText(w,tmpstr,px-(x/2),scry-(w.GetBottomMargin()-18),0);
w.renderText(px-(x/2),(w.GetBottomMargin()-18),0,tmpstr);
//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

@ -143,13 +143,15 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
} }
} }
w.qglColor(m_text_color);
for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) { for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
ty=(i - miny) * ymult; ty=(i - miny) * ymult;
fd=Format(i*m_yaxis_scale); // Override this as a function. fd=Format(i*m_yaxis_scale); // Override this as a function.
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;
DrawText(w,fd,start_px-12-x,scry-(h-(y/2.0)),0,m_text_color); w.renderText(start_px-12-x,h-(y/2.0),0,fd);
//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;

4
daily.cpp
View File

@ -53,8 +53,8 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw)
//scrollArea=new MyScrollArea(this); //scrollArea=new MyScrollArea(this);
QString s="QTreeWidget::selection-background-color { qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5, stop: 0 #FF92BB, stop: 1 white); }"; //ui->webView->setStyleSheet("QWebView { background-color: qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5, stop: 0 #FF92BB, stop: 1 white); }");
ui->treeWidget->setStyleSheet(s); //ui->treeWidget->setAlternatingRowColors(true);
GraphLayout=new QWidget(); GraphLayout=new QWidget();
ui->graphSizer->addWidget(GraphLayout,1); ui->graphSizer->addWidget(GraphLayout,1);

2
daily.ui
View File

@ -102,7 +102,7 @@
</font> </font>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>3</number>
</property> </property>
<property name="movable"> <property name="movable">
<bool>true</bool> <bool>true</bool>