histomicsui 1.6.1.dev12__tar.gz → 1.6.1.dev16__tar.gz

{histomicsui-1.6.1.dev12 → histomicsui-1.6.1.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev12
+Version: 1.6.1.dev16
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.

{histomicsui-1.6.1.dev12 → histomicsui-1.6.1.dev16}/histomicsui/web_client/dialogs/metadataPlot.js

@@ -4,6 +4,7 @@ import View from '@girder/core/views/View';
 
 import metadataPlotDialog from '../templates/dialogs/metadataPlot.pug';
 import '@girder/core/utilities/jquery/girderModal';
+import '../stylesheets/dialogs/metadataPlot.styl';
 
 const MetadataPlotDialog = View.extend({
     events: {
@@ -22,6 +23,7 @@ const MetadataPlotDialog = View.extend({
                 plotOptions: this.plotOptions
             })
         ).girderModal(this);
+
         return this;
     },
 

{histomicsui-1.6.1.dev12 → histomicsui-1.6.1.dev16}/histomicsui/web_client/panels/MetadataPlot.js

@@ -88,6 +88,7 @@ var MetadataPlot = Panel.extend({
         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.plottableListPromise = restRequest({
             url: `annotation/item/${this.item.id}/plot/list`,
             method: 'POST',
@@ -97,6 +98,8 @@ var MetadataPlot = Panel.extend({
             }
         }).done((result) => {
             this.plottableList = result;
+            this.plottableListPromise = null;
+            this.$el.toggleClass('loading', !!(this.plottableListPromise || this.plottableDataPromise));
             const plotOptions = this.getPlotOptions();
             if (plotOptions.filter((v) => v.type === 'number' && v.count).length >= 2) {
                 if (!hasPlot) {
@@ -163,8 +166,10 @@ var MetadataPlot = Panel.extend({
         if (this._currentAnnotations && this._currentAnnotations.length >= 1) {
             keys = keys.concat(['annotation.id', 'annotationelement.id']);
         }
+        let anyCompute = false;
         if (this.plotConfig.u) {
             ['x', 'y', 'r', 'c', 's'].forEach((k) => {
+                anyCompute = anyCompute || !!(this.plotConfig[k] !== undefined && this.plotConfig[k].startsWith('compute.'));
                 if (this.plotConfig[k] !== undefined && this.plotConfig[k].startsWith('compute.') && !keys.includes(this.plotConfig[k])) {
                     keys.push(this.plotConfig[k]);
                 }
@@ -172,8 +177,10 @@ var MetadataPlot = Panel.extend({
                     requiredKeys.push(this.plotConfig[k]);
                 }
             });
-            keys = keys.concat(this.plotConfig.u);
-            requiredKeys = requiredKeys.concat(this.plotConfig.u);
+            if (anyCompute) {
+                keys = keys.concat(this.plotConfig.u);
+                requiredKeys = requiredKeys.concat(this.plotConfig.u);
+            }
         }
         const fetch = {
             adjacentItems: !!this.plotConfig.folder,
@@ -181,10 +188,11 @@ var MetadataPlot = Panel.extend({
             requiredKeys: requiredKeys.join(','),
             annotations: JSON.stringify(this._currentAnnotations)
         };
-        if (this.plotConfig.u && this.plotConfig.u.length >= 3) {
+        if (this.plotConfig.u && this.plotConfig.u.length >= 3 && anyCompute) {
             fetch.compute = JSON.stringify({columns: this.plotConfig.u});
         }
         if (!this.plottableDataPromise || !_.isEqual(this._lastPlottableDataFetch, fetch)) {
+            this.$el.addClass('loading');
             this.plottableDataPromise = restRequest({
                 url: `annotation/item/${this.item.id}/plot/data`,
                 method: 'POST',
@@ -195,6 +203,8 @@ var MetadataPlot = Panel.extend({
         this._lastPlottableDataFetch = fetch;
         this.plottableDataPromise.done((result) => {
             this.plottableData = result;
+            this.plottableDataPromise = null;
+            this.$el.toggleClass('loading', !!(this.plottableListPromise || this.plottableDataPromise));
         });
     },
 
@@ -467,6 +477,7 @@ var MetadataPlot = Panel.extend({
             plotlyData.meanline = {visible: true};
             plotlyData.yaxis = {zeroline: false};
             plotlyData.scalemode = 'width';
+            plotlyData.spanmode = 'hard';
             plotlyData.width = 0.9;
             // plotlyData.points = 'outliers';
             plotlyData.points = 'all';

histomicsui-1.6.1.dev16/histomicsui/web_client/stylesheets/dialogs/metadataPlot.styl

@@ -0,0 +1,7 @@
+.modal-body
+  div.h-plot-resizable
+    resize vertical
+    overflow auto
+
+    select
+      height calc(100% - 24px)

{histomicsui-1.6.1.dev12 → histomicsui-1.6.1.dev16}/histomicsui/web_client/stylesheets/panels/metadataPlot.styl

@@ -17,6 +17,18 @@
     min-height 266px
     min-width 266px
 
+  .s-panel-title
+    .load-mark
+      display none
+
+.h-metadata-plot.loading
+  .s-panel-title
+    .icon-chart-line
+      display none
+
+    .load-mark
+      display inherit
+
 .h-panel-maximized
   .h-metadata-plot-area.js-plotly-plot
     height 100%

{histomicsui-1.6.1.dev12 → histomicsui-1.6.1.dev16}/histomicsui/web_client/templates/dialogs/metadataPlot.pug

@@ -28,7 +28,7 @@
           var numIndex = [];
           plotOptions.forEach((po, idx) => { numIndex.push(numNumbers);  if (po.type === 'number') { numNumbers += 1; }});
         for series, seriesidx in seriesList
-          .form-group
+          .form-group(class=series.multiple ? 'h-plot-resizable' : '')
             label(for='h-plot-series-' + series.key) #{series.label}
             if series.comment
               p.g-hui-description #{series.comment}

{histomicsui-1.6.1.dev12 → histomicsui-1.6.1.dev16}/histomicsui/web_client/templates/panels/metadataPlot.pug

@@ -1,7 +1,7 @@
 extends ./panel.pug
 
 block title
-  | #[span.icon-chart-line] Metadata Plot
+  | #[span.icon-chart-line] #[span.icon-spin1.animate-spin.load-mark(title="Getting Plot Information")] Metadata Plot
 block controls
   span.s-no-panel-toggle
     button.g-widget-metadata-plot-settings.btn.btn-sm.btn-default(title="Plot Settings")

{histomicsui-1.6.1.dev12 → histomicsui-1.6.1.dev16}/histomicsui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev12
+Version: 1.6.1.dev16
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.

{histomicsui-1.6.1.dev12 → histomicsui-1.6.1.dev16}/histomicsui.egg-info/SOURCES.txt

@@ -79,6 +79,7 @@ histomicsui/web_client/static/favicon.png
 histomicsui/web_client/stylesheets/body/configView.styl
 histomicsui/web_client/stylesheets/body/image.styl
 histomicsui/web_client/stylesheets/dialogs/editStyleGroups.styl
+histomicsui/web_client/stylesheets/dialogs/metadataPlot.styl
 histomicsui/web_client/stylesheets/dialogs/openAnnotatedImage.styl
 histomicsui/web_client/stylesheets/dialogs/saveAnnotation.styl
 histomicsui/web_client/stylesheets/layout/header.styl

{histomicsui-1.6.1.dev12 → histomicsui-1.6.1.dev16}/tox.ini

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