diff --git a/WSJT-X_Users_Guide.docx b/WSJT-X_Users_Guide.docx
index 358b48c0a..5c6707601 100644
Binary files a/WSJT-X_Users_Guide.docx and b/WSJT-X_Users_Guide.docx differ
diff --git a/about.cpp b/about.cpp
index 95bb7ee1e..fa1842fa1 100644
--- a/about.cpp
+++ b/about.cpp
@@ -11,7 +11,7 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) :
m_Str = "" + m_Revision + "
\n\n";
m_Str += "WSJT-X implements experimental mode JT9 for
";
m_Str += "Amateur Radio communication at MF and LF.
";
- m_Str += "Copyright 2001-2012 by Joe Taylor, K1JT. Additional
";
+ m_Str += "Copyright 2001-2013 by Joe Taylor, K1JT. Additional
";
m_Str += "acknowledgments are contained in the source code.
";
ui->labelTxt->setText(m_Str);
}
diff --git a/logqso.ui b/logqso.ui
index 48b414533..00c6c01d5 100644
--- a/logqso.ui
+++ b/logqso.ui
@@ -11,7 +11,7 @@
- Dialog
+ Log QSO
@@ -52,6 +52,31 @@
+ -
+
+
+
+ 10
+
+
+
+ Click OK to confirm the following QSO:
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 20
+
+
+
+
-
-
@@ -74,6 +99,11 @@
16777215
+
+
+ 10
+
+
Call
@@ -102,6 +132,11 @@
16777215
+
+
+ 10
+
+
Date
@@ -130,6 +165,11 @@
16777215
+
+
+ 10
+
+
Time
@@ -158,6 +198,11 @@
16777215
+
+
+ 10
+
+
Mode
@@ -186,6 +231,11 @@
16777215
+
+
+ 10
+
+
Band
@@ -339,6 +389,11 @@
16777215
+
+
+ 10
+
+
Rpt Sent
@@ -367,6 +422,11 @@
16777215
+
+
+ 10
+
+
Rpt Rcvd
@@ -395,6 +455,11 @@
16777215
+
+
+ 10
+
+
Grid
@@ -426,6 +491,11 @@
16777215
+
+
+ 10
+
+
Name
@@ -551,6 +621,11 @@
true
+
+
+ 10
+
+
Comments
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7c5a282c8..451ba5321 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -98,6 +98,9 @@ MainWindow::MainWindow(QWidget *parent) :
connect(&proc_jt9, SIGNAL(readyReadStandardError()),
this, SLOT(readFromStderr()));
+ connect(&p3, SIGNAL(error(QProcess::ProcessError)),
+ this, SLOT(p3_error()));
+
ui->bandComboBox->setEditable(true);
ui->bandComboBox->lineEdit()->setReadOnly(true);
ui->bandComboBox->lineEdit()->setAlignment(Qt::AlignCenter);
@@ -1120,6 +1123,13 @@ void MainWindow::jt9_error() //jt9_error
}
}
+void MainWindow::p3_error() //jt9_error
+{
+ if(!m_killAll) {
+ QString t="Error running the command\n" + m_cmnd;
+ msgBox(t);
+ }
+}
void MainWindow::readFromStderr() //readFromStderr
{
QByteArray t=proc_jt9.readAllStandardError();
@@ -1289,32 +1299,22 @@ void MainWindow::guiUpdate()
if(bTxTime and m_iptt==0 and !btxMute) {
icw[0]=m_ncw;
-#define NEW
-#ifdef NEW
+
//Raise PTT
- if(m_pttMethodIndex==0) {
+ if(m_pttMethodIndex==0) { //CAT control for PTT
m_cmnd=rig_command() + " T 1";
p3.start(m_cmnd);
p3.waitForFinished();
m_iptt=1;
}
- if(m_pttMethodIndex==1 or m_pttMethodIndex==2) {
+ if(m_pttMethodIndex==1 or m_pttMethodIndex==2) { //DTR or RTS
ptt(m_pttPort,1,&m_iptt,&m_COMportOpen);
// ptt(m_pttPort,1,&m_iptt);
}
-// qDebug() << "ptt1Timer" << m_iptt;
- ptt1Timer->start(200); //Sequencer delay
-#else
- int itx=1;
- ptt(m_pttPort,itx,&m_iptt,&m_COMportOpen); // Raise PTT
- if(!soundOutThread.isRunning()) {
- QString t=ui->tx6->text();
- double snr=t.mid(1,5).toDouble();
- if(snr>0.0 or snr < -50.0) snr=99.0;
- soundOutThread.setTxSNR(snr);
- soundOutThread.start(QThread::HighPriority);
+ if(m_pttMethodIndex==3) { //VOX
+ m_iptt=1;
}
-#endif
+ ptt1Timer->start(200); //Sequencer delay
}
if(!bTxTime || btxMute) {
btxok=false;
@@ -1417,28 +1417,18 @@ void MainWindow::guiUpdate()
}
if(nc0 == 0) {
-#ifdef NEW
-
//Lower PTT
- if(m_pttMethodIndex==0) {
+ if(m_pttMethodIndex==0) { //CAT
m_cmnd=rig_command() + " T 0";
p3.start(m_cmnd);
p3.waitForFinished();
}
- if(m_pttMethodIndex==1 or m_pttMethodIndex==2) {
+ if(m_pttMethodIndex==1 or m_pttMethodIndex==2) { //DTR-RTS
ptt(m_pttPort,0,&m_iptt,&m_COMportOpen);
}
-#else
- int itx=0;
- ptt(m_pttPort,itx,&m_iptt,&m_COMportOpen); // Lower PTT
-
- if(!btxMute) soundOutThread.quitExecution=true;
- m_transmitting=false;
- if(m_auto) {
- m_monitoring=true;
- soundInThread.setMonitoring(m_monitoring);
- }
-#endif
+ if(m_pttMethodIndex==3) { //VOX
+ m_iptt=0;
+ }
}
if(m_iptt == 0 && !btxok) {
@@ -1509,8 +1499,6 @@ QString MainWindow::rig_command()
void MainWindow::startTx2()
{
if(!soundOutThread.isRunning()) {
- //qDebug() << "startTx2";
-
if(!soundOutThread.isRunning()) {
QString t=ui->tx6->text();
double snr=t.mid(1,5).toDouble();
@@ -1978,6 +1966,10 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button
m_noSuffix,m_toRTTY,m_dBtoComments);
if(logDlg.exec() == QDialog::Accepted) {
}
+ m_hisCall="";
+ ui->dxCallEntry->setText("");
+ m_hisGrid="";
+ ui->dxGridEntry->setText("");
m_rptSent="";
m_rptRcvd="";
m_qsoStart="";
diff --git a/mainwindow.h b/mainwindow.h
index 713e5e45f..747ce365f 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -36,6 +36,7 @@ public slots:
void readFromStdout();
void readFromStderr();
void jt9_error();
+ void p3_error();
protected:
virtual void keyPressEvent( QKeyEvent *e );
diff --git a/wsjtx.iss b/wsjtx.iss
index 552674a7c..b1f20c42a 100644
--- a/wsjtx.iss
+++ b/wsjtx.iss
@@ -1,6 +1,6 @@
[Setup]
AppName=wsjtx
-AppVerName=wsjtx Version 0.8 r3111
+AppVerName=wsjtx Version 0.8 r3113
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx
DefaultGroupName=wsjtx