iplotx 0.6.7__py3-none-any.whl → 0.6.8__py3-none-any.whl

iplotx/tree.py

@@ -311,13 +311,21 @@ class TreeArtist(mpl.artist.Artist):
         if not leaf_style.get("deep", True):
             return
 
+        # Given the conditions above, we should have leaf labels. If not,
+        # make a None series with a valid index
+        leaf_label_series = self._get_label_series("leaf")
+        if leaf_label_series is None:
+            leaf_label_series = self._ipx_internal_data["leaf_df"].copy()
+            leaf_label_series["label"] = None
+            leaf_label_series = leaf_label_series["label"]
+
         edge_style = get_style(
             ".leafedge",
         )
         default_style = {
             "linestyle": "--",
             "linewidth": 1,
-            "edgecolor": "#111",
+            "color": "#111",
         }
         for key, value in default_style.items():
             if key not in edge_style:
@@ -335,14 +343,24 @@ class TreeArtist(mpl.artist.Artist):
         else:
             cmap_fun = None
 
-        leaf_shallow_layout = self.get_layout("leaf")
-
         if "cmap" in edge_style:
             colorarray = []
         edgepatches = []
         adjacent_vertex_ids = []
-        for i, vid in enumerate(leaf_shallow_layout.index):
-            edge_stylei = rotate_style(edge_style, index=i, key=vid)
+        for i, (vid, label) in enumerate(leaf_label_series.items()):
+            # Use leaf label to compute backup key for style rotation
+            # NOTE: This is quite a common use case. Users typically
+            # refer to leaves via their labels because that's what you see
+            # on screen. While an object exact match should take priority
+            # for power users, a backup based on label is useful. Beginners
+            # won't stumble upon this anyway since it's only used if
+            # a dict-like property for leaf edges is provided, which is a
+            # decently advanced thing to do.
+            # NOTE: Multiple leaves might have the same label, in which case
+            # all leaves will be style matched to this *unless* the dict-like
+            # style object *also* matches on leaf objects directly, which
+            # takes precedence since key2 is only a fallback.
+            edge_stylei = rotate_style(edge_style, index=i, key=vid, key2=label)
 
             if cmap_fun is not None:
                 colorarray.append(edge_stylei["color"])

iplotx/version.py

@@ -2,4 +2,4 @@
 iplotx version information module.
 """
 
-__version__ = "0.6.7"
+__version__ = "0.6.8"

{iplotx-0.6.7.dist-info → iplotx-0.6.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iplotx
-Version: 0.6.7
+Version: 0.6.8
 Summary: Plot networkx from igraph and networkx.
 Project-URL: Homepage, https://github.com/fabilab/iplotx
 Project-URL: Documentation, https://readthedocs.org/iplotx

{iplotx-0.6.7.dist-info → iplotx-0.6.8.dist-info}/RECORD

@@ -6,9 +6,9 @@ iplotx/label.py,sha256=6am3a0ejcW_bWEXSOODE1Ke3AyCU1lJ45RfnXNbHAQw,8923
 iplotx/layout.py,sha256=KxmRLqjo8AYCBAmXez8rIiLU2sM34qhb6ox9AHYwRyE,4839
 iplotx/network.py,sha256=LaW9zQZ4sKiDVb25_icnquGNnN7HrKC7NO07o6PSmGI,11527
 iplotx/plotting.py,sha256=IEUxW1xzTljLjBfsVP2BNsOPCDpj5bEPZ99bzvD5-mo,10066
-iplotx/tree.py,sha256=Zzz7nCPZrSjh9_yHXFdd8hjbF-FYURTZs00rUHc4OT8,27304
+iplotx/tree.py,sha256=-69lpPjisRfigY4fDQcmVxzOAf1tGwMXviUcW6mZU6U,28508
 iplotx/typing.py,sha256=QLdzV358IiD1CFe88MVp0D77FSx5sSAVUmM_2WPPE8I,1463
-iplotx/version.py,sha256=1Mi-AUAfWTkSNROfIn7bWkeZBzSl_j_A7HmbA4LSs0c,66
+iplotx/version.py,sha256=Ssoh-uTVPI9dHESTgtP5SAY8kO-o2pYIi_gVIxFJKiw,66
 iplotx/vertex.py,sha256=-JZaQPjIAWWP8Wap1HyR4g4HXLNGLwjf4v6jyo994Tk,14671
 iplotx/edge/__init__.py,sha256=HlxeIs88RbRrTetJNLcoq9gjV7cBhOdqQoiVZFFylFc,27081
 iplotx/edge/arrow.py,sha256=C4XoHGCYou1z2alz5Q2VhdaWYEzgebtEF70zVYY_frk,15533
@@ -33,6 +33,6 @@ iplotx/utils/geometry.py,sha256=6RrC6qaB0-1vIk1LhGA4CfsiMd-9JNniSPyL_l9mshE,9245
 iplotx/utils/internal.py,sha256=WWfcZDGK8Ut1y_tOHRGg9wSqY1bwSeLQO7dHM_8Tvwo,107
 iplotx/utils/matplotlib.py,sha256=wELE73quQv10-1w9uA5eDTgkZkylJvjg7pd3K5tZPOo,6294
 iplotx/utils/style.py,sha256=wMWxJykxBD-JmcN8-rSKlWcV6pMfwKgR4EzSpk_NX8k,547
-iplotx-0.6.7.dist-info/METADATA,sha256=O3tkLhtN4pM3FxyONC75a3CYvf1Ba6iU8bHRTgtBzgM,4908
-iplotx-0.6.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-iplotx-0.6.7.dist-info/RECORD,,
+iplotx-0.6.8.dist-info/METADATA,sha256=HorC8mcRXtF_RaDZQQbrPWtdXyBwGPTLYa5oNVViVM0,4908
+iplotx-0.6.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+iplotx-0.6.8.dist-info/RECORD,,