From 0516a86dd8411464242c7c4725d2651d4e2650dd Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 25 Mar 2013 19:13:49 +0000 Subject: [PATCH] 1. Tweak the DialFreq label; remove similar label from Wide Graph window. 2. Add a tab for Default Frequencies on Setup window. 3. Update Makefile.MinGW 4. Bump version number to 0.8. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3097 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- devsetup.cpp | 38 + devsetup.h | 2 + devsetup.ui | 3491 ++++++++++++++++++++++++++------------------ lib/Makefile.MinGW | 2 +- mainwindow.cpp | 39 +- mainwindow.h | 6 +- mainwindow.ui | 12 +- widegraph.cpp | 22 - widegraph.h | 6 - widegraph.ui | 32 - wsjtx.iss | 2 +- 11 files changed, 2148 insertions(+), 1504 deletions(-) diff --git a/devsetup.cpp b/devsetup.cpp index 89674e84f..20a122e53 100644 --- a/devsetup.cpp +++ b/devsetup.cpp @@ -5,6 +5,8 @@ #define MAXDEVICES 100 +extern double dFreq[16]; + //----------------------------------------------------------- DevSetup() DevSetup::DevSetup(QWidget *parent) : QDialog(parent) { @@ -18,6 +20,7 @@ DevSetup::~DevSetup() { } + void DevSetup::initDlg() { int k,id; @@ -160,6 +163,23 @@ void DevSetup::initDlg() ui.macro9->setText(m_macro[8].toUpper()); ui.macro10->setText(m_macro[9].toUpper()); + ui.f1->setText(m_dFreq[0]); + ui.f2->setText(m_dFreq[1]); + ui.f3->setText(m_dFreq[2]); + ui.f4->setText(m_dFreq[3]); + ui.f5->setText(m_dFreq[4]); + ui.f6->setText(m_dFreq[5]); + ui.f7->setText(m_dFreq[6]); + ui.f8->setText(m_dFreq[7]); + ui.f9->setText(m_dFreq[8]); + ui.f10->setText(m_dFreq[9]); + ui.f11->setText(m_dFreq[10]); + ui.f12->setText(m_dFreq[11]); + ui.f13->setText(m_dFreq[12]); + ui.f14->setText(m_dFreq[13]); + ui.f15->setText(m_dFreq[14]); + ui.f16->setText(m_dFreq[15]); + } //------------------------------------------------------- accept() @@ -198,6 +218,24 @@ void DevSetup::accept() m_macro.append(ui.macro9->text()); m_macro.append(ui.macro10->text()); + m_dFreq.clear(); + m_dFreq.append(ui.f1->text()); + m_dFreq.append(ui.f2->text()); + m_dFreq.append(ui.f3->text()); + m_dFreq.append(ui.f4->text()); + m_dFreq.append(ui.f5->text()); + m_dFreq.append(ui.f6->text()); + m_dFreq.append(ui.f7->text()); + m_dFreq.append(ui.f8->text()); + m_dFreq.append(ui.f9->text()); + m_dFreq.append(ui.f10->text()); + m_dFreq.append(ui.f11->text()); + m_dFreq.append(ui.f12->text()); + m_dFreq.append(ui.f13->text()); + m_dFreq.append(ui.f14->text()); + m_dFreq.append(ui.f15->text()); + m_dFreq.append(ui.f16->text()); + QDialog::accept(); } diff --git a/devsetup.h b/devsetup.h index 0c7fd2683..137efdcdb 100644 --- a/devsetup.h +++ b/devsetup.h @@ -14,6 +14,7 @@ public: ~DevSetup(); void initDlg(); + qint32 m_idInt; qint32 m_pttMethodIndex; qint32 m_pttPort; @@ -49,6 +50,7 @@ public: QString m_handshake; QStringList m_macro; + QStringList m_dFreq; QProcess p4; QMessageBox msgBox0; diff --git a/devsetup.ui b/devsetup.ui index e80739b37..a245aa126 100644 --- a/devsetup.ui +++ b/devsetup.ui @@ -7,1184 +7,199 @@ 0 0 468 - 488 + 441 Setup - - - - - 0 - - - - Station - - + + + + 300 + 410 + 156 + 23 + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + 9 + 29 + 450 + 371 + + + + + 0 + 0 + + + + 0 + + + + Station + + + + - + - - - - - - 0 - 0 - - - - - 80 - 20 - - - - - 80 - 16777215 - - - - My Call: - - - - - - - - 0 - 0 - - - - - 90 - 0 - - - - - 90 - 16777215 - - - - K1JT - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 80 - 20 - - - - - 80 - 16777215 - - - - My Grid: - - - - - - - - 0 - 0 - - - - - 60 - 0 - - - - - 60 - 16777215 - - - - FN20qi - - - - + + + + 0 + 0 + + + + + 80 + 20 + + + + + 80 + 16777215 + + + + My Call: + + - - - - - - 0 - 0 - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - PTT method: - - - - - - - - 0 - 0 - - - - - 90 - 0 - - - - - 90 - 16777215 - - - - 1 - - - - CAT - - - - - DTR - - - - - RTS - - - - - VOX - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - PTT Port: - - - - - - - - 0 - 0 - - - - - 60 - 0 - - - - - 60 - 16777215 - - - - - None - - - - - COM1 - - - - - COM2 - - - - - COM3 - - - - - COM4 - - - - - COM5 - - - - - COM6 - - - - - COM7 - - - - - COM8 - - - - - COM9 - - - - - COM10 - - - - - COM11 - - - - - COM12 - - - - - COM13 - - - - - COM14 - - - - - COM15 - - - - - USB - - - - - + + + + 0 + 0 + + + + + 90 + 0 + + + + + 90 + 16777215 + + + + K1JT + + - - - - - - 0 - 20 - - - - ID Interval (min): - - - - - - - true - - - - 60 - 16777215 - - - - -20 - - - 10 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - ID after 73 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 146 - 0 - - - - - 146 - 16777215 - - - - Enable PSK Reporter - - - - - - - + - Qt::Vertical + Qt::Horizontal - 20 - 15 + 40 + 20 - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Enable CAT - - - - - - - - 0 - 0 - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - Rig: - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - - - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - CAT port: - - - - - - - - 0 - 0 - - - - - 90 - 0 - - - - - 90 - 16777215 - - - - 0 - - - - None - - - - - COM1 - - - - - COM2 - - - - - COM3 - - - - - COM4 - - - - - COM5 - - - - - COM6 - - - - - COM7 - - - - - COM8 - - - - - COM9 - - - - - COM10 - - - - - COM11 - - - - - COM12 - - - - - COM13 - - - - - COM14 - - - - - COM15 - - - - - USB - - - - - /dev/ttyS0 - - - - - /dev/ttyS1 - - - - - /dev/ttyS2 - - - - - /dev/ttyS3 - - - - - /dev/ttyUSB0 - - - - - /dev/ttyUSB1 - - - - - /dev/ttyUSB2 - - - - - /dev/ttyUSB3 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - Data bits: - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - 1 - - - - 7 - - - - - 8 - - - - - - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Serial rate: - - - - - - - - 0 - 0 - - - - - 90 - 0 - - - - - 90 - 16777215 - - - - 1 - - - - 1200 - - - - - 4800 - - - - - 9600 - - - - - 19200 - - - - - 38400 - - - - - 57600 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - Stop bits: - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - 1 - - - - 1 - - - - - 2 - - - - - - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Handshake: - - - - - - - - 0 - 0 - - - - - 90 - 0 - - - - - 90 - 16777215 - - - - 2 - - - - None - - - - - XonXoff - - - - - Hardware - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical + + + + 0 + 0 + - + - 20 - 15 + 80 + 20 - + + + 80 + 16777215 + + + + My Grid: + + - - - - - - 90 - 0 - - - - - 90 - 16777215 - - - - Dev Channel - - - - - - - API Name - - - Qt::AlignCenter - - - - - - - - - - - - - - 90 - 0 - - - - - 75 - 16777215 - - - - Audio In: - - - - - - - true - - - - - - - - - - - - 0 - 0 - - - - - 90 - 0 - - - - - 75 - 16777215 - - - - Audio Out: - - - - - - - - - - - - - - - 0 - 0 - - - - - 90 - 20 - - - - Save Directory: - - - - - - - C:\Users\joe\wsjt\map65\save - - - - - - + + + + 0 + 0 + + + + + 60 + 0 + + + + + 60 + 16777215 + + + + FN20qi + + - - - - - Tx Macros - - - - - + + + + + + 0 + 0 + + + + + 80 + 0 + + + + + 80 + 16777215 + + + + PTT method: + + + + + 0 @@ -1193,20 +208,324 @@ - 200 + 90 0 - 200 + 90 16777215 + + 1 + + + + CAT + + + + + DTR + + + + + RTS + + + + + VOX + + - - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + + 80 + 16777215 + + + + PTT Port: + + + + + + + + 0 + 0 + + + + + 60 + 0 + + + + + 60 + 16777215 + + + + + None + + + + + COM1 + + + + + COM2 + + + + + COM3 + + + + + COM4 + + + + + COM5 + + + + + COM6 + + + + + COM7 + + + + + COM8 + + + + + COM9 + + + + + COM10 + + + + + COM11 + + + + + COM12 + + + + + COM13 + + + + + COM14 + + + + + COM15 + + + + + USB + + + + + + + + + + + + + 0 + 20 + + + + ID Interval (min): + + + + + + + true + + + + 60 + 16777215 + + + + -20 + + + 10 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + ID after 73 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 146 + 0 + + + + + 146 + 16777215 + + + + Enable PSK Reporter + + + + + + + + + Qt::Vertical + + + + 20 + 15 + + + + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Enable CAT + + + + + 0 @@ -1226,12 +545,32 @@ - 8 + Rig: - - + + + + + 0 + 0 + + + + + 200 + 0 + + + + + + + + + + 0 @@ -1240,23 +579,23 @@ - 20 + 100 0 - 20 + 100 16777215 - 7 + CAT port: - - + + 0 @@ -1265,20 +604,161 @@ - 200 + 90 0 - 200 + 90 16777215 + + 0 + + + + None + + + + + COM1 + + + + + COM2 + + + + + COM3 + + + + + COM4 + + + + + COM5 + + + + + COM6 + + + + + COM7 + + + + + COM8 + + + + + COM9 + + + + + COM10 + + + + + COM11 + + + + + COM12 + + + + + COM13 + + + + + COM14 + + + + + COM15 + + + + + USB + + + + + /dev/ttyS0 + + + + + /dev/ttyS1 + + + + + /dev/ttyS2 + + + + + /dev/ttyS3 + + + + + /dev/ttyUSB0 + + + + + /dev/ttyUSB1 + + + + + /dev/ttyUSB2 + + + + + /dev/ttyUSB3 + + - - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + 0 @@ -1287,23 +767,23 @@ - 20 + 50 0 - 20 + 50 16777215 - 10 + Data bits: - - + + 0 @@ -1312,64 +792,37 @@ - 200 + 50 0 - 200 + 50 16777215 + + 1 + + + + 7 + + + + + 8 + + - - - - - 0 - 0 - - - - - 200 - 0 - - - - - 200 - 16777215 - - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - - 200 - 16777215 - - - - - - + + + + + + 0 @@ -1378,23 +831,23 @@ - 20 + 100 0 - 20 + 100 16777215 - 9 + Serial rate: - - + + 0 @@ -1403,20 +856,91 @@ - 200 + 90 0 - 200 + 90 16777215 + + 1 + + + + 1200 + + + + + 4800 + + + + + 9600 + + + + + 19200 + + + + + 38400 + + + + + 57600 + + - - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + Stop bits: + + + + + 0 @@ -1425,20 +949,37 @@ - 200 + 50 0 - 200 + 50 16777215 + + 1 + + + + 1 + + + + + 2 + + - - + + + + + + 0 @@ -1447,48 +988,23 @@ - 20 + 100 0 - 20 + 100 16777215 - 3 + Handshake: - - - - - 0 - 0 - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - 4 - - - - - + + 0 @@ -1497,164 +1013,38 @@ - 200 + 90 0 - 200 + 90 16777215 + + 2 + + + + None + + + + + XonXoff + + + + + Hardware + + - - - - - 0 - 0 - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - 1 - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - - 200 - 16777215 - - - - - - - - - 0 - 0 - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - 2 - - - - - - - - 0 - 0 - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - 5 - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - - 200 - 16777215 - - - - - - - - - 0 - 0 - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - 6 - - - - - + + Qt::Horizontal @@ -1669,33 +1059,1290 @@ - + Qt::Vertical 20 - 40 + 15 + + + + + + + + + + + 90 + 0 + + + + + 90 + 16777215 + + + + Dev Channel + + + + + + + API Name + + + Qt::AlignCenter + + + + + + + + + + + + + + 90 + 0 + + + + + 75 + 16777215 + + + + Audio In: + + + + + + + true + + + + + + + + + + + + 0 + 0 + + + + + 90 + 0 + + + + + 75 + 16777215 + + + + Audio Out: + + + + + + + + + + + + + + + 0 + 0 + + + + + 90 + 20 + + + + Save Directory: + + + + + + + C:\Users\joe\wsjt\map65\save + + + + + + + + + + + + + + Tx Macros + + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + + 200 + 16777215 + + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + 8 + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + 7 + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + + 200 + 16777215 + + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + 10 + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + + 200 + 16777215 + + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + + 200 + 16777215 + + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + + 200 + 16777215 + + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + 9 + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + + 200 + 16777215 + + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + + 200 + 16777215 + + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + 3 + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + 4 + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + + 200 + 16777215 + + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + 1 + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + + 200 + 16777215 + + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + 2 + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + 5 + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + + 200 + 16777215 + + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + 6 + + + + + + + Qt::Horizontal + + + + 40 + 20 - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Default Frequencies + + + + + 10 + 20 + 431 + 241 + + + + + + Band + + + + + + + Freq (MHz) + + + + + + + Band + + + + + + + Freq (MHz) + + + + + + + 2200 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 20 + + + + 0.136 + + + Qt::AlignCenter + + + + + + + 17 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + 18.1046 + + + Qt::AlignCenter + + + + + + + 630 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 20 + + + + 0.4742 + + + Qt::AlignCenter + + + + + + + 15 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + 21.078 + + + Qt::AlignCenter + + + + + + + 160 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 20 + + + + 1.838 + + + Qt::AlignCenter + + + + + + + 12 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + 24.9246 + + + Qt::AlignCenter + + + + + + + 80 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 20 + + + + 3.578 + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 10 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + 28.078 + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 60 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 20 + + + + 5.2872 + + + Qt::AlignCenter + + + + + + + 6 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + 50.293 + + + Qt::AlignCenter + + + + + + + 40 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 20 + + + + 7.078 + + + Qt::AlignCenter + + + + + + + 4 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + 70.091 + + + Qt::AlignCenter + + + + + + + 30 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 20 + + + + 10.130 + + + Qt::AlignCenter + + + + + + + 2 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + 144.489 + + + Qt::AlignCenter + + + + + + + 20 m + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 20 + + + + 14.078 + + + Qt::AlignCenter + + + + + + + Other + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + 432.178 + + + Qt::AlignCenter + + + + - - + + diff --git a/lib/Makefile.MinGW b/lib/Makefile.MinGW index d89116344..b9d886b44 100644 --- a/lib/Makefile.MinGW +++ b/lib/Makefile.MinGW @@ -32,7 +32,7 @@ OBJS1 = pctile.o graycode.o sort.o ssort.o \ entail.o fano232.o gran.o spec9.o sync9.o decode9.o \ fil3.o redsync.o decoder.o grid2n.o n2grid.o timer.o \ decode9a.o getlags.o afc9.o fchisq.o twkfreq.o downsam9.o \ - peakdt9.o symspec2.o stdmsg.o + peakdt9.o symspec2.o stdmsg.o morse.o azdist.o geodist.o libjt9.a: $(OBJS1) ar cr libjt9.a $(OBJS1) diff --git a/mainwindow.cpp b/mainwindow.cpp index a4c907dd6..f095f20e0 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -18,13 +18,13 @@ bool btxok; //True if OK to transmit bool btxMute; double outputLatency; //Latency in seconds double dFreq[]={0.136,0.4742,1.838,3.578,5.2872,7.078,10.130,14.078, - 18.1046,21.078,24.9246,28.078,50.293,70.091,144.489,0.0}; + 18.1046,21.078,24.9246,28.078,50.293,70.091,144.489,432.178}; WideGraph* g_pWideGraph = NULL; QSharedMemory mem_jt9("mem_jt9"); QString rev="$Rev$"; -QString Program_Title_Version=" WSJT-X v0.7, r" + rev.mid(6,4) + +QString Program_Title_Version=" WSJT-X v0.8, r" + rev.mid(6,4) + " by K1JT"; //-------------------------------------------------- MainWindow constructor @@ -37,6 +37,8 @@ MainWindow::MainWindow(QWidget *parent) : on_EraseButton_clicked(); ui->labUTC->setStyleSheet( \ "QLabel { background-color : black; color : yellow; }"); + ui->labDialFreq->setStyleSheet( \ + "QLabel { background-color : black; color : yellow; }"); /* ui->labTol1->setStyleSheet( \ "QLabel { background-color : white; color : black; }"); @@ -171,9 +173,6 @@ MainWindow::MainWindow(QWidget *parent) : char *to = (char*)mem_jt9.data(); int size=sizeof(jt9com_); if(jt9com_.newdat==0) { -// int noffset = 4*4*5760000 + 4*4*322*32768 + 4*4*32768; -// to += noffset; -// size -= noffset; } memset(to,0,size); //Zero all decoding params in shared memory @@ -182,6 +181,16 @@ MainWindow::MainWindow(QWidget *parent) : msgBox("Unable to initialize PortAudio."); } readSettings(); //Restore user's setup params + + if(m_dFreq.length()<=1) { + m_dFreq.clear(); + for(int i=0; i<16; i++) { + QString t; + t.sprintf("%f",dFreq[i]); + m_dFreq.append(t); + } + } + QFile lockFile(m_appDir + "/.lock"); //Create .lock so jt9 will wait lockFile.open(QIODevice::ReadWrite); //QFile quitFile(m_appDir + "/.lock"); @@ -200,7 +209,6 @@ MainWindow::MainWindow(QWidget *parent) : genStdMsgs("-30"); on_actionWide_Waterfall_triggered(); //### g_pWideGraph->setTxFreq(m_txFreq); - m_dialFreq=g_pWideGraph->dialFreq(); if(m_mode=="JT9-1") on_actionJT9_1_triggered(); if(m_mode=="JT9-2") on_actionJT9_2_triggered(); @@ -333,6 +341,7 @@ void MainWindow::writeSettings() settings.setValue("PSKReporter",m_pskReporter); settings.setValue("After73",m_After73); settings.setValue("Macros",m_macro); + settings.setValue("DefaultFreqs",m_dFreq); settings.setValue("toRTTY",m_toRTTY); settings.setValue("NoSuffix",m_noSuffix); settings.setValue("dBtoComments",m_dBtoComments); @@ -419,6 +428,7 @@ void MainWindow::readSettings() m_pskReporter=settings.value("PSKReporter",false).toBool(); m_After73=settings.value("After73",false).toBool(); m_macro=settings.value("Macros","").toStringList(); + m_dFreq=settings.value("DefaultFreqs","").toStringList(); m_toRTTY=settings.value("toRTTY",false).toBool(); ui->actionConvert_JT9_x_to_RTTY->setChecked(m_toRTTY); m_noSuffix=settings.value("NoSuffix",false).toBool(); @@ -534,6 +544,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog dlg.m_pskReporter=m_pskReporter; dlg.m_After73=m_After73; dlg.m_macro=m_macro; + dlg.m_dFreq=m_dFreq; dlg.m_catEnabled=m_catEnabled; dlg.m_rig=m_rig; dlg.m_rigIndex=m_rigIndex; @@ -560,6 +571,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog m_nDevOut=dlg.m_nDevOut; m_paOutDevice=dlg.m_paOutDevice; m_macro=dlg.m_macro; + m_dFreq=dlg.m_dFreq; m_catEnabled=dlg.m_catEnabled; m_rig=dlg.m_rig; m_rigIndex=dlg.m_rigIndex; @@ -726,7 +738,7 @@ void MainWindow::dialFreqChanged2(double f) QString t; t.sprintf("%.6f",m_dialFreq); int n=t.length(); - t=t.mid(0,n-3) + " " + t.mid(n-3,3) + " MHz"; + t=t.mid(0,n-3) + " " + t.mid(n-3,3); ui->labDialFreq->setText(t); statusChanged(); } @@ -858,8 +870,9 @@ void MainWindow::on_actionWide_Waterfall_triggered() //Display Waterfalls SLOT(freezeDecode(int))); connect(g_pWideGraph, SIGNAL(f11f12(int)),this, SLOT(bumpFqso(int))); - connect(g_pWideGraph, SIGNAL(dialFreqChanged(double)),this, - SLOT(dialFreqChanged2(double))); } +// connect(g_pWideGraph, SIGNAL(dialFreqChanged(double)),this, +// SLOT(dialFreqChanged2(double))); + } g_pWideGraph->show(); } @@ -1191,7 +1204,7 @@ void MainWindow::readFromStdout() //readFromStdout QString remote="call," + c2 + ","; if(gridOK(g2)) remote += "gridsquare," + g2 + ","; int nHz=t.mid(22,4).toInt(); - uint nfreq=1000000.0*g_pWideGraph->dialFreq() + nHz + 0.5; + uint nfreq=1000000.0*m_dialFreq + nHz + 0.5; remote += "freq," + QString::number(nfreq); int nsnr=t.mid(10,3).toInt(); remote += ",mode,JT9,snr," + QString::number(nsnr) + ",,"; @@ -1547,8 +1560,6 @@ void MainWindow::stopTx2() void MainWindow::ba2msg(QByteArray ba, char message[]) //ba2msg() { - bool eom; - eom=false; int iz=ba.length(); for(int i=0;i<22; i++) { if(idialFreq(); QDateTime t = QDateTime::currentDateTimeUtc(); QString date=t.toString("yyyyMMdd"); QFile f("wsjtx.log"); @@ -1948,7 +1958,7 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button } else { QString logEntry=t.date().toString("yyyy-MMM-dd,") + t.time().toString("hh:mm,") + m_hisCall + "," + m_hisGrid + "," + - QString::number(dialFreq) + "," + m_mode + "," + + QString::number(m_dialFreq) + "," + m_mode + "," + m_rptSent + "," + m_rptRcvd; QTextStream out(&f); out << logEntry << endl; @@ -2196,7 +2206,6 @@ void MainWindow::on_bandComboBox_currentIndexChanged(int index) { m_band=index; m_dialFreq=dFreq[index]; - if(g_pWideGraph!=NULL) g_pWideGraph->setDialFreq(m_dialFreq); if(m_catEnabled) { int nHz=int(1000000.0*m_dialFreq + 0.5); QString cmnd1,cmnd3; diff --git a/mainwindow.h b/mainwindow.h index 57fa5bdb2..11822dbea 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -109,7 +109,6 @@ private slots: void on_inGain_valueChanged(int n); void bumpFqso(int n); void on_actionMonitor_OFF_at_startup_triggered(); - void dialFreqChanged2(double f); void on_actionErase_ALL_TXT_triggered(); void on_actionErase_wsjtx_log_adi_triggered(); void showMacros(const QPoint& pos); @@ -258,9 +257,11 @@ private: QString m_qsoStop; QString m_catPort; QString m_handshake; - QStringList m_macro; QString m_cmnd; + QStringList m_macro; + QStringList m_dFreq; + SoundInThread soundInThread; //Instantiate the audio threads SoundOutThread soundOutThread; @@ -276,6 +277,7 @@ private: void msgtype(QString t, QLineEdit* tx); void stub(); void statusChanged(); + void dialFreqChanged2(double f); bool gridOK(QString g); QString rig_command(); }; diff --git a/mainwindow.ui b/mainwindow.ui index cf4ee73e6..e8b920613 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -304,11 +304,17 @@ p, li { white-space: pre-wrap; } + + + 0 + 30 + + - 12 - 75 - true + 16 + 50 + false diff --git a/widegraph.cpp b/widegraph.cpp index ae454551a..3b6250eea 100644 --- a/widegraph.cpp +++ b/widegraph.cpp @@ -39,8 +39,6 @@ WideGraph::WideGraph(QWidget *parent) : ui->widePlot->setBinsPerPixel(1); m_waterfallAvg = settings.value("WaterfallAvg",5).toInt(); ui->waterfallAvgSpinBox->setValue(m_waterfallAvg); - m_dialFreq=settings.value("DialFreqMHz",14.078).toDouble(); - ui->fDialLineEdit->setText(QString::number(m_dialFreq)); ui->widePlot->m_bCurrent=settings.value("Current",true).toBool(); ui->widePlot->m_bCumulative=settings.value("Cumulative",false).toBool(); ui->widePlot->m_bJT9Sync=settings.value("JT9Sync",false).toBool(); @@ -52,7 +50,6 @@ WideGraph::WideGraph(QWidget *parent) : m_qsoFreq=settings.value("QSOfreq",1010).toInt(); ui->widePlot->setFQSO(m_qsoFreq,true); settings.endGroup(); - emit dialFreqChanged(m_dialFreq); } WideGraph::~WideGraph() @@ -74,7 +71,6 @@ void WideGraph::saveSettings() settings.setValue("PlotWidth",ui->widePlot->plotWidth()); settings.setValue("FreqSpan",ui->freqSpanSpinBox->value()); settings.setValue("WaterfallAvg",ui->waterfallAvgSpinBox->value()); - settings.setValue("DialFreqMHz",m_dialFreq); settings.setValue("Current",ui->widePlot->m_bCurrent); settings.setValue("Cumulative",ui->widePlot->m_bCumulative); settings.setValue("JT9Sync",ui->widePlot->m_bJT9Sync); @@ -231,22 +227,11 @@ void WideGraph::setPalette(QString palette) ui->widePlot->setPalette(palette); } -void WideGraph::on_fDialLineEdit_editingFinished() -{ - m_dialFreq=ui->fDialLineEdit->text().toDouble(); - emit dialFreqChanged(m_dialFreq); -} - double WideGraph::fGreen() { return ui->widePlot->fGreen(); } -double WideGraph::dialFreq() -{ - return m_dialFreq; -} - void WideGraph::setPeriod(int ntrperiod, int nsps) { m_TRperiod=ntrperiod; @@ -259,13 +244,6 @@ void WideGraph::setTxFreq(int n) ui->widePlot->setTxFreq(n); } -void WideGraph::setDialFreq(double f) -{ - m_dialFreq=f; - ui->fDialLineEdit->setText(QString::number(m_dialFreq)); - emit dialFreqChanged(m_dialFreq); -} - void WideGraph::on_spec2dComboBox_currentIndexChanged(const QString &arg1) { ui->widePlot->m_bCurrent=false; diff --git a/widegraph.h b/widegraph.h index 083dc69ca..1f3bd2132 100644 --- a/widegraph.h +++ b/widegraph.h @@ -30,15 +30,12 @@ public: void setPeriod(int ntrperiod, int nsps); void setTxFreq(int n); double fGreen(); - double dialFreq(); - void setDialFreq(double freq); qint32 m_qsoFreq; signals: void freezeDecode2(int n); void f11f12(int n); - void dialFreqChanged(double f); public slots: void wideFreezeDecode(int n); @@ -51,7 +48,6 @@ private slots: void on_freqSpanSpinBox_valueChanged(int arg1); void on_zeroSpinBox_valueChanged(int arg1); void on_gainSpinBox_valueChanged(int arg1); - void on_fDialLineEdit_editingFinished(); void on_spec2dComboBox_currentIndexChanged(const QString &arg1); private: @@ -62,8 +58,6 @@ private: qint32 m_nsps; qint32 m_ntr0; - double m_dialFreq; - Ui::WideGraph *ui; }; diff --git a/widegraph.ui b/widegraph.ui index 8f1e7d2d1..1df167d9c 100644 --- a/widegraph.ui +++ b/widegraph.ui @@ -295,38 +295,6 @@ - - - - true - - - Dial Freq (MHz) - - - - - - - true - - - - 0 - 0 - - - - - 65 - 16777215 - - - - 1.8395 - - - diff --git a/wsjtx.iss b/wsjtx.iss index 001a8da34..733d9dd8b 100644 --- a/wsjtx.iss +++ b/wsjtx.iss @@ -1,6 +1,6 @@ [Setup] AppName=wsjtx -AppVerName=wsjtx Version 0.7 r3063 +AppVerName=wsjtx Version 0.8 r3097 AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT DefaultDirName=c:\wsjtx DefaultGroupName=wsjtx