Add MAX_ACTIVE_CHANNELS to iviewer_settings.py

will-moore · will-moore · commit 54a9a7f0b313 · 2025-01-09T11:17:03.000Z
diff --git a/plugin/omero_iviewer/iviewer_settings.py b/plugin/omero_iviewer/iviewer_settings.py
@@ -35,6 +35,14 @@
           "omero.pixeldata.max_projection_bytes will be used or "
           "the lower value if both are set.")],
 
+    "omero.web.iviewer.max_active_channels":
+        ["MAX_ACTIVE_CHANNELS",
+         10,
+         int,
+         ("Default maximum number of active channels. If the /omero_ms_image_region/ "
+          "microservice endpoint is provided, the options.maxActiveChannels "
+          "from that response will be used instead.")],
+
     "omero.web.iviewer.roi_page_size":
         ["ROI_PAGE_SIZE",
          500,
diff --git a/plugin/omero_iviewer/views.py b/plugin/omero_iviewer/views.py
@@ -50,6 +50,7 @@
 ROI_PAGE_SIZE = getattr(iviewer_settings, 'ROI_PAGE_SIZE')
 ROI_PAGE_SIZE = min(MAX_LIMIT, ROI_PAGE_SIZE)
 MAX_PROJECTION_BYTES = getattr(iviewer_settings, 'MAX_PROJECTION_BYTES')
+MAX_ACTIVE_CHANNELS = getattr(iviewer_settings, 'MAX_ACTIVE_CHANNELS')
 ROI_COLOR_PALETTE = getattr(iviewer_settings, 'ROI_COLOR_PALETTE')
 SHOW_PALETTE_ONLY = getattr(iviewer_settings, 'SHOW_PALETTE_ONLY')
 ENABLE_MIRROR = getattr(iviewer_settings, 'ENABLE_MIRROR')
@@ -114,6 +115,7 @@ def index(request, iid=None, conn=None, **kwargs):
         nodedescriptors = None
 
     params['MAX_PROJECTION_BYTES'] = max_bytes
+    params['MAX_ACTIVE_CHANNELS'] = MAX_ACTIVE_CHANNELS
     params['NODEDESCRIPTORS'] = nodedescriptors
     params['ROI_COLOR_PALETTE'] = ROI_COLOR_PALETTE
     params['SHOW_PALETTE_ONLY'] = SHOW_PALETTE_ONLY
diff --git a/src/app/context.js b/src/app/context.js
@@ -192,14 +192,12 @@ export default class Context {
      luts = new Map();
 
      /**
-      * max active channels
-      * 
-      * //  TODO: make the default configurable.
+      * max active channels - default is loaded from iviewer_settings
       *
       * @memberof Context
       * @type {number}
       */
-     max_active_channels = 20;
+     max_active_channels = 10;
 
      /**
       * the lookup png
@@ -360,11 +358,9 @@ export default class Context {
     loadMaxActiveChannels() {
         // query microservice endpoint...
         let url = this.server + "/omero_ms_image_region/";
-        console.log(url);
         fetch(url, {method: "OPTIONS"})
         .then(r => r.json())
         .then(data => {
-            console.log('data', data);
             if (Number.isInteger(data.options?.maxActiveChannels)) {
                 this.max_active_channels = data.options.maxActiveChannels;
                 // in case the images loaded already (this query took longer than
@@ -492,6 +488,7 @@ export default class Context {
         this.max_projection_bytes = parseInt(this.initParams[REQUEST_PARAMS.MAX_PROJECTION_BYTES], 10)
                                     || (1024 * 1024 * 256);
         this.max_projection_bytes = parseInt(this.initParams[REQUEST_PARAMS.MAX_PROJECTION_BYTES], 10) || (1024 * 1024 * 256);
+        this.max_active_channels = parseInt(this.initParams[REQUEST_PARAMS.MAX_ACTIVE_CHANNELS], 10) || 10;
         let userPalette = `${this.initParams[REQUEST_PARAMS.ROI_COLOR_PALETTE]}`
         if (userPalette) {
             let arr = userPalette.match(/\[[^\[\]]*\]/g)
diff --git a/src/model/image_info.js b/src/model/image_info.js
@@ -475,7 +475,6 @@ export default class ImageInfo {
 
     applyMaxActiveChannels(max_active_channels) {
         // let conf = this.context.getImageConfig(this.config_id);
-        console.log("applyMaxActiveChannels", max_active_channels, this.channels);
         if (this.channels == null) {
             return;
         }
diff --git a/src/utils/constants.js b/src/utils/constants.js
@@ -134,6 +134,7 @@ export const REQUEST_PARAMS = {
     ZOOM: 'ZM',
     ROI_PAGE_SIZE: 'ROI_PAGE_SIZE',
     MAX_PROJECTION_BYTES: 'MAX_PROJECTION_BYTES',
+    MAX_ACTIVE_CHANNELS: 'MAX_ACTIVE_CHANNELS',
     ROI_COLOR_PALETTE: 'ROI_COLOR_PALETTE',
     SHOW_PALETTE_ONLY: 'SHOW_PALETTE_ONLY',
     ENABLE_MIRROR: 'ENABLE_MIRROR',

Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,6 @@ export default class ImageInfo {`
`475`	`475`
`476`	`476`	`applyMaxActiveChannels(max_active_channels) {`
`477`	`477`	`// let conf = this.context.getImageConfig(this.config_id);`
`478`		`- console.log("applyMaxActiveChannels", max_active_channels, this.channels);`
`479`	`478`	`if (this.channels == null) {`
`480`	`479`	`return;`
`481`	`480`	`}`