Skip to content
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.

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

MovementUpdater: update FOV position and position_after_move signals and slots #60

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

sohamazing
Copy link
Contributor

@sohamazing sohamazing commented Jan 2, 2025

fixed issues position update signals:

welplateMultiPointWIdget.update_live_coordinates(self, pos: squid.abc.Pos):

  • connect to MovementUpdater.position_after_move signal (now receives Pos object instead of x_mm, y_mm floats)
  • slot for drawing and getting the scanCoordinates for the live scan grid (only when sample is glass slide and not flexible acquisition)

navigationViewer.draw_fov_current_position(self, pos: squid.abc.Pos)

  • connect to MovementUpdater.position signal (instead of MovementUpdater.position_after_move)
  • slot for drawing the live stage fov position

move to cached position after boot

  • moving to the cached position on startup no longer hidden behind HOMING flags
  • correctly init_z (in MultiPointWidgets) after moving to the cached pos

@sohamazing sohamazing changed the title Fov and stage bugs update FOV position and position after move signals and slots Jan 2, 2025
@sohamazing sohamazing changed the title update FOV position and position after move signals and slots update FOV position and position_after_move signals and slots Jan 2, 2025
@sohamazing sohamazing changed the title update FOV position and position_after_move signals and slots MovementUpdater: update FOV position and position_after_move signals and slots Jan 2, 2025
@@ -3729,13 +3729,13 @@ def update_well_coordinates(self, selected):
elif self.scanCoordinates.has_regions():
self.scanCoordinates.clear_regions()

def update_live_coordinates(self, x, y):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change this PR to just contain the update_live_coordinates changes in this file? I think the others are unrelated or already in master.

the draw_current_fov changes look like they could be okay, but I think the and is just replicating previous logic - did something change there?

self.stage.move_y_to(cached_pos.y_mm)
self.stage.move_z_to(cached_pos.z_mm)

if ENABLE_WELLPLATE_MULTIPOINT:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the duplication here on purpose?

@sohamazing sohamazing force-pushed the fov-and-stage-bugs branch 3 times, most recently from 19b9bf4 to 589de99 Compare January 4, 2025 08:43
…inates (position_after_move signal)

fix move from well selector double click

move to cached position on startup no longer hidden behind HOMING flags
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants