From 6b5131ab5ed544d15a527c7538bc1b6d8da10795 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 28 Feb 2019 11:21:06 -0500 Subject: [PATCH] Trial changes to support messages for Slovenian Contest Club's RTTY-like contest. --- Configuration.cpp | 1 + widgets/mainwindow.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Configuration.cpp b/Configuration.cpp index 059c514c8..ecf4c5ef1 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -209,6 +209,7 @@ namespace |LB|NU|YT|PEI |DC # District of Columbia |DX # anyone else + |SCC # Slovenia Contest Club contest ) )", QRegularExpression::CaseInsensitiveOption | QRegularExpression::ExtendedPatternSyntaxOption}; diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 2a1c12e70..06b0e307a 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -5492,10 +5492,10 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call, if (m_config.clear_DX () and SpecOp::HOUND != m_config.special_op_id()) clearDX (); m_dateTimeQSOOn = QDateTime {}; auto special_op = m_config.special_op_id (); - if (SpecOp::NONE < special_op && special_op < SpecOp::FOX) - { - ui->sbSerialNumber->setValue (ui->sbSerialNumber->value () + 1); - } + if (SpecOp::NONE < special_op && special_op < SpecOp::FOX && + m_config.RTTY_Exchange()!="SCC") { + ui->sbSerialNumber->setValue(ui->sbSerialNumber->value() + 1); + } m_xSent.clear (); m_xRcvd.clear (); @@ -5564,7 +5564,7 @@ void MainWindow::displayWidgets(qint64 n) j=j>>1; } b=SpecOp::EU_VHF==m_config.special_op_id() or (SpecOp::RTTY==m_config.special_op_id() and - (m_config.RTTY_Exchange()=="#" or m_config.RTTY_Exchange()=="DX")); + (m_config.RTTY_Exchange()=="DX" or m_config.RTTY_Exchange()=="SCC")); ui->sbSerialNumber->setVisible(b); m_lastCallsign.clear (); // ensures Tx5 is updated for new modes genStdMsgs (m_rpt, true); @@ -6292,7 +6292,7 @@ void MainWindow::on_reset_cabrillo_log_action_triggered () "They will be kept in the ADIF log file but will not be available " "for export in your Cabrillo log."))) { - ui->sbSerialNumber->setValue (1); + if(m_config.RTTY_Exchange()!="SCC") ui->sbSerialNumber->setValue(1); if (!m_cabrilloLog) m_cabrilloLog.reset (new CabrilloLog {&m_config}); m_cabrilloLog->reset (); }