Merge pull request #1230 from girder/frame-selection-fixes

Frame selector widget various fixes
girder · Jun 30, 2023 · e4c9350 · e4c9350
2 parents b0681a6 + 02cb806
commit e4c9350
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 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
@@ -13,7 +13,7 @@ export default {
     },
     data() {
         return {
-            enabledLayers: this.layers,
+            enabledLayers: [],
             colorPickerShown: undefined,
             currentFrameHistogram: undefined,
             compositeLayerInfo: {},
@@ -194,6 +194,22 @@ export default {
     },
     mounted() {
         this.initializeLayerInfo()
+        if (this.layerMap) {
+            // channels all enabled by default
+            this.enabledLayers = this.layers
+        } else {
+            // only some bands enabled by default
+            ['red', 'green', 'blue', 'gray', 'grey'].forEach((bandColor) => {
+                if (this.layers.includes(bandColor)) {
+                    this.enabledLayers.push(bandColor)
+                }
+            })
+            // if no known band colors exist, enable the first three
+            if (this.enabledLayers.length === 0) {
+                this.enabledLayers = this.layers.slice(0, 3)
+            }
+        }
+        this.updateActiveLayers()
         this.updateStyle()
     }
 }

diff --git a/girder/girder_large_image/web_client/vue/components/FrameSelector.vue b/girder/girder_large_image/web_client/vue/components/FrameSelector.vue
@@ -11,7 +11,7 @@ export default Vue.extend({
             currentFrame: 0,
             maxFrame: 0,
             sliderModes: [],
-            currentModeId: 1,
+            currentModeId: 0,
             indices: [],
             indexInfo: {},
             style: {},
@@ -127,9 +127,15 @@ export default Vue.extend({
                 this.sliderModes.push(
                     { id: 0, name: 'Frame' }
                 )
-                this.sliderModes.push(
-                    { id: 1, name: 'Axis' }
-                )
+                if(
+                    Object.keys(this.imageMetadata.IndexRange).length > 0
+                    && Object.keys(this.imageMetadata.IndexStride).length > 0
+                ) {
+                    this.sliderModes.push(
+                        { id: 1, name: 'Axis' }
+                    )
+                    this.currentModeId = 1
+                }
             } else {
                 this.sliderModes.push(
                     { id: -1, name: 'Default' }
@@ -141,9 +147,11 @@ export default Vue.extend({
                     { id: 2, name: 'Channel Compositing' }
                 )
             }
-            this.sliderModes.push(
-                { id: 3, name: 'Band Compositing' }
-            )
+            if (this.imageMetadata.bandCount > 1) {
+                this.sliderModes.push(
+                    { id: 3, name: 'Band Compositing' }
+                )
+            }
         }
     },
     mounted() {