VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-02 08:55:23 -04:00
Code Issues Projects Releases Wiki Activity

ATV Demod: cosmetic reformatting

Browse Source
This commit is contained in:
f4exb 2017-02-25 05:10:54 +01:00
parent 864df4d232
commit a5df0a1ee4
2 changed files with 69 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/channelrx/demodatv/atvscreen.cpp
View File

@ -28,14 +28,14 @@
#include <QDebug> #include <QDebug>
ATVScreen::ATVScreen(QWidget* parent) : ATVScreen::ATVScreen(QWidget* parent) :
QGLWidget(parent), QGLWidget(parent), m_objMutex(QMutex::NonRecursive)
m_objMutex(QMutex::NonRecursive)
{ {
setAttribute(Qt::WA_OpaquePaintEvent); setAttribute(Qt::WA_OpaquePaintEvent);
//connect(&m_objTimer, SIGNAL(timeout()), this, SLOT(tick())); //connect(&m_objTimer, SIGNAL(timeout()), this, SLOT(tick()));
//m_objTimer.start(50); //m_objTimer.start(50);
m_chrLastData = NULL; m_chrLastData = NULL;
m_blnConfigChanged = false;
m_blnDataChanged = false; m_blnDataChanged = false;
m_blnGLContextInitialized = false; m_blnGLContextInitialized = false;
@ -113,16 +113,20 @@ void ATVScreen::initializeGL()
{ {
if (objSurface->surfaceType() != QSurface::OpenGLSurface) if (objSurface->surfaceType() != QSurface::OpenGLSurface)
{ {
qCritical() << "ATVScreen::initializeGL: surface is not an OpenGLSurface: " << objSurface->surfaceType() << " cannot use an OpenGL context"; qCritical() << "ATVScreen::initializeGL: surface is not an OpenGLSurface: "
<< objSurface->surfaceType()
<< " cannot use an OpenGL context";
return; return;
} }
else else
{ {
qDebug() << "ATVScreen::initializeGL: OpenGL surface:" << " class: " << (objSurface->surfaceClass() == QSurface::Window ? "Window" : "Offscreen"); qDebug() << "ATVScreen::initializeGL: OpenGL surface:"
<< " class: " << (objSurface->surfaceClass() == QSurface::Window ? "Window" : "Offscreen");
} }
} }
connect(objGlCurrentContext, &QOpenGLContext::aboutToBeDestroyed, this, &ATVScreen::cleanup); // TODO: when migrating to QOpenGLWidget connect(objGlCurrentContext, &QOpenGLContext::aboutToBeDestroyed, this,
&ATVScreen::cleanup); // TODO: when migrating to QOpenGLWidget
//Par défaut //Par défaut
m_intAskedCols = ATV_COLS; m_intAskedCols = ATV_COLS;
@ -163,12 +167,10 @@ void ATVScreen::mousePressEvent(QMouseEvent* event)
{ {
} }
void ATVScreen::tick() void ATVScreen::tick()
{ {
} }
void ATVScreen::connectTimer(const QTimer& objTimer) void ATVScreen::connectTimer(const QTimer& objTimer)
{ {
/* /*
@ -187,7 +189,6 @@ void ATVScreen::cleanup()
} }
} }
bool ATVScreen::selectRow(int intLine) bool ATVScreen::selectRow(int intLine)
{ {
if (m_blnGLContextInitialized) if (m_blnGLContextInitialized)
@ -200,6 +201,7 @@ bool ATVScreen::setDataColor(int intCol,int intRed, int intGreen, int intBlue)
{ {
if (m_blnGLContextInitialized) if (m_blnGLContextInitialized)
{ {
return m_objGLShaderArray.SetDataColor(intCol, qRgb(intRed, intGreen, intBlue)); return m_objGLShaderArray.SetDataColor(intCol,
qRgb(intRed, intGreen, intBlue));
} }
} }

3
plugins/channelrx/demodatv/atvscreen.h
View File

@ -28,15 +28,12 @@
#include <QFont> #include <QFont>
#include <QMatrix4x4> #include <QMatrix4x4>
#include "dsp/dsptypes.h" #include "dsp/dsptypes.h"
#include "dsp/scopevis.h"
#include "gui/scaleengine.h"
#include "glshaderarray.h" #include "glshaderarray.h"
#include "gui/glshadertextured.h" #include "gui/glshadertextured.h"
#include "util/export.h" #include "util/export.h"
#include "util/bitfieldindex.h" #include "util/bitfieldindex.h"
class ScopeVis;
class QPainter; class QPainter;