Expose Graph node_marker option (#4255)

* Expose Graph node_marker option * Update reference notebook
holoviz · Mar 4, 2020 · 33669de · 33669de
1 parent 2429747
commit 33669de
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/examples/reference/elements/bokeh/Graph.ipynb b/examples/reference/elements/bokeh/Graph.ipynb
@@ -72,9 +72,7 @@
     "source = np.zeros(N)\n",
     "target = node_indices\n",
     "\n",
-    "padding = dict(x=(-1.2, 1.2), y=(-1.2, 1.2))\n",
-    "\n",
-    "simple_graph = hv.Graph(((source, target),)).redim.range(**padding)\n",
+    "simple_graph = hv.Graph(((source, target),))\n",
     "simple_graph"
    ]
   },
@@ -148,8 +146,7 @@
     "nodes = hv.Nodes((x, y, node_indices, node_labels), vdims='Type')\n",
     "graph = hv.Graph(((source, target, edge_weights), nodes, paths), vdims='Weight')\n",
     "\n",
-    "graph.redim.range(**padding).opts(node_color='Type', edge_color='Weight',\n",
-    "                                  cmap=['blue', 'red'], edge_cmap='viridis')"
+    "graph.opts(node_color='Type', edge_color='Weight', cmap=['blue', 'red'], edge_cmap='viridis')"
    ]
   },
   {

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
@@ -1022,7 +1022,8 @@ def _apply_transforms(self, element, data, ranges, style, group=None):
             if util.isscalar(val):
                 key = val
             else:
-                key = {'field': k}
+                # Node marker does not handle {'field': ...}
+                key = k if k == 'node_marker' else {'field': k} 
                 data[k] = val
 
             # If color is not valid colorspec add colormapper

diff --git a/holoviews/plotting/bokeh/graphs.py b/holoviews/plotting/bokeh/graphs.py
@@ -56,7 +56,8 @@ class GraphPlot(CompositeElementPlot, ColorbarPlot, LegendPlot):
 
     style_opts = (['edge_'+p for p in fill_properties+line_properties] +
                   ['node_'+p for p in fill_properties+line_properties] +
-                  ['node_size', 'cmap', 'edge_cmap', 'node_cmap', 'node_radius'])
+                  ['node_size', 'cmap', 'edge_cmap', 'node_cmap',
+                   'node_radius', 'node_marker'])
 
     _nonvectorized_styles =  ['cmap', 'edge_cmap', 'node_cmap']