Merge branch 'agussman-feature/35_curved_links_13_multiple_edges'

bricaud · Oct 21, 2018 · 7eab0d7 · 7eab0d7
2 parents 9a8eecc + 48a98c6
commit 7eab0d7
Show file tree

Hide file tree

Showing 4 changed files with 218 additions and 175 deletions.
diff --git a/css/graphStyle.css b/css/graphStyle.css
@@ -49,12 +49,18 @@
   fill: none;
   pointer-events: all;
 }
-/*
+
 .links line {
   stroke: #999;
   stroke-opacity: 0.6;
 }
 
+path {
+  fill: none;
+}
+
+/*
+
 .nodes circle {
   stroke: #fff;
   stroke-width: 1.5px;

diff --git a/scripts/graphConf.js b/scripts/graphConf.js
@@ -39,3 +39,4 @@ const node_position_y = 'graphexpy'
 const default_edge_stroke_width = 3;
 const default_edge_color = "#CCC";
 const edge_label_color = "#111";
+const use_curved_edges = true;
diff --git a/scripts/graphShapes.js b/scripts/graphShapes.js
@@ -179,7 +179,7 @@ var graphShapes = (function(){
 
 	function decorate_link(edges,edgepaths,edgelabels){
 
-		var edges_deco = edges.append("line").attr("class", "edge").classed("active_edge",true)
+		var edges_deco = edges.append("path").attr("class", "edge").classed("active_edge",true)
 			.attr("source_ID",function(d) { return d.source;})
 			.attr("target_ID",function(d) { return d.target;})
 			.attr("ID",function(d) { return d.id;});