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

WinXP+Intel GFX only works with slow QWidget, so lets have both

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

21
sleepyhead/Graphs/gGraphView.cpp
View File

@ -233,7 +233,11 @@ gGraph *gGraphView::popGraph()
}
gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
#ifdef BROKEN_OPENGL_BUILD
: QWidget(parent)
#else
: QGLWidget(QGLFormat(QGL::DoubleBuffer | QGL::DirectRendering | QGL::HasOverlay | QGL::Rgba),parent,shared),
#endif
m_offsetY(0), m_offsetX(0), m_scaleY(1.0), m_scrollbar(nullptr)
{
m_shared = shared;
@ -272,7 +276,7 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
print_scaleY = print_scaleX = 1.0;
redrawtimer = new QTimer(this);
connect(redrawtimer, SIGNAL(timeout()), SLOT(updateGL()));
connect(redrawtimer, SIGNAL(timeout()), SLOT(redraw()));
m_fadingOut = false;
m_fadingIn = false;
@ -289,8 +293,10 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
m_dpr = 1;
#endif
#ifndef BROKEN_OPENGL_BUILD
setAutoFillBackground(false);
setAutoBufferSwap(false);
#endif
}
void gGraphView::closeEvent(QCloseEvent * event)
{
@ -309,6 +315,9 @@ void gGraphView::closeEvent(QCloseEvent * event)
gGraphView::~gGraphView()
{
#ifndef BROKEN_OPENGL_BUILD
doneCurrent();
#endif
#ifdef ENABLE_THREADED_DRAWING
@ -1735,7 +1744,7 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
m_offsetY -= PROFILE.appearance->graphHeight() * 3 * m_scaleY;
m_scrollbar->setValue(m_offsetY);
m_offsetY = m_scrollbar->value();
updateGL();
redraw();
return;
} else if (event->key() == Qt::Key_PageDown) {
m_offsetY += PROFILE.appearance->graphHeight() * 3 * m_scaleY; //PROFILE.appearance->graphHeight();
@ -1744,7 +1753,7 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
m_scrollbar->setValue(m_offsetY);
m_offsetY = m_scrollbar->value();
updateGL();
redraw();
return;
// redraw();
}
@ -2010,7 +2019,9 @@ int gGraphView::visibleGraphs()
void gGraphView::redraw()
{
if (!m_inAnimation) {
#ifdef BROKEN_OPENGL_BUILD
repaint();
#else
updateGL();
}
#endif
}

17
sleepyhead/Graphs/gGraphView.h
View File

@ -21,7 +21,10 @@
#include <QPixmap>
#include <QRect>
#include <QPixmapCache>
#ifdef BROKEN_OPENGL_BUILD
#include <QGLWidget>
#endif
#include <Graphs/gGraph.h>
#include <Graphs/glcommon.h>
@ -160,7 +163,12 @@ class gToolTip : public QObject
It led to quite a performance increase over the old Qt method.
*/
class gGraphView : public QGLWidget
class gGraphView
#ifdef BROKEN_OPENGL_BUILD
:public QWidget
#else
:public QGLWidget
#endif
{
Q_OBJECT
public:
@ -234,9 +242,6 @@ class gGraphView : public QGLWidget
//! \brief Set a redraw timer for ms milliseconds, clearing any previous redraw timer.
void timedRedraw(int ms);
//! \brief Call UpdateGL unless animation is in progress
void redraw();
gGraph *m_selected_graph;
gToolTip *m_tooltip;
QTimer *timer;
@ -436,6 +441,10 @@ class gGraphView : public QGLWidget
//! \brief Simply refreshes the GL view, called when timeout expires.
void refreshTimeout();
//! \brief Call UpdateGL unless animation is in progress
void redraw();
};
#endif // GGRAPHVIEW_H

13
sleepyhead/sleepyhead.pro
View File

@ -4,7 +4,7 @@
#
#-------------------------------------------------
QT += core gui opengl network xml
QT += core gui network xml
greaterThan(QT_MAJOR_VERSION,4) {
QT += widgets webkitwidgets
@ -12,6 +12,17 @@ greaterThan(QT_MAJOR_VERSION,4) {
QT += webkit
}
#Windows XP with older intel cards needs the following variable defined
#It slows other platforms down way too much
DEFINES += BROKEN_OPENGL_BUILD
contains(DEFINES, BROKEN_OPENGL_BUILD) {
message("Building with QWidget gGraphView")
} else {
message("Building with QGLWidget gGraphView")
QT += opengl
}
#CONFIG += c++11
CONFIG += rtti