Merge pull request #249 from collin80/WIP

Fix timestamp loading for CARBusAnalyzer files
2020-10-05 18:21:27 -04:00
parent bae715053d c0f3e09c0b
commit 419ef1248d
1 changed files with 2 additions and 1 deletions
@@ -790,7 +790,8 @@ bool FrameFileIO::loadCARBUSAnalyzerFile(QString filename, QVector<CANFrame>* fr
            if (tokens.length() > 3)
            {
                QString time = tokens[0].replace(",",".");
-                thisFrame.setTimeStamp(static_cast<uint64_t>(time.toDouble() * 1000));
+                double timeStamp = time.toDouble() * 1000000.0;
+                thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, static_cast<int64_t>(timeStamp)));
                thisFrame.setFrameId(static_cast<uint32_t>(tokens[3].toInt(nullptr, 16)));
                thisFrame.setExtendedFrameFormat(thisFrame.frameId() > 0x7FF);
                thisFrame.isReceived = true;