iplotx 0.6.4__py3-none-any.whl → 0.6.5__py3-none-any.whl

iplotx/edge/__init__.py

@@ -357,6 +357,8 @@ class EdgeCollection(mpl.collections.PatchCollection):
             waypoints = edge_stylei.get("waypoints", "none")
             if waypoints is False or waypoints is np.False_:
                 waypoints = "none"
+            elif isinstance(waypoints, (list, tuple)) and len(waypoints) == 0:
+                waypoints = "none"
             elif waypoints is True or waypoints is np.True_:
                 raise ValueError(
                     "Could not determine automatically type of edge waypoints.",

iplotx/ingest/typing.py

@@ -311,11 +311,12 @@ class TreeDataProvider(Protocol):
         leaf_name_attrs = ("name",)
 
         # Add edge_df
-        edge_data = {"_ipx_source": [], "_ipx_target": []}
+        edge_data = {"_ipx_source": [], "_ipx_target": [], "branch_length": []}
         for node in self.preorder():
             for child in self.get_children(node):
                 edge_data["_ipx_source"].append(node)
                 edge_data["_ipx_target"].append(child)
+                edge_data["branch_length"].append(self.get_branch_length(child))
         edge_df = pd.DataFrame(edge_data)
         tree_data["edge_df"] = edge_df
 

iplotx/network.py

@@ -239,17 +239,18 @@ class NetworkArtist(mpl.artist.Artist):
         labels = self._get_label_series("edge")
         edge_style = get_style(".edge")
 
+        edge_df = self._ipx_internal_data["edge_df"].set_index(["_ipx_source", "_ipx_target"])
+
         if "cmap" in edge_style:
             cmap_fun = _build_cmap_fun(
-                edge_style["color"],
-                edge_style["cmap"],
+                edge_style,
+                "color",
                 edge_style.get("norm", None),
+                internal=edge_df,
             )
         else:
             cmap_fun = None
 
-        edge_df = self._ipx_internal_data["edge_df"].set_index(["_ipx_source", "_ipx_target"])
-
         if "cmap" in edge_style:
             colorarray = []
         edgepatches = []

iplotx/tree.py

@@ -329,8 +329,8 @@ class TreeArtist(mpl.artist.Artist):
 
         if "cmap" in edge_style:
             cmap_fun = _build_cmap_fun(
-                edge_style["color"],
-                edge_style["cmap"],
+                edge_style,
+                "color",
             )
         else:
             cmap_fun = None
@@ -537,16 +537,17 @@ class TreeArtist(mpl.artist.Artist):
         labels = self._get_label_series("edge")
         edge_style = get_style(".edge")
 
+        edge_df = self._ipx_internal_data["edge_df"].set_index(["_ipx_source", "_ipx_target"])
+
         if "cmap" in edge_style:
             cmap_fun = _build_cmap_fun(
-                edge_style["color"],
-                edge_style["cmap"],
+                edge_style,
+                "color",
+                internal=edge_df,
             )
         else:
             cmap_fun = None
 
-        edge_df = self._ipx_internal_data["edge_df"].set_index(["_ipx_source", "_ipx_target"])
-
         if "cmap" in edge_style:
             colorarray = []
         edgepatches = []

iplotx/utils/matplotlib.py

@@ -1,6 +1,8 @@
+from typing import Optional, Any
 from functools import wraps, partial
 from math import atan2
 import numpy as np
+import pandas as pd
 import matplotlib as mpl
 
 from .geometry import (
@@ -162,15 +164,39 @@ def _compute_mid_coord_and_rot(path, trans):
     return coord, rot
 
 
-def _build_cmap_fun(values, cmap, norm=None):
-    """Map colormap on top of numerical values."""
+def _build_cmap_fun(
+    style: dict[str, Any],
+    key: str,
+    norm=None,
+    internal: Optional[pd.DataFrame] = None,
+):
+    """Map colormap on top of numerical values.
+
+    Parameters:
+        style: A dictionary of style properties.
+        key: The key in the style dictionary to look for values. Values can be a list/array,
+            a dictionary of numerical values, or a string, in which case the corresponding
+            column in the "internal" DataFrame is used as an array of numerical values.
+        norm: An optional matplotlib Normalize instance. If None, the values are normalized.
+        internal: An optional DataFrame, required if "values" is a string.
+    """
+    values = style[key]
+    cmap = style["cmap"]
+
     cmap = mpl.cm._ensure_cmap(cmap)
 
-    if np.isscalar(values):
-        values = [values]
+    if isinstance(values, str):
+        if not isinstance(internal, pd.DataFrame):
+            raise ValueError("If 'values' is a string, 'internal' must be a DataFrame.")
+        values = internal[values].values
+        internal[key] = values
+
+    else:
+        if np.isscalar(values):
+            values = [values]
 
-    if isinstance(values, dict):
-        values = np.array(list(values.values()))
+        if isinstance(values, dict):
+            values = np.array(list(values.values()))
 
     if norm is None:
         vmin = np.nanmin(values)

iplotx/version.py

@@ -2,4 +2,4 @@
 iplotx version information module.
 """
 
-__version__ = "0.6.4"
+__version__ = "0.6.5"

iplotx/vertex.py

@@ -226,8 +226,8 @@ class VertexCollection(PatchCollection):
         style = self._style or {}
         if "cmap" in style:
             cmap_fun = _build_cmap_fun(
-                style["facecolor"],
-                style["cmap"],
+                style,
+                "facecolor",
             )
         else:
             cmap_fun = None

{iplotx-0.6.4.dist-info → iplotx-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iplotx
-Version: 0.6.4
+Version: 0.6.5
 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.4.dist-info → iplotx-0.6.5.dist-info}/RECORD

@@ -4,20 +4,20 @@ iplotx/cascades.py,sha256=OPqF7Huls-HFmDA5MCF6DEZlUeRVaXsbQcHBoKAgNJs,8182
 iplotx/groups.py,sha256=_9KdIiTAi1kXtd2mDywgBJCbqoRq2z-5fzOPf76Wgb8,6287
 iplotx/label.py,sha256=6am3a0ejcW_bWEXSOODE1Ke3AyCU1lJ45RfnXNbHAQw,8923
 iplotx/layout.py,sha256=KxmRLqjo8AYCBAmXez8rIiLU2sM34qhb6ox9AHYwRyE,4839
-iplotx/network.py,sha256=SlmDgc4tbCfvO08QWk-jUXrUfaz6S3xoXQVg6rP1910,11345
+iplotx/network.py,sha256=5A0yvoJKAfT1xcnWYh9hHM8dkF2NkHK7RK1h9Uc35-Y,11359
 iplotx/plotting.py,sha256=yACxkD6unKc5eDsAp7ZabRCAwLEXBowSMESX2oGNBDU,7291
-iplotx/tree.py,sha256=S_9tf8Mixv9P5dq616tjxuxdDYRmUXLNAcSXTxEgm_I,27310
+iplotx/tree.py,sha256=Zzz7nCPZrSjh9_yHXFdd8hjbF-FYURTZs00rUHc4OT8,27304
 iplotx/typing.py,sha256=QLdzV358IiD1CFe88MVp0D77FSx5sSAVUmM_2WPPE8I,1463
-iplotx/version.py,sha256=vBajZHKRfgreYlbl4HM9tYBbRK-Xcm4ddKiCB6_M6nY,66
-iplotx/vertex.py,sha256=T9j8Copv88cbh6ztC8uSGo4tIVERuHYEIeHf53Uh2aE,14578
-iplotx/edge/__init__.py,sha256=VkAsuxphQa-co79MZWzWErkRAkp97CwB20ozPEnpvrM,26888
+iplotx/version.py,sha256=4IFN3njnGdyj6gkoCknMRXJtKdrK2JFUlkOSIdsZDNM,66
+iplotx/vertex.py,sha256=AJEBtIDW0hDTij10M_hHXymVLm6iQHkQqZgVD2PllLw,14563
+iplotx/edge/__init__.py,sha256=hxRYlfWEx7DINKem9Rush9MnykRthw8jj90dsDWrK_M,27002
 iplotx/edge/arrow.py,sha256=C4XoHGCYou1z2alz5Q2VhdaWYEzgebtEF70zVYY_frk,15533
 iplotx/edge/geometry.py,sha256=tiaF4PzvsNBoROrEgcCsw0YdxxZr3oBxF4ord_k4ThA,15069
 iplotx/edge/leaf.py,sha256=SyGMv2PIOoH0pey8-aMVaZheK3hNe1Qz_okcyWbc4E4,4268
 iplotx/edge/ports.py,sha256=BpkbiEhX4mPBBAhOv4jcKFG4Y8hxXz5GRtVLCC0jbtI,1235
 iplotx/ingest/__init__.py,sha256=S0YfnXcFKseB7ZBQc4yRt0cNDsLlhqdom0TmSY3OY2E,4756
 iplotx/ingest/heuristics.py,sha256=715VqgfKek5LOJnu1vTo7RqPgCl-Bb8Cf6o7_Tt57fA,5797
-iplotx/ingest/typing.py,sha256=hVEcAREjFFFbAWsxRkQuvpy1B4L7JEv_NRVVmrEbUVk,13984
+iplotx/ingest/typing.py,sha256=-40DsfCte65FN-FFzlvKFiLLVQGncaRNW61kitlHf9w,14086
 iplotx/ingest/providers/network/igraph.py,sha256=8dWeaQ_ZNdltC098V2YeLXsGdJHQnBa6shF1GAfl0Zg,2973
 iplotx/ingest/providers/network/networkx.py,sha256=FIXMI3hXU1WtAzPVlQZcz47b-4V2omeHttnNTgS2gQw,4328
 iplotx/ingest/providers/network/simple.py,sha256=e_aHhiHhN9DrMoNrt7tEMPURXGhQ1TYRPzsxDEptUlc,3766
@@ -31,8 +31,8 @@ iplotx/style/leaf_info.py,sha256=JoX1cPjRM_k3f93jzUPQ3gPlVP4wY_n032nOVhrgelU,969
 iplotx/style/library.py,sha256=wO-eeY3EZfAl0v21aX9f5_MiZhHuL2kGsBYA3uJkIGs,8535
 iplotx/utils/geometry.py,sha256=6RrC6qaB0-1vIk1LhGA4CfsiMd-9JNniSPyL_l9mshE,9245
 iplotx/utils/internal.py,sha256=WWfcZDGK8Ut1y_tOHRGg9wSqY1bwSeLQO7dHM_8Tvwo,107
-iplotx/utils/matplotlib.py,sha256=TutVJ1dEWYgX_-CY6MvdhRvWYqxpByGb3TKrSByYPNM,5330
+iplotx/utils/matplotlib.py,sha256=wELE73quQv10-1w9uA5eDTgkZkylJvjg7pd3K5tZPOo,6294
 iplotx/utils/style.py,sha256=wMWxJykxBD-JmcN8-rSKlWcV6pMfwKgR4EzSpk_NX8k,547
-iplotx-0.6.4.dist-info/METADATA,sha256=YOeufF6IOi-7LNky1OZb6lYoBb_4WEz4IINvzM-96UA,4908
-iplotx-0.6.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-iplotx-0.6.4.dist-info/RECORD,,
+iplotx-0.6.5.dist-info/METADATA,sha256=0-0qPdtrERP5KY_nlerTLKWF6ykr9pQPBfIBEOo-43M,4908
+iplotx-0.6.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+iplotx-0.6.5.dist-info/RECORD,,