From 9010fa07c0d2c7971454ac2d7335f701f2e321a7 Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Sat, 27 Oct 2018 10:13:34 -0400 Subject: [PATCH] Replace ALLCALL with @ALLCALL --- jsc_list.cpp | 2 +- jsc_map.cpp | 2 +- mainwindow.cpp | 24 ++++++++++++------------ varicode.cpp | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jsc_list.cpp b/jsc_list.cpp index d44cdd2..a596455 100644 --- a/jsc_list.cpp +++ b/jsc_list.cpp @@ -256665,7 +256665,7 @@ const Tuple JSC::list[262144] = { {"ALLCOCK", 7, 255496}, {"ALLCLASSIFIEDS", 14, 205858}, {"ALLCHIN", 7, 102391}, - {"ALLCALL", 7, 81}, + {"@ALLCALL", 7, 81}, {"ALLBUSINESS", 11, 110217}, {"ALLBRITTON", 10, 248655}, {"ALLBRIGHT", 9, 249916}, diff --git a/jsc_map.cpp b/jsc_map.cpp index 83a1cb8..8738309 100644 --- a/jsc_map.cpp +++ b/jsc_map.cpp @@ -102,7 +102,7 @@ const Tuple JSC::map[262144] = { {"589", 3, 78}, {"579", 3, 79}, {"569", 3, 80}, - {"ALLCALL", 7, 81}, + {"@ALLCALL", 7, 81}, {"BEACON", 6, 82}, {"CQCQCQ", 6, 83}, {"CPY?", 4, 84}, diff --git a/mainwindow.cpp b/mainwindow.cpp index 1dafdf3..abcc361 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1510,7 +1510,7 @@ void MainWindow::initializeDummyData(){ i++; } - displayTextForFreq("KN4CRD: ALLCALL? \u2301 ", 42, DriftingDateTime::currentDateTimeUtc().addSecs(-315), true, true, true); + displayTextForFreq("KN4CRD: @ALLCALL? \u2301 ", 42, DriftingDateTime::currentDateTimeUtc().addSecs(-315), true, true, true); displayTextForFreq("J1Y: KN4CRD SNR -05 \u2301 ", 42, DriftingDateTime::currentDateTimeUtc().addSecs(-300), false, true, true); displayActivity(true); @@ -3672,7 +3672,7 @@ void MainWindow::readFromStdout() //readFromStdout } else { // convert BEACON to a directed command and process... cmd.from = cd.call; - cmd.to = "ALLCALL"; + cmd.to = "@ALLCALL"; cmd.cmd = " BEACON"; cmd.snr = cd.snr; cmd.bits = cd.bits; @@ -5003,11 +5003,11 @@ void MainWindow::createAllcallTableRows(QTableWidget *table, QString const &sele } count++; } - auto item = new QTableWidgetItem(count == 0 ? QString("ALLCALL") : QString("ALLCALL (%1)").arg(count)); - item->setData(Qt::UserRole, QVariant("ALLCALL")); + auto item = new QTableWidgetItem(count == 0 ? QString("@ALLCALL") : QString("@ALLCALL (%1)").arg(count)); + item->setData(Qt::UserRole, QVariant("@ALLCALL")); table->setItem(table->rowCount() - 1, 0, item); table->setSpan(table->rowCount() - 1, 0, 1, table->columnCount()); - if(selectedCall == "ALLCALL"){ + if(selectedCall == "@ALLCALL"){ table->item(table->rowCount()-1, 0)->setSelected(true); } } @@ -5642,7 +5642,7 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button auto dateTimeQSOOff = DriftingDateTime::currentDateTimeUtc(); if (dateTimeQSOOff < m_dateTimeQSOOn) dateTimeQSOOff = m_dateTimeQSOOn; QString call=callsignSelected(); - if(call == "ALLCALL"){ + if(call == "@ALLCALL"){ call = ""; } QString grid=""; @@ -7093,7 +7093,7 @@ void MainWindow::on_beaconButton_clicked() void MainWindow::on_selcalButton_clicked(){ if(ui->selcalButton->isChecked()){ - if(callsignSelected() == "ALLCALL"){ + if(callsignSelected() == "@ALLCALL"){ clearCallsignSelected(); } if(ui->tableWidgetRXAll->isVisible()){ @@ -8082,7 +8082,7 @@ bool MainWindow::isMyCallIncluded(const QString &text){ } bool MainWindow::isAllCallIncluded(const QString &text){ - return text.contains("ALLCALL"); + return text.contains("@ALLCALL"); } bool MainWindow::isGroupCallIncluded(const QString &text){ @@ -8698,7 +8698,7 @@ void MainWindow::processCommandActivity() { enqueueBeacon(reply); if(isAllCall){ - // since all beacons are technically ALLCALL, let's bump the allcall cache here... + // since all beacons are technically @ALLCALL, let's bump the allcall cache here... m_txAllcallCommandCache.insert(d.from, new QDateTime(now), 5); } @@ -8736,7 +8736,7 @@ void MainWindow::processCommandActivity() { enqueueBeacon(reply); if(isAllCall){ - // since all beacons are technically ALLCALL, let's bump the allcall cache here... + // since all beacons are technically @ALLCALL, let's bump the allcall cache here... m_txAllcallCommandCache.insert(d.from, new QDateTime(now), 25); } } @@ -8792,12 +8792,12 @@ void MainWindow::processCommandActivity() { continue; } - // do not queue ALLCALL replies if auto-reply is not checked or it's a beacon reply + // do not queue @ALLCALL replies if auto-reply is not checked or it's a beacon reply if(!ui->autoReplyButton->isChecked() && isAllCall && !d.cmd.contains("BEACON")){ continue; } - // add ALLCALLs to the ALLCALL cache + // add @ALLCALLs to the @ALLCALL cache if(isAllCall){ m_txAllcallCommandCache.insert(d.from, new QDateTime(now), 25); } diff --git a/varicode.cpp b/varicode.cpp index 8ca82ab..b677982 100644 --- a/varicode.cpp +++ b/varicode.cpp @@ -177,8 +177,8 @@ quint16 nusergrid = nbasegrid + 10; quint16 nmaxgrid = (1<<15)-1; QMap basecalls = { - { "<....>", nbasecall + 1 }, // incomplete callsign - { "ALLCALL", nbasecall + 2 }, + { "<....>", nbasecall + 1 }, // incomplete callsign + { "@ALLCALL", nbasecall + 2 }, // ALLCALL group }; QMap cqs = { @@ -1650,7 +1650,7 @@ QStringList Varicode::buildMessageFrames( auto calls = Varicode::parseCallsigns(line); bool lineStartsWithBaseCall = ( - line.startsWith("ALLCALL") || + line.startsWith("@ALLCALL") || line.startsWith("BEACON") || Varicode::startsWithCQ(line) );