Made canvas default. Renamed option labels.

Author: buhrmann

app.py

@@ -42,8 +42,8 @@ def index(canvas=None):
     NODE_CACHE = neo.neurons()
     REL_CACHE = neo.synapses_d3(NODE_CACHE, min_weight=0)
     jsn = json.dumps({'neurons':NODE_CACHE, 'synapses':REL_CACHE})
-    use_canvas = json.dumps(canvas == "canvas")
-    return render_template('graph.html', data=jsn, use_canvas=use_canvas)
+    use_canvas = canvas != "svg"
+    return render_template('graph.html', data=jsn, use_canvas=json.dumps(use_canvas))
 
 
 @APP.route('/_subgraph')

static/css/d3.css

@@ -59,6 +59,7 @@ body {
   background-color: rgba(245, 245, 245, 0.75);
   border-top-left-radius: 10px;
   border-top-right-radius: 10px;
+  pointer-events: none;
 }
 
 /* Paths in symbol legend */

templates/graph.html

@@ -71,11 +71,11 @@ <h3>Subgraph
           </div>
 
           <div class="form-group" id="subw">
-            <label for="subwslider">Synapse min weight [1-10]: </label> <output for="subwSlider" id="subwlabel">1</output>
+            <label for="subwslider">Mininum number of <br>chemical contacts [1-10]: </label> <output for="subwSlider" id="subwlabel">1</output>
             <input type="range" id="subwslider" name="subw" value="1" min="1" max="10" oninput="document.getElementById('subwlabel').value = value;">            
           </div>
           <div class="form-group" id="subj">
-            <label for="subjslider">Junction min weight [1-10]: </label> <output for="subjSlider" id="subjlabel">1</output>
+            <label for="subjslider">Mininum number of <br>electrical contacts [1-10]: </label> <output for="subjSlider" id="subjlabel">1</output>
             <input type="range" id="subjslider" name="subj" value="1" min="1" max="10" oninput="document.getElementById('subjlabel').value = value;">            
           </div>
           <div class="form-group" id="subp">
@@ -152,11 +152,11 @@ <h3>Visibility
             <input type="range" id="ndegslider" name="ndeg" value="0" min="0" max="200" oninput="filterNDeg(value)">            
           </div>
           <div class="form-group" id="wmin">
-            <label for="wminslider">Synapse min weight [1-40]:</label> <output for="wminslider" id="wminlabel">1</output>
+            <label for="wminslider">Mininum number of <br>chemical contacts [1-40]:</label> <output for="wminslider" id="wminlabel">1</output>
             <input type="range" id="wminslider" name="wmin" value="1" min="1" max="40" oninput="filterWMin(value)">            
           </div>
           <div class="form-group" id="jmin">
-            <label for="jminslider">Junction min weight [1-25]:</label> <output for="jminslider" id="jminlabel">1</output>
+            <label for="jminslider">Minimum number of <br>electrical contacts [1-25]:</label> <output for="jminslider" id="jminlabel">1</output>
             <input type="range" id="jminslider" name="jmin" value="1" min="1" max="25" oninput="filterJMin(value)">            
           </div>
           <div class="checkbox">
@@ -165,11 +165,11 @@ <h3>Visibility
           <div class="checkbox">
             <label><input type="checkbox" onchange="toggleJunctions(this)" checked>Electrical junctions</label>
           </div>
-          <div class="checkbox">
+          <!-- <div class="checkbox">
             <label title="Indicate directionality"><input type="checkbox" onchange="toggleArrows(this)" checked>Arrows</label>
-          </div>
+          </div> -->
           <div class="checkbox">
-            <label title="Disambiguate multiple connections between two neurons"><input type="checkbox" onchange="arcsplease(this)">Arcs</label>
+            <label title="Disambiguate multiple connections between two neurons"><input type="checkbox" onchange="arcsplease(this)">Connections as arcs</label>
           </div>
         </div>
         </div>
@@ -256,6 +256,7 @@ <h3>Export
     <div id="footerwrapper">
       <div id="footer"></div>
     </div>
+
   {% endif %}
 {% endblock %}