From 9c7ed53d1d22270c7d2a983cc98f86a6b272e5c2 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 24 Apr 2013 00:45:01 +0000 Subject: [PATCH] Clicking the "Report" spinner up/down should not change the Tx message number. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3205 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 21 +++++++++------------ mainwindow.h | 2 -- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 951c03bae..332f3bb90 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -95,9 +95,6 @@ MainWindow::MainWindow(QSharedMemory *shdmem, 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); @@ -1195,14 +1192,6 @@ 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(); @@ -2544,9 +2533,17 @@ void MainWindow::on_actionDouble_click_on_call_sets_Tx_Enable_triggered(bool che void MainWindow::on_rptSpinBox_valueChanged(int n) { m_rpt=QString::number(n); + int ntx0=m_ntx; genStdMsgs(m_rpt); -} + m_ntx=ntx0; + if(m_ntx==1) ui->txrb1->setChecked(true); + if(m_ntx==2) ui->txrb2->setChecked(true); + if(m_ntx==3) ui->txrb3->setChecked(true); + if(m_ntx==4) ui->txrb4->setChecked(true); + if(m_ntx==5) ui->txrb5->setChecked(true); + if(m_ntx==6) ui->txrb6->setChecked(true); +} void MainWindow::on_actionColor_highlighting_in_left_window_triggered(bool checked) { m_leftColor=checked; diff --git a/mainwindow.h b/mainwindow.h index e94d2c6bf..b08da9194 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -39,7 +39,6 @@ public slots: void readFromStdout(); void readFromStderr(); void jt9_error(); - void p3_error(); protected: virtual void keyPressEvent( QKeyEvent *e ); @@ -273,7 +272,6 @@ private: QFutureWatcher* watcher3; QProcess proc_jt9; - QProcess p3; QTimer* ptt1Timer; //StartTx delay QTimer* ptt0Timer; //StopTx delay