w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-24 10:22:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Trial changes to support messages for Slovenian Contest Club's RTTY-like contest.

Browse Source
This commit is contained in:
Joe Taylor 2019-02-28 11:21:06 -05:00
parent 5c7e1ba35d
commit 6b5131ab5e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Configuration.cpp
View File

@ -209,6 +209,7 @@ namespace
|LB|NU|YT|PEI |LB|NU|YT|PEI
|DC # District of Columbia |DC # District of Columbia
|DX # anyone else |DX # anyone else
|SCC # Slovenia Contest Club contest
) )
)", QRegularExpression::CaseInsensitiveOption | QRegularExpression::ExtendedPatternSyntaxOption}; )", QRegularExpression::CaseInsensitiveOption | QRegularExpression::ExtendedPatternSyntaxOption};

12
widgets/mainwindow.cpp
View File

@ -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 (); if (m_config.clear_DX () and SpecOp::HOUND != m_config.special_op_id()) clearDX ();
m_dateTimeQSOOn = QDateTime {}; m_dateTimeQSOOn = QDateTime {};
auto special_op = m_config.special_op_id (); auto special_op = m_config.special_op_id ();
if (SpecOp::NONE < special_op && special_op < SpecOp::FOX) if (SpecOp::NONE < special_op && special_op < SpecOp::FOX &&
{ m_config.RTTY_Exchange()!="SCC") {
ui->sbSerialNumber->setValue (ui->sbSerialNumber->value () + 1); ui->sbSerialNumber->setValue(ui->sbSerialNumber->value() + 1);
} }
m_xSent.clear (); m_xSent.clear ();
m_xRcvd.clear (); m_xRcvd.clear ();
@ -5564,7 +5564,7 @@ void MainWindow::displayWidgets(qint64 n)
j=j>>1; j=j>>1;
} }
b=SpecOp::EU_VHF==m_config.special_op_id() or (SpecOp::RTTY==m_config.special_op_id() and 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); ui->sbSerialNumber->setVisible(b);
m_lastCallsign.clear (); // ensures Tx5 is updated for new modes m_lastCallsign.clear (); // ensures Tx5 is updated for new modes
genStdMsgs (m_rpt, true); 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 " "They will be kept in the ADIF log file but will not be available "
"for export in your Cabrillo log."))) "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}); if (!m_cabrilloLog) m_cabrilloLog.reset (new CabrilloLog {&m_config});
m_cabrilloLog->reset (); m_cabrilloLog->reset ();
} }