Skip empty chords

holoviz · Dec 14, 2017 · 4f4e91d · 4f4e91d
1 parent 0b3988c
commit 4f4e91d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/holoviews/element/graphs.py b/holoviews/element/graphs.py
@@ -606,14 +606,21 @@ def _process(self, element, key=None):
             src_area, tgt_area = all_areas[src_idx[i]], all_areas[tgt_idx[i]]
             subpaths = []
             for _ in range(int(values[i])):
+                if not src_area or not tgt_area:
+                    continue
                 x0, y0 = src_area.pop()
+                if not tgt_area:
+                    continue
                 x1, y1 = tgt_area.pop()
                 b = quadratic_bezier((x0, y0), (x1, y1), (x0/2., y0/2.),
                                      (x1/2., y1/2.), steps=self.p.chord_samples)
                 subpaths.append(b)
                 subpaths.append(empty)
+            subpaths = [p for p in subpaths[:-1] if len(p)]
             if subpaths:
-                paths.append(np.concatenate(subpaths[:-1]))
+                paths.append(np.concatenate(subpaths))
+            else:
+                paths.append(np.array([]))
 
         # Construct Chord element from components
         if nodes_el:

diff --git a/holoviews/plotting/bokeh/__init__.py b/holoviews/plotting/bokeh/__init__.py
@@ -15,7 +15,6 @@
                         Table, ItemTable, Area, HSV, QuadMesh, VectorField,
                         Graph, Nodes, EdgePaths, Distribution, Bivariate,
                         TriMesh, Chord)
->>>>>>> Implemented Chord element and plots
 from ...core.options import Options, Cycle, Palette
 from ...core.util import VersionError