Commit graph

  • 4ae39db402 Revert scan to use old fast autofocus Joel Collins 2020-10-19 18:20:40 +01:00
  • 51ff132633 Refactored fast_autofocus Joel Collins 2020-10-19 18:17:29 +01:00
  • 2186bf7aaa Add /updownup_autofocus view Joel Collins 2020-10-19 17:59:54 +01:00
  • 4ceb6bcafe Separate "classic" fast AF from up-down-up AF Joel Collins 2020-10-19 17:59:07 +01:00
  • e6913b23e2 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server into master Joel Collins 2020-10-16 15:42:17 +01:00
  • d4c040bcac Fixed duplicated mini previews in settings Joel Collins 2020-10-16 15:42:11 +01:00
  • a3a00f8a68 2.6.0-beta.1 Joel Collins 2020-10-16 14:54:41 +01:00
  • 02766382e0 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server Joel Collins 2020-10-16 14:53:41 +01:00
  • a8648ea90e Upgraded to LabThings 1.1.1 Joel Collins 2020-10-16 14:53:18 +01:00
  • c33fb6afc8 Fixed initial stream object Joel Collins 2020-10-16 14:53:10 +01:00
  • b3332c078d Fixed misuse of id name Joel Collins 2020-10-16 14:53:02 +01:00
  • a5401a0a2e Cleaned up layout Joel Collins 2020-10-16 14:47:55 +01:00
  • 157eb28053 Fix stage geometry URL Joel Collins 2020-10-16 14:41:34 +01:00
  • b2c6c93284 Fix download button formatting Joel Collins 2020-10-16 14:41:23 +01:00
  • 0bc98104e2 Update lockfile Joel Collins 2020-10-16 14:41:13 +01:00
  • 01539bef3e Merge branch 'code-cleanup' into 'master' Joel Collins 2020-10-16 09:35:41 +00:00
  • 9310deeeff Fixed pylint line ignores Joel Collins 2020-10-16 09:35:41 +00:00
  • 68d578e825 Merge branch 'code-cleanup' into 'master' Joel Collins 2020-10-14 14:56:30 +00:00
  • 994e83dbeb Code cleanup Joel Collins 2020-10-14 14:56:29 +00:00
  • ad8fd54cb7 Added a spiral scan option Joe Knapper 2020-10-14 15:52:44 +01:00
  • 2bfb988460 Code formatting Joel Collins 2020-10-13 15:02:19 +01:00
  • 0234b20ce3 Merge branch 'change-stage-geometry' into 'master' Joel Collins 2020-10-13 14:00:51 +00:00
  • 4521913f1b Added OneOf to stage type schema Joel Collins 2020-10-13 14:59:59 +01:00
  • ba9c77d5c3 Changed stage type URL to /instrument/stage/type for consistency Joel Collins 2020-10-13 13:34:29 +00:00
  • abfbf6ae20 updated for new API view samuelmcdermott 2020-10-13 12:39:42 +01:00
  • 86d866c5f9 Moved API from action to property view samuelmcdermott 2020-10-13 12:39:17 +01:00
  • e886e9db28 change vue to use a task submitter for setting stage samuelmcdermott 2020-10-12 16:56:58 +01:00
  • f30679d4db stage API returns a dict samuelmcdermott 2020-10-12 16:56:25 +01:00
  • b25e7b75e0 Add Vue component for changing the stage type via API samuelmcdermott 2020-10-12 01:28:41 +01:00
  • 81ca2c9cb1 Add a get route for the stage type and rename samuelmcdermott 2020-10-12 01:23:44 +01:00
  • 79f3104409 Add API to set the stage samuelmcdermott 2020-10-11 01:01:21 +01:00
  • a1f27b0091 Move set_stage into a new function samuelmcdermott 2020-10-11 00:59:11 +01:00
  • d0b7958472 2.6.0-alpha.2 Joel Collins 2020-09-30 16:29:06 +01:00
  • 345d497166 Fixed MoveAndMeasureAPI args schema Joel Collins 2020-09-30 16:27:28 +01:00
  • 1c0cc32b6c Close #166 Joel Collins 2020-09-30 13:25:36 +01:00
  • 7eaca8d4f3 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server into master Joel Collins 2020-09-30 12:32:02 +01:00
  • e49c6c6e8e Close #172 Joel Collins 2020-09-30 12:31:49 +01:00
  • 9d8dae84bc Update README.md Joel Collins 2020-09-29 12:16:34 +00:00
  • fb2fa2f194 2.6.0-alpha.1 Joel Collins 2020-09-28 13:40:41 +01:00
  • 317bde6371 Added MoveAndMeasureAPI view Joel Collins 2020-09-28 13:38:27 +01:00
  • 497e3f052f 2.5.0 Joel Collins 2020-09-22 10:36:58 +01:00
  • a9917508b2 Updated lockfile Joel Collins 2020-09-22 10:29:54 +01:00
  • 85722fc64f Removed client version from About tab Joel Collins 2020-09-22 10:25:08 +01:00
  • 5765814d11 Updated dependencies Joel Collins 2020-09-22 10:24:21 +01:00
  • 5298430971 Tidied up mini stream formatting Joel Collins 2020-09-22 10:19:42 +01:00
  • ac21bb3617 Improved visibility observer on MJPEG streams Joel Collins 2020-09-22 10:08:16 +01:00
  • 292137cf09 2.5.0-beta.4 Joel Collins 2020-09-21 13:55:58 +01:00
  • 341f526d73 Updated LabThings to 1.1.0 Joel Collins 2020-09-21 13:50:46 +01:00
  • 647024d861 Removed old debug print Joel Collins 2020-09-21 13:50:40 +01:00
  • 68ba64e736 2.5.0-beta.3 Joel Collins 2020-09-21 09:41:24 +01:00
  • 9d5a356e62 Updated lockfile Joel Collins 2020-09-21 09:41:08 +01:00
  • d0d7817a60 Updated to LabThings 1.0.0 Joel Collins 2020-09-21 09:40:27 +01:00
  • c480a9ffe4 Update README.md Joel Collins 2020-09-18 15:45:50 +00:00
  • 859f02718d Added Dockerfile Joel Collins 2020-09-18 15:06:22 +00:00
  • 4fb3fc735e Move into dist before hashing Joel Collins 2020-09-18 14:09:10 +00:00
  • ab48f69fdc Add SHA256 of server tarball Joel Collins 2020-09-18 13:58:56 +00:00
  • dfb80f9b74 Keep tarignore, ignore .gitlab Joel Collins 2020-09-18 13:43:35 +00:00
  • 64c23254d9 2.5.0-beta.2 Joel Collins 2020-09-14 12:25:49 +01:00
  • 8a01d97d8f Close #177 Joel Collins 2020-09-14 12:25:30 +01:00
  • b30fa7d6a2 Updated dependencies Joel Collins 2020-09-14 12:24:19 +01:00
  • be2446d5c6 Update README.md Joel Collins 2020-09-09 16:30:30 +00:00
  • 893e8e9357 Calibrate with greyworld AWB if available Joel Collins 2020-09-09 17:25:31 +01:00
  • 8f12e395a6 2.5.0-beta.1 Joel Collins 2020-09-09 16:44:36 +01:00
  • 36747c33d7 Updated dependencies Joel Collins 2020-09-09 16:43:11 +01:00
  • 5ca386bde1 Merge branch 'deltastage' into 'master' Joel Collins 2020-09-09 15:18:25 +00:00
  • fa20475ab7 Merge branch 'integrated-slidescan' into 'master' Joel Collins 2020-09-09 15:17:45 +00:00
  • 9a3ba335c1 Made scan parameters editable (dev only for now) Joel Collins 2020-09-09 13:21:58 +01:00
  • 41eff92e7d Updated Action status strings Joel Collins 2020-09-09 13:21:40 +01:00
  • a34f98275b Updated scan tab icon Joel Collins 2020-09-09 13:21:21 +01:00
  • f0ce85fc3f Added app setting to enable/disable IHI slidescan Joel Collins 2020-09-09 12:54:44 +01:00
  • de7f4f6dfe Drafted integrated slide scan Joel Collins 2020-09-09 12:16:06 +01:00
  • 2ce58f2aee Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server Joel Collins 2020-09-07 16:33:01 +01:00
  • 54c342bbbb Switch to picamerax Joel Collins 2020-09-07 16:31:59 +01:00
  • 86eeac32ea Merge branch 'labthings-100-dev' into 'master' Joel Collins 2020-09-07 15:30:24 +00:00
  • 0bff4bdb62 Updated camera-stage-mapping to 0.1.4 Joel Collins 2020-09-07 15:29:40 +01:00
  • 6dcd6601c4 Include option for delta stage in microscope initialisation Samuel McDermott 2020-09-06 17:38:57 +01:00
  • 304002d747 Updated CSM and testing LabThings branch Joel Collins 2020-09-04 17:41:59 +01:00
  • 5139b24ffe Updated to new LabThings structure Joel Collins 2020-09-04 15:48:52 +01:00
  • 5e9e8cb2a3 Merge remote-tracking branch 'origin/master' into deltastage Samuel McDermott 2020-08-27 15:46:17 +01:00
  • 304e620143 Switch microscope ID to URN suffix string Joel Collins 2020-08-14 15:31:44 +01:00
  • f0c03d08a5 2.4.1 Joel Collins 2020-08-11 15:26:28 +01:00
  • 0b44944dd4 2.4.0 Joel Collins 2020-07-24 10:54:07 +01:00
  • ccd199a207 v2.4.0-rc.1 Joel Collins 2020-07-22 17:15:53 +01:00
  • 5d34ec615a Client 2.4.0 Joel Collins 2020-07-22 16:52:43 +01:00
  • fea256959b Fixed capture stream-flash animation hanging around afterwards Joel Collins 2020-07-22 16:52:05 +01:00
  • 76664363dc Show indeterminate progress as soon as action is requested Joel Collins 2020-07-22 16:40:46 +01:00
  • 72293627b7 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server Joel Collins 2020-07-22 16:22:08 +01:00
  • e110045dd3 Increased default_stop_timeout on TileScanAPI Joel Collins 2020-07-22 16:11:26 +01:00
  • 5c99da264f Added posh stop to slow autofocus Joel Collins 2020-07-22 16:11:13 +01:00
  • bb89d2fb3b 2.4.0-beta.2 Joel Collins 2020-07-22 16:05:35 +01:00
  • d7f4ee48d0 Updated LabThings to 0.8.0rc2 Joel Collins 2020-07-22 15:34:18 +01:00
  • 24338aec4d 2.4.0-beta.1 Joel Collins 2020-07-21 13:18:11 +01:00
  • 2e8149c130 Switched to LabThings 0.8.0rc1 from PyPI Joel Collins 2020-07-21 13:17:00 +01:00
  • 24398ba7dc Updated tasks nomenclature Joel Collins 2020-07-21 12:54:42 +01:00
  • 56051f8863 Updated LabThings to 0.8.0-beta.3 Joel Collins 2020-07-21 12:04:26 +01:00
  • ee738d5319 Fixed capture marshalling Joel Collins 2020-07-21 11:57:41 +01:00
  • 54c5605cb1 Removed use of deprecated current_task_stopped Joel Collins 2020-07-21 11:57:33 +01:00
  • c8c66803e5 Updated setting LabThings JSON encoder Joel Collins 2020-07-21 11:57:22 +01:00
  • 9f61935cf4 Updated LabThingsJSONEncoder import Joel Collins 2020-07-21 11:57:08 +01:00
  • 89f751cc47 Updated CSM Joel Collins 2020-07-15 17:28:20 +01:00