Commit graph

2059 commits

Author SHA1 Message Date
Joel Collins
3099db201f Merge branch 'jsclient-refactor' into 'master'
JS Client refactor and gallery pages

See merge request openflexure/openflexure-microscope-server!80
2020-10-27 17:16:23 +00:00
Joel Collins
81ca64e0d8 Properly set up ESLint 2020-10-27 17:05:57 +00:00
Joel Collins
e1cca30deb Added pagination to gallery 2020-10-27 16:37:11 +00:00
Joel Collins
e3a45b84d8 Fixed gallery overflow 2020-10-27 16:36:40 +00:00
Joel Collins
89b1f9dac9 Fixed incorrect import 2020-10-27 16:36:30 +00:00
Joel Collins
eff03bfa2c Rearranged main components 2020-10-27 14:52:27 +00:00
Joel Collins
250fd07e9a Code formatting and linting 2020-10-27 14:14:59 +00:00
Joel Collins
13b4c84783 Fixed node_modules exclusion from Black 2020-10-27 14:12:41 +00:00
Joel Collins
10d264c526 Always use builtin JPEG thumbnails 2020-10-27 14:05:24 +00:00
Joel Collins
09849ce064 Explicit JPEG thumbnail on capture 2020-10-27 14:04:55 +00:00
Joel Collins
9ff0aa331b 2.6.5 2020-10-26 15:43:55 +00:00
Joel Collins
729e473ea0 Close #186 2020-10-26 15:41:59 +00:00
Joel Collins
7a12dfb44b 2.6.4 2020-10-26 15:11:33 +00:00
Joel Collins
601e51d9b9 Code formatting 2020-10-26 14:58:09 +00:00
Joel Collins
ef4e825b9c Merge branch 'temporary' into 'master'
Added a spiral scan option

See merge request openflexure/openflexure-microscope-server!75
2020-10-26 14:54:23 +00:00
Joel Collins
58f7686aea Added a settle time to all stage moves 2020-10-26 14:51:34 +00:00
Joel Collins
9b4031ff12 Changed frame tracker logging level to debug 2020-10-26 14:33:40 +00:00
Joel Collins
cf3adf2101 Merge branch 'fixed-segfault' into 'master'
Fix #183

Closes #148 and #183

See merge request openflexure/openflexure-microscope-server!79
2020-10-26 13:57:36 +00:00
Joel Collins
a258b6338d Close #148 2020-10-26 13:48:33 +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
0b40974138 2.6.3 2020-10-22 16:01:21 +01:00
Joel Collins
3c63d6a240 Overhauled autofocus tracker 2020-10-22 16:00:52 +01:00
Joel Collins
68748a26c5 Never allow pylint failure 2020-10-22 16:00:35 +01:00
Joel Collins
cd8145c198 Isort 2020-10-22 15:59:19 +01:00
Joel Collins
bbda15b08d 2.6.2 2020-10-21 11:40:47 +01:00
Joel Collins
355b3cd8f2 Fixed argument parsing in PreferredLocationGUIView 2020-10-21 11:40:03 +01:00
Joel Collins
4ee1919252 2.6.1 2020-10-20 15:36:30 +01:00
Joel Collins
20fc0eb20e 2.6.0 2020-10-20 14:28:34 +01:00
Joel Collins
a5d0395334 Simplified tab icon style 2020-10-20 13:17:49 +01:00
Joel Collins
4234401b29 2.6.0-beta.2 2020-10-19 18:36:00 +01:00
Joel Collins
1677f0df76 Blackened 2020-10-19 18:34:58 +01:00
Joel Collins
b9bed71272 Merge branch 'old-fast-autofocus' into 'master'
Old fast autofocus

See merge request openflexure/openflexure-microscope-server!77
2020-10-19 17:24:44 +00:00
Joel Collins
4ae39db402 Revert scan to use old fast autofocus 2020-10-19 18:20:40 +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
e6913b23e2 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server into master 2020-10-16 15:42:17 +01:00
Joel Collins
d4c040bcac Fixed duplicated mini previews in settings 2020-10-16 15:42:11 +01:00
Joel Collins
a3a00f8a68 2.6.0-beta.1 2020-10-16 14:54:41 +01:00
Joel Collins
02766382e0 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2020-10-16 14:53:41 +01:00
Joel Collins
a8648ea90e Upgraded to LabThings 1.1.1 2020-10-16 14:53:18 +01:00
Joel Collins
c33fb6afc8 Fixed initial stream object 2020-10-16 14:53:10 +01:00
Joel Collins
b3332c078d Fixed misuse of id name 2020-10-16 14:53:02 +01:00
Joel Collins
a5401a0a2e Cleaned up layout 2020-10-16 14:47:55 +01:00
Joel Collins
157eb28053 Fix stage geometry URL 2020-10-16 14:41:34 +01:00
Joel Collins
b2c6c93284 Fix download button formatting 2020-10-16 14:41:23 +01:00
Joel Collins
0bc98104e2 Update lockfile 2020-10-16 14:41:13 +01:00
Joel Collins
01539bef3e Merge branch 'code-cleanup' into 'master'
Fixed pylint line ignores

See merge request openflexure/openflexure-microscope-server!76
2020-10-16 09:35:41 +00:00
Joel Collins
9310deeeff Fixed pylint line ignores 2020-10-16 09:35:41 +00:00