chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable stations heard command:

Browse Source
This commit is contained in:
Jordan Sherer 2018-10-19 09:53:51 -04:00
parent 8529ef0982
commit 644633721f
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mainwindow.cpp
View File

@ -6563,7 +6563,8 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
if(m_config.transmit_directed()) toggleTx(true); if(m_config.transmit_directed()) toggleTx(true);
}); });
auto heardQueryAction = menu->addAction(QString("%1$ - What are the stations are you hearing? (Top 4 ranked by most recently heard)").arg(call).trimmed()); #if ALLOW_STATIONS_HEARD
auto heardQueryAction = menu->addAction(QString("%1$ - What are the stations are you hearing? (Top 2 ranked by most recently heard)").arg(call).trimmed());
heardQueryAction->setDisabled(isAllCall); heardQueryAction->setDisabled(isAllCall);
connect(heardQueryAction, &QAction::triggered, this, [this](){ connect(heardQueryAction, &QAction::triggered, this, [this](){
@ -6576,6 +6577,7 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
if(m_config.transmit_directed()) toggleTx(true); if(m_config.transmit_directed()) toggleTx(true);
}); });
#endif
auto hashAction = menu->addAction(QString("%1#[MESSAGE] - Please ACK if you receive this message in its entirety").arg(call).trimmed()); auto hashAction = menu->addAction(QString("%1#[MESSAGE] - Please ACK if you receive this message in its entirety").arg(call).trimmed());
hashAction->setDisabled(isAllCall); hashAction->setDisabled(isAllCall);
@ -8656,10 +8658,11 @@ void MainWindow::processCommandActivity() {
reply = QString("%1 QTC %2").arg(d.from).arg(m_config.my_station()); reply = QString("%1 QTC %2").arg(d.from).arg(m_config.my_station());
} }
#if ALLOW_STATIONS_HEARD
// QUERIED STATIONS HEARD // QUERIED STATIONS HEARD
else if (d.cmd == "$" && !isAllCall) { else if (d.cmd == "$" && !isAllCall) {
int i = 0; int i = 0;
int maxStations = 4; int maxStations = 2;
auto calls = m_callActivity.keys(); auto calls = m_callActivity.keys();
qStableSort(calls.begin(), calls.end(), [this](QString qStableSort(calls.begin(), calls.end(), [this](QString
const & a, QString const & a, QString
@ -8678,19 +8681,24 @@ void MainWindow::processCommandActivity() {
break; break;
} }
auto d = m_callActivity[call]; if(call == d.from){
if (callsignAging && d.utcTimestamp.secsTo(now) / 60 >= callsignAging) {
continue; continue;
} }
lines.append(QString("%1 SNR %2 (%3)").arg(d.call).arg(Varicode::formatSNR(d.snr)).arg(since(d.utcTimestamp))); auto cd = m_callActivity[call];
if (callsignAging && cd.utcTimestamp.secsTo(now) / 60 >= callsignAging) {
continue;
}
lines.append(QString("%1 %2 (%3)").arg(cd.call).arg(Varicode::formatSNR(cd.snr)).arg(since(cd.utcTimestamp)));
i++; i++;
} }
lines.prepend(QString("%1 HEARING").arg(d.from)); lines.prepend(QString("%1 HEARING").arg(d.from));
reply = lines.join('\n'); reply = lines.join(' ');
} }
#endif
#if 0 #if 0
// PROCESS RETRANSMIT // PROCESS RETRANSMIT