Converted more code to be easier to generalize to larger CAN payloads
for CAN-FD. Improved some code to be faster. Fixed up some compile time warnings.
This commit is contained in:
+6
-6
@@ -22,22 +22,22 @@ QString FilterUtility::getId( QListWidgetItem * item )
|
||||
return getId(item->text());
|
||||
}
|
||||
|
||||
uint32_t FilterUtility::getGMLanArbitrationId(uint32_t id)
|
||||
uint32_t FilterUtility::getGMLanArbitrationId(int32_t id)
|
||||
{
|
||||
return (id >> 13) & 0x1FFF;
|
||||
}
|
||||
|
||||
uint32_t FilterUtility::getGMLanPriorityBits(uint32_t id)
|
||||
uint32_t FilterUtility::getGMLanPriorityBits(int32_t id)
|
||||
{
|
||||
return (id >> 26) & 0x7;
|
||||
}
|
||||
|
||||
uint32_t FilterUtility::getGMLanSenderId(uint32_t id)
|
||||
uint32_t FilterUtility::getGMLanSenderId(int32_t id)
|
||||
{
|
||||
return id & 0x1FFF;
|
||||
}
|
||||
|
||||
QListWidgetItem * FilterUtility::createCheckableFilterItem(uint32_t id, bool checked, QListWidget* parent)
|
||||
QListWidgetItem * FilterUtility::createCheckableFilterItem(int32_t id, bool checked, QListWidget* parent)
|
||||
{
|
||||
QListWidgetItem * thisItem = createFilterItem(id,parent);
|
||||
thisItem->setFlags(thisItem->flags() | Qt::ItemIsUserCheckable);
|
||||
@@ -48,7 +48,7 @@ QListWidgetItem * FilterUtility::createCheckableFilterItem(uint32_t id, bool che
|
||||
return thisItem;
|
||||
}
|
||||
|
||||
QListWidgetItem * FilterUtility::createFilterItem(uint32_t id, QListWidget* parent)
|
||||
QListWidgetItem * FilterUtility::createFilterItem(int32_t id, QListWidget* parent)
|
||||
{
|
||||
QSettings settings;
|
||||
DBCHandler * dbcHandler = DBCHandler::getReference();
|
||||
@@ -77,4 +77,4 @@ QListWidgetItem * FilterUtility::createFilterItem(uint32_t id, QListWidget* pare
|
||||
|
||||
thisItem->setText(filterItemName);
|
||||
return thisItem;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user