Fixes to allow native files and CRTD files to load with frame that have zero data bytes, allow loading of files that have errors.

2018-05-17 20:40:17 -04:00
parent 9f9ef3649b
commit f5b8f1090b
2 changed files with 16 additions and 3 deletions
@@ -545,7 +545,20 @@ void MainWindow::handleLoadFile()
    QString filename;
    QVector<CANFrame> tempFrames;

-    if (FrameFileIO::loadFrameFile(filename, &tempFrames))
+    QMessageBox::StandardButton confirmDialog;
+
+    bool loadResult = FrameFileIO::loadFrameFile(filename, &tempFrames);
+
+    if (!loadResult)
+    {
+        confirmDialog = QMessageBox::question(this, "Error Loading", "Do you want to salvage what could be loaded?",
+                                      QMessageBox::Yes|QMessageBox::No);
+        if (confirmDialog == QMessageBox::Yes) {
+            loadResult = true;
+        }
+    }
+
+    if (loadResult)
    {
        ui->canFramesView->scrollToTop();
        model->clearFrames();