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

2590 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard
00531a93bf Fixed response descriptions for stream/RAM capture 2021-07-06 15:24:43 +01:00
Richard
c81c4eb64d Better API docs for autofocus extension 2021-07-06 15:24:17 +01:00
Richard
202d942c90 Add entry point to generate OpenAPI yaml/json 
This is designed to be used as a console entry point so we can generate
the OpenAPI description without starting the server.
 2021-07-06 15:23:42 +01:00
Richard
1e21ce51fc Some basic validation for OpenAPI 
I was getting unhelpful OpenAPI errors, this Python script makes it easier
to figure out where they come from.
 2021-07-06 15:18:53 +01:00
Richard Bowman
5b63745ad0 Merge branch 'imjoy-support' into 'master' 
Added imjoy support

Closes #157

See merge request openflexure/openflexure-microscope-server!120
 2021-06-29 12:08:52 +00:00
Richard
8157fa6d58 Add YAML export from APISpec 2021-06-27 21:08:48 +01:00
Richard Bowman
5279becce7 Merge branch 'remember-scan-parameters' into 'master' 
Scan settings are now remembered

Closes #216

See merge request openflexure/openflexure-microscope-server!132
 2021-06-22 11:21:20 +00:00
Richard
f5711d953d linter fixes 2021-06-22 12:09:01 +01:00
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
3921f5de76 Remove commented-out code 2021-06-22 10:57:48 +01:00
Richard Bowman
826b81f3bf Merge branch 'use-pipenv-deploy-in-ci' into 'master' 
add --deploy flag to pipenv install

Closes #227

See merge request openflexure/openflexure-microscope-server!131
 2021-06-22 09:55:37 +00:00
Richard
03cb019864 Don't remember the "scanCapture" setting 
Given that it changes the "capture" button from
single image acquisition to a long running scan,
I think it's less confusing if the "scan capture" setting
is not remembered across page refreshes.
 2021-06-03 16:21:03 +01:00
Richard
318c4088dd Auto-open scan section if enabled 
Saving default to local storage has a problem:
if you have ticked "scan", the section is not
visible by default so it's easy to start a scan
by accident.  I've now forced it to be open if
the scanCapture checkbox is true.
 2021-06-03 16:16:00 +01:00
Richard
31faaaf161 Whitespace linting fixes 2021-06-03 16:10:03 +01:00
Richard
178d6fb84b Fix ame of CaptureContent 2021-06-03 16:09:51 +01:00
Richard
8afa503867 Scan settings are now remembered 
This is done in local storage, and I'm
quite pleased with how neat it is!
Happy to be corrected on a better way to pass `this` though!
 2021-06-03 16:09:40 +01:00
Richard
3573c64b94 add --deploy flag to pipenv install 2021-06-03 14:38:22 +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
5114033f5d Changelog entry 2021-05-29 13:09:42 +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
48ff706472 Merge branch 'version-bump' into 'master' 
Version bump

See merge request openflexure/openflexure-microscope-server!130
 2021-05-25 16:20:46 +00:00
Richard
4ca51d9ba9 Version bump 2021-05-25 17:03:02 +01:00
Richard Bowman
11876b070d Merge branch 'fix-dependencies' into 'master' 
Re-locked dependencies

Closes #225

See merge request openflexure/openflexure-microscope-server!129
 2021-05-25 14:48:35 +00:00
Richard Bowman
9c5d040d82 Re-locked dependencies 2021-05-25 11:28:46 +01:00
Kaspar Emanuel
90d5c35cdb Merge branch 'v2.10.0b0-release' into 'master' 
Updated changelog for beta release

See merge request openflexure/openflexure-microscope-server!128
 2021-05-25 10:20:40 +00:00
Richard Bowman
ba95b25800 Updated changelog for beta release 2021-05-25 10:20:40 +00: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
Richard Bowman
1aae062774 Merge branch 'fix-imagejs-stack' into 'imjoy-support' 
Support imagej.js stack, upgrade imjoy-core

See merge request rwb27/openflexure-microscope-server!4
 2021-05-18 09:53:30 +00: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
f2a4b976b9 Fix whitespace 2021-05-13 10:43:50 +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