Skip to content

The tables can display more than 8 data bytes #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
morcibacsi wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −16
Open

The tables can display more than 8 data bytes #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions 02_canSniffer_GUI/generate_ui.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@pyuic5 canSniffer.ui > canSniffer_ui.py
51 changes: 35 additions & 16 deletions 02_canSniffer_GUI/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import canSniffer_ui
from PyQt5.QtWidgets import QMainWindow, QApplication, QTableWidgetItem, QHeaderView, QFileDialog, QRadioButton
from PyQt5.QtWidgets import QVBoxLayout, QSizeGrip
from PyQt5.QtCore import Qt
from PyQt5.QtCore import Qt, QCoreApplication
from PyQt5.QtGui import QColor
import serial.tools.list_ports

Expand Down Expand Up @@ -179,10 +179,24 @@ def decodedTableItemChangedCallback(self):
def deleteDecodedLineCallback(self):
self.decodedMessagesTableWidget.removeRow(self.decodedMessagesTableWidget.currentRow())

def addColumnToTable(self, table):
colCount = table.columnCount()
table.insertColumn(colCount)
table.setColumnWidth(colCount, 32)
headItem = QTableWidgetItem()
headItem.setTextAlignment(Qt.AlignCenter)
table.setHorizontalHeaderItem(colCount, headItem)
newCol = table.horizontalHeaderItem(colCount)
if newCol is not None:
newCol.setText(QCoreApplication.translate("MainWindow", 'D%d' % int(colCount-5)))

def addToDecodedCallback(self):
newRow = self.decodedMessagesTableWidget.rowCount()
self.decodedMessagesTableWidget.insertRow(newRow)
for i in range(1, self.decodedMessagesTableWidget.columnCount()):
for i in range(1, self.mainMessageTableWidget.columnCount()):
if i >= self.decodedMessagesTableWidget.columnCount():
self.addColumnToTable(self.decodedMessagesTableWidget)

new_item = QTableWidgetItem(self.mainMessageTableWidget.item(self.mainMessageTableWidget.currentRow(), i))
self.decodedMessagesTableWidget.setItem(newRow, i, new_item)

Expand Down Expand Up @@ -310,24 +324,26 @@ def mainTablePopulatorCallback(self, rowData):
if self.mainMessageTableWidget.isRowHidden(row):
self.mainMessageTableWidget.setRowHidden(row, False)

for i in range(self.mainMessageTableWidget.columnCount()):
if i < len(rowData):
data = str(rowData[i])
item = self.mainMessageTableWidget.item(row, i)
newItem = QTableWidgetItem(data)
if item:
if item.text() != data:
if self.highlightNewDataCheckBox.isChecked() and \
self.groupModeCheckBox.isChecked() and \
i > 4:
newItem.setBackground(QColor(104, 37, 98))
else:
for i in range(len(rowData)):
colCount = self.mainMessageTableWidget.columnCount()
if i >= colCount:
self.addColumnToTable(self.mainMessageTableWidget)

data = str(rowData[i])
item = self.mainMessageTableWidget.item(row, i)
newItem = QTableWidgetItem(data)
if item:
if item.text() != data:
if self.highlightNewDataCheckBox.isChecked() and \
self.groupModeCheckBox.isChecked() and \
i > 4:
newItem.setBackground(QColor(104, 37, 98))
else:
newItem = QTableWidgetItem()
if self.highlightNewDataCheckBox.isChecked() and \
self.groupModeCheckBox.isChecked() and \
i > 4:
newItem.setBackground(QColor(104, 37, 98))

self.mainMessageTableWidget.setItem(row, i, newItem)

isFamiliar = False
Expand All @@ -344,7 +360,7 @@ def mainTablePopulatorCallback(self, rowData):
self.mainMessageTableWidget.setItem(row, 1, QTableWidgetItem(value))
isFamiliar = True

for i in range(self.mainMessageTableWidget.columnCount()):
for i in range(len(rowData)):
if (isFamiliar or (newId.find("(") >= 0)) and i < 3:
self.mainMessageTableWidget.item(row, i).setBackground(QColor(53, 81, 52))

Expand All @@ -369,6 +385,9 @@ def loadTableFromFile(self, table, path):
row = table.rowCount()
table.insertRow(row)
for i in range(len(rowData)):
if table == self.decodedMessagesTableWidget and i >= table.columnCount():
self.addColumnToTable(table)

if len(rowData[i]):
item = QTableWidgetItem(str(rowData[i]))
if not (table == self.decodedMessagesTableWidget and i == 0):
Expand Down
1 change: 1 addition & 0 deletions 02_canSniffer_GUI/run.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@python main.py