From 860b0ce21e4529b34a4d994c417fa06de697ce97 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 3 Nov 2020 15:49:24 -0500 Subject: [PATCH] Include TRperiod in the Q65 status bar label. --- widgets/mainwindow.cpp | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index a771d8a7b..7476ab9e3 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -2360,14 +2360,13 @@ void MainWindow::createStatusBar() //createStatusBar void MainWindow::setup_status_bar (bool vhf) { auto submode = current_submode (); - if (vhf && submode != QChar::Null) - { - mode_label.setText (m_mode + " " + submode); - } - else - { - mode_label.setText (m_mode); - } + if (vhf && submode != QChar::Null) { + QString t{m_mode + " " + submode}; + if(m_mode=="Q65") t=m_mode + "-" + QString::number(m_TRperiod) + submode; + mode_label.setText (t); + } else { + mode_label.setText (m_mode); + } if ("ISCAT" == m_mode) { mode_label.setStyleSheet ("QLabel{color: #000000; background-color: #ff9933}"); } else if ("JT9" == m_mode) { @@ -7620,6 +7619,7 @@ void MainWindow::on_sbTR_valueChanged(int value) if(m_transmitting) { on_stopTxButton_clicked(); } + on_sbSubmode_valueChanged(ui->sbSubmode->value()); statusUpdate (); } @@ -7644,14 +7644,13 @@ void MainWindow::on_sbSubmode_valueChanged(int n) m_nSubMode=n; m_wideGraph->setSubMode(m_nSubMode); auto submode = current_submode (); - if (submode != QChar::Null) - { - mode_label.setText (m_mode + " " + submode); - } - else - { - mode_label.setText (m_mode); - } + if (submode != QChar::Null) { + QString t{m_mode + " " + submode}; + if(m_mode=="Q65") t=m_mode + "-" + QString::number(m_TRperiod) + submode; + mode_label.setText (t); + } else { + mode_label.setText (m_mode); + } if(m_mode=="ISCAT") { if(m_nSubMode==0) ui->TxFreqSpinBox->setValue(1012); if(m_nSubMode==1) ui->TxFreqSpinBox->setValue(560);