Skip to content

Commit fe37e44

Browse files
committed
See if this fixes Windows performance issue.
1 parent 67db651 commit fe37e44

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

can_testbench.py

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -727,14 +727,14 @@ def initBaseUI(self):
727727

728728
self.bottomHorizontal = QHBoxLayout()
729729
self.bottomLabel = QGridLayout()
730-
self.msgLabel = QLabel()
730+
self.msgLabel = QLabel(self)
731731
self.msgLabel.setText(self.msgTableModel.msgLabel)
732732
msgSize = self.msgLabel.sizePolicy()
733733
msgSize.setHorizontalPolicy(QSizePolicy.Policy.Minimum)
734734
self.msgLabel.setSizePolicy(msgSize)
735735
self.bottomLabel.addWidget(self.msgLabel, 0, 0, Qt.AlignmentFlag.AlignLeft)
736736
self.bottomLabel.setColumnMinimumWidth(0, 400) # Couldn't figure this out, just hard code it. Monospace fonts are too big
737-
self.timeLabel = QLabel()
737+
self.timeLabel = QLabel(self)
738738
self.timeLabel.setText(self.msgTableModel.timeLabel)
739739
timeSize = self.timeLabel.sizePolicy()
740740
timeSize.setHorizontalPolicy(QSizePolicy.Policy.Fixed)
@@ -1520,6 +1520,7 @@ def onSignalGraphedChanged(self, msg: DbcMessage, row: int, graphed: bool, stopG
15201520
data = {
15211521
"timestamps": [datetime.datetime.fromtimestamp(x) for x in msg.timestamps],
15221522
}
1523+
logging.info("here")
15231524
# Add each signal's values and names to the data dictionary
15241525
for sig in msg.signals:
15251526
data[sig.signal.name] = sig.graphValues
@@ -1672,13 +1673,16 @@ def setupLogMessages(self, log_file):
16721673
else:
16731674
key.timestamps.append(msg.timestamp)
16741675

1675-
signalValues = key.message.decode(msg.data)
1676-
for sig in key.signals:
1677-
value = signalValues.get(sig.signal.name)
1678-
if value is not None:
1679-
if isinstance(value, namedsignalvalue.NamedSignalValue):
1680-
value = value.value
1681-
sig.graphValues.append(value)
1676+
try:
1677+
signalValues = key.message.decode(msg.data)
1678+
for sig in key.signals:
1679+
value = signalValues.get(sig.signal.name)
1680+
if value is not None:
1681+
if isinstance(value, namedsignalvalue.NamedSignalValue):
1682+
value = value.value
1683+
sig.graphValues.append(value)
1684+
except ValueError as error:
1685+
pass
16821686

16831687
def initTabs(self, tabWidget: QTabWidget):
16841688
self.tab = LogTab(self.rxMsgs, self.config)
@@ -1775,6 +1779,7 @@ def connectCan(self):
17751779
canManager = LogTabManager(self.config, self.dbcDb, self.tabWidget, opts.get('log_file'))
17761780
except Exception as error:
17771781
self.errorDialog(error)
1782+
logging.exception("An error occurred")
17781783
return
17791784
self.openTabs[f"{opts.get('log_file')}"] = canManager
17801785
self.config.writeConfig()

0 commit comments

Comments
 (0)