histomicsui 1.6.1.dev56__tar.gz → 1.6.1.dev60__tar.gz

{histomicsui-1.6.1.dev56 → histomicsui-1.6.1.dev60}/PKG-INFO

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

{histomicsui-1.6.1.dev56 → histomicsui-1.6.1.dev60}/histomicsui/web_client/panels/MetadataPlot.js

@@ -465,12 +465,19 @@ var MetadataPlot = Panel.extend({
     },
 
     plotDataToPlotly: function (plotData) {
-        const colorBrewerPaired12 = ['#a6cee3', '#1f78b4', '#b2df8a', '#33a02c', '#fb9a99', '#e31a1c', '#fdbf6f', '#ff7f00', '#cab2d6', '#6a3d9a', '#ffff99', '#b15928'];
+        let colorBrewerPaired12 = ['#a6cee3', '#1f78b4', '#b2df8a', '#33a02c', '#fb9a99', '#e31a1c', '#fdbf6f', '#ff7f00', '#cab2d6', '#6a3d9a', '#ffff99', '#b15928'];
         const viridis = ['#440154', '#482172', '#423d84', '#38578c', '#2d6f8e', '#24858d', '#1e9a89', '#2ab07e', '#51c468', '#86d449', '#c2df22', '#fde724'];
-        let colorScale;
-        if (plotData.series.c && (plotData.series.c.type === 'number' || !plotData.series.c.distinctcount)) {
+        // concatenate this so we have predictable colors for a longer scale
+        // for discrete values.  It would probably be better to use a longer
+        // scale
+        colorBrewerPaired12 = colorBrewerPaired12.concat(viridis);
+        let colorScale, sColorScale;
+        if (plotData.series.c && (plotData.series.c.type === 'number' || !plotData.series.c.distinctcount || plotData.series.c.distinctcount > colorBrewerPaired12.length)) {
             colorScale = window.d3.scale.linear().domain(viridis.map((_, i) => i / (viridis.length - 1) * ((plotData.series.c.max - plotData.series.c.min) || 0) + plotData.series.c.min)).range(viridis);
         }
+        if (plotData.series.s && (plotData.series.s.type === 'number' || !plotData.series.s.distinctcount || plotData.series.s.distinctcount > colorBrewerPaired12.length)) {
+            sColorScale = window.d3.scale.linear().domain(viridis.map((_, i) => i / (viridis.length - 1) * ((plotData.series.s.max - plotData.series.s.min) || 0) + plotData.series.s.min)).range(viridis);
+        }
         const plotlyData = {
             x: plotData.series.x ? plotData.data.map((d) => d[plotData.series.x.index]) : 0,
             y: plotData.data.map((d) => d[plotData.series.y.index]),
@@ -490,7 +497,7 @@ var MetadataPlot = Panel.extend({
                     : 10,
                 color: plotData.series.c
                     ? (
-                        !plotData.series.c.distinctcount
+                        colorScale
                             ? plotData.data.map((d) => colorScale(d[plotData.series.c.index]))
                             : plotData.data.map((d) => colorBrewerPaired12[plotData.series.c.distinct.indexOf(d[plotData.series.c.index])] || '#000000')
                     )
@@ -524,8 +531,15 @@ var MetadataPlot = Panel.extend({
                         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]}}};
+                                const cidx = plotData.series.s.distinct.indexOf(cval);
+                                return {
+                                    target: kidx,
+                                    value: {
+                                        line: {
+                                            color: colorScale ? sColorScale[cval] : colorBrewerPaired12[cidx]
+                                        }
+                                    }
+                                };
                             }
                         }
                         return {target: kidx, value: {line: {color: '#000000'}}};
@@ -550,13 +564,16 @@ var MetadataPlot = Panel.extend({
             };
             plotData.data.forEach((d) => {
                 const s = plotData.series.s && plotData.series.s.distinct ? plotData.series.s.distinct.indexOf(d[plotData.series.s.index]) : 0;
+                if (!isFinite(d[plotData.series.y.index]) || (plotData.series.x && !isFinite(d[plotData.series.x.index])) || (plotData.series.r && plotData.series.r === 'number' && !isFinite(d[plotData.series.r.index])) || (plotData.series.c && plotData.series.c === 'number' && !isFinite(d[plotData.series.c.index]))) {
+                    return;
+                }
                 if (pv.dd[s] === undefined) {
                     pv.dd[s] = d;
                 }
                 if (plotData.series.x) {
-                    pv.xd[s].push(d[plotData.series.x.index]);
+                    pv.xd[s].push(+d[plotData.series.x.index]);
                 }
-                pv.yd[s].push(d[plotData.series.y.index]);
+                pv.yd[s].push(+d[plotData.series.y.index]);
                 if (plotData.series.c) {
                     pv.cd[s].push(d[plotData.series.c.index]);
                 }

{histomicsui-1.6.1.dev56 → histomicsui-1.6.1.dev60}/histomicsui.egg-info/PKG-INFO

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