Commit graph

592 commits

Author SHA1 Message Date
Julian Stirling
8ce06991f9 Small tweaks to simulation camera to get scanning working. 2025-08-05 08:28:10 +01:00
Julian Stirling
7231e1cf5b Apply suggestions from code review of branch camera-and-bg-detect-setting-customisation 2025-08-04 22:44:40 +00:00
Julian Stirling
cde6d0c9b3 Save settings when detector settings updated 2025-07-31 21:10:52 +01:00
Julian Stirling
33413a591a Complete UI for arbitrary dectector settings. Required better method for invoking actions.
Error handling was fixed in the process of getting the above correct.
2025-07-31 20:56:55 +01:00
Julian Stirling
92d15d921b Display background detector settings built automatically from schema 2025-07-31 20:56:55 +01:00
Julian Stirling
e7e3a08210 Camera settings exposed in UI defined by server. 2025-07-31 20:56:55 +01:00
Julian Stirling
3651013440 Generalise server specified action buttons. 2025-07-31 20:56:55 +01:00
Julian Stirling
0794d4777f Camera calibration buttons specified by server. Simulation has option to remove sample 2025-07-31 20:56:55 +01:00
Joe Knapper
c00c027ab1 Apply suggestions from code review of branch img-name
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-07-31 14:52:21 +00:00
jaknapper
df918bf286 Prepend images with img_ 2025-07-31 13:53:57 +01:00
Julian Stirling
931a570b43 Merge branch 'purge-recentre' into 'v3'
Remove auto-recentre stage

Closes #486

See merge request openflexure/openflexure-microscope-server!339
2025-07-30 09:05:10 +00:00
jaknapper
10a49db9c9 Remove autorecentre 2025-07-29 18:29:15 +01:00
Julian Stirling
38f4a745c3 Fix bug with setting exposure time on load, add associated test 2025-07-29 14:05:12 +01:00
Julian Stirling
b90b02cf7d Better fix for exposure drift with more complete testing. Also fix return value for capture_to_memory 2025-07-29 12:11:45 +01:00
Julian Stirling
376780ea28 Stop exposure walking on camera reload, reset CCM on full calibration 2025-07-28 14:43:48 +01:00
Julian Stirling
547704fdc0 Merge branch 'bg_detect_in_camera' into 'v3'
Refactor background detect to allow switching algorithms

See merge request openflexure/openflexure-microscope-server!327
2025-07-28 09:21:43 +00:00
Julian Stirling
c17d7af1ab Apply suggestions from code review of branch bg_detect_in_camera 2025-07-27 19:26:05 +00:00
Julian Stirling
8e133a978d Clean up LUV background detect calculation 2025-07-27 10:32:33 +01:00
Julian Stirling
238d022342 Apply suggestions from code review of branch bg_detect_in_camera
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-07-26 16:45:06 +01:00
Joe Knapper
b4eaf48785 Merge branch 'Stitch-all' into 'v3'
Stitch all scans button, and refresh scan tab when closing modals

See merge request openflexure/openflexure-microscope-server!330
2025-07-25 17:20:03 +00:00
Joe Knapper
d6f1502593 Apply suggestions from code review of branch Stitch-all
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-07-25 16:42:27 +00:00
jaknapper
7ac77c3e89 Stitch all scans button, and refresh scan tab when closing modals 2025-07-25 16:52:37 +01:00
Julian Stirling
cc05ab4b5f Finish basic tests of background detect 2025-07-25 11:55:20 +01:00
Julian Stirling
d0b5db21ba Start adding background detect tests 2025-07-25 11:52:02 +01:00
Julian Stirling
ab6ccd429a Fix DataSchema return for background detector status 2025-07-24 18:37:34 +01:00
Julian Stirling
75bdae5593 Fix message formatting and dosctring syntax 2025-07-24 17:54:58 +01:00
Julian Stirling
25d2f400b1 Set background on the pi-camera during initial calibration 2025-07-24 17:15:28 +01:00
Julian Stirling
eed3c44804 Get new background detect running in simulation mode. 2025-07-24 17:08:39 +01:00
Julian Stirling
fe1b84a922 Complete first pass (untested on hardware) of bg detect refactor. 2025-07-24 17:07:50 +01:00
Julian Stirling
2245d9357d Continue to rebase background detect. 2025-07-24 17:07:50 +01:00
Julian Stirling
b5586a4b32 A partial refactor of background detect 2025-07-24 17:07:50 +01:00
Julian Stirling
31e3d15890 Add random noise to simulation image 2025-07-24 16:17:52 +01:00
Julian Stirling
5701225158 Update simulation canvas to have colour so it works with background detect. 2025-07-24 15:58:32 +01:00
Julian Stirling
c8e87577cb Add tests for new system Thing. 2025-07-15 00:14:07 +01:00
Julian Stirling
e3146f1798 Apply suggestions from code review of branch merge-settings-and-system-control
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-07-14 21:32:17 +00:00
Julian Stirling
9369b2988d Shutdown button terminates server in simulation. Adjust power tab layout 2025-07-14 18:57:36 +01:00
Julian Stirling
be94df7c8a Merge SettingsManager and SystemControl Things. 2025-07-14 17:59:46 +01:00
Julian Stirling
bed59c051b Merge branch 'update-setting-manager' into 'v3'
Update setting manager

Closes #477, #343, and #475

See merge request openflexure/openflexure-microscope-server!321
2025-07-14 16:47:41 +00:00
Julian Stirling
c9c8a89236 Merge branch 'simplify-csm-interface' into 'v3'
Add camera-stage-mapping compliant functions to BaseStage and BaseCamera.

Closes #346 and #476

See merge request openflexure/openflexure-microscope-server!326
2025-07-14 16:36:04 +00:00
Julian Stirling
34f8f86ef2 Apply suggestions from code review of branch update-setting-manager
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-07-14 17:11:54 +01:00
Julian Stirling
5c1f8f2e89 Write tests for checking git hash 2025-07-14 17:11:53 +01:00
Julian Stirling
608c4bd16f Expose version as thing property and via thing state so it ends up in metadata. 2025-07-14 17:11:53 +01:00
Julian Stirling
1dd0db888d Starting to create version reading code 2025-07-14 17:11:53 +01:00
Julian Stirling
d19d44ba4f Remove unused complex functionality from settings_manager.py. 2025-07-14 17:11:53 +01:00
Julian Stirling
59a5246904 Apply suggestions from code review of branch simplify-csm-interface
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-07-14 15:33:50 +00:00
Julian Stirling
705cf73173 Fixing docstrings for camera stage mapping changes. 2025-07-13 23:53:44 +01:00
Julian Stirling
531e5c27b2 Replace LoggingMoveWrapper with RecordedMove accepts a stage rather than an arbitrary move function
This was needed to get the correct key word arguments
2025-07-13 23:34:55 +01:00
Julian Stirling
b89449be77 Add camera-stage-mapping compliant functions to BaseStage and BaseCamera. 2025-07-13 21:55:55 +01:00
Julian Stirling
fab5fdfca2 Improve log filtering and logging error handling. Adding more logging tests. 2025-07-13 15:17:11 +01:00
Julian Stirling
ea73e44b01 Start adding tests for the loging configuration. 2025-07-13 14:28:55 +01:00