update images

* updated angular to 1.6.10 * new images * fixed horizon chart * changed category to beeswarm
densitydesign · Jun 4, 2018 · 2b996cc · 2b996cc
1 parent 58e15d1
commit 2b996cc
Show file tree

Hide file tree

Showing 31 changed files with 43,551 additions and 419 deletions.
diff --git a/bower.json b/bower.json
@@ -20,7 +20,7 @@
     "tests"
   ],
   "dependencies": {
-    "angular": "1.6.2",
+    "angular": "1.6.10",
     "d3": "5.0.0",
     "d3-voronoi": "https://github.com/d3/d3-voronoi/releases/download/v1.1.2/d3-voronoi.zip",
     "d3-delaunay": "https://github.com/d3/d3-delaunay/releases/download/v2.0.1/d3-delaunay.zip",
@@ -29,11 +29,11 @@
     "d3-contour": "https://github.com/d3/d3-contour/releases/download/v1.2.0/d3-contour.zip",
     "d3-box": "https://gist.githubusercontent.com/mikima/28d130bd380fd9be113c7040315ec036/raw/ffc793f4843311dc6a898715eec2c4492c86aeb3/box.js",
     "bootstrap": "3.3.6",
-    "angular-route": "1.6.2",
+    "angular-route": "1.6.10",
     "angular-strap": "2.3.12",
-    "angular-animate": "1.6.2",
+    "angular-animate": "1.6.10",
     "jquery-ui": "1.12.1",
-    "angular-sanitize": "1.6.2",
+    "angular-sanitize": "1.6.10",
     "angular-bootstrap-colorpicker": "latest",
     "bootstrap-colorpicker": "latest",
     "FileSaver": "https://cdn.rawgit.com/eligrey/FileSaver.js/e9d941381475b5df8b7d7691013401e171014e89/FileSaver.min.js",
@@ -47,6 +47,6 @@
     "js-xlsx": "0.8.5"
   },
   "resolutions": {
-    "angular": "1.6.2"
+    "angular": "1.6.10"
   }
 }
diff --git a/charts/beeswarmPlot.js b/charts/beeswarmPlot.js
@@ -65,7 +65,7 @@
         .title('Beeswarm Plot')
         .description("It distributes elements horizontally avoiding overlap between them and according to a selected dimension.<br/><br/>Based on <a href='https://bl.ocks.org/mbostock/6526445e2b44303eebf21da3b6627320'>https://bl.ocks.org/mbostock/6526445e2b44303eebf21da3b6627320</a>")
         .thumbnail("imgs/beeswarm.png")
-        .category('Dispersion')
+        .category('Distribution')
         .model(model)
 
     // visualiziation options

diff --git a/charts/horizonChart.js b/charts/horizonChart.js
@@ -31,10 +31,6 @@
 		.title('Bands')
 		.defaultValue(4)
 
-	var specular = chart.checkbox()
-		.title("Center values vertically")
-		.defaultValue(false)
-
 	var curve = chart.list()
 		.title("Interpolation")
 		.values(['Cardinal', 'Basis spline', 'Sankey', 'Linear'])
@@ -45,6 +41,9 @@
 		.values(['Original', 'Total (descending)', 'Total (ascending)', 'Name'])
 		.defaultValue('Original')
 
+	var colors = chart.color()
+		.title("Color scale")
+
 	// interpolation function
 
 	function CurveSankey(context) {
@@ -90,6 +89,9 @@
 
 	chart.draw(function(selection, data) {
 
+		//define colors
+		colors.domain(['Negative', 'Positive']);
+
 		//sort data
 		function sortBy(a, b) {
 			if (sorting() == 'Total (descending)') {
@@ -207,7 +209,7 @@
 
 				g.append("path")
 					.attr("class", "area")
-					.style("fill", '#699fbf')
+					.style("fill", colors()('Positive'))
 					.attr("d", area(single.values))
 					.attr("opacity", (i + 1) / bands())
 					.attr("clip-path", function(d) { return "url(#clip_" + d.id + ")" });
@@ -223,7 +225,7 @@
 
 				g.append("path")
 					.attr("class", "area")
-					.style("fill", '#bf6969')
+					.style("fill", colors()('Negative'))
 					.attr("d", area(single.values))
 					.attr("opacity", (i + 1) / bands())
 					.attr("clip-path", function(d) { return "url(#clip_" + d.id + ")" });