Merge pull request #485 from Tom-TBT/dynamic_lut

will-moore · web-flow · commit 387b490bcf89 · 2024-11-20T10:33:34.000Z
Dynamic LUT for iviewer
diff --git a/src/app/context.js b/src/app/context.js
@@ -31,7 +31,7 @@ import {
     REGIONS_STORED_SHAPES
 } from '../events/events';
 import {
-    APP_NAME, IMAGE_CONFIG_RELOAD, IVIEWER, INITIAL_TYPES, LUTS_NAMES,
+    APP_NAME, IMAGE_CONFIG_RELOAD, IVIEWER, INITIAL_TYPES,
     LUTS_PNG_URL, PLUGIN_NAME, PLUGIN_PREFIX, REQUEST_PARAMS, SYNC_LOCK,
     TABS, URI_PREFIX, WEB_API_BASE, WEBCLIENT, WEBGATEWAY
 } from '../utils/constants';
@@ -301,39 +301,43 @@ export default class Context {
      * @memberof Context
      */
     setUpLuts() {
-        this.luts_png.url =
-            this.server + this.getPrefixedURI(WEBGATEWAY, true) + LUTS_PNG_URL;
-
-        // determine the luts png height
-        let lutsPng = new Image();
-        lutsPng.onload = (e) => {
-            this.luts_png.height = e.target.naturalHeight;
-            this.luts_png.image = lutsPng;
-            for (let [id, conf] of this.image_configs) conf.changed();
-        }
-        lutsPng.src = this.luts_png.url;
-
-        // now query the luts list
-        let server = this.server;
-        let uri_prefix =  this.getPrefixedURI(WEBGATEWAY);
         $.ajax(
-            {url : server + uri_prefix + "/luts/",
+            {url : this.server + this.getPrefixedURI(WEBGATEWAY) + "/luts/",
             success : (response) => {
-                if (typeof response !== 'object' || response === null ||
-                    !Misc.isArray(response.luts)) return;
+                // Check first whether omero-web can provides LUT dynamically
+                // and set URL accordingly
+                let is_dynamic_lut = Boolean(response.png_luts_new);
+                if (is_dynamic_lut) {
+                    this.luts_png.url =
+                        this.server + this.getPrefixedURI(WEBGATEWAY, false) + "/luts_png/";
+                } else {
+                    this.luts_png.url =
+                        this.server + this.getPrefixedURI(WEBGATEWAY, true) + LUTS_PNG_URL;
+                }
+
+                // determine the luts png height
+                let lutsPng = new Image();
+                lutsPng.onload = (e) => {
+                    this.luts_png.height = e.target.naturalHeight;
+                    this.luts_png.image = lutsPng;
+                    for (let [id, conf] of this.image_configs) conf.changed();
+                }
+                lutsPng.src = this.luts_png.url;
+
+                if (is_dynamic_lut) {
+                    // If it's dynamic, uses the new list instead
+                    response.png_luts = response.png_luts_new
+                }
 
-                let i=0;
-                response.luts.map(
+                response.luts.forEach(
                     (l) => {
-                        let isInList = LUTS_NAMES.indexOf(l.name) !== -1;
                         let mapValue =
                             Object.assign({
                                 nice_name :
                                     l.name.replace(/.lut/g, "").replace(/_/g, " "),
-                                index : isInList ? i : -1
+                                index : is_dynamic_lut ? l.png_index_new : l.png_index
                             }, l);
                         this.luts.set(mapValue.name, mapValue);
-                        if (isInList) i++;
                     });
                 for (let [id, conf] of this.image_configs) conf.changed();
             }
@@ -463,7 +467,7 @@ export default class Context {
             }
         }
         this.show_palette_only = (this.initParams[REQUEST_PARAMS.SHOW_PALETTE_ONLY] != 'False') || false
-        this.enable_mirror = (this.initParams[REQUEST_PARAMS.ENABLE_MIRROR] != 'False') || false 
+        this.enable_mirror = (this.initParams[REQUEST_PARAMS.ENABLE_MIRROR] != 'False') || false
         // nodedescriptors can be empty string or "None" (undefined)
         let nds = this.initParams[REQUEST_PARAMS.NODEDESCRIPTORS];
         // initially hide left and right panels?
diff --git a/src/utils/constants.js b/src/utils/constants.js
@@ -207,52 +207,6 @@ export const PERMISSION_TOOLTIPS = {
  */
 export const LUTS_PNG_URL = '/img/luts_10.png';
 
-/**
- * luts list for pre-generated png
- * @type {Object}
- */
-export const LUTS_NAMES = [
-    '16_colors.lut',
-    '3-3-2_rgb.lut',
-    '5_ramps.lut',
-    '6_shades.lut',
-    'blue_orange_icb.lut',
-    'brgbcmyw.lut',
-    'cool.lut',
-    'cyan_hot.lut',
-    'edges.lut',
-    'fire.lut',
-    'gem.lut',
-    'glasbey.lut',
-    'glasbey_inverted.lut',
-    'glow.lut',
-    'grays.lut',
-    'green_fire_blue.lut',
-    'hilo.lut',
-    'ica.lut',
-    'ica2.lut',
-    'ica3.lut',
-    'ice.lut',
-    'magenta_hot.lut',
-    'orange_hot.lut',
-    'phase.lut',
-    'physics.lut',
-    'pup_br.lut',
-    'pup_nr.lut',
-    'rainbow_rgb.lut',
-    'red-green.lut',
-    'red_hot.lut',
-    'royal.lut',
-    'sepia.lut',
-    'smart.lut',
-    'spectrum.lut',
-    'thal.lut',
-    'thallium.lut',
-    'thermal.lut',
-    'unionjack.lut',
-    'yellow_hot.lut'
-];
-
 /**
  * the right hand panel tab names
  * @type {Object}
