From e2b835f5d158a70c84fea04f78ec6d9dea381a66 Mon Sep 17 00:00:00 2001 From: Anne Haley Date: Thu, 8 Feb 2024 22:13:15 +0000 Subject: [PATCH 1/3] fix(HistogramEditor): only send histogram requests when parent compositing table is active --- .../web_client/vue/components/CompositeLayers.vue | 1 + .../web_client/vue/components/HistogramEditor.vue | 4 +++- 2 files changed, 4 insertions(+), 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 index 1f2e9c5eb..81f4e455d 100644 --- 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/HistogramEditor.vue b/girder/girder_large_image/web_client/vue/components/HistogramEditor.vue index 60f966819..9db4eb7ea 100644 --- 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 if (this.framedelta !== undefined) { restRequest({ type: 'GET', From b15ecd5fcbf8f4c568105005115db163e60f6686 Mon Sep 17 00:00:00 2001 From: Anne Haley Date: Thu, 8 Feb 2024 22:14:12 +0000 Subject: [PATCH 2/3] fix(FrameSelector): Fill band names when bandCount>4 --- .../web_client/vue/components/FrameSelector.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/girder/girder_large_image/web_client/vue/components/FrameSelector.vue b/girder/girder_large_image/web_client/vue/components/FrameSelector.vue index 34bcc340a..acaddf486 100644 --- 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( From 7c90a8b9549fe129b6cdf2d559fd08cc45868ec0 Mon Sep 17 00:00:00 2001 From: Anne Haley Date: Thu, 8 Feb 2024 22:39:12 +0000 Subject: [PATCH 3/3] style: run client formatting --- .../web_client/vue/components/FrameSelector.vue | 2 +- .../web_client/vue/components/HistogramEditor.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/girder/girder_large_image/web_client/vue/components/FrameSelector.vue b/girder/girder_large_image/web_client/vue/components/FrameSelector.vue index acaddf486..3e4377f0b 100644 --- a/girder/girder_large_image/web_client/vue/components/FrameSelector.vue +++ b/girder/girder_large_image/web_client/vue/components/FrameSelector.vue @@ -214,7 +214,7 @@ export default Vue.extend({ this.metadata.bands = ['red', 'green', 'blue', 'alpha']; break; default: - this.metadata.bands = [...Array(this.metadata.bandCount).keys()].map((i) => `Band ${i+1}`) + 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 index 9db4eb7ea..c7b992702 100644 --- a/girder/girder_large_image/web_client/vue/components/HistogramEditor.vue +++ b/girder/girder_large_image/web_client/vue/components/HistogramEditor.vue @@ -15,7 +15,7 @@ export default { 'currentMin', 'currentMax', 'autoRange', - 'active', + 'active' ], emits: ['updateMin', 'updateMax', 'updateAutoRange'], data() { @@ -65,7 +65,7 @@ export default { }, methods: { fetchHistogram() { - if (!this.active) return + if (!this.active) return undefined; if (this.framedelta !== undefined) { restRequest({ type: 'GET',