Commit graph

62 commits

Author SHA1 Message Date
Richard Bowman
3f9c3447de Fixed typos in comments spotted in code review 2023-03-23 13:31:25 +00:00
Richard Bowman
106b50d333 Format fixes from black 2022-08-09 13:17:45 +01:00
Richard Bowman
9dbb083ee7 More Marshmallow argument updates 2022-08-09 13:16:10 +01:00
Richard Bowman
e22f36b308 Start explicit metadata argument for marshmallow
A side effect of re-locking dependencies is having a newer marshmallow.
This deprecates having `description=` as a keyword, and puts it in a
separate metadata arg instead.

This commit is the start of my search-and-replaceing to update to the new
format.
2022-08-09 12:52:57 +01:00
Richard Bowman
78ef9c531b Format fixes from black 2022-08-09 09:37:03 +01:00
Richard Bowman
a9fff24848 Explicitly specify encoding
The update to pylint means we were failing because open()
doesn't specify the encoding everywhere.  I have now specified utf-8
everywhere.  This was patchy before, and is default behaviour on the
Pi.  There's a slim chance it will cause some issues on Windows, but
that shouldn't affect anyone outside the developers.

I've also ignored a couple of new spurious warnings, and explicitly
ignored some unused variables.
2022-08-09 07:16:44 +01:00
Richard Bowman
23bf3410f3 Code formatting fixes from black 2022-01-13 14:47:38 +00:00
Joe Knapper
2d494b41d9 Added docstring for measure_settling_time and hold 2022-01-11 15:46:15 +00:00
Joe Knapper
ecbdd8a5bf Added measure_settling_time function to autofocus 2021-12-01 13:09:32 +00:00
Richard Bowman
040d7d4ba6 Fix action wrapper
The action wrapper was using an unbound function - it
now passes the extension object as self.

We were incorrectly passing endpoint names as positional arguments -
this is fixed and I now use a keyword argument.
2021-08-17 12:11:20 +01:00
Richard
ba0f78df84 fix typing in autofocus
I have an Optional dz, which is then
populated with a default if it's None.
I've added an explicit cast() to explain this to mypy.
2021-07-19 21:18:25 +01:00
Richard
72f3c11fdd linting and typing fixes 2021-07-19 20:29:13 +01:00
Richard
b7c9d3b73b Sorted remaining content_type issues and blackened 2021-07-19 20:09:09 +01:00
Richard
9892c7079a moved find_microscope into functions 2021-07-13 22:50:42 +01:00
Richard
c81c4eb64d Better API docs for autofocus extension 2021-07-06 15:24:17 +01:00
Richard Bowman
1cea75be70 Formatting fixes 2021-03-31 09:40:31 +01:00
Richard Bowman
e73ee8875c Fixed type annotations in autofocus and mock stage
I don't know why these didn't fail before - possibly because of
incomplete type information from old numpy...
I removed a few annotations because they were failing (e.g.
np.sum can return a scalar or an array), but I don't think
this should be a problem - the function inputs and return values
are still typed.
2021-03-30 17:51:00 +01:00
Richard Bowman
cd5e32b843 Removed deprecated np.float
numpy 1.20 deprecates np.float, which was only ever an alias for
``float``.  I've replaced all occurrences of np.float with float, as
recommended.  There should be no change in functionality.
2021-03-30 17:40:19 +01:00
Joel Collins
58b2967f53 Fixed autofocus 'PiCameraStreamer' object has no attribute 'annotate_text' error 2020-12-07 10:12:30 +00:00
Joel Collins
63b633ba44 2.9 dev numpy types 2020-12-04 13:35:11 +00:00
Joel Collins
8d0759e9e0 Updated default extensions to subclass structure 2020-11-30 16:41:39 +00:00
Joel Collins
7866ec0f47 Static type analysis 2020-11-30 13:36:45 +00:00
Joel Collins
6fb61e1e3f Reverted logging style 2020-11-12 15:45:58 +00:00
Joel Collins
9f5252194a Updated all log strings to new format 2020-11-12 15:12:17 +00:00
Joel Collins
da490fdfcd Separated move_and_measure locks 2020-10-28 15:40:29 +00:00
Joel Collins
459a8dc2a3 Reset tracker frames after each mode 2020-10-26 13:36:36 +00:00
Joel Collins
574f4a615d Fast AF use normal stream 2020-10-26 13:16:58 +00:00
Joel Collins
3c63d6a240 Overhauled autofocus tracker 2020-10-22 16:00:52 +01:00
Joel Collins
1677f0df76 Blackened 2020-10-19 18:34:58 +01:00
Joel Collins
51ff132633 Refactored fast_autofocus 2020-10-19 18:17:29 +01:00
Joel Collins
2186bf7aaa Add /updownup_autofocus view 2020-10-19 17:59:54 +01:00
Joel Collins
4ceb6bcafe Separate "classic" fast AF from up-down-up AF 2020-10-19 17:59:07 +01:00
Joel Collins
994e83dbeb Code cleanup 2020-10-14 14:56:29 +00:00
Joel Collins
2bfb988460 Code formatting 2020-10-13 15:02:19 +01:00
Joel Collins
345d497166 Fixed MoveAndMeasureAPI args schema 2020-09-30 16:27:28 +01:00
Joel Collins
317bde6371 Added MoveAndMeasureAPI view 2020-09-28 13:38:27 +01:00
Joel Collins
5c99da264f Added posh stop to slow autofocus 2020-07-22 16:11:13 +01:00
Joel Collins
24398ba7dc Updated tasks nomenclature 2020-07-21 12:54:42 +01:00
Joel Collins
29ee73cedc Fixed argument 'missing' values 2020-06-29 16:39:37 +01:00
Joel Collins
e6cb9f6b35 Initial 0.7.0 conversion 2020-06-29 15:24:59 +01:00
Joel Collins
9cecb477cb Flipped to explicit finite lock timeouts 2020-06-29 09:03:27 +01:00
Joel Collins
1819ca6a9c Switched to ActionView and PropertyView from decorators 2020-05-26 10:54:21 +01:00
Joel Collins
4a553040d3 Fixed logging and split access and root file handlers 2020-05-20 17:46:44 +01:00
Joel Collins
eaf4cf09f5 Updated to new Action tasks 2020-05-12 11:29:53 +01:00
Joel Collins
28e555ad9b Added explicit endpoints 2020-05-10 16:35:16 +01:00
Joel Collins
9646058c37 Code format 2020-04-28 13:20:38 +01:00
Joel Collins
6fcd8caf91 Merge branch 'autofocus-error-messages' into 'master'
Autofocus error messages

See merge request openflexure/openflexure-microscope-server!54
2020-04-24 15:14:37 +00:00
Joel Collins
cda5cdbb44 Switched away from using JSONify 2020-04-24 16:05:01 +01:00
Richard Bowman
be85d07210 Attempt to start the stream if it's stopped. 2020-04-23 11:22:14 +01:00
Richard Bowman
5a4aae8ed1 Added helpful errors if the stream has stopped 2020-04-23 11:15:10 +01:00