Skip to content

Commit

Permalink
fix: send pos from movement updater, and start movement updater (#59)
Browse files Browse the repository at this point in the history
This is a simplified #51 that keeps full position updates for anyone
that wants to listen.

Tested by: Running both a simulated and real system, and making sure the
red current fov box renders on the plate as expected.
  • Loading branch information
ianohara authored Jan 2, 2025
1 parent a7796ad commit 7b7afd0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions software/control/gui_hcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def do_update(self):
# In here, send all the signals that must be sent once per stop of movement. AKA once per arriving at a
# new position for a while.
self.sent_after_stopped = True
self.position_after_move.emit(pos.x_mm, pos.y_mm)
self.position_after_move.emit(pos)
else:
self.sent_after_stopped = False

Expand Down Expand Up @@ -713,7 +713,6 @@ def makeConnections(self):
self.wellplateFormatWidget.signalWellplateSettings.connect(self.wellSelectionWidget.onWellplateChanged)
self.wellplateFormatWidget.signalWellplateSettings.connect(lambda format_, *args: self.onWellplateChanged(format_))

#self.wellSelectionWidget.signal_wellSelectedPos.connect(lambda well_x, well_y: self.stage.move_x_to(well_x) and self.stage.move_y_to(well_y))
self.wellSelectionWidget.signal_wellSelectedPos.connect(self.move_to_mm)
if ENABLE_WELLPLATE_MULTIPOINT:
self.wellSelectionWidget.signal_wellSelected.connect(self.wellplateMultiPointWidget.update_well_coordinates)
Expand Down Expand Up @@ -742,6 +741,7 @@ def setup_movement_updater(self):
self.movement_update_timer = QTimer()
self.movement_update_timer.setInterval(100)
self.movement_update_timer.timeout.connect(self.movement_updater.do_update)
self.movement_update_timer.start()

def makeNapariConnections(self):
"""Initialize all Napari connections in one place"""
Expand Down

0 comments on commit 7b7afd0

Please sign in to comment.