From d657da59806c084523cb1ec55ab3269e5d044358 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 23 Apr 2020 16:15:19 -0400 Subject: [PATCH] Don't switch automatically to EU VHF Contest mode. --- Decoder/decodedtext.cpp | 9 --------- widgets/mainwindow.cpp | 11 ++--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/Decoder/decodedtext.cpp b/Decoder/decodedtext.cpp index 282bb6a31..95f6f9372 100644 --- a/Decoder/decodedtext.cpp +++ b/Decoder/decodedtext.cpp @@ -177,15 +177,6 @@ unsigned DecodedText::timeInSeconds() const + (padding_ ? string_.mid (column_time + 2 + padding_, 2).toUInt () : 0U); } -/* -2343 -11 0.8 1259 # YV6BFE F6GUU R-08 -2343 -19 0.3 718 # VE6WQ SQ2NIJ -14 -2343 -7 0.3 815 # KK4DSD W7VP -16 -2343 -13 0.1 3627 @ CT1FBK IK5YZT R+02 - -0605 Tx 1259 # CQ VK3ACF QF22 -*/ - QString DecodedText::report() const // returns a string of the SNR field with a leading + or - followed by two digits { int sr = snr(); diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index e964904f7..47b4778d8 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -4589,15 +4589,9 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie } bool bEU_VHF_w2=(nrpt>=520001 and nrpt<=594000); if(bEU_VHF_w2 and SpecOp::EU_VHF!=m_config.special_op_id()) { - // Switch automatically to EU VHF Contest mode - m_config.setEU_VHF_Contest(); -// m_nContest=EU_VHF; - if(m_transmitting) m_restart=true; - ui->decodedTextBrowser2->displayQSY (QString{"Enabled EU VHF Contest messages."}); - QString t0="EU VHF"; - ui->labDXped->setVisible(true); - ui->labDXped->setText(t0); + MessageBox::information_message (this, tr ("Should you switch to EU VHF Contest mode?")); } + QStringList t=message.string().split(' ', QString::SkipEmptyParts); int n=t.size(); QString t0=t.at(n-2); @@ -4609,7 +4603,6 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie m_xRcvd=t.at(n-2) + " " + t.at(n-1); t0=t.at(n-3); } - if(bFieldDay_msg and SpecOp::FIELD_DAY!=m_config.special_op_id()) { // ### Should be in ARRL Field Day mode ??? ### MessageBox::information_message (this, tr ("Should you switch to ARRL Field Day mode?"));