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

Flexible scan grid #27

Merged
merged 9 commits into from
Dec 6, 2024
Merged

Conversation

sohamazing
Copy link
Contributor

@sohamazing sohamazing commented Dec 4, 2024

  • removes legacy multipointwidget and grid acquisition
    • multiPointWidget2 -> flexibleMultiPointWidget
    • multiPointWidgetGrid -> wellplateMultiPointWidget
    • must have ENABLE_WELLPLATE_MULTIPOINT or ENABLE_FLEXIBLE_MULTIPOINT
  • flexible multipoint now
    • uses pre-calculated fov coordinates to run acquistion
    • dislpays scan grid for fov coordinates
    • no longer uses manual dx and dy
      • uses Nx, Ny, Overlap, Objective to create scan grid
      • pass ObjectiveStore to flexible multipoint widget
    • toggles scan grid correctly on NavigationViewer display for flexible and wellplate acquisitions (when tab changed)
  • cleanup codebase (multipointWorker and milutpointController) to only use coordinate acquisition
  • cleanup flexible multipoint widget UI

class MultiPointWidget(QFrame):
class FlexibleMultiPointWidget(QFrame):
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you switch the order of WellPlateMultiPointWidget and FlexibleMultiPointWidget? Current order deletes a lot of code and re-add a lot of code. Please try to avoid this kind of scenario.

Copy link
Contributor Author

@sohamazing sohamazing Dec 4, 2024

Choose a reason for hiding this comment

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

this is the old multipoint widget that is deleted

@sohamazing sohamazing requested a review from hongquanli December 4, 2024 16:10
Copy link
Contributor Author

@sohamazing sohamazing left a comment

Choose a reason for hiding this comment

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

changed this to make the diff more readable.


signal_acquisition_started = Signal(bool)
signal_acquisition_channels = Signal(list)
signal_acquisition_z_levels = Signal(int)
signal_acquisition_shape = Signal(int, int, int, float, float, float)
signal_acquisition_shape = Signal(int, float)
Copy link
Contributor

Choose a reason for hiding this comment

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

@sohamazing can you add in-line documentation here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added more here

@sohamazing sohamazing requested a review from hongquanli December 6, 2024 02:41
@hongquanli hongquanli merged commit b45b5f3 into Cephla-Lab:master Dec 6, 2024
1 check passed
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