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

Updated since computation to be accurate

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-06 15:27:26 -04:00
parent ccf00dc460
commit 56869d16a9
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mainwindow.cpp
View File

@ -3068,7 +3068,7 @@ void MainWindow::readFromStdout() //readFromStdout
d.freq = offset; d.freq = offset;
d.text = decodedtext.messageWords().first().trimmed(); d.text = decodedtext.messageWords().first().trimmed();
d.timestamp = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); d.utcTimestamp = QDateTime::currentDateTimeUtc();
d.snr = decodedtext.snr(); d.snr = decodedtext.snr();
m_bandActivity[offset].append(d); m_bandActivity[offset].append(d);
while(m_bandActivity[offset].count() > 10){ while(m_bandActivity[offset].count() > 10){
@ -3087,7 +3087,7 @@ void MainWindow::readFromStdout() //readFromStdout
d.grid = theirgrid; d.grid = theirgrid;
d.snr = decodedtext.snr(); d.snr = decodedtext.snr();
d.freq = decodedtext.frequencyOffset(); d.freq = decodedtext.frequencyOffset();
d.timestamp = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); d.utcTimestamp = QDateTime::currentDateTimeUtc();
m_callActivity[cqCall] = d; m_callActivity[cqCall] = d;
} }
} }
@ -3139,7 +3139,7 @@ void MainWindow::readFromStdout() //readFromStdout
RXDetail d; RXDetail d;
d.freq = audioFreq; d.freq = audioFreq;
d.text = decodedtext.messageWords().first(); d.text = decodedtext.messageWords().first();
d.timestamp = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); d.utcTimestamp = QDateTime::currentDateTimeUtc();
m_rxFrameQueue.append(d); m_rxFrameQueue.append(d);
if(d.text.contains(m_config.my_callsign())){ if(d.text.contains(m_config.my_callsign())){
@ -7442,19 +7442,19 @@ void MainWindow::postDecode (bool is_new, QString const& message)
if(!selectedItems.isEmpty()){ if(!selectedItems.isEmpty()){
selectedOffset = selectedItems.first()->text().toInt(); selectedOffset = selectedItems.first()->text().toInt();
} }
int now = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); auto now = QDateTime::currentDateTimeUtc();
for(int i = ui->tableWidgetRXAll->rowCount(); i >= 0; i--){ for(int i = ui->tableWidgetRXAll->rowCount(); i >= 0; i--){
ui->tableWidgetRXAll->removeRow(i); ui->tableWidgetRXAll->removeRow(i);
} }
QList<int> keys = m_bandActivity.keys(); QList<int> keys = m_bandActivity.keys();
qSort(keys.begin(), keys.end()); qSort(keys.begin(), keys.end());
foreach (int offset, keys) { foreach (int offset, keys) {
auto items = m_bandActivity[offset]; QList<ActivityDetail> items = m_bandActivity[offset];
if(items.length() > 0){ if(items.length() > 0){
QStringList text; QStringList text;
int snr = 0; int snr = 0;
foreach(auto item, items){ foreach(ActivityDetail item, items){
if(now - item.timestamp > 90*1000){ if(item.utcTimestamp.secsTo(now) > 90){
continue; continue;
} }
if(item.text.isEmpty()){ if(item.text.isEmpty()){
@ -7528,7 +7528,7 @@ void MainWindow::postDecode (bool is_new, QString const& message)
CallDetail d = m_callActivity[call]; CallDetail d = m_callActivity[call];
ui->tableWidgetCalls->insertRow(ui->tableWidgetCalls->rowCount()); ui->tableWidgetCalls->insertRow(ui->tableWidgetCalls->rowCount());
ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 0, new QTableWidgetItem(call)); ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 0, new QTableWidgetItem(call));
ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 1, new QTableWidgetItem(QString("(%1)").arg(since(QDateTime::fromMSecsSinceEpoch(d.timestamp, QTimeZone::utc()))))); ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 1, new QTableWidgetItem(QString("(%1)").arg(since(d.utcTimestamp))));
//ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 1, new QTableWidgetItem(d.grid)); //ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 1, new QTableWidgetItem(d.grid));
if(call == selectedCall){ if(call == selectedCall){
@ -7542,10 +7542,9 @@ void MainWindow::postDecode (bool is_new, QString const& message)
RXDetail d = m_rxFrameQueue.first(); RXDetail d = m_rxFrameQueue.first();
m_rxFrameQueue.removeFirst(); m_rxFrameQueue.removeFirst();
auto date = QDateTime::fromMSecsSinceEpoch(d.timestamp, QTimeZone::utc());
int freq = d.freq/10*10; int freq = d.freq/10*10;
int block = m_rxFrameBlockNumbers.contains(freq) ? m_rxFrameBlockNumbers[freq] : -1; int block = m_rxFrameBlockNumbers.contains(freq) ? m_rxFrameBlockNumbers[freq] : -1;
block = logRxTxMessageText(date, d.text, d.freq, false, block=block); block = logRxTxMessageText(d.utcTimestamp, d.text, d.freq, false, block=block);
m_rxFrameBlockNumbers[freq] = block; m_rxFrameBlockNumbers[freq] = block;
} }
} }

6
mainwindow.h
View File

@ -628,7 +628,7 @@ private:
QString call; QString call;
QString grid; QString grid;
int freq; int freq;
int timestamp; QDateTime utcTimestamp;
int snr; int snr;
}; };
@ -638,7 +638,7 @@ private:
QString secondCall; QString secondCall;
int freq; int freq;
QString text; QString text;
int timestamp; QDateTime utcTimestamp;
int snr; int snr;
}; };
@ -646,7 +646,7 @@ private:
{ {
int freq; int freq;
QString text; QString text;
int timestamp; QDateTime utcTimestamp;
}; };
int m_txFrameCount; int m_txFrameCount;