t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add progressbar to loading on main form, add ability to graph DBC defined signals, make graphing bias/scale work like DBC bias/scale to be consistent.

Browse Source
This commit is contained in:
Collin Kidder
2015-08-09 19:34:19 -04:00
parent 16b3c9de50
commit fa5acf612b
9 changed files with 350 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+14 -1
View File
@@ -443,11 +443,24 @@ void MainWindow::handleLoadFile()
QVector<CANFrame> tempFrames;
QProgressDialog progress(this);
progress.setWindowModality(Qt::WindowModal);
progress.setLabelText("Loading file...");
progress.setCancelButton(0);
progress.setRange(0,0);
progress.setMinimumDuration(0);
progress.show();
qApp->processEvents();
if (dialog.selectedNameFilter() == filters[0]) result = FrameFileIO::loadCRTDFile(filename, &tempFrames);
if (dialog.selectedNameFilter() == filters[1]) result = FrameFileIO::loadNativeCSVFile(filename, &tempFrames);
if (dialog.selectedNameFilter() == filters[2]) result = FrameFileIO::loadGenericCSVFile(filename, &tempFrames);
if (dialog.selectedNameFilter() == filters[3]) result = FrameFileIO::loadLogFile(filename, &tempFrames);
if (dialog.selectedNameFilter() == filters[4]) result = FrameFileIO::loadMicrochipFile(filename, &tempFrames);
progress.cancel();
if (result)
{
model->insertFrames(tempFrames);
@@ -840,7 +853,7 @@ void MainWindow::showSettingsDialog()
void MainWindow::showGraphingWindow()
{
if (!graphingWindow) {
graphingWindow = new GraphingWindow(model->getListReference());
graphingWindow = new GraphingWindow(dbcHandler, model->getListReference());
}
graphingWindow->show();
}