Repository navigation
Bugfix hardware_averaging + led_push for ROI (PR 10 rebased on the new camera base) - #12
Merged
Merged
Conversation
The camera base moved to camera_base.py in 5.0.x, so the three changes of this branch (led_push for update_roi and apply_roi, hardware_averaging False) are applied there; camera_base_pylablib.py is the one of 5.0.x. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Tdiso1u1ZhikSutj2Qs5Cg
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Before: #10 (by @rgeneaux) conflicts with 5.0.x since #11 moved the generic camera plugin to
camera_base.py, and the branch lives in a fork that could not be updated from here.After: the same two fixes apply on the new location, with the commits of #10 kept in the history (same authorship):
hardware_averaging = FalseinCameraBase: withTrue,grab_datais called at each frame at high frame rates and the plugin crashed within seconds.update_roiandapply_roiuseled_push: with pymodaq_gui 5.3.x,ledis a display-only indicator andled_pushis the clickable one, so the ROI controls work again.How: the merge of
5.0.xinto the branch of #10, the conflict being only the moved file; the diff to5.0.xis the three changed lines. The 26 tests oftests/test_camera_base.pypass. Not tried on a real camera, so the 100 FPS crash of the first point is not reproduced here.If this is merged, #10 can be closed (or its author can merge
5.0.xinto the fork branch instead).Generated by Claude Code