Commit graph

1104 commits

Author SHA1 Message Date
Richard Bowman
90f5a755b1 Handle absolute moves correctly
I've changed the default values in MoveStageAPI
so that it correctly handles absolute moves with missing axes.
I've also simplified it so it isn't using axes_to_array as that
resulted in a confusing code path.
2021-04-27 10:55:51 +01:00
Richard Bowman
2eade9ed30 Handle None in axes_to_array
None values should be treated the same as missing ones -
previously it would just crash.
2021-04-27 10:52:52 +01:00
Richard Bowman
e86e4d983a Merge branch 'abandon-poetry' into 'master'
Move away from poetry

Closes #218

See merge request openflexure/openflexure-microscope-server!124
2021-04-21 10:57:28 +00: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
Kaspar Emanuel
97bbbdee84 Merge branch 'ihi_scan' into 'master'
IHI scan style raster

See merge request openflexure/openflexure-microscope-server!113
2021-03-30 12:29:32 +00:00
Richard Bowman
af7ef08f63 Move away from poetry
More or less everything is now done by setup.py
Pipfile simply installs the module in editable mode, which
recursively resolves dependencies as defined in setup.py.
2021-03-26 21:11:22 +00:00
Richard Bowman
2b3c0a9bac Make the origin override persistent
The dev tools pane now remembers the last address you entered in
"override origin" to save a few clicks  when doing local Vue development
2021-02-09 09:46:52 +00:00
Richard Bowman
a9ef605c33 Merge branch 'fix-tour-placement' into 'master'
Fix tour placement

Closes #199

See merge request openflexure/openflexure-microscope-server!114
2021-02-06 15:32:27 +00:00
Richard Bowman
afbb71607d Fix placement of tour messages for icons
The tour pop-ups were getting stuck in the tab icon container.
Explicitly specifying that they could overflow said container,
and setting them to show to the right, seems to have fixed this issue.
2021-02-06 15:32:27 +00:00
Richard Bowman
9c069ef372 Allow MissingStage to be explicitly selected
You can now set the stage type to "MissingStage" in
microscope_configuration.json to stop the server looking for the stage.
A warning is logged to make it obvious what's happening.
2021-02-04 20:31:20 +00:00
Joe Knapper
3d47591cc9 Explicitly state IHI scan style as raster rather than server default 2021-02-03 12:18:57 +00:00
Joel Collins
5232b36644 Test cobertura mypy coverage report 2021-01-08 10:05:31 +00:00
Joel Collins
ef0f74838a Removed unused import 2021-01-07 10:09:43 +00:00
Joel Collins
e8560a1d5d Removed unused ERROR_SOURCES 2021-01-06 17:31:58 +00:00
Joel Collins
61554af270 Restructured camera rescue 2021-01-06 17:31:45 +00:00
Joel Collins
3501a5b624 Merge branch 'picamera-rescue' into 'master'
Picamerax error recovery

See merge request openflexure/openflexure-microscope-server!86
2021-01-05 17:11:03 +00:00
Joel Collins
f877c4f745 Added Spiral scan to standard options 2021-01-05 14:30:49 +00:00
Joel Collins
0592d31b22 Fix #194 2020-12-14 15:00:37 +00:00
Joel Collins
18956bf230 Update README.md 2020-12-09 16:04:23 +00:00
Joel Collins
68380385cb Watch for broken frames using JPEG end bytes, and log error 2020-12-08 18:07:05 +00:00
Joel Collins
d2488c566a Added more Advanced bitrate controls 2020-12-08 17:57:42 +00:00
Joel Collins
0626b13bfd Formatting 2020-12-07 17:08:47 +00:00
Joel Collins
42e0dfd39c Replaced MJPEG quality setting with MJPEG bitrate 2020-12-07 17:05:56 +00:00
Joel Collins
3e2f876627 Added mjpeg bitrate to settings 2020-12-07 16:49:00 +00:00
Joel Collins
9659c45bb4 Fixed SangaDeltaStage type annotations 2020-12-07 12:44:34 +00:00
Joel Collins
c75a7c5401 Lockfile update 2020-12-07 11:13:35 +00:00
Joel Collins
9d04842c56 Handle missing this.$refs.textboxKey ref 2020-12-07 11:12:07 +00:00
Joel Collins
599c31534d globalUpdateCaptures after scan 2020-12-07 10:37:04 +00:00
Joel Collins
58b2967f53 Fixed autofocus 'PiCameraStreamer' object has no attribute 'annotate_text' error 2020-12-07 10:12:30 +00:00
Joel Collins
311366c943 Added type hints to CSM extension 2020-12-04 17:05:40 +00:00
Joel Collins
920354537a Integrated CSMExtension 2020-12-04 16:05:39 +00:00
Joel Collins
7ba3f447e1 Added extra type hints 2020-12-04 15:23:03 +00:00
Joel Collins
1de6b2a0ab Fixed onScanError 2020-12-04 15:14:30 +00:00
Joel Collins
8eff136cc3 Reduced logging level of some mock camera notices 2020-12-04 15:09:45 +00:00
Joel Collins
4d1d0a15c4 Added log level filter 2020-12-04 15:08:47 +00:00
Joel Collins
08f653233b Fixed onError propagation 2020-12-04 15:08:39 +00:00
Joel Collins
213dec3e5c Fixed individual captures creating 'undefined' dataset 2020-12-04 14:24:00 +00:00
Joel Collins
3c3ecd7f0c Updated dependencies 2020-12-04 13:39:49 +00:00
Joel Collins
63b633ba44 2.9 dev numpy types 2020-12-04 13:35:11 +00:00
Kaspar Emanuel
805b9012dd Make linter happy 2020-12-02 10:57:07 +00:00
Kaspar Emanuel
cc73aec257 Detect picamera in use error 2020-12-02 10:46:23 +00:00
Kaspar Emanuel
cc1c5e77c3 Format check_picamera.py with black 2020-12-02 10:46:23 +00:00
Kaspar Emanuel
fbd3b349df Detect camera not enabled picamerax error 2020-12-02 10:46:21 +00:00
Joel Collins
f2a2d880f2 Stricter runtime type checks 2020-12-01 17:30:53 +00:00
Joel Collins
fd42e2e2b6 Fixed broken dataset rendering if key exists but is empty 2020-12-01 17:13:20 +00:00
Joel Collins
ac667c3e2a Fixed types in move_rel method 2020-12-01 17:10:47 +00:00
Joel Collins
bc9b80d11a Added start_worker and get_frame for compatibility 2020-12-01 17:10:25 +00:00
Joel Collins
37f92b6cce Linting fixes 2020-11-30 17:17:14 +00:00