rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2424 commits 1 branch 0 tags 24 MiB
Commit graph

207 commits

Author SHA1 Message Date
Richard
d73b0afd36 Disable ImJoy control 
If the environment variable is disabling ImJoy, don't allow
the user to enable it with the tick-box.
 2021-06-22 12:08:17 +01:00
Richard
33b3ffc7f7 Rely on store to enforce IMJOY_ENABLED 
This removes some now-redundant code.
 2021-06-22 12:07:27 +01:00
Richard
29de95fe74 Enforce ENABLE_IMJOY variable in store 
The store now won't let you enable imjoy if the environment
variable is not set to "true"
 2021-06-22 12:06:48 +01:00
Richard
dae818b6b5 Typo in webpack directive 2021-05-31 12:46:30 +01:00
Richard
9d088916a9 Linter fixes 2021-05-31 12:45:30 +01:00
Richard
a1313ae1c5 Fix CSS for plugin list 2021-05-31 12:43:21 +01:00
Richard
9b75e8ec05 Fixed service registration for imjoy 2021-05-31 11:36:32 +01:00
Richard
4716dc8812 Added exposure and autofocus to imjoy service 
This is currently untested
 2021-05-29 14:34:17 +01:00
Richard
55a9f49fd2 Sundry linting/debug removal 2021-05-29 13:06:52 +01:00
Richard
6a353ccbd3 Added UI controls to enable ImJoy and gallery 
There are now tick boxes in "features" settings to
enable/disable ImJoy and the gallery.
These persist in local storage.
 2021-05-29 13:06:13 +01:00
Richard
dac1c9a748 Merge branch 'master' into imjoy-support 2021-05-29 12:10:01 +01:00
Richard
d176654e96 Allow ImJoy plugins to be disabled 
ImJoy is now loaded dynamically, and can be turned off with
an environment variable.
I've added two new scripts to develop and build without ImJoy.
I suspect these won't see much use, but
they will remind us how to do it when we
want to release a medical version.
The ImJoy "chunk" is named for ease of separation.

Co-authored-by: Kaspar Emanuel <kaspar@monostable.co.uk>
 2021-05-29 12:03:55 +01:00
Richard Bowman
de28b0e2f6 Merge branch 'improve-local-development' into 'master' 
Local development improvements

See merge request openflexure/openflexure-microscope-server!125
 2021-05-18 10:56:10 +00:00
Richard Bowman
4d405443bb Merge branch 'scan-shape-limits' into 'master' 
Add minimum scan dimension

See merge request openflexure/openflexure-microscope-server!123
 2021-05-18 10:55:06 +00:00
Richard
f9f78b867c Tidied up setTabProperty 
I was doing nasty things with a for loop - we've replaced it with a
map statement, which achieves the same thing but works better with
Vue.js reactivity.
 2021-05-18 11:52:36 +01:00
Richard
3e0be6fa81 Set icon based on window id, not name 2021-05-18 11:36:48 +01:00
Richard
9ba9bccd90 Added a hash to the service type name 
This is required by the updated imjoy core

Co-authored-by: Kaspar Emanuel <kaspar@monostable.co.uk>
 2021-05-18 11:31:31 +01:00
Wei Ouyang
de5a0f6d6b Fix scan name 2021-05-14 11:57:41 +02:00
Wei Ouyang
344146639d Remove item 2021-05-14 11:44:53 +02:00
Wei Ouyang
d2d0dc4518 Add comment 2021-05-14 11:41:22 +02:00
Wei Ouyang
f129244c26 Fix _rvalue key error 2021-05-14 11:36:48 +02:00
Wei Ouyang
508d9d9acf Support imagej.js stack, upgrade core; 2021-05-14 11:11:06 +02:00
Richard
7585e24744 Swap windows for tabs 
Each ImJoy window now gets its own top-level tab.
This involved some fairly significant refactoring of the ImJoy
component, but I think it's cleaner now.
I've moved imjoy-related stuff into a store "module" to keep it clean.
 2021-05-13 17:10:36 +01:00
Richard
0e16835e1b Streamlined code and added multi-JPEG 
It's now possible to open a folder of JPEGs
in ImageJ at once; they appear as separate, named images.
 2021-05-12 17:15:17 +01:00
Richard
a1fce44a4d kludge to fix the color of text in drop-down 
something strange is happening with CSS precedence that makes the
elements of the dropdown go white-on-white.
I have added a specific color:black to fix this.
 2021-05-11 22:01:11 +01:00
