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

Compat for older Qt

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-06 07:15:11 +00:00
parent 7d9553dd7c
commit 57ad5fd0bc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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().toSecsSinceEpoch(); d.timestamp = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
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().toSecsSinceEpoch(); d.timestamp = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
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().toSecsSinceEpoch(); d.timestamp = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
m_rxFrameQueue.append(d); m_rxFrameQueue.append(d);
if(d.text.contains(m_config.my_callsign())){ if(d.text.contains(m_config.my_callsign())){
@ -5297,8 +5297,8 @@ bool MainWindow::prepareNextMessageFrame()
} }
void MainWindow::scheduleBeacon(bool first){ void MainWindow::scheduleBeacon(bool first){
int timestamp = QDateTime::currentDateTimeUtc().addSecs(first ? 15 : 300).toSecsSinceEpoch(); int timestamp = QDateTime::currentDateTimeUtc().addSecs(first ? 15 : 300).toMSecsSinceEpoch();
m_nextBeacon = QDateTime::fromSecsSinceEpoch(roundUp(timestamp, 15) + 1, QTimeZone::utc()); m_nextBeacon = QDateTime::fromMSecsSinceEpoch(roundUp(timestamp, 15) + 1, QTimeZone::utc());
beaconTimer.start(QDateTime::currentDateTimeUtc().msecsTo(m_nextBeacon) - 2*1000); beaconTimer.start(QDateTime::currentDateTimeUtc().msecsTo(m_nextBeacon) - 2*1000);
} }
@ -7442,7 +7442,7 @@ 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().toSecsSinceEpoch(); int now = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
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);
} }
@ -7454,7 +7454,7 @@ void MainWindow::postDecode (bool is_new, QString const& message)
QStringList text; QStringList text;
int snr = 0; int snr = 0;
foreach(auto item, items){ foreach(auto item, items){
if(now - item.timestamp > 90){ if(now - item.timestamp > 90*1000){
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::fromSecsSinceEpoch(d.timestamp, QTimeZone::utc()))))); 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(d.grid)); //ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 1, new QTableWidgetItem(d.grid));
if(call == selectedCall){ if(call == selectedCall){
@ -7542,7 +7542,7 @@ 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::fromSecsSinceEpoch(d.timestamp, QTimeZone::utc()); 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(date, d.text, d.freq, false, block=block);