Merge pull request #1463 from girder/composites-histogram-reqs

Fix histogram request bug in band compositing mode
girder · Feb 13, 2024 · b61cb1b · b61cb1b
2 parents b4cff79 + 35c518a
commit b61cb1b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/girder/girder_large_image/web_client/vue/components/CompositeLayers.vue b/girder/girder_large_image/web_client/vue/components/CompositeLayers.vue
@@ -455,6 +455,7 @@ export default {
                 :auto-range="autoRange"
                 :current-min="min"
                 :current-max="max"
+                :active="active"
                 @updateMin="(v, d) => updateLayerMin(layerName, v, d)"
                 @updateMax="(v, d) => updateLayerMax(layerName, v, d)"
                 @updateAutoRange="(v) => updateLayerAutoRange(layerName, v)"

diff --git a/girder/girder_large_image/web_client/vue/components/FrameSelector.vue b/girder/girder_large_image/web_client/vue/components/FrameSelector.vue
@@ -213,6 +213,8 @@ export default Vue.extend({
                     case 4:
                         this.metadata.bands = ['red', 'green', 'blue', 'alpha'];
                         break;
+                    default:
+                        this.metadata.bands = [...Array(this.metadata.bandCount).keys()].map((i) => `Band ${i + 1}`);
                 }
             } else {
                 this.metadata.bands = Object.values(this.metadata.bands).map(

diff --git a/girder/girder_large_image/web_client/vue/components/HistogramEditor.vue b/girder/girder_large_image/web_client/vue/components/HistogramEditor.vue
@@ -14,7 +14,8 @@ export default {
         'framedelta',
         'currentMin',
         'currentMax',
-        'autoRange'
+        'autoRange',
+        'active'
     ],
     emits: ['updateMin', 'updateMax', 'updateAutoRange'],
     data() {
@@ -64,6 +65,7 @@ export default {
     },
     methods: {
         fetchHistogram() {
+            if (!this.active) return undefined;
             if (this.framedelta !== undefined) {
                 restRequest({
                     type: 'GET',