w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 13:48:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Correct the way "Rate" is being updated."

Browse Source 
This reverts commit 9b8b604a8c.
This commit is contained in:
Joe Taylor 2022-04-11 11:03:43 -04:00
parent afa020558f
commit 708342f40a
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
widgets/mainwindow.cpp
View File

@ -3450,7 +3450,6 @@ void MainWindow::ARRL_Digi_Update(DecodedText dt)
m_recentCall[deCall]=rc; m_recentCall[deCall]=rc;
m_points=m_activeCall.value(deCall).points; m_points=m_activeCall.value(deCall).points;
} }
updateRate();
} }
void MainWindow::ARRL_Digi_Display() void MainWindow::ARRL_Digi_Display()
@ -6326,33 +6325,28 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call,
al.band=band; al.band=band;
al.points=points; al.points=points;
m_arrl_log.append(al); m_arrl_log.append(al);
int iz=m_arrl_log.size();
int rate=0;
int nbc=0;
for(int i=iz-1; i>=0; i--) {
double hrDiff = m_arrl_log[i].time.msecsTo(al.time)/3600000.0;
if(hrDiff > 1.0) break;
rate += m_arrl_log[i].points;
if(i<iz-1 and m_arrl_log[i].band != m_arrl_log[i+1].band) nbc += 1;
}
m_ActiveStationsWidget->setRate(rate);
m_ActiveStationsWidget->setScore(m_score);
m_ActiveStationsWidget->setBandChanges(nbc);
} }
updateRate();
m_xSent.clear (); m_xSent.clear ();
m_xRcvd.clear (); m_xRcvd.clear ();
if (m_config.clear_DXcall ()) ui->dxCallEntry->clear (); if (m_config.clear_DXcall ()) ui->dxCallEntry->clear ();
if (m_config.clear_DXgrid ()) ui->dxGridEntry->clear (); if (m_config.clear_DXgrid ()) ui->dxGridEntry->clear ();
} }
void MainWindow::updateRate()
{
int iz=m_arrl_log.size();
int rate=0;
int nbc=0;
double hrDiff;
for(int i=iz-1; i>=0; i--) {
hrDiff = m_arrl_log[i].time.msecsTo(QDateTime::currentDateTimeUtc())/3600000.0;
if(hrDiff > 1.0) break;
rate += m_arrl_log[i].points;
if(i<iz-1 and m_arrl_log[i].band != m_arrl_log[i+1].band) nbc += 1;
}
m_ActiveStationsWidget->setRate(rate);
m_ActiveStationsWidget->setScore(m_score);
m_ActiveStationsWidget->setBandChanges(nbc);
}
qint64 MainWindow::nWidgets(QString t) qint64 MainWindow::nWidgets(QString t)
{ {
Q_ASSERT(t.length()==N_WIDGETS); Q_ASSERT(t.length()==N_WIDGETS);

1
widgets/mainwindow.h
View File

@ -785,7 +785,6 @@ private:
void CQTxFreq(); void CQTxFreq();
void useNextCall(); void useNextCall();
void abortQSO(); void abortQSO();
void updateRate();
void write_all(QString txRx, QString message); void write_all(QString txRx, QString message);
bool isWorked(int itype, QString key, float fMHz=0, QString=""); bool isWorked(int itype, QString key, float fMHz=0, QString="");