Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 9 additions & 8 deletions bapsf_motion/gui/configure/controllers.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class AxisControlWidget(QWidget):
targetPositionChanged = Signal(float)
lostConnection = Signal()
establishedConnection = Signal()
requestDisplayRefresh = Signal()

def __init__(
self,
Expand Down Expand Up @@ -146,6 +147,8 @@ def _connect_signals(self):
self.establishedConnection.connect(self._handle_connection_established)
self.lostConnection.connect(self._handle_connection_lost)

self.requestDisplayRefresh.connect(self.update_display_of_axis_status)

def _define_layout(self):
layout = QVBoxLayout()
layout.setContentsMargins(0, 0, 0, 0)
Expand Down Expand Up @@ -619,11 +622,11 @@ def link_axis(self, mg: MotionGroup | None, ax_index: int):
self._emit_connection_established
)
axis.motor.signals.connection_lost.connect(self._emit_connection_lost)
axis.motor.signals.status_changed.connect(self.update_display_of_axis_status)
axis.motor.signals.status_changed.connect(self.requestDisplayRefresh.emit)
axis.motor.signals.status_changed.connect(self.axisStatusChanged.emit)
axis.motor.signals.movement_started.connect(self._emit_movement_started)
axis.motor.signals.movement_finished.connect(self._emit_movement_finished)
axis.motor.signals.movement_finished.connect(self.update_display_of_axis_status)
axis.motor.signals.movement_finished.connect(self.requestDisplayRefresh.emit)

self.update_display_of_axis_status()
self.axisLinked.emit()
Expand All @@ -636,14 +639,12 @@ def unlink_axis(self):
self._emit_connection_established
)
axis.motor.signals.connection_lost.disconnect(self._emit_connection_lost)
axis.motor.signals.status_changed.disconnect(
self.update_display_of_axis_status
)
axis.motor.signals.status_changed.disconnect(self.requestDisplayRefresh.emit)
axis.motor.signals.status_changed.disconnect(self.axisStatusChanged.emit)
axis.motor.signals.movement_started.disconnect(self._emit_movement_started)
axis.motor.signals.movement_finished.disconnect(self._emit_movement_finished)
axis.motor.signals.movement_finished.disconnect(
self.update_display_of_axis_status
self.requestDisplayRefresh.emit
)

self._mg = None
Expand Down Expand Up @@ -721,7 +722,7 @@ def closeEvent(self, event: QCloseEvent):
)
self.axis.motor.signals.connection_lost.disconnect(self._emit_connection_lost)
self.axis.motor.signals.status_changed.disconnect(
self.update_display_of_axis_status
self.requestDisplayRefresh.emit
)
self.axis.motor.signals.status_changed.disconnect(self.axisStatusChanged.emit)
self.axis.motor.signals.movement_started.disconnect(
Expand All @@ -731,7 +732,7 @@ def closeEvent(self, event: QCloseEvent):
self._emit_movement_finished
)
self.axis.motor.signals.movement_finished.disconnect(
self.update_display_of_axis_status
self.requestDisplayRefresh.emit
)

event.accept()
Expand Down