From 746b0e8cf35266200a4c145b2ec41d968e0c021a Mon Sep 17 00:00:00 2001 From: Anne Haley Date: Thu, 14 Sep 2023 11:14:35 -0400 Subject: [PATCH 1/4] Fix bands not working: refer to processed metadata rather than original metadata --- .../web_client/vue/components/FrameSelector.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 341513137..b2254e9ad 100644 --- a/girder/girder_large_image/web_client/vue/components/FrameSelector.vue +++ b/girder/girder_large_image/web_client/vue/components/FrameSelector.vue @@ -250,24 +250,24 @@ export default Vue.extend({
Date: Thu, 14 Sep 2023 11:37:20 -0400 Subject: [PATCH 2/4] Allow band compositing for single-band image --- .../web_client/vue/components/FrameSelector.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b2254e9ad..dacd059ff 100644 --- a/girder/girder_large_image/web_client/vue/components/FrameSelector.vue +++ b/girder/girder_large_image/web_client/vue/components/FrameSelector.vue @@ -173,7 +173,7 @@ export default Vue.extend({ {id: 2, name: 'Channel Compositing'} ); } - if (this.metadata.bandCount > 1) { + if (this.metadata.bandCount) { this.sliderModes.push( {id: 3, name: 'Band Compositing'} ); From 476288dfb54d8c6f9f40af3f10d9ecb0a587aaaa Mon Sep 17 00:00:00 2001 From: Anne Haley Date: Thu, 14 Sep 2023 12:28:46 -0400 Subject: [PATCH 3/4] Add red, green, blue, and gray to the color table --- girder/girder_large_image/web_client/vue/utils/colors.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/girder/girder_large_image/web_client/vue/utils/colors.js b/girder/girder_large_image/web_client/vue/utils/colors.js index d9ebe31ac..b3881f31e 100644 --- a/girder/girder_large_image/web_client/vue/utils/colors.js +++ b/girder/girder_large_image/web_client/vue/utils/colors.js @@ -5,7 +5,11 @@ export const CHANNEL_COLORS = { '^CY3(|[^\d].*)$': '#FF8000', // eslint-disable-line '^CY5(|[^\d].*)$': '#FF00FF', // eslint-disable-line '^YFP.*$': '#00FF00', - '^GFP.*$': '#00FF00' + '^GFP.*$': '#00FF00', + '^red$': '#FF0000', + '^green$': '#00FF00', + '^blue$': '#0000FF', + '^gr[ae]y(|scale)$': '#FFFFFF', }; export const OTHER_COLORS = [ From f83feb31428a8e44f5cad88bcac4570b89b33ab9 Mon Sep 17 00:00:00 2001 From: Anne Haley Date: Thu, 14 Sep 2023 12:43:35 -0400 Subject: [PATCH 4/4] Remove trailing comma for linting --- girder/girder_large_image/web_client/vue/utils/colors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/girder/girder_large_image/web_client/vue/utils/colors.js b/girder/girder_large_image/web_client/vue/utils/colors.js index b3881f31e..11a2e7034 100644 --- a/girder/girder_large_image/web_client/vue/utils/colors.js +++ b/girder/girder_large_image/web_client/vue/utils/colors.js @@ -9,7 +9,7 @@ export const CHANNEL_COLORS = { '^red$': '#FF0000', '^green$': '#00FF00', '^blue$': '#0000FF', - '^gr[ae]y(|scale)$': '#FFFFFF', + '^gr[ae]y(|scale)$': '#FFFFFF' }; export const OTHER_COLORS = [