set default state of interpretFrames, overwriteDups and filtersPersistDuringClear to true
This commit is contained in:
+5
-5
@@ -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();
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
|
||||
@@ -241,6 +241,9 @@
|
||||
<property name="text">
|
||||
<string>Keep Filters When Clearing</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
@@ -255,6 +258,9 @@
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Overwrite Mode</string>
|
||||
</property>
|
||||
@@ -272,6 +278,9 @@
|
||||
<property name="text">
|
||||
<string>Interpret Frames</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
|
||||
Reference in New Issue
Block a user