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

Revert back to QGLWidget.. QWidget BackingStores suck more than a vacuum cleaner

Browse Source
This commit is contained in:
Mark Watkins 2014-05-16 23:38:28 +10:00
parent d0fdf69deb
commit 2dd2d952d1
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sleepyhead/Graphs/gGraphView.cpp
View File

@ -233,7 +233,7 @@ gGraph *gGraphView::popGraph()
} }
gGraphView::gGraphView(QWidget *parent, gGraphView *shared) gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
: QWidget(parent), : QGLWidget(QGLFormat(QGL::DoubleBuffer | QGL::DirectRendering | QGL::HasOverlay | QGL::Rgba),parent,shared),
m_offsetY(0), m_offsetX(0), m_scaleY(1.0), m_scrollbar(nullptr) m_offsetY(0), m_offsetX(0), m_scaleY(1.0), m_scrollbar(nullptr)
{ {
m_shared = shared; m_shared = shared;
@ -272,12 +272,7 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
print_scaleY = print_scaleX = 1.0; print_scaleY = print_scaleX = 1.0;
redrawtimer = new QTimer(this); redrawtimer = new QTimer(this);
//redrawtimer->setInterval(80); connect(redrawtimer, SIGNAL(timeout()), SLOT(updateGL()));
//redrawtimer->start();
connect(redrawtimer, SIGNAL(timeout()), SLOT(repaint()));
//cubeimg.push_back(images["brick"]);
//cubeimg.push_back(images[""]);
m_fadingOut = false; m_fadingOut = false;
m_fadingIn = false; m_fadingIn = false;
@ -288,11 +283,14 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
use_pixmap_cache = true; use_pixmap_cache = true;
// pixmapcache.setCacheLimit(10240*2); // pixmapcache.setCacheLimit(10240*2);
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
m_dpr = devicePixelRatio(); // this->windowHandle()->devicePixelRatio(); m_dpr = devicePixelRatio();
#else
m_dpr = 1; m_dpr = 1;
#endif #endif
setAutoFillBackground(false);
setAutoBufferSwap(false);
} }
void gGraphView::closeEvent(QCloseEvent * event) void gGraphView::closeEvent(QCloseEvent * event)
{ {
@ -941,7 +939,7 @@ bool gGraphView::renderGraphs(QPainter &painter)
return numgraphs > 0; return numgraphs > 0;
} }
void gGraphView::paintEvent(QPaintEvent * event) void gGraphView::paintGL()
{ {
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
QElapsedTimer time; QElapsedTimer time;
@ -1034,6 +1032,7 @@ void gGraphView::paintEvent(QPaintEvent * event)
#endif #endif
painter.end(); painter.end();
swapBuffers();
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);
@ -1736,7 +1735,7 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
m_offsetY -= PROFILE.appearance->graphHeight() * 3 * m_scaleY; m_offsetY -= PROFILE.appearance->graphHeight() * 3 * m_scaleY;
m_scrollbar->setValue(m_offsetY); m_scrollbar->setValue(m_offsetY);
m_offsetY = m_scrollbar->value(); m_offsetY = m_scrollbar->value();
repaint(); updateGL();
return; return;
} else if (event->key() == Qt::Key_PageDown) { } else if (event->key() == Qt::Key_PageDown) {
m_offsetY += PROFILE.appearance->graphHeight() * 3 * m_scaleY; //PROFILE.appearance->graphHeight(); m_offsetY += PROFILE.appearance->graphHeight() * 3 * m_scaleY; //PROFILE.appearance->graphHeight();
@ -1745,7 +1744,7 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
m_scrollbar->setValue(m_offsetY); m_scrollbar->setValue(m_offsetY);
m_offsetY = m_scrollbar->value(); m_offsetY = m_scrollbar->value();
repaint(); updateGL();
return; return;
// redraw(); // redraw();
} }
@ -2012,6 +2011,6 @@ int gGraphView::visibleGraphs()
void gGraphView::redraw() void gGraphView::redraw()
{ {
if (!m_inAnimation) { if (!m_inAnimation) {
repaint(); updateGL();
} }
} }

5
sleepyhead/Graphs/gGraphView.h
View File

@ -21,6 +21,7 @@
#include <QPixmap> #include <QPixmap>
#include <QRect> #include <QRect>
#include <QPixmapCache> #include <QPixmapCache>
#include <QGLWidget>
#include <Graphs/gGraph.h> #include <Graphs/gGraph.h>
#include <Graphs/glcommon.h> #include <Graphs/glcommon.h>
@ -159,7 +160,7 @@ class gToolTip : public QObject
It led to quite a performance increase over the old Qt method. It led to quite a performance increase over the old Qt method.
*/ */
class gGraphView : public QWidget class gGraphView : public QGLWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -329,7 +330,7 @@ class gGraphView : public QWidget
protected: protected:
//! \brief The heart of the OpenGL drawing code //! \brief The heart of the OpenGL drawing code
virtual void paintEvent(QPaintEvent * event); virtual void paintGL();
//! \brief Calculates the sum of all graph heights //! \brief Calculates the sum of all graph heights
float totalHeight(); float totalHeight();

2
sleepyhead/sleepyhead.pro
View File

@ -4,7 +4,7 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += core gui network xml QT += core gui opengl network xml
greaterThan(QT_MAJOR_VERSION,4) { greaterThan(QT_MAJOR_VERSION,4) {
QT += widgets webkitwidgets QT += widgets webkitwidgets