Skip to content

Commit

Permalink
collin80#194: new filters default to false if any existing filters ar…
Browse files Browse the repository at this point in the history
…e false
  • Loading branch information
NKirkby committed Jun 11, 2019
1 parent 20dfb26 commit 2393144
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
18 changes: 17 additions & 1 deletion canframemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,18 @@ QVariant CANFrameModel::headerData(int section, Qt::Orientation orientation,
return QVariant();
}

bool CANFrameModel::any_filters_are_configured(void)
{
for (auto const &val : filters)
{
if (val == true)
continue;
else
return true;
}
return false;
}


void CANFrameModel::addFrame(const CANFrame& frame, bool autoRefresh = false)
{
Expand All @@ -517,7 +529,11 @@ void CANFrameModel::addFrame(const CANFrame& frame, bool autoRefresh = false)
//if this ID isn't found in the filters list then add it and show it by default
if (!filters.contains(tempFrame.ID))
{
filters.insert(tempFrame.ID, true);
// if there are any filters already configured, leave the new filter disabled
if (any_filters_are_configured())
filters.insert(tempFrame.ID, false);
else
filters.insert(tempFrame.ID, true);
needFilterRefresh = true;
}

Expand Down
1 change: 1 addition & 0 deletions canframemodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public slots:
void qSortCANFrameAsc(QVector<CANFrame>* frames, Column column, int lowerBound, int upperBound);
void qSortCANFrameDesc(QVector<CANFrame>* frames, Column column, int lowerBound, int upperBound);
uint64_t getCANFrameVal(int row, Column col);
bool any_filters_are_configured(void);

QVector<CANFrame> frames;
QVector<CANFrame> filteredFrames;
Expand Down

0 comments on commit 2393144

Please sign in to comment.