histomicsui 1.6.1.dev10__tar.gz → 1.6.1.dev14__tar.gz

{histomicsui-1.6.1.dev10 → histomicsui-1.6.1.dev14}/PKG-INFO

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

{histomicsui-1.6.1.dev10 → histomicsui-1.6.1.dev14}/histomicsui/web_client/dialogs/metadataPlot.js

@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 import View from '@girder/core/views/View';
 
 import metadataPlotDialog from '../templates/dialogs/metadataPlot.pug';
@@ -35,6 +37,11 @@ const MetadataPlotDialog = View.extend({
                 configOptions[series] = val;
             }
         });
+        ['u'].forEach((series) => {
+            const opts = this.$('#h-plot-series-' + series + ' option');
+            const val = opts.filter((idx, o) => o.selected).map((idx, o) => $(o).val()).get();
+            configOptions[series] = val.length ? val : undefined;
+        });
         this.result = configOptions;
         this.$el.modal('hide');
     }

{histomicsui-1.6.1.dev10 → histomicsui-1.6.1.dev14}/histomicsui/web_client/panels/MetadataPlot.js

@@ -150,7 +150,7 @@ var MetadataPlot = Panel.extend({
         if (!keys.length) {
             return;
         }
-        const requiredKeys = [];
+        let requiredKeys = [];
         ['x', 'y'].forEach((k) => {
             if (this.plotConfig[k] !== undefined) {
                 requiredKeys.push(this.plotConfig[k]);
@@ -163,12 +163,27 @@ var MetadataPlot = Panel.extend({
         if (this._currentAnnotations && this._currentAnnotations.length >= 1) {
             keys = keys.concat(['annotation.id', 'annotationelement.id']);
         }
+        if (this.plotConfig.u) {
+            ['x', 'y', 'r', 'c', 's'].forEach((k) => {
+                if (this.plotConfig[k] !== undefined && this.plotConfig[k].startsWith('compute.') && !keys.includes(this.plotConfig[k])) {
+                    keys.push(this.plotConfig[k]);
+                }
+                if (this.plotConfig[k] !== undefined && this.plotConfig[k].startsWith('compute.') && !requiredKeys.includes(this.plotConfig[k])) {
+                    requiredKeys.push(this.plotConfig[k]);
+                }
+            });
+            keys = keys.concat(this.plotConfig.u);
+            requiredKeys = requiredKeys.concat(this.plotConfig.u);
+        }
         const fetch = {
             adjacentItems: !!this.plotConfig.folder,
             keys: keys.join(','),
             requiredKeys: requiredKeys.join(','),
             annotations: JSON.stringify(this._currentAnnotations)
         };
+        if (this.plotConfig.u && this.plotConfig.u.length >= 3) {
+            fetch.compute = JSON.stringify({columns: this.plotConfig.u});
+        }
         if (!this.plottableDataPromise || !_.isEqual(this._lastPlottableDataFetch, fetch)) {
             this.plottableDataPromise = restRequest({
                 url: `annotation/item/${this.item.id}/plot/data`,

{histomicsui-1.6.1.dev10 → histomicsui-1.6.1.dev14}/histomicsui/web_client/templates/dialogs/metadataPlot.pug

@@ -21,7 +21,8 @@
             {key: 'y', label: 'y-axis', number: true},
             {key: 'r', label: 'Radius'},
             {key: 'c', label: 'Color'},
-            {key: 's', label: 'Symbol', string: true, comment: 'Grouping for violin plots'}]
+            {key: 's', label: 'Symbol', string: true, comment: 'Grouping for violin plots'},
+            {key: 'u', label: 'Dimension Reducation', number: true, multiple: true}]
         -
           var numNumbers = 0;
           var numIndex = [];
@@ -31,14 +32,15 @@
             label(for='h-plot-series-' + series.key) #{series.label}
             if series.comment
               p.g-hui-description #{series.comment}
-            select.form-control(id='h-plot-series-' + series.key)
+            select.form-control(id='h-plot-series-' + series.key, multiple=series.multiple)
               if !series.number
                 option(value='_none_', selected=plotConfig[series.key] === undefined) None
               each opt, optidx in plotOptions
                 if (!series.number || opt.type === 'number') && (!series.string || opt.type === 'string' || opt.distinct)
                   - var selected = plotConfig[series.key] === opt.key
                   - if (plotConfig[series.key] === undefined && series.number === true && numIndex[optidx] === seriesidx) { selected = true; }
-                  option(value=opt.key, selected=selected) #{opt.title}
+                  - if (series.multiple) { selected = plotConfig[series.key] ? plotConfig[series.key].includes(opt.key) : false; }
+                  option(value=opt.key, selected=selected) #{opt.title}#{opt.count > 1 && opt.distinctcount !== 1 ? ' *' : ''}
         .form-group
           label(for='h-plot-folder')
             input#h-plot-folder(type='checkbox', checked=plotConfig.folder)

{histomicsui-1.6.1.dev10 → histomicsui-1.6.1.dev14}/histomicsui/web_client/views/layout/LoginView.js

@@ -9,7 +9,6 @@ wrap(LoginView, 'render', function (render) {
         const loginText = (settings['histomicsui.login_text'] || '');
         if (loginText) {
             this.$('#g-login-form label[for="g-login"]').text(loginText);
-            console.log('HERE', loginText); // DWM::
         }
         return null;
     });

{histomicsui-1.6.1.dev10 → histomicsui-1.6.1.dev14}/histomicsui.egg-info/PKG-INFO

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

{histomicsui-1.6.1.dev10 → histomicsui-1.6.1.dev14}/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 =