Use regex to determine known channel matches

girder · Jun 27, 2023 · 5274457 · 5274457
1 parent 99c38f6
commit 5274457
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/girder/girder_large_image/web_client/vue/components/CompositeLayers.vue b/girder/girder_large_image/web_client/vue/components/CompositeLayers.vue
@@ -47,15 +47,20 @@ export default {
                     autoRange: undefined
                 }
             })
-            Object.entries(CHANNEL_COLORS).forEach(([channelName, color]) => {
-                if(this.layers.includes(channelName)){
-                    this.compositeLayerInfo[channelName].palette = color
-                    usedColors.push(color)
-                }
-            })
+            // Assign colors
             this.layers.forEach((layerName) => {
                 if (!this.compositeLayerInfo[layerName].palette) {
                     let chosenColor;
+
+                    // Search for case-insensitive regex match among known channel-colors
+                    Object.entries(CHANNEL_COLORS).forEach(([channelName, color]) => {
+                        if (layerName.toUpperCase().match(
+                            new RegExp("^" + channelName + ".*$")
+                        )) {
+                            chosenColor = color
+                        }
+                    })
+
                     const unusedColors = OTHER_COLORS.filter(
                         (color) => !usedColors.includes(color)
                     )