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

set default state of interpretFrames, overwriteDups and filtersPersistDuringClear to true

Browse Source
This commit is contained in:
Leopixelo
2026-06-08 15:03:38 +02:00
parent 286df56895
commit 93a642e3ab
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
canframemodel.cpp
+5 -5
View File
@@ -74,9 +74,9 @@ CANFrameModel::CANFrameModel(QObject *parent)
filteredFrames.reserve(preallocSize); filteredFrames.reserve(preallocSize);
dbcHandler = DBCHandler::getReference(); dbcHandler = DBCHandler::getReference();
interpretFrames = false; interpretFrames = true;
overwriteDups = false; overwriteDups = true;
filtersPersistDuringClear = false; filtersPersistDuringClear = true;
useHexMode = true; useHexMode = true;
useColorsByCanId = false; useColorsByCanId = false;
timeStyle = TS_MICROS; timeStyle = TS_MICROS;
@@ -870,13 +870,13 @@ int CANFrameModel::sendBulkRefresh()
return num; return num;
} }
void CANFrameModel::clearFrames() void CANFrameModel::clearFrames(bool forceClearFilters)
{ {
mutex.lock(); mutex.lock();
this->beginResetModel(); this->beginResetModel();
frames.clear(); frames.clear();
filteredFrames.clear(); filteredFrames.clear();
if(filtersPersistDuringClear == false) if(filtersPersistDuringClear == false || forceClearFilters)
{ {
filters.clear(); filters.clear();
busFilters.clear(); busFilters.clear();
canframemodel.h
+1 -1
View File
@@ -42,7 +42,7 @@ public:
void sendRefresh(); void sendRefresh();
void sendRefresh(int); void sendRefresh(int);
int sendBulkRefresh(); int sendBulkRefresh();
void clearFrames(); void clearFrames(bool forceClearFilters = false);
void setInterpretMode(bool); void setInterpretMode(bool);
bool getInterpretMode(); bool getInterpretMode();
void setOverwriteMode(bool); void setOverwriteMode(bool);
mainwindow.cpp
+1 -1
View File
@@ -218,7 +218,7 @@ MainWindow::MainWindow(QWidget *parent) :
normalRowHeight = ui->canFramesView->rowHeight(0); normalRowHeight = ui->canFramesView->rowHeight(0);
if (normalRowHeight == 0) normalRowHeight = 30; //should not be necessary but provides a sane number if something stupid happened. if (normalRowHeight == 0) normalRowHeight = 30; //should not be necessary but provides a sane number if something stupid happened.
qDebug() << "normal row height = " << normalRowHeight; 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 ui->canFramesView->verticalHeader()->setDefaultSectionSize(normalRowHeight); // Set the default height for all rows to the height that was calculated
ui/mainwindow.ui
+9
View File
@@ -241,6 +241,9 @@
<property name="text"> <property name="text">
<string>Keep Filters When Clearing</string> <string>Keep Filters When Clearing</string>
</property> </property>
<property name="checked">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@@ -255,6 +258,9 @@
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text"> <property name="text">
<string>Overwrite Mode</string> <string>Overwrite Mode</string>
</property> </property>
@@ -272,6 +278,9 @@
<property name="text"> <property name="text">
<string>Interpret Frames</string> <string>Interpret Frames</string>
</property> </property>
<property name="checked">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>