w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-19 10:32:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

More decoder progress.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2665 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-10-15 19:55:48 +00:00
parent 30c1266614
commit 465a3c630e
5 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jt9decode.cpp
View File

@ -1,6 +0,0 @@
#include "jt9decode.h"
void JT9DecodeThread::run()
{
qDebug() << "Decode Thread started";
}

29
jt9decode.h
View File

@ -1,29 +0,0 @@
#ifndef JT9DECODE_H
#define JT9DECODE_H
#include <QtCore>
#include <QDebug>
class JT9DecodeThread : public QThread
{
Q_OBJECT
protected:
virtual void run();
public:
// Constructs (but does not start) a JT9DecodeThread
JT9DecodeThread()
: quitExecution(false) // Initialize some private members
, m_txOK(false)
{
}
public:
bool quitExecution; //If true, thread exits gracefully
// Private members
private:
bool m_txOK; //Enable Tx audio
};
#endif // JT9DECODE_H

3
mainwindow.cpp
View File

@ -824,8 +824,7 @@ void MainWindow::freezeDecode(int n) //freezeDecode()
void MainWindow::decode() //decode() void MainWindow::decode() //decode()
{ {
// jt9DecodeThread.start(QThread::NormalPriority); m_len1=80;
*future3 = QtConcurrent::run(decoder_, &m_TRperiod); *future3 = QtConcurrent::run(decoder_, &m_TRperiod);
watcher3->setFuture(*future2); watcher3->setFuture(*future2);
} }

5
mainwindow.h
View File

@ -7,7 +7,6 @@
#include <QHash> #include <QHash>
#include "soundin.h" #include "soundin.h"
#include "soundout.h" #include "soundout.h"
#include "jt9decode.h"
#include "commons.h" #include "commons.h"
#include "sleep.h" #include "sleep.h"
@ -136,6 +135,7 @@ private:
qint32 m_TRperiod; qint32 m_TRperiod;
qint32 m_nsps; qint32 m_nsps;
qint32 m_hsymStop; qint32 m_hsymStop;
qint32 m_len1;
bool m_monitoring; bool m_monitoring;
bool m_transmitting; bool m_transmitting;
@ -153,6 +153,8 @@ private:
bool m_kb8rq; bool m_kb8rq;
bool m_NB; bool m_NB;
char m_decoded[80];
float m_pctZap; float m_pctZap;
QRect m_wideGraphGeom; QRect m_wideGraphGeom;
@ -192,7 +194,6 @@ private:
SoundInThread soundInThread; //Instantiate the audio threads SoundInThread soundInThread; //Instantiate the audio threads
SoundOutThread soundOutThread; SoundOutThread soundOutThread;
JT9DecodeThread jt9DecodeThread;
//---------------------------------------------------- private functions //---------------------------------------------------- private functions
void readSettings(); void readSettings();

6
wsjtx.pro
View File

@ -35,8 +35,7 @@ QMAKE_EXTRA_COMPILERS += gfortran
SOURCES += main.cpp mainwindow.cpp plotter.cpp about.cpp \ SOURCES += main.cpp mainwindow.cpp plotter.cpp about.cpp \
soundin.cpp soundout.cpp devsetup.cpp \ soundin.cpp soundout.cpp devsetup.cpp \
widegraph.cpp getfile.cpp \ widegraph.cpp getfile.cpp \
displaytext.cpp getdev.cpp \ displaytext.cpp getdev.cpp
jt9decode.cpp
win32 { win32 {
SOURCES += killbyname.cpp SOURCES += killbyname.cpp
@ -44,8 +43,7 @@ SOURCES += killbyname.cpp
HEADERS += mainwindow.h plotter.h soundin.h soundout.h \ HEADERS += mainwindow.h plotter.h soundin.h soundout.h \
about.h devsetup.h widegraph.h getfile.h \ about.h devsetup.h widegraph.h getfile.h \
commons.h sleep.h displaytext.h \ commons.h sleep.h displaytext.h
jt9decode.h
DEFINES += __cplusplus DEFINES += __cplusplus