diff --git a/displayWidgets.txt b/displayWidgets.txt index ae813ad48..34750cf98 100644 --- a/displayWidgets.txt +++ b/displayWidgets.txt @@ -1,25 +1,26 @@ Here are the "displayWidgets()" strings for WSJT-X modes 1 2 3 - 012345678901234567890123456789012 + 0123456789012345678901234567890123 ---------------------------------------------- -JT4 111010000000110000110000000000000 -JT4/VHF 111110010010110110111100000000000 -JT9 111010000000111000010000000000001 -JT9/VHF 111110101000111110010000000000000 -JT9+JT65 111010000001111000010000000000001 -JT65 111010000000111000010000000000001 -JT65/VHF 111110010000110110101100010000000 -QRA64 111110010110110110000000001000000 -ISCAT 100111000000000110000000000000000 -MSK144 101111110100000000010001000000000 -WSPR 000000000000000001010000000000000 -Echo 000000000000000000000010000000000 -FCal 001101000000000000000000000001000 -FT8 111010000100111000010000100110001 -FT8/VHF 111010000100111000010000100110001 -FT8/Fox 111010000100111000010000000000100 -FT8/Hound 111010000100111000010000000000110 +JT4 1110100000001100001100000000000000 +JT4/VHF 1111100100101101101111000000000000 +JT9 1110100000001110000100000000000010 +JT9/VHF 1111101010001111100100000000000000 +JT9+JT65 1110100000011110000100000000000010 +JT65 1110100000001110000100000000000010 +JT65/VHF 1111100100001101101011000100000000 +QRA64 1111100101101101100000000010000000 +ISCAT 1001110000000001100000000000000000 +MSK144 1011111101000000000100010000000000 +WSPR 0000000000000000010100000000000000 +FST240W 0000000000000000010100000000000001 +Echo 0000000000000000000000100000000000 +FCal 0011010000000000000000000000010000 +FT8 1110100001001110000100001001100010 +FT8/VHF 1110100001001110000100001001100010 +FT8/Fox 1110100001001110000100000000001000 +FT8/Hound 1110100001001110000100000000001100 ---------------------------------------------- 1 2 3 012345678901234567890123456789012 @@ -60,3 +61,4 @@ Mapping of column numbers to widgets 30. labDXped 31. cbRxAll 32. cbCQonly +33. sbTR_FST240W diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index ecb0ad970..9c5e9c6bb 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -208,6 +208,7 @@ namespace // grid exact match excluding RR73 QRegularExpression grid_regexp {"\\A(?![Rr]{2}73)[A-Ra-r]{2}[0-9]{2}([A-Xa-x]{2}){0,1}\\z"}; auto quint32_max = std::numeric_limits::max (); + constexpr int N_WIDGETS {34}; bool message_is_73 (int type, QStringList const& msg_parts) { @@ -5792,6 +5793,7 @@ void MainWindow::displayWidgets(qint64 n) if(i==30) ui->labDXped->setVisible(b); if(i==31) ui->cbRxAll->setVisible(b); if(i==32) ui->cbCQonly->setVisible(b); + if(i==33) ui->sbTR_FST240W->setVisible(b); j=j>>1; } ui->pbBestSP->setVisible(m_mode=="FT4"); @@ -5819,8 +5821,8 @@ void MainWindow::on_actionFST240_triggered() ui->actionFST240->setChecked(true); WSPR_config(false); bool bVHF=m_config.enable_VHF_features(); -// 012345678901234567890123456789012 - displayWidgets(nWidgets("111111000100111100010000000100000")); +// 0123456789012345678901234567890123 + displayWidgets(nWidgets("1111110001001111000100000001000000")); setup_status_bar (bVHF); m_TRperiod = ui->sbTR->value(); ui->sbTR->setMinimum(15); @@ -5843,8 +5845,8 @@ void MainWindow::on_actionFST240W_triggered() m_modeTx="FST240W"; WSPR_config(true); ui->actionFST240W->setChecked(true); -// 012345678901234567890123456789012 - displayWidgets(nWidgets("000001000000000001010000000000000")); +// 0123456789012345678901234567890123 + displayWidgets(nWidgets("0000000000000000010100000000000001")); bool bVHF=m_config.enable_VHF_features(); setup_status_bar (bVHF); m_nSubMode=0; @@ -5899,7 +5901,7 @@ void MainWindow::on_actionFT4_triggered() ui->label_7->setText(tr ("Rx Frequency")); ui->label_6->setText(tr ("Band Activity")); ui->decodedTextLabel->setText( " UTC dB DT Freq " + tr ("Message")); - displayWidgets(nWidgets("111010000100111000010000000110001")); + displayWidgets(nWidgets("1110100001001110000100000001100010")); ui->txrb2->setEnabled(true); ui->txrb4->setEnabled(true); ui->txrb5->setEnabled(true); @@ -5948,7 +5950,7 @@ void MainWindow::on_actionFT8_triggered() ui->label_6->setText(tr ("Band Activity")); ui->decodedTextLabel->setText( " UTC dB DT Freq " + tr ("Message")); } - displayWidgets(nWidgets("111010000100111000010000100110001")); + displayWidgets(nWidgets("1110100001001110000100001001100010")); ui->txrb2->setEnabled(true); ui->txrb4->setEnabled(true); ui->txrb5->setEnabled(true); @@ -5966,7 +5968,7 @@ void MainWindow::on_actionFT8_triggered() ui->cbAutoSeq->setEnabled(false); ui->tabWidget->setCurrentIndex(2); ui->TxFreqSpinBox->setValue(300); - displayWidgets(nWidgets("111010000100111000010000000000100")); + displayWidgets(nWidgets("1110100001001110000100000000001000")); ui->labDXped->setText(tr ("Fox")); on_fox_log_action_triggered(); } @@ -5976,7 +5978,7 @@ void MainWindow::on_actionFT8_triggered() ui->cbAutoSeq->setEnabled(false); ui->tabWidget->setCurrentIndex(0); ui->cbHoldTxFreq->setChecked(true); - displayWidgets(nWidgets("111010000100110000010000000000110")); + displayWidgets(nWidgets("11101000010011000001000000000011000")); ui->labDXped->setText(tr ("Hound")); ui->txrb1->setChecked(true); ui->txrb2->setEnabled(false); @@ -6051,9 +6053,9 @@ void MainWindow::on_actionJT4_triggered() ui->sbSubmode->setValue(0); } if(bVHF) { - displayWidgets(nWidgets("111110010010110110111100000000000")); + displayWidgets(nWidgets("1111100100101101101111000000000000")); } else { - displayWidgets(nWidgets("111010000000110000110000000000000")); + displayWidgets(nWidgets("1110100000001100001100000000000000")); } fast_config(false); statusChanged(); @@ -6106,9 +6108,9 @@ void MainWindow::on_actionJT9_triggered() ui->label_6->setText(tr ("Band Activity")); ui->label_7->setText(tr ("Rx Frequency")); if(bVHF) { - displayWidgets(nWidgets("111110101000111110010000000000000")); + displayWidgets(nWidgets("1111101010001111100100000000000000")); } else { - displayWidgets(nWidgets("111010000000111000010000000000001")); + displayWidgets(nWidgets("1110100000001110000100000000000010")); } fast_config(m_bFastMode); ui->cbAutoSeq->setVisible(m_bFast9); @@ -6147,7 +6149,7 @@ void MainWindow::on_actionJT9_JT65_triggered() ui->label_7->setText(tr ("Rx Frequency")); ui->decodedTextLabel->setText("UTC dB DT Freq " + tr ("Message")); ui->decodedTextLabel2->setText("UTC dB DT Freq " + tr ("Message")); - displayWidgets(nWidgets("111010000001111000010000000000001")); + displayWidgets(nWidgets("1110100000011110000100000000000010")); fast_config(false); statusChanged(); } @@ -6195,9 +6197,9 @@ void MainWindow::on_actionJT65_triggered() ui->label_7->setText(tr ("Rx Frequency")); } if(bVHF) { - displayWidgets(nWidgets("111110010000110110101100010000000")); + displayWidgets(nWidgets("1111100100001101101011000100000000")); } else { - displayWidgets(nWidgets("111010000000111000010000000000001")); + displayWidgets(nWidgets("1110100000001110000100000000000010")); } fast_config(false); if(ui->cbShMsgs->isChecked()) { @@ -6229,7 +6231,7 @@ void MainWindow::on_actionQRA64_triggered() ui->TxFreqSpinBox->setValue(1000); QString fname {QDir::toNativeSeparators(m_config.temp_dir ().absoluteFilePath ("red.dat"))}; m_wideGraph->setRedFile(fname); - displayWidgets(nWidgets("111110010010110110000000001000000")); + displayWidgets(nWidgets("1111100100101101100000000010000000")); statusChanged(); } @@ -6265,7 +6267,7 @@ void MainWindow::on_actionISCAT_triggered() ui->sbSubmode->setMaximum(1); if(m_nSubMode==0) ui->TxFreqSpinBox->setValue(1012); if(m_nSubMode==1) ui->TxFreqSpinBox->setValue(560); - displayWidgets(nWidgets("100111000000000110000000000000000")); + displayWidgets(nWidgets("1001110000000001100000000000000000")); fast_config(true); statusChanged (); } @@ -6326,7 +6328,7 @@ void MainWindow::on_actionMSK144_triggered() ui->rptSpinBox->setValue(0); ui->rptSpinBox->setSingleStep(1); ui->sbFtol->values ({20, 50, 100, 200}); - displayWidgets(nWidgets("101111110100000000010001000010000")); + displayWidgets(nWidgets("1011111101000000000100010000100000")); fast_config(m_bFastMode); statusChanged(); @@ -6364,7 +6366,7 @@ void MainWindow::on_actionWSPR_triggered() m_bFastMode=false; m_bFast9=false; ui->TxFreqSpinBox->setValue(ui->WSPRfreqSpinBox->value()); - displayWidgets(nWidgets("000000000000000001010000000000000")); + displayWidgets(nWidgets("0000000000000000010100000000000000")); fast_config(false); statusChanged(); } @@ -6397,7 +6399,7 @@ void MainWindow::on_actionEcho_triggered() m_bFast9=false; WSPR_config(true); ui->decodedTextLabel->setText(" UTC N Level Sig DF Width Q"); - displayWidgets(nWidgets("000000000000000000000010000000000")); + displayWidgets(nWidgets("0000000000000000000000100000000000")); fast_config(false); statusChanged(); } @@ -6422,7 +6424,7 @@ void MainWindow::on_actionFreqCal_triggered() // 18:15:47 0 1 1500 1550.349 0.100 3.5 10.2 ui->decodedTextLabel->setText(" UTC Freq CAL Offset fMeas DF Level S/N"); ui->measure_check_box->setChecked (false); - displayWidgets(nWidgets("001101000000000000000000000001000")); + displayWidgets(nWidgets("0011010000000000000000000000010000")); statusChanged(); } diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index c2b73bf23..070fbbae5 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -51,7 +51,6 @@ #define NUM_FST240_SYMBOLS 160 //240/2 data + 5*8 sync #define NUM_CW_SYMBOLS 250 #define TX_SAMPLE_RATE 48000 -#define N_WIDGETS 33 #define NRING 3456000 extern int volatile itone[NUM_ISCAT_SYMBOLS]; //Audio tones for all Tx symbols