From 465a3c630efe0cf01ac7bc908f2ee3419d804196 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Mon, 15 Oct 2012 19:55:48 +0000
Subject: [PATCH] More decoder progress.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2665 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 jt9decode.cpp  |  6 ------
 jt9decode.h    | 29 -----------------------------
 mainwindow.cpp |  3 +--
 mainwindow.h   |  5 +++--
 wsjtx.pro      |  6 ++----
 5 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 jt9decode.cpp
 delete mode 100644 jt9decode.h

diff --git a/jt9decode.cpp b/jt9decode.cpp
deleted file mode 100644
index fe340134d..000000000
--- a/jt9decode.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "jt9decode.h"
-
-void JT9DecodeThread::run()
-{
-  qDebug() << "Decode Thread started";
-}
diff --git a/jt9decode.h b/jt9decode.h
deleted file mode 100644
index 638f8a7bd..000000000
--- a/jt9decode.h
+++ /dev/null
@@ -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
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 987bee00f..476b66b61 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -824,8 +824,7 @@ void MainWindow::freezeDecode(int n)                          //freezeDecode()
 
 void MainWindow::decode()                                       //decode()
 {
-//  jt9DecodeThread.start(QThread::NormalPriority);
-
+  m_len1=80;
   *future3 = QtConcurrent::run(decoder_, &m_TRperiod);
   watcher3->setFuture(*future2);
 }
diff --git a/mainwindow.h b/mainwindow.h
index ebdf1e963..4f0fbce36 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -7,7 +7,6 @@
 #include <QHash>
 #include "soundin.h"
 #include "soundout.h"
-#include "jt9decode.h"
 #include "commons.h"
 #include "sleep.h"
 
@@ -136,6 +135,7 @@ private:
     qint32  m_TRperiod;
     qint32  m_nsps;
     qint32  m_hsymStop;
+    qint32  m_len1;
 
     bool    m_monitoring;
     bool    m_transmitting;
@@ -153,6 +153,8 @@ private:
     bool    m_kb8rq;
     bool    m_NB;
 
+    char    m_decoded[80];
+
     float   m_pctZap;
 
     QRect   m_wideGraphGeom;
@@ -192,7 +194,6 @@ private:
 
     SoundInThread soundInThread;             //Instantiate the audio threads
     SoundOutThread soundOutThread;
-    JT9DecodeThread jt9DecodeThread;
 
 //---------------------------------------------------- private functions
     void readSettings();
diff --git a/wsjtx.pro b/wsjtx.pro
index 7c52b1918..2e502dd54 100644
--- a/wsjtx.pro
+++ b/wsjtx.pro
@@ -35,8 +35,7 @@ QMAKE_EXTRA_COMPILERS += gfortran
 SOURCES += main.cpp mainwindow.cpp plotter.cpp about.cpp \
     soundin.cpp soundout.cpp devsetup.cpp \
     widegraph.cpp getfile.cpp \
-    displaytext.cpp getdev.cpp \
-    jt9decode.cpp
+    displaytext.cpp getdev.cpp
 
 win32 {
 SOURCES += killbyname.cpp
@@ -44,8 +43,7 @@ SOURCES += killbyname.cpp
 
 HEADERS  += mainwindow.h plotter.h soundin.h soundout.h \
             about.h devsetup.h widegraph.h getfile.h \
-            commons.h sleep.h displaytext.h \
-    jt9decode.h
+            commons.h sleep.h displaytext.h
 
 DEFINES += __cplusplus