rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

LP-29 use QOpenGLWidget in place of depecrated QGLWidget

Browse Source
This commit is contained in:
Philippe Renon 2015-12-09 08:32:04 +01:00
parent 596286604e
commit 3e10e89cec
7 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/gcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.cpp
View File

@ -26,9 +26,11 @@
*/ */
#include "opmapwidget.h" #include "opmapwidget.h"
#include "waypointitem.h"
#include <QtGui> #include <QtGui>
#include <QMetaObject> #include <QMetaObject>
#include "waypointitem.h" #include <QOpenGLWidget>
namespace mapcontrol { namespace mapcontrol {
OPMapWidget::OPMapWidget(QWidget *parent, Configuration *config) : QGraphicsView(parent), configuration(config), UAV(0), GPS(0), Home(0) OPMapWidget::OPMapWidget(QWidget *parent, Configuration *config) : QGraphicsView(parent), configuration(config), UAV(0), GPS(0), Home(0)
@ -210,7 +212,7 @@ void OPMapWidget::SetUseOpenGL(const bool &value)
{ {
useOpenGL = value; useOpenGL = value;
if (useOpenGL) { if (useOpenGL) {
setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers))); setViewport(new QOpenGLWidget()); // QGLFormat(QGL::SampleBuffers)));
} else { } else {
setupViewport(new QWidget()); setupViewport(new QWidget());
} }

9
ground/gcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h
View File

@ -33,11 +33,7 @@
#include "../core/languagetype.h" #include "../core/languagetype.h"
#include "../core/diagnostics.h" #include "../core/diagnostics.h"
#include "configuration.h" #include "configuration.h"
#include <QObject>
#include <QtOpenGL/QGLWidget>
#include "waypointitem.h" #include "waypointitem.h"
#include "QtSvg/QGraphicsSvgItem"
#include "QGraphicsView"
#include "uavitem.h" #include "uavitem.h"
#include "gpsitem.h" #include "gpsitem.h"
#include "homeitem.h" #include "homeitem.h"
@ -45,6 +41,11 @@
#include "waypointline.h" #include "waypointline.h"
#include "waypointcircle.h" #include "waypointcircle.h"
#include "waypointitem.h" #include "waypointitem.h"
#include <QObject>
#include "QtSvg/QGraphicsSvgItem"
#include "QGraphicsView"
namespace mapcontrol { namespace mapcontrol {
class UAVItem; class UAVItem;
class GPSItem; class GPSItem;

4
ground/gcs/src/plugins/dial/dialgadgetwidget.cpp
View File

@ -30,7 +30,7 @@
#include <utils/stylehelper.h> #include <utils/stylehelper.h>
#include <iostream> #include <iostream>
#include <math.h> #include <math.h>
#include <QtOpenGL/QGLWidget> #include <QOpenGLWidget>
#include <QDebug> #include <QDebug>
DialGadgetWidget::DialGadgetWidget(QWidget *parent) : QGraphicsView(parent) DialGadgetWidget::DialGadgetWidget(QWidget *parent) : QGraphicsView(parent)
@ -75,7 +75,7 @@ DialGadgetWidget::~DialGadgetWidget()
void DialGadgetWidget::enableOpenGL(bool flag) void DialGadgetWidget::enableOpenGL(bool flag)
{ {
if (flag) { if (flag) {
setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers))); setViewport(new QOpenGLWidget()); // QGLFormat(QGL::SampleBuffers)));
} else { } else {
setViewport(new QWidget); setViewport(new QWidget);
} }

4
ground/gcs/src/plugins/gcscontrol/joystickcontrol.cpp
View File

@ -29,7 +29,7 @@
#include "extensionsystem/pluginmanager.h" #include "extensionsystem/pluginmanager.h"
#include <QDebug> #include <QDebug>
#include <QWidget> #include <QWidget>
#include <QtOpenGL/QGLWidget> #include <QOpenGLWidget>
#include <QMouseEvent> #include <QMouseEvent>
/** /**
@ -85,7 +85,7 @@ JoystickControl::~JoystickControl()
void JoystickControl::enableOpenGL(bool flag) void JoystickControl::enableOpenGL(bool flag)
{ {
if (flag) { if (flag) {
setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers))); setViewport(new QOpenGLWidget()); // QGLFormat(QGL::SampleBuffers)));
} else { } else {
setViewport(new QWidget); setViewport(new QWidget);
} }

4
ground/gcs/src/plugins/lineardial/lineardialgadgetwidget.cpp
View File

@ -28,7 +28,7 @@
#include "lineardialgadgetwidget.h" #include "lineardialgadgetwidget.h"
#include <utils/stylehelper.h> #include <utils/stylehelper.h>
#include <QFileDialog> #include <QFileDialog>
#include <QtOpenGL/QGLWidget> #include <QOpenGLWidget>
#include <QDebug> #include <QDebug>
LineardialGadgetWidget::LineardialGadgetWidget(QWidget *parent) : QGraphicsView(parent) LineardialGadgetWidget::LineardialGadgetWidget(QWidget *parent) : QGraphicsView(parent)
@ -66,7 +66,7 @@ LineardialGadgetWidget::~LineardialGadgetWidget()
void LineardialGadgetWidget::enableOpenGL(bool flag) void LineardialGadgetWidget::enableOpenGL(bool flag)
{ {
if (flag) { if (flag) {
setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers))); setViewport(new QOpenGLWidget()); // QGLFormat(QGL::SampleBuffers)));
} else { } else {
setViewport(new QWidget); setViewport(new QWidget);
} }

1
ground/gcs/src/plugins/qmlview/qmlviewgadgetwidget.cpp
View File

@ -34,7 +34,6 @@
#include <QDebug> #include <QDebug>
#include <QSvgRenderer> #include <QSvgRenderer>
#include <QtOpenGL/QGLWidget>
#include <QtCore/qfileinfo.h> #include <QtCore/qfileinfo.h>
#include <QtCore/qdir.h> #include <QtCore/qdir.h>

12
ground/gcs/src/plugins/telemetry/monitorwidget.cpp
View File

@ -198,18 +198,6 @@ MonitorWidget::~MonitorWidget()
} }
} }
/*!
\brief Enables/Disables OpenGL
*/
// void LineardialGadgetWidget::enableOpenGL(bool flag)
// {
// if (flag) {
// setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
// } else {
// setViewport(new QWidget);
// }
// }
void MonitorWidget::telemetryConnected() void MonitorWidget::telemetryConnected()
{ {
qDebug() << "telemetry connected"; qDebug() << "telemetry connected";