Richard
b0f26f1b1e Transfers of stacks and using ndarrays 2021-05-11 21:43:33 +01:00
Richard
126766aa06 Removed unnecessary package 
I'm not using vuex-map-fields, so have
removed it.
 2021-05-05 16:44:25 +01:00
Richard
0bdb5b4721 Actually save stream settings to local storage 
After some refactoring, I lost the code that actually
saved stream settings to local storage.
This commit restores that functionality.
 2021-05-05 16:19:43 +01:00
Wei Ouyang
c9cd6fc3bf Bump core version and fix service interface 2021-04-27 19:17:17 +00:00
Richard
82a277b04c Cache stream settings in local storage 
GPU preview and MJPEG stream settings are now persisted
using localStorage.  The old code that disabled
the stream for local connections now
just sets the initial/default value.

The initialisation of stream settings is now done
in the created() method of streamContent.vue.

I've eliminated the "globalsafetogglepreview" event
in favour of watching the store.
 2021-04-27 16:36:55 +01:00
Richard
e14800b549 linter fixes 2021-04-27 14:28:08 +01:00
Richard
6b8d34761c Merge remote-tracking branch 'origin/master' into imjoy-support 
Merge in changes from master,

This matters because we need to get the fixes to Python
package management and the stage API for absolute moves.
 2021-04-27 12:25:12 +01:00
Richard
297908fbc8 Stage move API now works 
The test plugin seems to have problems
calling setPosition more than once.
We don't understand this...

Co-authored-by: Kaspar Emanuel <kaspar@monostable.co.uk>
 2021-04-27 12:23:37 +01:00
Richard
757ee216cf Merge branch 'imjoy-support' of gitlab.com:rwb27/openflexure-microscope-server into imjoy-support 2021-04-27 11:31:20 +01:00
Richard Bowman
1f1a75c02a Merge branch 'master' into auto-exposure-gain-awb 2021-04-21 12:10:47 +01:00
Wei Ouyang
ab2523e231 Use official version of default_base_frame.html 2021-04-07 10:05:27 +00:00
Wei Ouyang
2a8536c386 Allow insecure url in imjoy plugins 2021-04-07 09:49:09 +00: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
9d81a80bbb Fixed infinite loop in pollUntilComplete 2021-03-24 13:25:54 +00:00
Richard
024f2566f0 Working stage positioning 
NB there is a server bug that means absolute moves fail -
this should be fixed in a separate branch.
 2021-03-24 13:23:20 +00:00
Richard Bowman
cd30872d62 Split out action polling to separate function. 2021-03-09 21:56:06 +00:00
Richard Bowman
2b0b548307 Removed some TODOs because we did them! 2021-03-09 12:16:36 +00:00
Richard Bowman
0165f0a798 Populated snapImage and getImage 
Co-authored-by: Kaspar Emanuel <kaspar@monostable.co.uk>
 2021-03-09 12:12:28 +00:00
Richard Bowman
03a4f36556 Remove spurious GPU preview event 2021-03-01 12:20:04 +00:00
Richard Bowman
8624e45df4 Axios version bump and vuex-map-fields 
vuex-map-fields cleans up code when mapping
store state to local computed properties.
 2021-02-23 17:36:58 +00:00
Richard Bowman
a7bb0f9423 Reset tour button and URL origin 
Reset tour button resets the local storage used to mark the tour
as done.

Overriding the origin can now be done with a query string.
This will load the store with the new origin from the start,
so might be better for testing some things.
I'm not worried about unexpected bugs, as it is quite obvious
from the URL what's going on.
 2021-02-23 15:56:15 +00:00
Richard Bowman
1f3ba2bff1 Allow origin to be overridden by query 
Specifying overrideOrigin in the URL now
sets up the store with the modified origin.
This is intended for development, and makes it
much less annoying to develop with a Vue dev server.
 2021-02-23 15:54:28 +00:00
Richard Bowman
621b99eb9b Switch tab when opening with ImJoy 2021-02-23 12:27:58 +00:00
Richard Bowman
9b52865f95 Added an implementation of snapImage() to API 
Co-authored-by: Kaspar Emanuel <kaspar@monostable.co.uk>
 2021-02-23 12:08:20 +00:00
Richard Bowman
1e45640195 Added control to reset LST 
You can now recalibrate the LST without running auto-gain.
 2021-02-15 20:19:39 +00:00