toggling groups

mwasiluk · Sep 8, 2016 · 5f63300 · 5f63300
1 parent f4534d3
commit 5f63300
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/dist/odc-d3.js b/dist/odc-d3.js
diff --git a/dist/odc-d3.min.js b/dist/odc-d3.min.js
diff --git a/dist/odc-d3.min.js.map b/dist/odc-d3.min.js.map
diff --git a/src/histogram.js b/src/histogram.js
@@ -83,8 +83,11 @@ export class Histogram extends Chart{
         if (colorValue && typeof colorValue === 'string' || colorValue instanceof String){
             this.plot.color = colorValue;
         }else if(this.plot.colorCategory){
-            var domain = Object.getOwnPropertyNames(d3.map(this.data, d => this.config.groups.value.call(this.config, d))['_']);
-            self.plot.colorCategory.domain(domain);
+            if(this.config.groups){
+                var domain = Object.getOwnPropertyNames(d3.map(this.data, d => this.config.groups.value.call(this.config, d))['_']);
+                self.plot.colorCategory.domain(domain);
+            }
+
             this.plot.color = d =>  self.plot.colorCategory(d.key);
         }
 

diff --git a/src/scatterplot-matrix.js b/src/scatterplot-matrix.js
@@ -249,7 +249,6 @@ export class ScatterPlotMatrix extends Chart {
 
 
         function plotSubplot(p) {
-            console.log('plotSubplot');
             var plot = self.plot;
             plot.subplots.push(p);
             var cell = d3.select(this);
@@ -297,7 +296,7 @@ export class ScatterPlotMatrix extends Chart {
                             .style("left", (d3.event.pageX + 5) + "px")
                             .style("top", (d3.event.pageY - 28) + "px");
 
-                        var group = self.config.groups.value(d);
+                        var group = self.config.groups ? self.config.groups.value(d) : false;
                         if(group || group===0 ){
                             html+="<br/>";
                             var label = self.config.groups.label;

diff --git a/src/scatterplot.js b/src/scatterplot.js
@@ -35,7 +35,7 @@ export class ScatterPlotConfig extends ChartConfig{
     };
     dot = {
         radius: 2,
-        color: d => this.groups.value(d, this.groups.key), // string or function returning color's value for color scale
+        color: d => this.groups ? this.groups.value(d, this.groups.key) : '', // string or function returning color's value for color scale
         d3ColorCategory: 'category10'
     };
     transition= true;
@@ -255,7 +255,7 @@ export class ScatterPlot extends Chart{
                     .duration(200)
                     .style("opacity", .9);
                 var html = "(" + plot.x.value(d) + ", " + plot.y.value(d) + ")";
-                var group = self.config.groups.value(d, self.config.groups.key);
+                var group = self.config.groups ?  self.config.groups.value(d, self.config.groups.key) : null;
                 if (group || group === 0) {
                     html += "<br/>";
                     var label = self.config.groups.label;