Skip to content

Keep the selected CAN line speed when switching screens #1886

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
lennardm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Keep the selected CAN line speed when switching screens #1886

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
11 changes: 9 additions & 2 deletions src/ddt4all/ui/main_window/main_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,11 +640,15 @@ def show_options_dialog(self):
options_dialog.exec_()

def set_can_combo(self, bus):
self.canlinecombo.clear()
# Keep the user's CAN line choice when the combo is rebuilt (e.g. on every screen change);
# rebuilding used to reset it to "Auto" and reconnect the ECU at 500K.
previous = self.canlinecombo.currentIndex()
self.canlinecombo.blockSignals(True)
try:
self.canlinecombo.clicked.disconnect()
self.canlinecombo.currentIndexChanged.disconnect()
except Exception:
pass
self.canlinecombo.clear()
if bus == "CAN":
self.canlinecombo.addItem(_("CAN Line 1 Auto"))
self.canlinecombo.addItem(_("CAN Line 1@500K"))
Expand All @@ -653,12 +657,15 @@ def set_can_combo(self, bus):
self.canlinecombo.addItem(_("CAN Line 2@500K"))
self.canlinecombo.addItem(_("CAN Line 2@250K"))
self.canlinecombo.addItem(_("CAN Line 2@125K"))
if 0 < previous < self.canlinecombo.count():
self.canlinecombo.setCurrentIndex(previous)
self.canlinecombo.currentIndexChanged.connect(self.changecanspeed)
else:
if bus == "KWP2000":
self.canlinecombo.addItem(_("KWP2000"))
if bus == "ISO8":
self.canlinecombo.addItem(_("ISO8"))
self.canlinecombo.blockSignals(False)

def flow_control(self):
enabled = self.fctrigger.isChecked()
Expand Down
Loading