VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 17:58:43 -05:00
Code Issues Projects Releases Wiki Activity

ATV Demod: ATV screen code cleanup

Browse Source
This commit is contained in:
f4exb 2017-11-07 01:10:56 +01:00
parent db57a4b1e1
commit b0c1a99b6c
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,6 @@ ATVScreen::ATVScreen(QWidget* parent) :
m_chrLastData = NULL; m_chrLastData = NULL;
m_blnConfigChanged = false; m_blnConfigChanged = false;
m_blnDataChanged = false; m_blnDataChanged = false;
//m_blnRenderImmediate = false;
m_blnGLContextInitialized = false; m_blnGLContextInitialized = false;
//Par défaut //Par défaut
@ -172,14 +171,6 @@ void ATVScreen::tick()
} }
} }
void ATVScreen::connectTimer(const QTimer& objTimer)
{
qDebug() << "ATVScreen::connectTimer";
disconnect(&m_objTimer, SIGNAL(timeout()), this, SLOT(tick()));
connect(&objTimer, SIGNAL(timeout()), this, SLOT(tick()));
m_objTimer.stop();
}
void ATVScreen::cleanup() void ATVScreen::cleanup()
{ {
if (m_blnGLContextInitialized) if (m_blnGLContextInitialized)

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

@ -50,18 +50,8 @@ public:
virtual void resizeATVScreen(int intCols, int intRows); virtual void resizeATVScreen(int intCols, int intRows);
virtual void renderImage(unsigned char * objData); virtual void renderImage(unsigned char * objData);
QRgb* getRowBuffer(int intRow);
void resetImage();
virtual bool selectRow(int intLine); virtual bool selectRow(int intLine);
virtual bool setDataColor(int intCol,int intRed, int intGreen, int intBlue); virtual bool setDataColor(int intCol,int intRed, int intGreen, int intBlue);
//void setRenderImmediate(bool blnRenderImmediate) { m_blnRenderImmediate = blnRenderImmediate; }
void connectTimer(const QTimer& timer);
//Valeurs par défaut
static const int ATV_COLS=192;
static const int ATV_ROWS=625;
signals: signals:
void traceSizeChanged(int); void traceSizeChanged(int);
@ -77,18 +67,24 @@ private:
QTimer m_objTimer; QTimer m_objTimer;
QMutex m_objMutex; QMutex m_objMutex;
bool m_blnDataChanged; bool m_blnDataChanged;
//bool m_blnRenderImmediate;
bool m_blnConfigChanged; bool m_blnConfigChanged;
GLShaderArray m_objGLShaderArray; GLShaderArray m_objGLShaderArray;
unsigned char *m_chrLastData;
//Valeurs par défaut
static const int ATV_COLS=192;
static const int ATV_ROWS=625;
void initializeGL(); void initializeGL();
void resizeGL(int width, int height); void resizeGL(int width, int height);
void paintGL(); void paintGL();
void mousePressEvent(QMouseEvent*); void mousePressEvent(QMouseEvent*);
unsigned char *m_chrLastData; QRgb* getRowBuffer(int intRow);
void resetImage();
protected slots: protected slots:
void cleanup(); void cleanup();