w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Display calls in ActiveStations only when they are "ready to call". Erase on band change.

This commit is contained in:
Joe Taylor 2022-03-19 16:05:30 -04:00
parent fd7caa8cd6
commit ab48d77d0f
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
widgets/activeStations.cpp
View File

@ -83,3 +83,8 @@ void ActiveStations::setClickOK(bool b)
{ {
m_clickOK=b; m_clickOK=b;
} }
void ActiveStations::erase()
{
ui->RecentStationsPlainTextEdit->clear();
}

1
widgets/activeStations.h
View File

@ -24,6 +24,7 @@ public:
int maxRecent(); int maxRecent();
int maxAge(); int maxAge();
void setClickOK(bool b); void setClickOK(bool b);
void erase();
Q_SLOT void select(); Q_SLOT void select();
bool m_clickOK=false; bool m_clickOK=false;

34
widgets/mainwindow.cpp
View File

@ -3373,7 +3373,6 @@ void MainWindow::ARRL_Digi_Update(DecodedText dt)
ActiveCall ac; ActiveCall ac;
RecentCall rc; RecentCall rc;
if(deGrid.contains(grid_regexp)) { if(deGrid.contains(grid_regexp)) {
if(!m_activeCall.contains(deCall) or deGrid!=m_activeCall.value(deCall).grid4) { if(!m_activeCall.contains(deCall) or deGrid!=m_activeCall.value(deCall).grid4) {
// Transmitting station's call is not already in QMap "m_activeCall", or grid has changed. // Transmitting station's call is not already in QMap "m_activeCall", or grid has changed.
@ -3444,19 +3443,21 @@ void MainWindow::ARRL_Digi_Display()
if(age>maxAge) { if(age>maxAge) {
icall.remove(); icall.remove();
} else { } else {
i++; if(m_recentCall.value(deCall).ready2call) {
int az=m_activeCall[deCall].az; i++;
deGrid=m_activeCall[deCall].grid4; int az=m_activeCall[deCall].az;
points=m_activeCall[deCall].points; deGrid=m_activeCall[deCall].grid4;
bands=m_activeCall[deCall].bands; points=m_activeCall[deCall].points;
if(points>maxPoints) maxPoints=points; bands=m_activeCall[deCall].bands;
float x=float(age)/(maxAge+1); if(points>maxPoints) maxPoints=points;
if(x>1.0) x=0; float x=float(age)/(maxAge+1);
pts[i-1]=points - x; if(x>1.0) x=0;
QString t1; pts[i-1]=points - x;
t1 = t1.asprintf(" %3d %+2.2d %4d %1d %2d %4d",az,snr,freq,itx,age,points); QString t1;
t1 = (deCall + " ").left(6) + " " + m_activeCall[deCall].grid4 + t1 + " " + bands; t1 = t1.asprintf(" %3d %+2.2d %4d %1d %2d %4d",az,snr,freq,itx,age,points);
list.append(t1); t1 = (deCall + " ").left(6) + " " + m_activeCall[deCall].grid4 + t1 + " " + bands;
list.append(t1);
}
} }
} }
if(i==0) return; if(i==0) return;
@ -7465,6 +7466,11 @@ void MainWindow::handle_transceiver_update (Transceiver::TransceiverState const&
if (m_lastDialFreq != m_freqNominal && if (m_lastDialFreq != m_freqNominal &&
(m_mode != "MSK144" (m_mode != "MSK144"
|| !(ui->cbCQTx->isEnabled () && ui->cbCQTx->isVisible () && ui->cbCQTx->isChecked()))) { || !(ui->cbCQTx->isEnabled () && ui->cbCQTx->isVisible () && ui->cbCQTx->isChecked()))) {
if(m_lastDialFreq != m_freqNominal and m_ActiveStationsWidget->isVisible()) {
m_recentCall.clear();
m_ActiveStationsWidget->erase();
}
m_lastDialFreq = m_freqNominal; m_lastDialFreq = m_freqNominal;
m_secBandChanged=QDateTime::currentMSecsSinceEpoch()/1000; m_secBandChanged=QDateTime::currentMSecsSinceEpoch()/1000;
pskSetLocal (); pskSetLocal ();