histomicsui 1.6.1.dev20__tar.gz → 1.6.1.dev24__tar.gz

{histomicsui-1.6.1.dev20 → histomicsui-1.6.1.dev24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev20
+Version: 1.6.1.dev24
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -20,7 +20,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: girder-large-image-annotation>=1.29.4
+Requires-Dist: girder-large-image-annotation>=1.29.10
 Requires-Dist: girder-slicer-cli-web[girder]>=1.4.0
 Requires-Dist: cachetools
 Requires-Dist: orjson

{histomicsui-1.6.1.dev20 → histomicsui-1.6.1.dev24}/histomicsui/web_client/package.json

@@ -42,6 +42,7 @@
         "sinon": "^2.1.0",
         "tinycolor2": "~1.4.1",
         "url-search-params-polyfill": "^8.1.1",
+        "uuid": "^8.3.2",
         "vue": "~2.6.14",
         "vue-color": "^2.8.1",
         "vue-loader": "~15.9.8",

{histomicsui-1.6.1.dev20 → histomicsui-1.6.1.dev24}/histomicsui/web_client/panels/MetadataPlot.js

@@ -2,6 +2,7 @@
 
 import $ from 'jquery';
 import _ from 'underscore';
+import {v4 as uuidv4} from 'uuid';
 
 import {restRequest} from '@girder/core/rest';
 
@@ -12,6 +13,8 @@ import MetadataPlotDialog from '../dialogs/metadataPlot';
 import metadataPlotTemplate from '../templates/panels/metadataPlot.pug';
 import '../stylesheets/panels/metadataPlot.styl';
 
+const sessionId = uuidv4();
+
 var MetadataPlot = Panel.extend({
     events: _.extend(Panel.prototype.events, {
         'click .g-widget-metadata-plot-settings': function (event) {
@@ -79,33 +82,40 @@ var MetadataPlot = Panel.extend({
         this.plottableList = null;
         if (this.plottableListPromise) {
             this.plottableListPromise.abort();
+            this.plottableListLoading = false;
         }
         this.plottableData = null;
         if (this.plottableDataPromise) {
             this.plottableDataPromise.abort();
             this.plottableDataPromise = null;
+            this.plottableDataLoading = false;
         }
         const hasPlot = (this.getPlotOptions().filter((v) => v.type === 'number' && v.count).length >= 2);
 
         // redo this when annotations are turned on or off
         this.$el.addClass('loading');
+        this.plottableListLoading = true;
         this.plottableListPromise = restRequest({
             url: `annotation/item/${this.item.id}/plot/list`,
             method: 'POST',
             error: null,
             data: {
-                annotations: JSON.stringify(this._currentAnnotations)
+                annotations: JSON.stringify(this._currentAnnotations),
+                uuid: sessionId
             }
         }).done((result) => {
             this.plottableList = result;
-            this.plottableListPromise = null;
-            this.$el.toggleClass('loading', !!(this.plottableListPromise || this.plottableDataPromise));
+            this.plottableListLoading = false;
+            this.$el.toggleClass('loading', !!(this.plottableListLoading || this.plottableDataLoading));
             const plotOptions = this.getPlotOptions();
             if (plotOptions.filter((v) => v.type === 'number' && v.count).length >= 2) {
                 if (!hasPlot) {
                     this.render();
                 }
             }
+        }).fail((result) => {
+            this.plottableListLoading = false;
+            this.$el.toggleClass('loading', !!(this.plottableListLoading || this.plottableDataLoading));
         });
     },
 
@@ -182,29 +192,34 @@ var MetadataPlot = Panel.extend({
                 requiredKeys = requiredKeys.concat(this.plotConfig.u);
             }
         }
-        const fetch = {
+        const params = {
             adjacentItems: !!this.plotConfig.folder,
             keys: keys.join(','),
             requiredKeys: requiredKeys.join(','),
-            annotations: JSON.stringify(this._currentAnnotations)
+            annotations: JSON.stringify(this._currentAnnotations),
+            uuid: sessionId
         };
         if (this.plotConfig.u && this.plotConfig.u.length >= 3 && anyCompute) {
-            fetch.compute = JSON.stringify({columns: this.plotConfig.u});
+            params.compute = JSON.stringify({columns: this.plotConfig.u});
         }
-        if (!_.isEqual(this._lastPlottableDataFetch, fetch)) {
+        if (!_.isEqual(this._lastPlottableDataParams, params)) {
             this.$el.addClass('loading');
+            this.plottableDataLoading = true;
             this.plottableDataPromise = restRequest({
                 url: `annotation/item/${this.item.id}/plot/data`,
                 method: 'POST',
                 error: null,
-                data: fetch
+                data: params
             });
+            this._lastPlottableDataParams = params;
         }
-        this._lastPlottableDataFetch = fetch;
         this.plottableDataPromise.done((result) => {
             this.plottableData = result;
-            this.plottableDataPromise = null;
-            this.$el.toggleClass('loading', !!(this.plottableListPromise || this.plottableDataPromise));
+            this.plottableDataLoading = false;
+            this.$el.toggleClass('loading', !!(this.plottableListLoading || this.plottableDataLoading));
+        }).fail(() => {
+            this.plottableDataLoading = false;
+            this.$el.toggleClass('loading', !!(this.plottableListLoading || this.plottableDataLoading));
         });
     },
 
@@ -478,17 +493,28 @@ var MetadataPlot = Panel.extend({
             plotlyData.yaxis = {zeroline: false};
             plotlyData.scalemode = 'width';
             plotlyData.spanmode = 'hard';
+            plotlyData.showlegend = false;
             plotlyData.width = 0.9;
             // plotlyData.points = 'outliers';
             plotlyData.points = 'all';
             plotlyData.pointpos = 0;
             plotlyData.jitter = 0;
             // plotlyData.side = 'positive';
-            if (plotData.series.c && plotData.series.c.distinct) {
+            if (plotData.series.c && plotData.series.c.distinct && plotData.series.s.distinct) {
                 plotlyData.transforms = [{
                     type: 'groupby',
                     groups: plotlyData.x,
-                    styles: Object.keys(plotData.series.c.distinct).map((k, kidx) => ({target: kidx, value: {line: {color: colorBrewerPaired12[kidx]}}}))
+                    styles: Object.keys(plotData.series.s.distinct).map((k, kidx) => {
+                        k = plotData.series.s.distinct[kidx];
+                        for (let didx = 0; didx < plotData.data.length; didx += 1) {
+                            if (plotData.data[didx][plotData.series.s.index] === k) {
+                                const cval = plotData.data[didx][plotData.series.c.index];
+                                const cidx = plotData.series.c.distinct.indexOf(cval);
+                                return {target: kidx, value: {line: {color: colorBrewerPaired12[cidx]}}};
+                            }
+                        }
+                        return {target: kidx, value: {line: {color: '#000000'}}};
+                    })
                 }];
             }
         }

{histomicsui-1.6.1.dev20 → histomicsui-1.6.1.dev24}/histomicsui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev20
+Version: 1.6.1.dev24
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -20,7 +20,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: girder-large-image-annotation>=1.29.4
+Requires-Dist: girder-large-image-annotation>=1.29.10
 Requires-Dist: girder-slicer-cli-web[girder]>=1.4.0
 Requires-Dist: cachetools
 Requires-Dist: orjson

{histomicsui-1.6.1.dev20 → histomicsui-1.6.1.dev24}/histomicsui.egg-info/requires.txt

@@ -1,4 +1,4 @@
-girder-large-image-annotation>=1.29.4
+girder-large-image-annotation>=1.29.10
 girder-slicer-cli-web[girder]>=1.4.0
 cachetools
 orjson

{histomicsui-1.6.1.dev20 → histomicsui-1.6.1.dev24}/setup.py

@@ -42,7 +42,7 @@ setup(
         'Programming Language :: Python :: 3.12',
     ],
     install_requires=[
-        'girder-large-image-annotation>=1.29.4',
+        'girder-large-image-annotation>=1.29.10',
         'girder-slicer-cli-web[girder]>=1.4.0',
         'cachetools',
         'orjson',

{histomicsui-1.6.1.dev20 → histomicsui-1.6.1.dev24}/tox.ini

@@ -18,7 +18,6 @@ deps =
   setuptools_scm
   urllib3<1.26
   -rrequirements-dev.txt
-  girder-large-image-annotation!=1.29.8,!=1.29.9
 extras =
   analysis
 allowlist_externals =