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

Fix shutdown ASSERTION failure on Windows platform

Browse Source
This commit is contained in:
Mark Watkins 2013-01-18 08:49:15 +10:00
parent 777772b5d4
commit f0a1e4c15a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Graphs/gGraphView.cpp
View File

@ -1970,8 +1970,8 @@ QPixmap gGraph::renderPixmap(int w, int h, bool printing)
pm=sg->renderPixmap(w,h,false); pm=sg->renderPixmap(w,h,false);
#endif #endif
if (pm.isNull()) { if (pm.isNull()) {
// this one gives nags
pm=QPixmap::fromImage(sg->fboRenderPixmap(w,h)); pm=QPixmap::fromImage(sg->fboRenderPixmap(w,h));
// this one gives nags
} else if (pm.isNull()) { // not sure if this will work with printing } else if (pm.isNull()) { // not sure if this will work with printing
qDebug() << "Had to use PixelBuffer for snapshots\n"; qDebug() << "Had to use PixelBuffer for snapshots\n";
pm=QPixmap::fromImage(sg->pbRenderPixmap(w,h)); pm=QPixmap::fromImage(sg->pbRenderPixmap(w,h));
@ -2087,7 +2087,7 @@ void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
} }
gGraphView::gGraphView(QWidget *parent, gGraphView * shared) : gGraphView::gGraphView(QWidget *parent, gGraphView * shared) :
QGLWidget(parent,shared), QGLWidget(QGLFormat(QGL::Rgba | QGL::DoubleBuffer),parent,shared),
m_offsetY(0),m_offsetX(0),m_scaleY(1.0),m_scrollbar(NULL) m_offsetY(0),m_offsetX(0),m_scaleY(1.0),m_scrollbar(NULL)
{ {
m_shared=shared; m_shared=shared;
@ -3102,7 +3102,7 @@ void gGraphView::paintGL()
v+=ring[i]; v+=ring[i];
} }
double fps=v/double(rs); double fps=v/double(rs);
ss="Debug Mode "+QString::number(ms,'f',1)+"ms ("+QString::number(fps,'f',1)+"fps) "+QString::number(lines_drawn_this_frame,'f',0)+" lines "+QString::number(quads_drawn_this_frame,'f',0)+" quads "+QString::number(pixmap_cache.count(),'f',0)+" strings "+QString::number(pixmap_cache_size/1024.0,'f',1)+"Kb"; ss="Debug Mode "+QString::number(fps,'f',1)+"fps "+QString::number(lines_drawn_this_frame,'f',0)+" lines "+QString::number(quads_drawn_this_frame,'f',0)+" quads "+QString::number(pixmap_cache.count(),'f',0)+" strings "+QString::number(pixmap_cache_size/1024.0,'f',1)+"Kb";
int w,h; int w,h;
GetTextExtent(ss,w,h); // this uses tightBoundingRect, which is different on Mac than it is on Windows & Linux. GetTextExtent(ss,w,h); // this uses tightBoundingRect, which is different on Mac than it is on Windows & Linux.
QColor col=Qt::white; QColor col=Qt::white;