girder-large-image 1.30.2.dev10__tar.gz → 1.30.2.dev44__tar.gz

{girder_large_image-1.30.2.dev10 → girder_large_image-1.30.2.dev44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-large-image
-Version: 1.30.2.dev10
+Version: 1.30.2.dev44
 Summary: A Girder plugin to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -21,9 +21,9 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: girder>=3.1.18
 Requires-Dist: girder-jobs>=3.0.3
-Requires-Dist: large_image>=1.30.2.dev10
+Requires-Dist: large_image>=1.30.2.dev44
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.30.2.dev10; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.30.2.dev44; extra == "tasks"
 Requires-Dist: girder-worker[girder]>=0.6.0; extra == "tasks"
 
 A Girder plugin to work with large, multiresolution images.

{girder_large_image-1.30.2.dev10 → girder_large_image-1.30.2.dev44}/girder_large_image/web_client/views/imageViewerWidget/geojs.js

@@ -45,11 +45,13 @@ var GeojsImageViewerWidget = ImageViewerWidget.extend({
                 }
                 return this;
             }),
-            $.ajax({ // like $.getScript, but allow caching
-                url: root + '/plugins/large_image/extra/geojs.js' + (BUILD_TIMESTAMP ? '?_=' + BUILD_TIMESTAMP : ''),
-                dataType: 'script',
-                cache: true
-            }))
+            !window.geo
+                ? $.ajax({ // like $.getScript, but allow caching
+                    url: root + '/plugins/large_image/extra/geojs.js' + (BUILD_TIMESTAMP ? '?_=' + BUILD_TIMESTAMP : ''),
+                    dataType: 'script',
+                    cache: true
+                })
+                : true)
             .done(() => {
                 this.trigger('g:beforeFirstRender', this);
                 this.render();

{girder_large_image-1.30.2.dev10 → girder_large_image-1.30.2.dev44}/girder_large_image/web_client/vue/components/FrameSelector.vue

@@ -36,6 +36,31 @@ export default Vue.extend({
         currentStyle() {
             const curStyle = this.style[this.currentModeId];
             return curStyle ? JSON.stringify(curStyle, null, null) : '';
+        },
+        sliderLabels() {
+            const labels = {};
+            labels.IndexC = this.imageMetadata.channels;
+            Object.entries(this.metadata).forEach(([key, info]) => {
+                if (key.includes('Value')) {
+                    const labelKey = key.replace('Value', 'Index');
+                    if (info.values) {
+                        if (info.uniform) {
+                            labels[labelKey] = info.values.map((v) => {
+                                if (typeof v === 'number') return Number(v.toPrecision(5));
+                                return v;
+                            });
+                        } else {
+                            // non-uniform values have a value for every frame
+                            // labels will change with currentFrame, so only populate current label
+                            let currentLabel = info.values[this.currentFrame];
+                            if (typeof currentLabel === 'number') currentLabel = Number(currentLabel.toPrecision(5));
+                            labels[labelKey] = new Array(this.indexInfo[labelKey].range + 1).fill('');
+                            labels[labelKey][this.indexInfo[labelKey].current] = currentLabel;
+                        }
+                    }
+                }
+            });
+            return labels;
         }
     },
     watch: {
@@ -328,7 +353,7 @@ export default Vue.extend({
         :current-value="indexInfo[index].current"
         :value-max="indexInfo[index].range"
         :label="index.replace('Index', '')"
-        :slider-labels="index === 'IndexC' ? imageMetadata.channels : []"
+        :slider-labels="sliderLabels[index]"
         :max-merge="indexInfo[index].maxMerge || false"
         @updateMaxMerge="(v) => updateMaxMergeAxis({index, maxMerge: v})"
         @updateValue="(v) => updateAxisSlider({index, frame: v})"

{girder_large_image-1.30.2.dev10 → girder_large_image-1.30.2.dev44}/girder_large_image.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-large-image
-Version: 1.30.2.dev10
+Version: 1.30.2.dev44
 Summary: A Girder plugin to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -21,9 +21,9 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: girder>=3.1.18
 Requires-Dist: girder-jobs>=3.0.3
-Requires-Dist: large_image>=1.30.2.dev10
+Requires-Dist: large_image>=1.30.2.dev44
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.30.2.dev10; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.30.2.dev44; extra == "tasks"
 Requires-Dist: girder-worker[girder]>=0.6.0; extra == "tasks"
 
 A Girder plugin to work with large, multiresolution images.

{girder_large_image-1.30.2.dev10 → girder_large_image-1.30.2.dev44}/girder_large_image.egg-info/requires.txt

@@ -1,7 +1,7 @@
 girder>=3.1.18
 girder-jobs>=3.0.3
-large_image>=1.30.2.dev10
+large_image>=1.30.2.dev44
 
 [tasks]
-large-image-tasks[girder]>=1.30.2.dev10
+large-image-tasks[girder]>=1.30.2.dev44
 girder-worker[girder]>=0.6.0

{girder_large_image-1.30.2.dev10 → girder_large_image-1.30.2.dev44}/test_girder/web_client_specs/imageViewerSpec.js

@@ -11,7 +11,11 @@ $(function () {
             var GeojsViewer = girder.plugins.large_image.views.imageViewerWidget.geojs;
             girder.utilities.PluginUtils.wrap(GeojsViewer, 'initialize', function (initialize) {
                 this.once('g:beforeFirstRender', function () {
-                    window.geo.util.mockWebglRenderer();
+                    try {
+                        window.geo.util.mockWebglRenderer();
+                    } catch (err) {
+                        // if this is already mocked, do nothing.
+                    }
                     window.geo.webgl.webglRenderer._maxTextureSize = 256;
                 });
                 initialize.apply(this, _.rest(arguments));