histomicsui 1.5.1.dev8__tar.gz → 1.5.1.dev14__tar.gz

{histomicsui-1.5.1.dev8 → histomicsui-1.5.1.dev14}/PKG-INFO

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

{histomicsui-1.5.1.dev8 → histomicsui-1.5.1.dev14}/histomicsui/web_client/panels/MetadataPlot.js

@@ -198,7 +198,9 @@ var MetadataPlot = Panel.extend({
                             entry._roots[opt.root] = entry._roots[opt.root] || meta[opt.root][idx];
                         }
                         if (value === undefined || (opt.type === 'number' && !_.isFinite(value))) {
-                            end = true;
+                            if (plotData.format !== 'violin' || key !== 'x') {
+                                end = true;
+                            }
                         }
                         if (opt.type === 'string' || (['s', 'c'].includes(key) && opt.distinct)) {
                             value = '' + value;
@@ -300,11 +302,16 @@ var MetadataPlot = Panel.extend({
         if (plotData.format === 'violin') {
             plotlyData.type = 'violin';
             plotlyData.x = plotlyData.marker.symbol;
-            // plotlyData.points = none;
             plotlyData.box = {visible: true};
             plotlyData.meanline = {visible: true};
-            plotlyData.line = {color: plotlyData.marker.color};
             plotlyData.yaxis = {zeroline: false};
+            plotlyData.scalemode = 'width';
+            plotlyData.width = 0.9;
+            // plotlyData.points = 'outliers';
+            plotlyData.points = 'all';
+            plotlyData.pointpos = 0;
+            plotlyData.jitter = 0;
+            // plotlyData.side = 'positive';
             if (plotData.ranges.c && plotData.ranges.c.distinct) {
                 plotlyData.transforms = [{
                     type: 'groupby',
@@ -313,6 +320,7 @@ var MetadataPlot = Panel.extend({
                 }];
             }
         }
+        console.log(plotlyData);
         return [plotlyData];
     },
 
@@ -349,7 +357,7 @@ var MetadataPlot = Panel.extend({
                 if (maximized) {
                     plotOptions.margin.l += 20;
                     plotOptions.margin.b += 40;
-                    plotOptions.xaxis = {title: {text: `${plotData.plotToOpt.x.root} - ${plotData.plotToOpt.x.key}`}};
+                    plotOptions.xaxis = {title: {text: plotData.format !== 'violin' ? `${plotData.plotToOpt.x.root} - ${plotData.plotToOpt.x.key}` : `${plotData.plotToOpt.s.root} - ${plotData.plotToOpt.s.key}`}};
                     plotOptions.yaxis = {title: {text: `${plotData.plotToOpt.y.root} - ${plotData.plotToOpt.y.key}`}};
                 }
                 window.Plotly.newPlot(elem[0], this.plotDataToPlotly(plotData), plotOptions);

{histomicsui-1.5.1.dev8 → histomicsui-1.5.1.dev14}/histomicsui/web_client/templates/dialogs/metadataPlot.pug

@@ -17,7 +17,7 @@
               option(value=opt.key, selected=plotConfig.format === opt.key) #{opt.label}
         -
           var seriesList = [
-            {key: 'x', label: 'x-axis', number: true, comment: 'Used only for data length in violin plots'},
+            {key: 'x', label: 'x-axis', number: true, comment: 'Not used in violin plots'},
             {key: 'y', label: 'y-axis', number: true},
             {key: 'r', label: 'Radius'},
             {key: 'c', label: 'Color'},

{histomicsui-1.5.1.dev8 → histomicsui-1.5.1.dev14}/histomicsui/webroot.mako

@@ -16,7 +16,7 @@
     <script src="${staticPublicPath}/built/girder_app.min.js"></script>
     <script>
     $(function () {
-      $('body').addClass('hui-body')
+      $('body').addClass('hui-body');
       girder.router.enabled(false);
       girder.events.trigger('g:appload.before');
       var app = new girder.plugins.histomicsui.App({

{histomicsui-1.5.1.dev8 → histomicsui-1.5.1.dev14}/histomicsui.egg-info/PKG-INFO

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