Commit graph

Select branches

Hide pull requests

fafo

Mono Color

• b8ddab1ed8 Remove correlation only stitching, now covered by preview stitch jaknapper 2025-04-14 17:34:11 +01:00
• 5bfadceeeb Pink icon for thumbnail placeholders jaknapper 2025-04-23 16:13:47 +01:00
• 5ca4c824aa Remove producing thumbnail (to be added to stitching repo) jaknapper 2025-04-23 14:28:41 +01:00
• 7617d31194 Errors raised as errors, not logs jaknapper 2025-04-23 14:28:05 +01:00
• 3adc34c30b Merge branch 'dont-test-focus-change' into 'v3' Julian Stirling 2025-04-23 11:28:05 +00:00
• c4dc357cf3 Apply 1 suggestion(s) to 1 file(s) Joe Knapper 2025-04-23 10:57:56 +00:00
• 283a10c560 Always move back to expected focus after failed autofocus Joe Knapper 2025-04-23 09:15:54 +00:00
• 0ac455bf89 Merge branch 'autofocus-at-start' into 'v3' Julian Stirling 2025-04-23 08:10:21 +00:00
• 91057f164a Thumbnails and accurate durations in scan-list tab jaknapper 2025-04-22 19:02:29 +01:00
• 3bcc71304e Fixed focused path tracking, move to estimated focus before autofocus jaknapper 2025-04-22 14:33:27 +01:00
• 7cb1a3980e Remove focus_change_acceptable test, autofocus from centre jaknapper 2025-04-17 17:20:40 +01:00
• 5d8a1073b2 Remove focus_change_acceptable jaknapper 2025-04-16 18:29:33 +01:00
• 257d700333 Merge branch 'shorter-move-spiral-path' into 'v3' Julian Stirling 2025-04-17 15:37:52 +00:00
• 07cbef0536 Reimplement tie breaking by distance between Joe Knapper 2025-04-17 10:25:40 +01:00
• c895383a83 Remove repeated moves_from_centre() code jaknapper 2025-04-17 10:10:13 +01:00
• c18472dc8a Add the import info for ScanPlanner jaknapper 2025-04-17 09:51:03 +01:00
• 041106ebea Only open pickle file if planner was successfully generated Joe Knapper 2025-04-17 08:48:14 +00:00
• 1248c2b7c8 Remove unneeded third sort key Joe Knapper 2025-04-17 08:47:24 +00:00
• 871cab72f4 Apply 5 suggestion(s) to 2 file(s) Joe Knapper 2025-04-17 08:43:51 +00:00
• 2741123cf9 Looping autofocus at the start of the scan jaknapper 2025-04-16 18:47:47 +01:00
• c18667c973 Update pickles Joe Knapper 2025-04-15 16:38:11 +01:00
• b414697cfb Update testing for multiple sample shapes Joe Knapper 2025-04-15 16:29:29 +01:00
• 7373424fcf Ruff formatting jaknapper 2025-04-15 10:40:45 +01:00
• ec25ae7126 Add a scan path planner that prioritises shorter moves jaknapper 2025-04-14 18:37:30 +01:00
• be64d4c5e0 Merge branch 'further-scan-refactor' into 'v3' Julian Stirling 2025-04-14 16:07:37 +00:00
• 06632f195e Spelling corrections and docstring improvements Julian Stirling 2025-04-14 15:46:27 +00:00
• bd411db5ea Relax line length when linting (increased checker) Julian Stirling 2025-04-14 09:25:01 +01:00
• 7f46bc2d9b Fixing capture_thread variable and autofocus logic Julian Stirling 2025-04-14 00:03:39 +01:00
• 2ced848695 Add functionality for testing the scan planner on a given sample shape Julian Stirling 2025-04-13 18:01:06 +01:00
• a0b6dbdfce Add weay to access a copy of the data from a ScanPlanner Julian Stirling 2025-04-13 17:05:28 +01:00
• 91073535a8 More tests for scan planners Julian Stirling 2025-04-13 12:52:05 +01:00
• 842e196f9b Add some basic tests, and do minor fixes based on tests and MyPy Julian Stirling 2025-04-12 01:03:08 +01:00
• 1f66e8bc7a Enormous refactor of the scan code, was hard to find an intermediate working place to commit Julian Stirling 2025-04-11 21:13:05 +01:00
• cddb49c9f7 Clean up code as I remove bare excepts Julian Stirling 2025-04-11 14:36:55 +01:00
• 2c171026be Still tidying the start end end of the scan code Julian Stirling 2025-04-11 11:37:04 +01:00
• 797f3bcb60 Collecting scan parameters into dictionary that will become a dataclass Julian Stirling 2025-04-11 00:43:51 +01:00
• 19a4724eb9 Merge branch 'more-linting' into 'v3' Joe Knapper 2025-04-14 09:02:28 +00:00
• 7665d45e09 Make the coverage report touch all files Julian Stirling 2025-04-11 23:29:32 +01:00
• 1c871749b0 Remove module level noqa from background detect. Julian Stirling 2025-04-11 12:32:32 +01:00
• 4eeff35e2d Fixes to naming to make basic lint checks pass Julian Stirling 2025-04-11 12:29:14 +01:00
• e4cfcc76a7 Add some extra rules to ruff, also add a more complete ruff config that fails Julian Stirling 2025-04-11 11:56:55 +01:00
• 5ab0a62964 Merge branch 'refactor-scanning' into 'v3' Julian Stirling 2025-04-10 22:05:40 +00:00
• b7c472bb24 fix comment on number of zeros padding the scan name Julian Stirling 2025-04-10 22:39:22 +01:00
• 31c768c12a Move @_scan_running decorator out of class and tidy as suggested in review Julian Stirling 2025-04-10 22:14:56 +01:00
• e030eb576b Add @scan_running decorator for scans to try to access to the scan logger for methods not called by the scan Julian Stirling 2025-04-10 16:26:57 +01:00
• 26e265f026 Fixes from review (mostly spellings) Julian Stirling 2025-04-10 16:35:49 +00:00
• 840c527cc2 Remove unused Stitching Thing Julian Stirling 2025-04-10 13:53:51 +01:00
• a5d55c95b8 Further tidying of scan directory variables Julian Stirling 2025-04-10 13:24:11 +01:00
• 90cfce146d Fix default scan name Julian Stirling 2025-04-10 11:46:16 +01:00
• 040373ef88 Run check background aonly fter scan variables are stored Julian Stirling 2025-04-10 11:45:57 +01:00
• 83d2930d1f Fix capture error handing Julian Stirling 2025-04-09 23:52:47 +01:00
• 70e7a21a29 Starting to refactor smart scan to rely on class variables Julian Stirling 2025-04-09 22:44:02 +01:00
• ff1184d453 Handle errors in capture thread Julian Stirling 2025-04-09 15:36:43 +01:00
• 5dd23f6ef4 Merge branch 'scanning-cleanup' into 'v3' Julian Stirling 2025-04-09 17:13:59 +00:00
• 1d5d67f35a Split out background detect into a new file Joe Knapper 2025-04-09 16:41:15 +01:00
• f4db9b6e52 Removed commented out code and unused functions Joe Knapper 2025-04-09 15:32:13 +01:00
• a5d1f1e965 Removed commented out code jaknapper 2025-04-09 12:07:03 +01:00
• e28a160b22 Ruff formatting adding commas jaknapper 2025-04-09 14:59:20 +01:00
• 8d14aee27c Breaking out capture and save code into three seperate methods jaknapper 2025-04-09 13:11:55 +01:00
• 6ec7487001 Merge branch 'inverse_colours' into 'v3' Joe Knapper 2025-04-09 11:08:59 +00:00
• 1044764192 Disable tour by removing shortcut and default to run jaknapper 2025-04-08 19:23:04 +01:00
• 9c2ab977c5 Removed imports and variable to pass Ruff linting jaknapper 2025-04-08 19:07:23 +01:00
• 52532a90d7 More spacing below buttons jaknapper 2025-04-08 18:41:11 +01:00
• 4fa2813e6a More spacing and nicer dark mode colours jaknapper 2024-10-03 14:01:41 +01:00
• 574aa1c6c0 Only grab a JPEG from the stream to get scanning working jaknapper 2025-04-08 17:52:55 +01:00
• d4247235e3 Merge branch 'csm-return-to-start' into 'v3' Joe Knapper 2025-04-08 12:49:38 +00:00
• bf82f37c47 Dependency bump for camera_stage_mapping to 0.1.8 Returns the errors we expect Joe Knapper 2025-04-08 12:09:15 +00:00
• e4ef8b2717 Merge branch 'consistent-logging' into 'v3' Joe Knapper 2025-04-08 11:31:33 +00:00
• 2cffe21727 Merge branch 'background-UV' into 'v3' Joe Knapper 2025-04-08 10:30:17 +00:00
• a4390255db Merge branch 'reorder_tabs' into 'v3' Julian Stirling 2025-04-08 10:27:18 +00:00
• b340da488e Use the UV channels only to determine if an area is background or sample jaknapper 2025-02-25 15:17:44 +00:00
• 3dab8f09a4 Merge branch 'purge-windows-line-endings' into 'v3' Julian Stirling 2025-04-08 10:07:14 +00:00
• 1493f51212 Purge all windows line endings and add check to formatter. Julian Stirling 2025-04-08 10:46:22 +01:00
• 3a47151694 Serve logfile and logs for UI seperately Julian Stirling 2025-04-07 23:38:09 +01:00
• 70d9e2f758 Add custom log handler for sending logs to UI Julian Stirling 2025-04-07 23:16:00 +01:00
• 421d4a5f10 Spaces in tab names, more space, centred jaknapper 2025-04-07 18:54:30 +01:00
• 3e82286245 Reorder GUI tabs to match the order of use jaknapper 2025-04-07 18:18:16 +01:00
• f5a41f76f3 Lazier regex for finding logs with square brackets jaknapper 2025-04-07 18:07:51 +01:00
• 33c74741fe Fixed import and re-raise cancelled error jaknapper 2025-04-07 15:46:20 +01:00
• a506625e40 Treat cancellation and other errors differently Joe Knapper 2025-04-07 14:22:43 +01:00
• 9995e5b3bb Import custom Mapping error from camera_stage_mapping Joe Knapper 2025-04-07 14:18:07 +01:00
• dd0b30df51 Stop uvicorn.run disabling existing loggers Julian Stirling 2025-04-06 15:19:39 +01:00
• 67443ff939 Capture ValueErrors, which covers most CSM errors, not all Exceptions jaknapper 2025-04-03 13:52:04 +01:00
• 46d513d9e6 Catch cancelled and other errors in single line jaknapper 2025-04-02 18:25:35 +01:00
• 26d488e75f Merge branch 'exposure-time-name' into 'v3' Julian Stirling 2025-04-02 17:09:26 +00:00
• 79b396a66f CSM always returns to start on error Joe Knapper 2025-04-02 17:54:12 +01:00
• 550c977f59 Merge branch 'split-ruff-ci' into 'v3' Julian Stirling 2025-04-02 13:41:35 +00:00
• 32f2a7ce70 Fix spurious line endings, don't allow ruff-format to fail anymore Julian Stirling 2025-04-02 14:25:22 +01:00
• 928d5ef300 Try pinning pydantic version as server now fails tests with error Julian Stirling 2025-04-02 13:52:42 +01:00
• 336b504377 Split up ruff format and lint allowing format to fail Julian Stirling 2025-04-02 13:39:12 +01:00
• 01d906e46a Rename exposure (with limit) jaknapper 2025-01-11 11:38:45 +00:00
• 9fb417e4e6 Edit v3 branch readme as we make it the Default branch to point people to master if they are looking for v2 code Julian Stirling 2025-02-21 10:40:25 +00:00
• e8ae496d08 Use published packages Richard Bowman 2024-12-16 17:55:25 +00:00
• 83e10b125b Fix return type annotation for autofocus Richard Bowman 2024-12-15 00:16:25 +00:00
• db11e03321 Constrain numpy < 2 Richard Bowman 2024-12-15 00:15:17 +00:00
• d9c8a083fd Merge branch 'v3-ci-and-tests' into 'v3' Richard Bowman 2024-12-03 14:42:48 +00:00
• 1d59cddac1 Disable pytest code quality report Richard Bowman 2024-12-03 14:19:36 +00:00
• c3cd30b642 Only rebuild docker for changes Richard Bowman 2024-12-03 12:54:34 +00:00
• 71e6d84aa4 Build docker image and run ruff/pytest Richard Bowman 2024-12-03 12:18:45 +00:00
• 77794c94eb Update documentation on dependencies/dev tools Richard Bowman 2024-12-03 11:18:24 +00:00