Commit graph

760 commits

Author SHA1 Message Date
Chish36
6bed02eccf Removed assert statement and replaced with custom exception 2025-10-17 15:19:06 +01:00
Chish36
ab9a324122 Typehint added and import removed. 2025-10-17 15:19:06 +01:00
Chish36
1afaa53413 Removed cv2 resize 2025-10-17 15:19:06 +01:00
Chish36
3a0961e9dc Clearer dictionary keys 2025-10-17 15:19:06 +01:00
Chish36
8dad346320 Made changes to docstrings and a few minor code changes. 2025-10-17 15:19:06 +01:00
Chish36
875bf1a6de Fixed ruff format errors 2025-10-17 15:19:06 +01:00
Chish36
e95f31d832 Resolved data tracking error. 2025-10-17 15:19:06 +01:00
Chish36
f501e7741d More refactoring 2025-10-17 15:19:06 +01:00
Chish36
024c74f67b More docstrings and comments. Removed json dump to openflexure folder. 2025-10-17 15:19:06 +01:00
Chish36
4cde2d5cd1 Changed typehints to literal for axis and direction 2025-10-17 15:19:06 +01:00
Chish36
897cb022b1 Improved code readability 2025-10-17 15:19:06 +01:00
Chish36
d6c47bd43e Ruff formatting stuff 2025-10-17 15:19:06 +01:00
Chish36
6579a65f84 Made changes based on ruff-lint-increased feedback 2025-10-17 15:19:06 +01:00
Chish36
32129125d6 Fixed spelling 2025-10-17 15:19:06 +01:00
Chish36
8ce7f9f779 Removed empty lines 2025-10-17 15:19:06 +01:00
Chish36
d035b186a2 Updated docstrings 2025-10-17 15:19:06 +01:00
Chish36
f0a67bac19 Type set and added default values to data tracker class 2025-10-17 15:19:06 +01:00
Chish36
4106d0348c Delta is tracked with class now 2025-10-17 15:19:06 +01:00
Chish36
63bd34f548 Removed focus_data 2025-10-17 15:19:06 +01:00
Chish36
db0dc11274 Tracking correlations and stage coordinates with class now. 2025-10-17 15:19:06 +01:00
Chish36
47bc1479e2 Changed function names. 2025-10-17 15:19:06 +01:00
Chish36
703e8293d5 Rom data is now saved to settings.json 2025-10-17 15:19:06 +01:00
Chish36
f7264441e1 Updated labthings dependencies 2025-10-17 15:19:06 +01:00
Chish36
38906c8fff Moved quadratic function to utilities file 2025-10-17 15:19:05 +01:00
Chish36
d494761cbb Updated docstrings and fixed ruff errors 2025-10-17 15:19:05 +01:00
Chish36
1c7527c2ef Parisitic motion is now tracked with an exception 2025-10-17 15:19:05 +01:00
Chish36
23d53949b4 Small moves and medium moves are now in separate functions 2025-10-17 15:19:05 +01:00
Chish36
61c3877202 Removed the need for steps_generate function 2025-10-17 15:19:05 +01:00
Chish36
e74ac9d859 Improved docstrings and type hints. 2025-10-17 15:19:05 +01:00
Chish36
e327305549 Docstring added 2025-10-17 15:19:05 +01:00
Chish36
b90ecf8c49 Motion detection is now a function and a few other minor tweaks 2025-10-17 15:19:05 +01:00
Chish36
ada120db9c Minor tweaks to z_pred and lowered tolerance for failure 2025-10-17 15:19:05 +01:00
Chish36
154870142d Optional autofocus and other minor tweaks 2025-10-17 15:19:05 +01:00
Chish36
725f993366 Typehints and docstrings added 2025-10-17 15:19:05 +01:00
Chish36
0267251a18 Move and measure and z predict are now separate functions 2025-10-17 15:19:05 +01:00
Chish36
71e21d1e72 Step range and all other data is saved to stage_measure thing 2025-10-17 15:19:05 +01:00
Chish36
e0b086bdc8 Added parisitic motion detect, z prediction and saved results 2025-10-17 15:19:05 +01:00
Chish36
eb01aaf017 Completes all necessary movements along a single axis 2025-10-17 15:19:05 +01:00
jaknapper
416830cbe8 Strip new lines when logging stitching 2025-10-10 12:27:09 +01:00
Julian Stirling
4135532476 Apply suggestions from code review of branch ce-disable 2025-10-09 17:46:13 +01:00
Joe Knapper
909de1709d set ce_enable in tuning_utils 2025-10-09 15:36:01 +01:00
Julian Stirling
94541b2d4f Merge branch 'stack-height-sanitise' into 'v3'
Verify stack params at start of scan main loop

Closes #455

See merge request openflexure/openflexure-microscope-server!400
2025-10-09 14:00:59 +00:00
Joe Knapper
089beae01a Tests for coercing stack params to valid values.
Co-authored with Julian Stirling
2025-10-09 14:26:01 +01:00
Joe Knapper
fa6fdb1a67 Stack parameter coercion in create_stack_params
Co-authored with Julian Stirling
2025-10-09 14:23:47 +01:00
Joe Knapper
33ff356f76 Apply suggestions from code review of branch stack-height-sanitise
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-10-09 14:22:48 +01:00
Richard Bowman
c89db72d0a Don't coerce or log from validators.
Passing a logger in to the Model is hard: I've changed the
StackParams model so that it only validates, and raises a
ValueError if it's not correct.

Pydantic will turn the ValueError into a ValidationError.
2025-10-09 14:22:45 +01:00
Joe Knapper
05e0394485 StackParams as pydantic basemodel with validators 2025-10-09 14:22:42 +01:00
Joe Knapper
f90e716d8e Stack limits as globals 2025-10-09 14:22:40 +01:00
jaknapper
18e49ba50c Test stack params at start of scan main loop 2025-10-09 14:22:37 +01:00
Julian Stirling
6a2d69ed04 Merge branch 'primary-buttons' into 'v3'
Clean up primary vs secondary buttons

Closes #554

See merge request openflexure/openflexure-microscope-server!402
2025-10-07 14:15:45 +00:00