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

Restore original functionality regarding stations heard

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-27 01:36:55 -04:00
parent 2158722ebc
commit 52a5650a74
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mainwindow.cpp
View File

@ -7160,7 +7160,8 @@ void MainWindow::buildQueryMenu(QMenu * menu){
menu->addSeparator(); menu->addSeparator();
auto ackQueryAction = menu->addAction("? - Are you hearing me?"); /*
auto ackQueryAction = menu->addAction("^ - Are you hearing me?");
connect(ackQueryAction, &QAction::triggered, this, [this](){ connect(ackQueryAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
@ -7171,9 +7172,9 @@ void MainWindow::buildQueryMenu(QMenu * menu){
addMessageText(QString("%1?").arg(selectedCall), true); addMessageText(QString("%1?").arg(selectedCall), true);
toggleTx(true); toggleTx(true);
}); });
*/
auto snrQueryAction = menu->addAction("^ - What is my signal report?"); auto snrQueryAction = menu->addAction("? - What is my signal report?");
snrQueryAction->setDisabled(isAllCall);
connect(snrQueryAction, &QAction::triggered, this, [this](){ connect(snrQueryAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
@ -7181,7 +7182,7 @@ void MainWindow::buildQueryMenu(QMenu * menu){
return; return;
} }
addMessageText(QString("%1^").arg(selectedCall), true); addMessageText(QString("%1?").arg(selectedCall), true);
toggleTx(true); toggleTx(true);
}); });
@ -8709,14 +8710,15 @@ void MainWindow::displayActivity(bool force){
// construct reply // construct reply
QString reply; QString reply;
// QUERIED ACK
if(d.cmd == "?"){
reply = QString("%1 ACK").arg(Radio::base_callsign(d.from));
}
// QUERIED SNR // QUERIED SNR
else if(d.cmd == "^" && !isAllCall){ if(d.cmd == "?"){
reply = QString("%1 SNR %2").arg(Radio::base_callsign(d.from)).arg(Varicode::formatSNR(d.snr)); reply = QString("%1 SNR %2").arg(Radio::base_callsign(d.from)).arg(Varicode::formatSNR(d.snr));
} }
// QUERIED ACK
//else if(d.cmd == "#"){
// reply = QString("%1 ACK").arg(Radio::base_callsign(d.from));
//}
// QUERIED PWR // QUERIED PWR
else if(d.cmd == "%" && !isAllCall && m_config.my_dBm() >= 0){ else if(d.cmd == "%" && !isAllCall && m_config.my_dBm() >= 0){
reply = QString("%1 PWR %2").arg(Radio::base_callsign(d.from)).arg(Varicode::formatPWR(m_config.my_dBm())); reply = QString("%1 PWR %2").arg(Radio::base_callsign(d.from)).arg(Varicode::formatPWR(m_config.my_dBm()));