From 38174ed6dcaac196f028e8cc90c7a8118b794554 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 14 Mar 2022 15:59:49 -0400 Subject: [PATCH] Use "ARRL_DIGI" rather than "NA_VHF". Needs testing! --- Configuration.cpp | 5 +- Configuration.hpp | 2 +- Configuration.ui | 377 +++++++++++++++++++++-------------------- widgets/mainwindow.cpp | 25 ++- 4 files changed, 217 insertions(+), 192 deletions(-) diff --git a/Configuration.cpp b/Configuration.cpp index 661a42d6e..e8285e0c9 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -903,7 +903,7 @@ QString Configuration::Field_Day_Exchange() const { return m_->FD_exchange_; } - +/* void Configuration::setEU_VHF_Contest() { m_->bSpecialOp_=true; @@ -912,6 +912,7 @@ void Configuration::setEU_VHF_Contest() m_->SelectedActivity_ = static_cast (SpecialOperatingActivity::EU_VHF); m_->write_settings(); } +*/ QString Configuration::RTTY_Exchange() const { @@ -1157,6 +1158,7 @@ Configuration::impl::impl (Configuration * self, QNetworkAccessManager * network ui_->special_op_activity_button_group->setId (ui_->rbField_Day, static_cast (SpecialOperatingActivity::FIELD_DAY)); ui_->special_op_activity_button_group->setId (ui_->rbRTTY_Roundup, static_cast (SpecialOperatingActivity::RTTY)); ui_->special_op_activity_button_group->setId (ui_->rbWW_DIGI, static_cast (SpecialOperatingActivity::WW_DIGI)); + ui_->special_op_activity_button_group->setId (ui_->rbARRL_Digi, static_cast (SpecialOperatingActivity::ARRL_DIGI)); ui_->special_op_activity_button_group->setId (ui_->rbFox, static_cast (SpecialOperatingActivity::FOX)); ui_->special_op_activity_button_group->setId (ui_->rbHound, static_cast (SpecialOperatingActivity::HOUND)); @@ -2227,7 +2229,6 @@ void Configuration::impl::accept () clear_DXcall_ = ui_->cbClearDXcall->isChecked(); highlight_DXgrid_ = ui_->cbHighlightDXgrid->isChecked(); clear_DXgrid_ = ui_->cbClearDXgrid->isChecked(); - write_settings (); // make visible to all } diff --git a/Configuration.hpp b/Configuration.hpp index c4cf068ec..9f5e64edd 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -190,7 +190,7 @@ public: bool highlight_DXgrid () const; bool clear_DXgrid () const; - enum class SpecialOperatingActivity {NONE, NA_VHF, EU_VHF, FIELD_DAY, RTTY, WW_DIGI, FOX, HOUND}; + enum class SpecialOperatingActivity {NONE, NA_VHF, EU_VHF, FIELD_DAY, RTTY, WW_DIGI, ARRL_DIGI, FOX, HOUND}; SpecialOperatingActivity special_op_id () const; struct CalibrationParams diff --git a/Configuration.ui b/Configuration.ui index 0a0860461..5caff9148 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -2518,74 +2518,6 @@ Right click for insert and delete options. Advanced - - - - <html><head/><body><p>User-selectable parameters for JT65 VHF/UHF/Microwave decoding.</p></body></html> - - - JT65 VHF/UHF/Microwave decoding parameters - - - - - - Random erasure patterns: - - - sbNtrials - - - - - - - <html><head/><body><p>Maximum number of erasure patterns for stochastic soft-decision Reed Solomon decoder is 10^(n/2).</p></body></html> - - - 0 - - - 12 - - - 6 - - - - - - - Aggressive decoding level: - - - sbAggressive - - - - - - - <html><head/><body><p>Higher levels will increase the probability of decoding, but will also increase probability of a false decode.</p></body></html> - - - 10 - - - - - - - Two-pass decoding - - - true - - - - - - @@ -2598,47 +2530,6 @@ Right click for insert and delete options. false - - - - <html><head/><body><p>FT8 DXpedition mode: Hound operator calling the DX.</p></body></html> - - - Hound - - - Hound - - - true - - - special_op_activity_button_group - - - - - - - - 0 - 0 - - - - <html><head/><body><p>North American VHF/UHF/Microwave contests and others in which a 4-character grid locator is the required exchange.</p></body></html> - - - NA VHF Contest - - - NA VHF, ARRL Digi-DX - - - special_op_activity_button_group - - - @@ -2680,6 +2571,28 @@ Right click for insert and delete options. + + + + + 0 + 0 + + + + <html><head/><body><p>North American VHF/UHF/Microwave contests and others in which a 4-character grid locator is the required exchange.</p></body></html> + + + NA VHF Contest + + + NA VHF + + + special_op_activity_button_group + + + @@ -2693,74 +2606,24 @@ Right click for insert and delete options. - - - - - - <html><head/><body><p>ARRL RTTY Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> - - - R T T Y Roundup - - - RTTY Roundup messages - - - special_op_activity_button_group - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - RTTY Roundup exchange - - - RTTY RU Exch: - - - RTTY_Exchange - - - - - - - - 70 - 0 - - - - <html><head/><body><p>ARRL RTTY Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> - - - NJ - - - Qt::AlignCenter - - - - - - + + + + <html><head/><body><p>FT8 DXpedition mode: Hound operator calling the DX.</p></body></html> + + + Hound + + + Hound + + + true + + + special_op_activity_button_group + + @@ -2853,6 +2716,88 @@ Right click for insert and delete options. + + + + + + <html><head/><body><p>ARRL RTTY Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> + + + R T T Y Roundup + + + RTTY Roundup messages + + + special_op_activity_button_group + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + RTTY Roundup exchange + + + RTTY RU Exch: + + + RTTY_Exchange + + + + + + + + 70 + 0 + + + + <html><head/><body><p>ARRL RTTY Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> + + + NJ + + + Qt::AlignCenter + + + + + + + + + + + ARRL International Digital Contest + + + ARRL Digi Contest + + + special_op_activity_button_group + + + @@ -3028,6 +2973,74 @@ Right click for insert and delete options. + + + + <html><head/><body><p>User-selectable parameters for JT65 VHF/UHF/Microwave decoding.</p></body></html> + + + JT65 VHF/UHF/Microwave decoding parameters + + + + + + Random erasure patterns: + + + sbNtrials + + + + + + + <html><head/><body><p>Maximum number of erasure patterns for stochastic soft-decision Reed Solomon decoder is 10^(n/2).</p></body></html> + + + 0 + + + 12 + + + 6 + + + + + + + Aggressive decoding level: + + + sbAggressive + + + + + + + <html><head/><body><p>Higher levels will increase the probability of decoding, but will also increase probability of a false decode.</p></body></html> + + + 10 + + + + + + + Two-pass decoding + + + true + + + + + + @@ -3268,13 +3281,13 @@ Right click for insert and delete options. - - - - - + + + + + diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 729cbc87b..e35130a4c 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1023,7 +1023,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, ui->pbBestSP->setVisible(m_mode=="FT4"); int n=ui->respondComboBox->currentIndex(); - if(m_config.special_op_id()!=SpecOp::NA_VHF and n>1) n=0; + if(m_config.special_op_id()!=SpecOp::ARRL_DIGI and n>1) n=0; ui->respondComboBox->setCurrentIndex(n); // this must be the last statement of constructor @@ -1918,7 +1918,7 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog "Fox-and-Hound operation is available only in FT8 mode.\nGo back and change your selection."); } int n=ui->respondComboBox->currentIndex(); - if(m_config.special_op_id()!=SpecOp::NA_VHF and n>1) n=1; + if(m_config.special_op_id()!=SpecOp::ARRL_DIGI and n>1) n=1; ui->respondComboBox->setCurrentIndex(n); } } @@ -3522,7 +3522,8 @@ void MainWindow::readFromStdout() //readFromStdout } } - if(m_mode=="FT8" and SpecOp::NA_VHF==m_config.special_op_id()) { + qDebug() << "aaa" << int(m_config.special_op_id()); + if(m_mode=="FT8" and SpecOp::ARRL_DIGI==m_config.special_op_id()) { // Extract and save information that's relevant for the ARRL Digi contest QString deCall; QString deGrid; @@ -4418,7 +4419,8 @@ void MainWindow::guiUpdate() (SpecOp::NA_VHF==m_config.special_op_id() or SpecOp::FIELD_DAY==m_config.special_op_id() or SpecOp::RTTY==m_config.special_op_id() or - SpecOp::WW_DIGI==m_config.special_op_id()) ) { + SpecOp::WW_DIGI==m_config.special_op_id() or + SpecOp::ARRL_DIGI==m_config.special_op_id()) ) { //We're in a contest-like mode other than EU_VHF: start QSO with Tx2. ui->tx1->setEnabled(false); ui->txb1->setEnabled(false); @@ -5035,7 +5037,9 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie && (message_words.at(3).contains(qso_partner_base_call) or m_bDoubleClicked or bEU_VHF_w2 or (m_QSOProgress==CALLING))) { if(message_words.at(4).contains(grid_regexp) and SpecOp::EU_VHF!=m_config.special_op_id()) { - if((SpecOp::NA_VHF==m_config.special_op_id() or SpecOp::WW_DIGI==m_config.special_op_id()) and bContestOK){ + if((SpecOp::NA_VHF==m_config.special_op_id() or SpecOp::WW_DIGI==m_config.special_op_id() or + SpecOp::ARRL_DIGI==m_config.special_op_id() ) + and bContestOK) { setTxMsg(3); m_QSOProgress=ROGER_REPORT; } else { @@ -5409,6 +5413,7 @@ void MainWindow::genCQMsg () if(SpecOp::FIELD_DAY == m_config.special_op_id()) m_cqStr="FD"; if(SpecOp::RTTY == m_config.special_op_id()) m_cqStr="RU"; if(SpecOp::WW_DIGI == m_config.special_op_id()) m_cqStr="WW"; + if(SpecOp::ARRL_DIGI == m_config.special_op_id()) m_cqStr="TEST"; if( tlist.at(1)==my_callsign ) { t="CQ " + m_cqStr + " " + tlist.at(1) + " " + tlist.at(2); } else { @@ -5518,6 +5523,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional) } if(SpecOp::NA_VHF==m_config.special_op_id()) sent=my_grid; if(SpecOp::WW_DIGI==m_config.special_op_id()) sent=my_grid; + if(SpecOp::ARRL_DIGI==m_config.special_op_id()) sent=my_grid; if(SpecOp::FIELD_DAY==m_config.special_op_id()) sent=m_config.Field_Day_Exchange(); if(SpecOp::RTTY==m_config.special_op_id()) { sent=rst + m_config.RTTY_Exchange(); @@ -6053,6 +6059,10 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button m_xSent=m_config.my_grid().left(4); m_xRcvd=m_hisGrid; break; + case SpecOp::ARRL_DIGI: + m_xSent=m_config.my_grid().left(4); + m_xRcvd=m_hisGrid; + break; default: break; } @@ -6396,6 +6406,7 @@ void MainWindow::on_actionFT8_triggered() if(SpecOp::FIELD_DAY==m_config.special_op_id()) t0+="Field Day"; if(SpecOp::RTTY==m_config.special_op_id()) t0+="RTTY"; if(SpecOp::WW_DIGI==m_config.special_op_id()) t0+="WW_DIGI"; + if(SpecOp::ARRL_DIGI==m_config.special_op_id()) t0+="ARRL_DIGI"; if(t0=="") { ui->labDXped->setVisible(false); } else { @@ -8636,9 +8647,9 @@ void MainWindow::on_cbCQonly_toggled(bool) void MainWindow::on_respondComboBox_currentIndexChanged (int n) { - if(m_config.special_op_id()!=SpecOp::NA_VHF and n==2) { + if(m_config.special_op_id()!=SpecOp::ARRL_DIGI and n==2) { ui->respondComboBox->setCurrentIndex(1); - MessageBox::warning_message (this, tr ("\"CQ: Max Pts\" is available only\n in NA VHF contest mode."));\ + MessageBox::warning_message (this, tr ("\"CQ: Max Pts\" is available only\n in ARRL DIGI contest mode."));\ } }