girder-large-image 1.31.2.dev72__tar.gz → 1.31.2.dev79__tar.gz

{girder_large_image-1.31.2.dev72 → girder_large_image-1.31.2.dev79}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-large-image
-Version: 1.31.2.dev72
+Version: 1.31.2.dev79
 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.31.2.dev72
+Requires-Dist: large_image>=1.31.2.dev79
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.31.2.dev72; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.31.2.dev79; 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.31.2.dev72 → girder_large_image-1.31.2.dev79}/girder_large_image/web_client/widgets/CompositeLayers.vue

@@ -21,7 +21,8 @@ module.exports = {
             compositeLayerInfo: {},
             expandedRows: [],
             autoRangeForAll: undefined,
-            showKeyboardShortcuts: false
+            showKeyboardShortcuts: false,
+            queuedRequests: undefined
         };
     },
     computed: {
@@ -51,7 +52,22 @@ module.exports = {
             }
         },
         histogramParams() {
-            this.getFrameHistogram(this.histogramParams);
+            this.queueHistogramRequest(this.histogramParams);
+        },
+        frameHistograms() {
+            if (this.queuedRequests) {
+                let requests = this.queuedRequests[this.currentFrame];
+                if (!requests) this.queuedRequests = undefined;
+                const receivedFrames = Object.keys(this.frameHistograms).map((v) => parseInt(v));
+                requests = requests.filter((r) => !receivedFrames.includes(r.frame));
+                if (!requests.length) this.queuedRequests = undefined;
+                else {
+                    this.getFrameHistogram(requests[0]);
+                    this.queuedRequests = {
+                        [this.currentFrame]: requests.slice(1)
+                    };
+                }
+            }
         }
     },
     mounted() {
@@ -82,6 +98,20 @@ module.exports = {
         }
     },
     methods: {
+        queueHistogramRequest(params) {
+            if (this.queuedRequests === undefined) {
+                this.getFrameHistogram(params);
+                this.queuedRequests = {};
+            } else {
+                if (!this.queuedRequests[this.currentFrame]) {
+                    this.queuedRequests[this.currentFrame] = [];
+                }
+                this.queuedRequests[this.currentFrame] = [
+                    ...this.queuedRequests[this.currentFrame],
+                    Object.assign({}, params)
+                ];
+            }
+        },
         keyHandler(e) {
             let numericKey = parseFloat(e.key);
             if (e.ctrlKey && !isNaN(numericKey)) {
@@ -143,7 +173,6 @@ module.exports = {
                     usedColors.push(chosenColor);
                 }
             });
-            this.getFrameHistogram(this.histogramParams);
         },
         initializeStateFromStyle() {
             this.enabledLayers = [];
@@ -446,7 +475,7 @@ module.exports = {
                 :layer-index="index"
                 :current-frame="currentFrame"
                 :frame-histograms="frameHistograms"
-                :get-frame-histogram="getFrameHistogram"
+                :get-frame-histogram="queueHistogramRequest"
                 :histogram-params="histogramParams"
                 :framedelta="framedelta"
                 :auto-range="autoRange"

{girder_large_image-1.31.2.dev72 → girder_large_image-1.31.2.dev79}/girder_large_image/web_client/widgets/HistogramEditor.vue

@@ -134,19 +134,23 @@ module.exports = {
             this.fetchHistogram();
         },
         frameHistograms() {
-            if (this.framedelta !== undefined) {
-                const targetFrame = this.currentFrame + this.framedelta;
-                if (this.frameHistograms[targetFrame]) {
-                    this.histogram = this.frameHistograms[targetFrame][0];
-                }
+            const framedelta = this.framedelta || 0;
+            const targetFrame = this.currentFrame + framedelta;
+            if (this.frameHistograms[targetFrame]) {
+                this.histogram = this.frameHistograms[targetFrame][0];
             }
         },
         histogram() {
             this.xRange = [5, this.$refs.svg.clientWidth];
-            this.vRange = [this.histogram.min, this.histogram.max];
-            this.drawHistogram(
-                this.simplifyHistogram(this.histogram.hist)
-            );
+            if (this.histogram) {
+                this.vRange = [this.histogram.min, this.histogram.max];
+                this.drawHistogram(
+                    this.simplifyHistogram(this.histogram.hist)
+                );
+            } else {
+                this.vRange = [0, 1];
+                this.drawHistogram([0, 0, 0]);
+            }
             makeDraggableSVG(
                 this.$refs.svg,
                 this.validateHandleDrag,

{girder_large_image-1.31.2.dev72 → girder_large_image-1.31.2.dev79}/girder_large_image.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-large-image
-Version: 1.31.2.dev72
+Version: 1.31.2.dev79
 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.31.2.dev72
+Requires-Dist: large_image>=1.31.2.dev79
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.31.2.dev72; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.31.2.dev79; 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.31.2.dev72 → girder_large_image-1.31.2.dev79}/girder_large_image.egg-info/requires.txt

@@ -1,7 +1,7 @@
 girder>=3.1.18
 girder-jobs>=3.0.3
-large_image>=1.31.2.dev72
+large_image>=1.31.2.dev79
 
 [tasks]
-large-image-tasks[girder]>=1.31.2.dev72
+large-image-tasks[girder]>=1.31.2.dev79
 girder-worker[girder]>=0.6.0