From 9eb2a913b76e37a7bdb63aad009afc517e5cd5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Tue, 21 Mar 2023 13:03:10 +0100 Subject: [PATCH] Fix parsing of timestamp in packet logs, change file ending --- .../LibreVNA-GUI/Device/LibreVNA/devicepacketlog.cpp | 2 +- .../LibreVNA-GUI/Device/LibreVNA/devicepacketlogview.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlog.cpp b/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlog.cpp index 190514f..8ed6307 100644 --- a/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlog.cpp +++ b/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlog.cpp @@ -156,7 +156,7 @@ nlohmann::json DevicePacketLog::LogEntry::toJSON() void DevicePacketLog::LogEntry::fromJSON(nlohmann::json j) { type = QString::fromStdString(j.value("type", "")) == "Packet" ? Type::Packet : Type::InvalidBytes; - timestamp = QDateTime::fromMSecsSinceEpoch(j.value("timestamp", 0UL), Qt::TimeSpec::UTC); + timestamp = QDateTime::fromMSecsSinceEpoch(j.value("timestamp", 0ULL), Qt::TimeSpec::UTC); serial = QString::fromStdString(j.value("serial", "")); datapoint = nullptr; p = nullptr; diff --git a/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlogview.cpp b/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlogview.cpp index 54555eb..87fc1b5 100644 --- a/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlogview.cpp +++ b/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlogview.cpp @@ -28,7 +28,7 @@ DevicePacketLogView::DevicePacketLogView(QWidget *parent) : updateTree(); }); connect(ui->buttonBox->button(QDialogButtonBox::Save), &QPushButton::clicked, [=](){ - QString filename = QFileDialog::getSaveFileName(nullptr, "Load USB log data", "", "USB log files (*.usblog)", nullptr, QFileDialog::DontUseNativeDialog); + QString filename = QFileDialog::getSaveFileName(nullptr, "Load LibreVNA log data", "", "LibreVNA log files (*.vnalog)", nullptr, QFileDialog::DontUseNativeDialog); if(filename.isEmpty()) { // aborted selection return; @@ -42,7 +42,7 @@ DevicePacketLogView::DevicePacketLogView(QWidget *parent) : file.close(); }); connect(ui->buttonBox->button(QDialogButtonBox::Open), &QPushButton::clicked, [=](){ - QString filename = QFileDialog::getOpenFileName(nullptr, "Load USB log data", "", "USB log files (*.usblog)", nullptr, QFileDialog::DontUseNativeDialog); + QString filename = QFileDialog::getOpenFileName(nullptr, "Load LibreVNA log data", "", "LibreVNA log files (*.vnalog)", nullptr, QFileDialog::DontUseNativeDialog); if(filename.isEmpty()) { // aborted selection return;