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

Left out some more stuff in last commit

Browse Source
This commit is contained in:
Mark Watkins 2014-05-17 00:18:39 +10:00
parent 7a347f67fd
commit a5740df0a9
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sleepyhead/Graphs/gGraphView.cpp
View File

@ -234,7 +234,7 @@ gGraph *gGraphView::popGraph()
gGraphView::gGraphView(QWidget *parent, gGraphView *shared) gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
#ifdef BROKEN_OPENGL_BUILD #ifdef BROKEN_OPENGL_BUILD
: QWidget(parent) : QWidget(parent),
#else #else
: QGLWidget(QGLFormat(QGL::DoubleBuffer | QGL::DirectRendering | QGL::HasOverlay | QGL::Rgba),parent,shared), : QGLWidget(QGLFormat(QGL::DoubleBuffer | QGL::DirectRendering | QGL::HasOverlay | QGL::Rgba),parent,shared),
#endif #endif
@ -948,7 +948,11 @@ bool gGraphView::renderGraphs(QPainter &painter)
return numgraphs > 0; return numgraphs > 0;
} }
#ifdef BROKEN_OPENGL_BUILD
void gGraphView::paintEvent(QPaintEvent *)
#else
void gGraphView::paintGL() void gGraphView::paintGL()
#endif
{ {
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
QElapsedTimer time; QElapsedTimer time;
@ -1041,7 +1045,10 @@ void gGraphView::paintGL()
#endif #endif
painter.end(); painter.end();
#ifndef BROKEN_OPENGL_BUILD
swapBuffers(); swapBuffers();
#endif
if (this->isVisible() && !graphs_drawn && render_cube) { // keep the cube spinning if (this->isVisible() && !graphs_drawn && render_cube) { // keep the cube spinning
redrawtimer->setInterval(1000.0 / 50); // 50 FPS redrawtimer->setInterval(1000.0 / 50); // 50 FPS
redrawtimer->setSingleShot(true); redrawtimer->setSingleShot(true);

7
sleepyhead/Graphs/gGraphView.h
View File

@ -334,9 +334,12 @@ class gGraphView
protected: protected:
//! \brief The heart of the OpenGL drawing code //! \brief The heart of the drawing code
#ifdef BROKEN_OPENGL_BUILD
virtual void paintEvent(QPaintEvent *);
#else
virtual void paintGL(); virtual void paintGL();
#endif
//! \brief Calculates the sum of all graph heights //! \brief Calculates the sum of all graph heights
float totalHeight(); float totalHeight();