Commit graph

2307 commits

Author SHA1 Message Date
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
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 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
fc86745006 Fix whitespace 2021-02-09 10:19:56 +00:00
Richard Bowman
2b3c0a9bac Make the origin override persistent
The dev tools pane now remembers the last address you entered in
"override origin" to save a few clicks  when doing local Vue development
2021-02-09 09:46:52 +00:00
Richard Bowman
f4e3f1f277 Merge branch 'update-readme' into 'master'
Update build instructions

See merge request openflexure/openflexure-microscope-server!115
2021-02-08 09:32:12 +00:00
Richard Bowman
d72240ef03 Update build instructions 2021-02-08 09:19:46 +00:00
Richard Bowman
a9ef605c33 Merge branch 'fix-tour-placement' into 'master'
Fix tour placement

Closes #199

See merge request openflexure/openflexure-microscope-server!114
2021-02-06 15:32:27 +00:00
Richard Bowman
afbb71607d Fix placement of tour messages for icons
The tour pop-ups were getting stuck in the tab icon container.
Explicitly specifying that they could overflow said container,
and setting them to show to the right, seems to have fixed this issue.
2021-02-06 15:32:27 +00:00
Richard Bowman
de9b34e332 Merge branch 'allow-dummy-stage' into 'master'
Allow MissingStage to be explicitly selected

See merge request openflexure/openflexure-microscope-server!112
2021-02-04 20:31:22 +00:00
Richard Bowman
9c069ef372 Allow MissingStage to be explicitly selected
You can now set the stage type to "MissingStage" in
microscope_configuration.json to stop the server looking for the stage.
A warning is logged to make it obvious what's happening.
2021-02-04 20:31:20 +00:00
Joel Collins
8e4d34205f Isort 2021-01-08 12:34:41 +00:00
Joel Collins
18b2dabbd2 Merge branch 'mypy-coverage' into 'master'
Mypy coverage report

See merge request openflexure/openflexure-microscope-server!110
2021-01-08 11:08:05 +00:00
Joel Collins
5f48be3807 Merge branch 'master' into 'mypy-coverage'
# Conflicts:
#   poetry.lock
2021-01-08 10:51:15 +00:00
Joel Collins
bb7d543ecd Actually removed pynpm and updated sphinx 2021-01-08 10:22:04 +00:00
Joel Collins
5232b36644 Test cobertura mypy coverage report 2021-01-08 10:05:31 +00:00
Joel Collins
180d73f9c4 Upgraded to LabThings ^1.2.2 2021-01-07 10:23:46 +00:00
Joel Collins
bd7833c20f Test app object initialises 2021-01-07 10:23:27 +00:00
Joel Collins
ef0f74838a Removed unused import 2021-01-07 10:09:43 +00:00
Joel Collins
e8560a1d5d Removed unused ERROR_SOURCES 2021-01-06 17:31:58 +00:00
Joel Collins
61554af270 Restructured camera rescue 2021-01-06 17:31:45 +00:00
Joel Collins
3501a5b624 Merge branch 'picamera-rescue' into 'master'
Picamerax error recovery

See merge request openflexure/openflexure-microscope-server!86
2021-01-05 17:11:03 +00:00
Joel Collins
f877c4f745 Added Spiral scan to standard options 2021-01-05 14:30:49 +00:00
Joel Collins
8594414c60 Removed jtc CC 2020-12-15 12:08:40 +00:00
Joel Collins
3f3a0d0eee Removed jtc CC 2020-12-15 12:08:26 +00:00
Joel Collins
4a98602071 Merge branch '2.9-patch' into 'master'
2.9.3

Closes #194

See merge request openflexure/openflexure-microscope-server!109
2020-12-14 15:46:08 +00:00
Joel Collins
f330cc93ec v2.9.3 2020-12-14 15:05:14 +00:00
Joel Collins
0592d31b22 Fix #194 2020-12-14 15:00:37 +00:00
Joel Collins
f67bf01777 Updated isort command to use Poe 2020-12-09 16:11:20 +00:00
Joel Collins
18956bf230 Update README.md 2020-12-09 16:04:23 +00:00
Joel Collins
332fc90083 Added Key info 2020-12-09 15:51:02 +00:00
Joel Collins
06cc2880e7 Formatting 2020-12-09 15:34:58 +00:00
Joel Collins
a3598b433c Added Creating releases notes 2020-12-09 15:31:40 +00:00
Joel Collins
8d69132ae1 Merge branch '2.9.2-release' into 'master'
2.9.2 release

See merge request openflexure/openflexure-microscope-server!108
2020-12-09 12:14:40 +00:00
Joel Collins
5c62a341b6 Updated changelog 2020-12-09 12:01:28 +00:00
Joel Collins
e6c63e2eaf Merge branch 'better-bitrate-controls' into 'master'
Better stream bitrate controls

See merge request openflexure/openflexure-microscope-server!106
2020-12-09 11:55:38 +00:00
Joel Collins
72d33fff7d Patch version 2020-12-08 18:26:31 +00:00
Joel Collins
68380385cb Watch for broken frames using JPEG end bytes, and log error 2020-12-08 18:07:05 +00:00
Joel Collins
d2488c566a Added more Advanced bitrate controls 2020-12-08 17:57:42 +00:00
Joel Collins
6e1383d1c4 Merge branch 'bitrate-controls' into 'master'
Added stream bitrate controls

See merge request openflexure/openflexure-microscope-server!105
2020-12-07 17:23:51 +00:00
Joel Collins
47680fd23b v2.9.1 2020-12-07 17:11:02 +00:00
Joel Collins
0626b13bfd Formatting 2020-12-07 17:08:47 +00:00
Joel Collins
42e0dfd39c Replaced MJPEG quality setting with MJPEG bitrate 2020-12-07 17:05:56 +00:00
Joel Collins
3e2f876627 Added mjpeg bitrate to settings 2020-12-07 16:49:00 +00:00
Joel Collins
d6e6a48c3e Merge branch 'eslint-on-branches' into 'master'
Run eslint on branches

See merge request openflexure/openflexure-microscope-server!104
2020-12-07 14:45:45 +00:00
Joel Collins
d454255cb6 Run eslint on branches 2020-12-07 14:45:17 +00:00