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

Removed printing of ALLCALL messages that were not freetext in the RX window

Browse Source
This commit is contained in:
Jordan Sherer 2018-11-19 23:02:59 -05:00
parent 565c031b28
commit f018a622ce
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mainwindow.cpp
View File

@ -2673,10 +2673,8 @@ void MainWindow::on_monitorTxButton_toggled(bool checked){
} }
void MainWindow::on_selcalButton_toggled(bool checked){ void MainWindow::on_selcalButton_toggled(bool checked){
#if SELCAL_SHOULD_HIDE_BAND_ACTIVITY
if(checked){ if(checked){
if(callsignSelected() == "@ALLCALL"){
clearCallsignSelected();
}
if(ui->tableWidgetRXAll->isVisible()){ if(ui->tableWidgetRXAll->isVisible()){
ui->tableWidgetRXAll->setVisible(false); ui->tableWidgetRXAll->setVisible(false);
m_bandActivityWasVisible = true; m_bandActivityWasVisible = true;
@ -2686,6 +2684,11 @@ void MainWindow::on_selcalButton_toggled(bool checked){
} else { } else {
ui->tableWidgetRXAll->setVisible(m_bandActivityWasVisible); ui->tableWidgetRXAll->setVisible(m_bandActivityWasVisible);
} }
#endif
if(checked && callsignSelected() == "@ALLCALL"){
clearCallsignSelected();
}
resetPushButtonToggleText(ui->selcalButton); resetPushButtonToggleText(ui->selcalButton);
@ -8558,7 +8561,7 @@ void MainWindow::processRxActivity() {
int prevOffset = d.freq; int prevOffset = d.freq;
if(hasExistingMessageBuffer(d.freq, false, &prevOffset) && ( if(hasExistingMessageBuffer(d.freq, false, &prevOffset) && (
(m_messageBuffer[prevOffset].cmd.to == m_config.my_callsign()) || (m_messageBuffer[prevOffset].cmd.to == m_config.my_callsign()) ||
(isAllCallIncluded(m_messageBuffer[prevOffset].cmd.to) && !ui->selcalButton->isChecked()) || // (isAllCallIncluded(m_messageBuffer[prevOffset].cmd.to) && !ui->selcalButton->isChecked()) || // don't incrementally print allcalls
(isGroupCallIncluded(m_messageBuffer[prevOffset].cmd.to)) (isGroupCallIncluded(m_messageBuffer[prevOffset].cmd.to))
) )
){ ){
@ -8906,7 +8909,7 @@ void MainWindow::processCommandActivity() {
bool shouldDisplay = true; bool shouldDisplay = true;
// don't display ping allcalls // don't display ping allcalls
if(isAllCall && (ad.text.contains(": HEARTBEAT") || d.cmd == " HEARTBEAT")){ if(isAllCall && (d.cmd != " " || ad.text.contains(": HEARTBEAT"))){ // || d.cmd == " HEARTBEAT")){
shouldDisplay = false; shouldDisplay = false;
} }