mirror of https://github.com/saitohirga/WSJT-X.git
Add Logged label and implement display of QSO Rate for last hour.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8360 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
4f6f448daf
commit
8f4487b2b3
|
@ -7417,6 +7417,7 @@ void MainWindow::foxTxSequencer()
|
|||
m_msgAvgWidget->foxAddLog(logLine);
|
||||
}
|
||||
on_logQSOButton_clicked();
|
||||
m_foxRateQueue.enqueue(now); //Add present time in seconds to Rate queue.
|
||||
m_loggedByFox[hc1] += (m_lastBand + " ");
|
||||
if(m_foxQSOqueue.contains(hc1)) m_foxQSOqueue.removeOne(hc1);
|
||||
|
||||
|
@ -7475,10 +7476,14 @@ Transmit:
|
|||
if(ageSec > maxAge) {
|
||||
m_foxQSO.remove(a);
|
||||
m_foxQSOqueue.removeOne(a);
|
||||
} else {
|
||||
// qDebug() << "Age:" << a << ageSec;
|
||||
}
|
||||
}
|
||||
while(!m_foxRateQueue.isEmpty()) {
|
||||
qint64 age = now - m_foxRateQueue.head();
|
||||
if(age < 3600) break;
|
||||
m_foxRateQueue.dequeue();
|
||||
}
|
||||
m_msgAvgWidget->foxLabRate(m_foxRateQueue.size());
|
||||
}
|
||||
|
||||
void MainWindow::rm_tb4(QString houndCall)
|
||||
|
|
|
@ -581,6 +581,7 @@ private:
|
|||
QQueue<QString> m_houndQueue;
|
||||
QQueue<QString> m_foxQSOqueue;
|
||||
QQueue<QString> m_foxRR73Queue;
|
||||
QQueue<qint64> m_foxRateQueue;
|
||||
|
||||
QDateTime m_dateTimeQSOOn;
|
||||
QDateTime m_dateTimeLastTX;
|
||||
|
|
|
@ -27,6 +27,7 @@ MessageAveraging::MessageAveraging(QSettings * settings, QFont const& font, QWid
|
|||
ui->lab3->setVisible(false);
|
||||
}
|
||||
setWindowTitle(m_title_);
|
||||
m_nLogged_=0;
|
||||
}
|
||||
|
||||
MessageAveraging::~MessageAveraging()
|
||||
|
@ -111,10 +112,14 @@ void MessageAveraging::foxLabRate(int n)
|
|||
{
|
||||
QString t;
|
||||
t.sprintf("Rate: %3d",n);
|
||||
ui->lab3->setText(t);
|
||||
ui->lab4->setText(t);
|
||||
}
|
||||
|
||||
void MessageAveraging::foxAddLog(QString logLine)
|
||||
{
|
||||
ui->msgAvgPlainTextEdit->insertPlainText(logLine + "\n");
|
||||
m_nLogged_++;
|
||||
QString t;
|
||||
t.sprintf("Logged: %d",m_nLogged_);
|
||||
ui->lab3->setText(t);
|
||||
}
|
||||
|
|
|
@ -32,6 +32,7 @@ private:
|
|||
void setContentFont (QFont const&);
|
||||
QSettings * settings_;
|
||||
QString m_title_;
|
||||
qint32 m_nLogged_;
|
||||
|
||||
QScopedPointer<Ui::MessageAveraging> ui;
|
||||
};
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>276</width>
|
||||
<width>354</width>
|
||||
<height>268</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
@ -79,6 +79,13 @@
|
|||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="lab3">
|
||||
<property name="text">
|
||||
<string>Logged: 0</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="lab4">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
|
|
Loading…
Reference in New Issue