minor fixes

Author: bricofStitchFix

d3_lib.py

@@ -18,7 +18,7 @@ def set_styles(css_file_names):
     return "<style>" + style + "</style>"
 
 
-def draw_graph(type, data):
+def draw_graph(type, data_dict):
 
     JS_text = Template('''
     
@@ -31,8 +31,8 @@ def draw_graph(type, data):
                 ''')
 
     divnum = int(random.uniform(0,9999999999))
-    
+    data_dict['divnum'] = divnum
     main_text_template = Template( open(this_dir() + '/js/' + type + '.js','r').read() )
-    
-    main_text = main_text_template.safe_substitute({'divnum': divnum, 'data': str(data)})
+    main_text = main_text_template.safe_substitute(data_dict)
+
     return JS_text.safe_substitute({'divnum': divnum, 'main_text': main_text})

hello_dom.ipynb

@@ -5,7 +5,8 @@
    "metadata": {},
    "source": [
     "# Hello DOM!\n",
-    "## A one-step at a time introduction to using D3 in Jupyter"
+    "\n",
+    "A one-step at a time introduction to using D3 in Jupyter"
    ]
   },
   {

js/force_directed_graph.js

@@ -7,8 +7,8 @@ var width = 960,
 var color = d3.scale.category20();
 
 var force = d3.layout.force()
-    .charge(-120)
-    .linkDistance(300)
+    .charge(-300)
+    .linkDistance(50)
     .size([width, height]);
 
 d3.select("#maindiv${divnum}").selectAll("svg").remove();
@@ -18,7 +18,7 @@ var svg = d3.select("#maindiv${divnum}").append("svg")
 
 //d3.json("miserables.json", function(error, graph) {
 //  if (error) throw error;
-var graph = $data;
+var graph = $data ;
 
   force
       .nodes(graph.nodes)
@@ -35,7 +35,7 @@ var graph = $data;
       .data(graph.nodes)
     .enter().append("circle")
       .attr("class", "node")
-      .attr("r", 5)
+      .attr("r", 8)
       .style("fill", function(d) { return color(d.group); })
       .call(force.drag);