From 47ec235cfa8187aea184650fc11ee4a5458a5e0e Mon Sep 17 00:00:00 2001 From: Justin Georgi Date: Wed, 11 Sep 2024 11:46:37 -0700 Subject: [PATCH] Clean up new worker configuration Signed-off-by: Justin Georgi --- README.md | 3 ++- public/conf/conf.yaml | 2 +- src/pages/detect.vue | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c3911a5..997912c 100644 --- a/README.md +++ b/README.md @@ -47,9 +47,10 @@ The following site settings are avaible: | name | description | values | default | | --- | --- | --- | --- | | `agreeExpire` | number of months before users are shown the site agreement dialog again
set to 0 to display dialog on every reload | integer >= 0 | 3 | -| `demo` | set to **true** to enable demo mode by default | boolean | false +| `demo` | set to **true** to enable demo mode by default | boolean | false | | `regions` | array of regions names to enable | thorax, abdomen, limbs, head | [thorax, abdomen, limbs, head] | | `useExternal` | detemines the ability to use an external detection server:
**none** - external server cannot be configured
**optional** - external server can be configured in the app's settings page
**list** - external server can be selected in the app's settings page but only the configured server(s) may be selected
**required** - external server settings from conf file will be used by default and disable server options in the settings page | none, optional, list, required | **optional** | +| `disableWorkers` | force app to use a single thread for detection computations instead of multi threading web workers | boolean | **optional** | | `external` | properties of the external server(s) ALVINN may connect to
This setting must be a single element array if **useExternal** is set to **required**.
This setting must be an array of one or more elements if **useExternal** is set to **list** | external server settings array | []| | `infoUrl` | root url for links to information about identified structures
Structure labels with spaces replaced by underscores will be appended to this value for full information links (*e.g.,* Abdominal_diapragm) | string | info link not shown | diff --git a/public/conf/conf.yaml b/public/conf/conf.yaml index 8c9adc7..f124937 100644 --- a/public/conf/conf.yaml +++ b/public/conf/conf.yaml @@ -6,7 +6,7 @@ regions: - limbs - head useExternal: none -disableWorkers: true +disableWorkers: false external: - name: Mserver address: "192.169.1.105" diff --git a/src/pages/detect.vue b/src/pages/detect.vue index 7dd69ed..243077d 100644 --- a/src/pages/detect.vue +++ b/src/pages/detect.vue @@ -362,7 +362,9 @@ this.detectWorker.postMessage({call: 'localDetect', image: res[1]}, [res[1]]) }) } else { - this.localDetect(this.imageView).then(dets => { + createImageBitmap(this.imageView).then(res => { + return this.localDetect(res) + }).then(dets => { this.detecting = false this.resultData = dets this.uploadDirty = true