diff --git a/canframemodel.cpp b/canframemodel.cpp index a778796..985868d 100644 --- a/canframemodel.cpp +++ b/canframemodel.cpp @@ -74,9 +74,9 @@ CANFrameModel::CANFrameModel(QObject *parent) filteredFrames.reserve(preallocSize); dbcHandler = DBCHandler::getReference(); - interpretFrames = false; - overwriteDups = false; - filtersPersistDuringClear = false; + interpretFrames = true; + overwriteDups = true; + filtersPersistDuringClear = true; useHexMode = true; useColorsByCanId = false; timeStyle = TS_MICROS; @@ -870,13 +870,13 @@ int CANFrameModel::sendBulkRefresh() return num; } -void CANFrameModel::clearFrames() +void CANFrameModel::clearFrames(bool forceClearFilters) { mutex.lock(); this->beginResetModel(); frames.clear(); filteredFrames.clear(); - if(filtersPersistDuringClear == false) + if(filtersPersistDuringClear == false || forceClearFilters) { filters.clear(); busFilters.clear(); diff --git a/canframemodel.h b/canframemodel.h index 6f58257..da89823 100644 --- a/canframemodel.h +++ b/canframemodel.h @@ -42,7 +42,7 @@ public: void sendRefresh(); void sendRefresh(int); int sendBulkRefresh(); - void clearFrames(); + void clearFrames(bool forceClearFilters = false); void setInterpretMode(bool); bool getInterpretMode(); void setOverwriteMode(bool); diff --git a/mainwindow.cpp b/mainwindow.cpp index 56ba04c..74f1aed 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -218,7 +218,7 @@ MainWindow::MainWindow(QWidget *parent) : normalRowHeight = ui->canFramesView->rowHeight(0); if (normalRowHeight == 0) normalRowHeight = 30; //should not be necessary but provides a sane number if something stupid happened. qDebug() << "normal row height = " << normalRowHeight; - model->clearFrames(); + model->clearFrames(true); ui->canFramesView->verticalHeader()->setDefaultSectionSize(normalRowHeight); // Set the default height for all rows to the height that was calculated diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index fa8430f..c369540 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -241,6 +241,9 @@ Keep Filters When Clearing + + true + @@ -255,6 +258,9 @@ true + + true + Overwrite Mode @@ -272,6 +278,9 @@ Interpret Frames + + true +