From d73b0afd366b9f2fa4184942a985564c64c0c02e Mon Sep 17 00:00:00 2001 From: Richard Date: Tue, 22 Jun 2021 12:08:17 +0100 Subject: [PATCH] Disable ImJoy control If the environment variable is disabling ImJoy, don't allow the user to enable it with the tick-box. --- .../api/static/src/assets/less/theme.less | 6 +++--- .../settingsComponents/featuresSettings.vue | 21 +++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/openflexure_microscope/api/static/src/assets/less/theme.less b/openflexure_microscope/api/static/src/assets/less/theme.less index e3984a21..81c1f136 100644 --- a/openflexure_microscope/api/static/src/assets/less/theme.less +++ b/openflexure_microscope/api/static/src/assets/less/theme.less @@ -10,8 +10,8 @@ // Colors // -@global-color: #666; -@global-emphasis-color: #333; +@global-color: #000; +@global-emphasis-color: #C32280; @global-muted-color: #666; @global-primary-background: #C32280; @@ -33,7 +33,7 @@ @global-medium-font-size: 20px; @global-small-font-size: 14px; -@global-emphasis-color: #222; + // // Base diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/featuresSettings.vue b/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/featuresSettings.vue index 14636010..d707c56a 100644 --- a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/featuresSettings.vue +++ b/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/featuresSettings.vue @@ -14,18 +14,21 @@ for use in clinics acquiring blood smear samples using a 100x oil-immersion objective, with a Raspberry Pi Camera v2.

-

- +

+

-

+

ImJoy enables integration with a wide variety of microscopy and image analysis applications, including ImageJ.JS and Kaibu. Support for ImJoy within the OFM software is currently experimental, and it may slow down loading of the application.

+

+ ImJoy plugins are disabled in this build of the OpenFlexure software. +