diff --git a/framefileio.cpp b/framefileio.cpp index 53fd2e2..9ba521c 100644 --- a/framefileio.cpp +++ b/framefileio.cpp @@ -325,7 +325,7 @@ bool FrameFileIO::loadCRTDFile(QString filename, QVector* frames) { QList tokens = line.split(' '); int multiplier; - if (tokens.length() > 3) + if (tokens.length() > 2) { int idxOfDecimal = tokens[0].indexOf('.'); if (idxOfDecimal > -1) { @@ -699,7 +699,7 @@ bool FrameFileIO::loadNativeCSVFile(QString filename, QVector* frames) if (line.length() > 2) { QList tokens = line.split(','); - if (tokens.length() >= 6) + if (tokens.length() >= 5) { if (tokens[0].length() > 3) { diff --git a/mainwindow.cpp b/mainwindow.cpp index 40df9e7..6752d46 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -545,7 +545,20 @@ void MainWindow::handleLoadFile() QString filename; QVector 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();