caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix parsing of timestamp in packet logs, change file ending

Browse Source
This commit is contained in:
Jan Käberich 2023-03-21 13:03:10 +01:00
parent 2111f5844a
commit 9eb2a913b7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlog.cpp
View File

@ -156,7 +156,7 @@ nlohmann::json DevicePacketLog::LogEntry::toJSON()
void DevicePacketLog::LogEntry::fromJSON(nlohmann::json j) void DevicePacketLog::LogEntry::fromJSON(nlohmann::json j)
{ {
type = QString::fromStdString(j.value("type", "")) == "Packet" ? Type::Packet : Type::InvalidBytes; 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", "")); serial = QString::fromStdString(j.value("serial", ""));
datapoint = nullptr; datapoint = nullptr;
p = nullptr; p = nullptr;

4
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlogview.cpp
View File

@ -28,7 +28,7 @@ DevicePacketLogView::DevicePacketLogView(QWidget *parent) :
updateTree(); updateTree();
}); });
connect(ui->buttonBox->button(QDialogButtonBox::Save), &QPushButton::clicked, [=](){ 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()) { if(filename.isEmpty()) {
// aborted selection // aborted selection
return; return;
@ -42,7 +42,7 @@ DevicePacketLogView::DevicePacketLogView(QWidget *parent) :
file.close(); file.close();
}); });
connect(ui->buttonBox->button(QDialogButtonBox::Open), &QPushButton::clicked, [=](){ 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()) { if(filename.isEmpty()) {
// aborted selection // aborted selection
return; return;