Commit graph

2257 commits

Author SHA1 Message Date
Joel Collins
65a28cc0f4 Default to new camera and stage settings slip 2019-06-05 16:03:17 +01:00
Joel Collins
0d8396b3e4 Fixed Microscope and camera arguments 2019-06-04 14:04:07 +01:00
Joel Collins
41d9ab51ad Restructured camera attaching 2019-06-04 14:03:46 +01:00
Joel Collins
f7ba68b443 Converted base camera into an ABC 2019-06-04 14:03:30 +01:00
Joel Collins
3cf166226b Converted config dict into properties/attributes 2019-06-04 14:03:16 +01:00
Joel Collins
5e6372835e Added extra debug log 2019-06-04 14:02:53 +01:00
Joel Collins
1d6ae5c9da Manage transition to new camera settings structure 2019-06-04 13:02:58 +01:00
Joel Collins
f109f76049 Merge branch 'electron-specific-code' into 'master'
Include custom title bar in Win and Linux

See merge request openflexure/openflexure-microscope-jsclient!32
2019-06-03 16:36:17 +00:00
Joel Collins
f35a06008c Added CSS to better style the electron menubar 2019-06-03 15:50:07 +01:00
Joel Collins
22d139ecf8 Added titlebar icon 2019-06-03 13:38:03 +01:00
Joel Collins
73b5011fea Removed old Vue icon asset 2019-06-03 13:37:54 +01:00
Joel Collins
b0687426dd Hide frame on Win and Linux 2019-06-03 10:24:24 +01:00
Joel Collins
1baf040b89 Show custom titlebar on Win and Linux 2019-06-03 10:24:15 +01:00
Joel Collins
3826bdb511 Lock tab tooltips to bottom alignment 2019-06-03 10:23:58 +01:00
Joel Collins
7e12758400 Added CET dependency 2019-06-03 10:23:45 +01:00
Joel Collins
dbb7d6fbf4 Merge branch 'electron-specific-code' into 'master'
Separate build targets for electron and web

See merge request openflexure/openflexure-microscope-jsclient!31
2019-06-03 08:52:38 +00:00
Joel Collins
793c8e2c7e Condensed build:app into package 2019-06-02 22:03:49 +01:00
Joel Collins
f1d3047109 Draft updated CI 2019-06-02 21:21:59 +01:00
Joel Collins
a154c9dd15 Ignore app dist folder 2019-06-02 21:21:48 +01:00
Joel Collins
814df5f27a Update electron app source directory 2019-06-02 21:15:41 +01:00
Joel Collins
396adca35f Separate app and web builds 2019-06-02 21:15:32 +01:00
Joel Collins
adfec0bbfe JS file for electron-renderer specific code 2019-06-02 21:15:15 +01:00
Joel Collins
4bdf940bdd Separate web and app targets 2019-06-02 21:15:02 +01:00
Joel Collins
70be245c2a Ensure stream recording at start of fast_up_down_up_autofocus 2019-05-30 10:43:46 +01:00
Joel Collins
200edd14b3 Merge branch 'auto-update' into 'master'
Updated choco CI

See merge request openflexure/openflexure-microscope-jsclient!30
2019-05-29 08:53:57 +00:00
Joel Collins
61e5860a08 Update to new CI format 2019-05-29 09:53:07 +01:00
Joel Collins
ab3c7756ca Only generate choco for deterministic tag URLs 2019-05-29 09:53:00 +01:00
Joel Collins
5d7fa03cbd Iterated version number 2019-05-29 09:43:27 +01:00
Joel Collins
c107125377 Skip loading invalid captures into array 2019-05-29 09:32:14 +01:00
Joel Collins
2c4fa4aead Return empty dict if capture is corrupt 2019-05-29 09:29:46 +01:00
Joel Collins
9ab1da34ff Handle corrupt captures 2019-05-29 09:28:42 +01:00
Joel Collins
96070b17f5 Merge branch 'master' into 'stable'
v0.2.6

See merge request openflexure/openflexure-microscope-jsclient!29
2019-05-28 14:41:23 +00:00
Joel Collins
7e094b86ff Merge branch 'auto-update' into 'master'
Dark theme

See merge request openflexure/openflexure-microscope-jsclient!28
2019-05-28 14:38:11 +00:00
Joel Collins
46f1442e53 Iterate version number 2019-05-28 15:37:15 +01:00
Joel Collins
17883e0567 Added dark-theme 2019-05-28 15:37:09 +01:00
Joel Collins
a7fc14d93f Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2019-05-28 13:47:51 +01:00
Joel Collins
c52fb7d854 Updated lockfile 2019-05-28 13:47:42 +01:00
Joel Collins
1f2799d9e1 Merge branch 'joram-fix-test' into 'master'
Joram fixes

See merge request openflexure/openflexure-microscope-server!21
2019-05-28 12:17:29 +00:00
Joel Collins
5a509037da Merge branch 'master' into 'stable'
Auto-update capability

See merge request openflexure/openflexure-microscope-jsclient!27
2019-05-28 11:46:24 +00:00
Joel Collins
bce35ef2d1 Merge branch 'auto-update' into 'master'
Auto update

See merge request openflexure/openflexure-microscope-jsclient!26
2019-05-28 11:45:13 +00:00
Joel Collins
d65329eafd Fixed feed URL to stable branch 2019-05-28 12:05:48 +01:00
Joel Collins
63ef0d7af8 Fixed choco dependency 2019-05-28 12:02:56 +01:00
Joel Collins
cfb448e8d3 Update CI to new updatable builds 2019-05-28 12:00:02 +01:00
Joel Collins
ad805b91c0 Add updater to apps 2019-05-28 11:59:46 +01:00
Joel Collins
a4a2ada99b Add electron-updater and new build scripts 2019-05-28 11:59:34 +01:00
Joel Collins
34cbc6c1ec Switch to combined builder config 2019-05-28 11:59:05 +01:00
Joel Collins
e0f7f12c3b Remove legacy setupEvents 2019-05-28 11:58:45 +01:00
Joel Collins
60c49a8331 Fixed setting Iterable vs Int backlash 2019-05-28 09:28:08 +01:00
Joel Collins
5e34b998dd Fixed plugin calling old focus_rel method 2019-05-28 09:27:47 +01:00
Joel Collins
39e2e0baad Re-implemented scan methods 2019-05-27 13:35:53 +01:00