rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable ImJoy control

Browse source 
If the environment variable is disabling ImJoy, don't allow
the user to enable it with the tick-box.
This commit is contained in:
Richard 2021-06-22 12:08:17 +01:00
parent 33b3ffc7f7
commit d73b0afd36
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openflexure_microscope/api/static/src/assets/less/theme.less
View file

@ -10,8 +10,8 @@
// Colors // Colors
// //
@global-color: #666; @global-color: #000;
@global-emphasis-color: #333; @global-emphasis-color: #C32280;
@global-muted-color: #666; @global-muted-color: #666;
@global-primary-background: #C32280; @global-primary-background: #C32280;
@ -33,7 +33,7 @@
@global-medium-font-size: 20px; @global-medium-font-size: 20px;
@global-small-font-size: 14px; @global-small-font-size: 14px;
@global-emphasis-color: #222;
// //
// Base // Base

21
openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/featuresSettings.vue
View file

@ -14,18 +14,21 @@
for use in clinics acquiring blood smear samples using a 100x for use in clinics acquiring blood smear samples using a 100x
oil-immersion objective, with a Raspberry Pi Camera v2. oil-immersion objective, with a Raspberry Pi Camera v2.
</p> </p>
<p class="uk-margin-small"> <p class="uk-margin-small" :class="{'uk-text-muted': !imjoyPermitted}">
<label <label :disabled="!imjoyPermitted">
><input v-model="imjoyEnabled" class="uk-checkbox" type="checkbox" /> <input v-model="imjoyEnabled" class="uk-checkbox" type="checkbox" :disabled="!imjoyPermitted"/>
Enable ImJoy plugin engine</label Enable ImJoy plugin engine
> </label>
</p> </p>
<p class="uk-margin-small"> <p class="uk-margin-small" v-if="imjoyPermitted">
<a href="https://imjoy.io/">ImJoy</a> enables integration with a wide <a href="https://imjoy.io/">ImJoy</a> enables integration with a wide
variety of microscopy and image analysis applications, including ImageJ.JS variety of microscopy and image analysis applications, including ImageJ.JS
and Kaibu. Support for ImJoy within the OFM software is currently and Kaibu. Support for ImJoy within the OFM software is currently
experimental, and it may slow down loading of the application. experimental, and it may slow down loading of the application.
</p> </p>
<p class="uk-margin-small uk-text-muted" v-if="!imjoyPermitted">
ImJoy plugins are disabled in this build of the OpenFlexure software.
</p>
<p class="uk-margin-small"> <p class="uk-margin-small">
<label <label
><input v-model="galleryEnabled" class="uk-checkbox" type="checkbox" /> ><input v-model="galleryEnabled" class="uk-checkbox" type="checkbox" />
@ -72,6 +75,12 @@ export default {
set(value) { set(value) {
this.$store.commit("changeGalleryEnabled", value); this.$store.commit("changeGalleryEnabled", value);
} }
},
imjoyPermitted: function () {
// ImJoy may be disabled using an environment variable.
// If this function returns false, it is never possible to
// use ImJoy, so we should gray out the option.
return process.env.VUE_APP_ENABLE_IMJOY === "true";
} }
}, },