iplotx 0.3.1__py3-none-any.whl → 0.5.0__py3-none-any.whl

iplotx/utils/matplotlib.py

@@ -74,13 +74,24 @@ def _additional_set_methods(attributes, cls=None):
     return cls
 
 
-# FIXME: this method appears quite inconsistent, would be better to improve.
-# The issue is that to really know the size of a label on screen, we need to
-# render it first. Therefore, we should render the labels, then render the
-# vertices. Leaving for now, since this can be styled manually which covers
-# many use cases.
-def _get_label_width_height(text, hpadding=18, vpadding=12, **kwargs):
-    """Get the bounding box size for a text with certain properties."""
+def _get_label_width_height(text, hpadding=18, vpadding=12, dpi=72.0, **kwargs):
+    """Get the bounding box size for a text with certain properties.
+
+    Parameters:
+        text: The text to measure.
+        hpadding: Horizontal padding to add to the width.
+        vpadding: Vertical padding to add to the height.
+        **kwargs: Additional keyword arguments for text properties. "fontsize" is accepted,
+            as is "size". Many other properties are not used and will raise and exception.
+
+    Returns:
+        A tuple (width, height) representing the size of the text bounding box. Because
+        some text properties such as weight are not taken into account, ths function is not
+        very accurate. Yet, it is often good enough and easier to implement than a careful
+        orchestration of Figure.draw_without_rendering.
+    """
+    if "fontsize" in kwargs:
+        kwargs["size"] = kwargs.pop("fontsize")
     forbidden_props = [
         "horizontalalignment",
         "verticalalignment",
@@ -99,47 +110,56 @@ def _get_label_width_height(text, hpadding=18, vpadding=12, **kwargs):
     width = boundingbox.width
     height = boundingbox.height
 
-    # Scaling with font size appears broken... try to patch it up linearly here, even though we know it don't work well
+    # Scaling with font size appears broken... try to patch it up linearly here, even though we
+    # know it does not work terribly accurately
     width *= kwargs.get("size", 12) / 12.0
     height *= kwargs.get("size", 12) / 12.0
 
     width += hpadding
     height += vpadding
+
+    # Scale by dpi
+    width *= dpi / 72.0
+    height *= dpi / 72.0
+
     return (width, height)
 
 
 def _compute_mid_coord_and_rot(path, trans):
     """Compute mid point of an edge, straight or curved."""
-    # Distinguish between straight and curved paths
+    # Straight path
     if path.codes[-1] == mpl.path.Path.LINETO:
         coord = path.vertices.mean(axis=0)
-        vtr = trans(path.vertices)
-        rot = atan2(
-            vtr[-1, 1] - vtr[0, 1],
-            vtr[-1, 0] - vtr[0, 0],
-        )
+        v1 = path.vertices[0]
+        v2 = path.vertices[-1]
 
     # Cubic Bezier
     elif path.codes[-1] == mpl.path.Path.CURVE4:
         coord = _evaluate_cubic_bezier(path.vertices, 0.5)
-        # TODO:
-        rot = 0
+        v1 = _evaluate_cubic_bezier(path.vertices, 0.475)
+        v2 = _evaluate_cubic_bezier(path.vertices, 0.525)
 
     # Square Bezier
     elif path.codes[-1] == mpl.path.Path.CURVE3:
         coord = _evaluate_squared_bezier(path.vertices, 0.5)
-        # TODO:
-        rot = 0
+        v1 = _evaluate_squared_bezier(path.vertices, 0.475)
+        v2 = _evaluate_squared_bezier(path.vertices, 0.525)
 
     else:
         raise ValueError(
             "Curve type not straight and not squared/cubic Bezier, cannot compute mid point."
         )
 
+    v1 = trans(v1)
+    v2 = trans(v2)
+    rot = atan2(
+        v2[1] - v1[1],
+        v2[0] - v1[0],
+    )
     return coord, rot
 
 
-def _build_cmap_fun(values, cmap):
+def _build_cmap_fun(values, cmap, norm=None):
     """Map colormap on top of numerical values."""
     cmap = mpl.cm._ensure_cmap(cmap)
 
@@ -149,8 +169,9 @@ def _build_cmap_fun(values, cmap):
     if isinstance(values, dict):
         values = np.array(list(values.values()))
 
-    vmin = np.nanmin(values)
-    vmax = np.nanmax(values)
-    norm = mpl.colors.Normalize(vmin=vmin, vmax=vmax)
+    if norm is None:
+        vmin = np.nanmin(values)
+        vmax = np.nanmax(values)
+        norm = mpl.colors.Normalize(vmin=vmin, vmax=vmax)
 
     return lambda x: cmap(norm(x))

iplotx/utils/style.py

@@ -1 +1,17 @@
-from copy import copy
+import copy
+from collections import defaultdict
+
+
+def copy_with_deep_values(style):
+    """Make a deep copy of the style dict but do not create copies of the keys."""
+    # Defaultdict should be respected
+    if hasattr(style, "default_factory"):
+        newdict = defaultdict(lambda: style.default_factory())
+    else:
+        newdict = {}
+    for key, value in style.items():
+        if isinstance(value, dict):
+            newdict[key] = copy_with_deep_values(value)
+        else:
+            newdict[key] = copy.copy(value)
+    return newdict

iplotx/version.py

@@ -2,4 +2,4 @@
 iplotx version information module.
 """
 
-__version__ = "0.3.1"
+__version__ = "0.5.0"

iplotx/vertex.py

@@ -14,6 +14,7 @@ import matplotlib as mpl
 from matplotlib.collections import PatchCollection
 from matplotlib.patches import (
     Patch,
+    Polygon,
     Ellipse,
     Circle,
     RegularPolygon,
@@ -54,7 +55,7 @@ class VertexCollection(PatchCollection):
         *args,
         layout_coordinate_system: str = "cartesian",
         style: Optional[dict[str, Any]] = None,
-        labels: Optional[Sequence[str]] = None,
+        labels: Optional[Sequence[str] | pd.Series] = None,
         **kwargs,
     ):
         """Initialise the VertexCollection.
@@ -68,10 +69,13 @@ class VertexCollection(PatchCollection):
 
         self._index = layout.index
         self._style = style
-        self._labels = labels
         self._layout = layout
         self._layout_coordinate_system = layout_coordinate_system
 
+        if (labels is not None) and (not isinstance(labels, pd.Series)):
+            labels = pd.Series(labels, index=self._layout.index)
+        self._labels = labels
+
         # Create patches from structured data
         patches, sizes, kwargs2 = self._init_vertex_patches()
 
@@ -90,6 +94,10 @@ class VertexCollection(PatchCollection):
         if self._labels is not None:
             self._compute_label_collection()
 
+    def __len__(self):
+        """Return the number of vertices in the collection."""
+        return len(self.get_paths())
+
     def get_children(self) -> tuple[mpl.artist.Artist]:
         """Get the children artists.
 
@@ -226,9 +234,7 @@ class VertexCollection(PatchCollection):
 
         if style.get("size", 20) == "label":
             if self._labels is None:
-                warnings.warn(
-                    "No labels found, cannot resize vertices based on labels."
-                )
+                warnings.warn("No labels found, cannot resize vertices based on labels.")
                 style["size"] = get_style("default.vertex")["size"]
 
         if "cmap" in style:
@@ -264,9 +270,7 @@ class VertexCollection(PatchCollection):
         transform = self.get_offset_transform()
 
         style = (
-            copy_with_deep_values(self._style.get("label", None))
-            if self._style is not None
-            else {}
+            copy_with_deep_values(self._style.get("label", None)) if self._style is not None else {}
         )
         forbidden_props = ["hpadding", "vpadding"]
         for prop in forbidden_props:
@@ -355,7 +359,7 @@ def make_patch(
     **kwargs,
 ) -> tuple[Patch, float]:
     """Make a patch of the given marker shape and size."""
-    forbidden_props = ["label", "cmap", "norm", "cascade"]
+    forbidden_props = ["label", "cmap", "norm", "cascade", "deep"]
     for prop in forbidden_props:
         if prop in kwargs:
             kwargs.pop(prop)
@@ -363,12 +367,12 @@ def make_patch(
     if np.isscalar(size):
         size = float(size)
         size = (size, size)
+    size = np.asarray(size, dtype=float)
 
     # Size of vertices is determined in self._transforms, which scales with dpi, rather than here,
     # so normalise by the average dimension (btw x and y) to keep the ratio of the marker.
     # If you check in get_sizes, you will see that rescaling also happens with the max of width
     # and height.
-    size = np.asarray(size, dtype=float)
     size_max = size.max()
     if size_max > 0:
         size /= size_max
@@ -379,15 +383,59 @@ def make_patch(
     elif marker in ("s", "square", "r", "rectangle"):
         art = Rectangle((-size[0] / 2, -size[1] / 2), size[0], size[1], **kwargs)
     elif marker in ("^", "triangle"):
-        art = RegularPolygon((0, 0), numVertices=3, radius=size[0] / 2, **kwargs)
-    elif marker in ("d", "diamond"):
-        art, _ = make_patch("s", size[0], angle=45, **kwargs)
+        art = RegularPolygon((0, 0), numVertices=3, radius=size[0] / np.sqrt(2), **kwargs)
     elif marker in ("v", "triangle_down"):
         art = RegularPolygon(
-            (0, 0), numVertices=3, radius=size[0] / 2, orientation=np.pi, **kwargs
+            (0, 0),
+            numVertices=3,
+            radius=size[0] / np.sqrt(2),
+            orientation=np.pi,
+            **kwargs,
+        )
+    elif marker in ("<", "triangle_left"):
+        art = RegularPolygon(
+            (0, 0),
+            numVertices=3,
+            radius=size[0] / np.sqrt(2),
+            orientation=np.pi / 2,
+            **kwargs,
         )
+    elif marker in (">", "triangle_right"):
+        art = RegularPolygon(
+            (0, 0),
+            numVertices=3,
+            radius=size[0] / np.sqrt(2),
+            orientation=-np.pi / 2,
+            **kwargs,
+        )
+    elif marker in ("d", "diamond"):
+        art = RegularPolygon((0, 0), numVertices=4, radius=size[0] / np.sqrt(2), **kwargs)
+    elif marker in ("p", "pentagon"):
+        art = RegularPolygon((0, 0), numVertices=5, radius=size[0] / np.sqrt(2), **kwargs)
+    elif marker in ("h", "hexagon"):
+        art = RegularPolygon((0, 0), numVertices=6, radius=size[0] / np.sqrt(2), **kwargs)
+    elif marker in ("8", "octagon"):
+        art = RegularPolygon((0, 0), numVertices=8, radius=size[0] / np.sqrt(2), **kwargs)
     elif marker in ("e", "ellipse"):
-        art = Ellipse((0, 0), size[0] / 2, size[1] / 2, **kwargs)
+        art = Ellipse((0, 0), size[0], size[1], **kwargs)
+    elif marker in ("*", "star"):
+        size *= np.sqrt(2)
+        art = Polygon(
+            [
+                (0, size[1] / 2),
+                (size[0] / 7, size[1] / 7),
+                (size[0] / 2, size[1] / 7),
+                (size[0] / 4, -size[1] / 8),
+                (size[0] / 3, -size[1] / 2),
+                (0, -0.27 * size[1]),
+                (-size[0] / 3, -size[1] / 2),
+                (-size[0] / 4, -size[1] / 8),
+                (-size[0] / 2, size[1] / 7),
+                (-size[0] / 7, size[1] / 7),
+                (0, size[1] / 2),
+            ][::-1],
+            **kwargs,
+        )
     else:
         raise KeyError(f"Unknown marker: {marker}")
 

{iplotx-0.3.1.dist-info → iplotx-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iplotx
-Version: 0.3.1
+Version: 0.5.0
 Summary: Plot networkx from igraph and networkx.
 Project-URL: Homepage, https://github.com/fabilab/iplotx
 Project-URL: Documentation, https://readthedocs.org/iplotx
@@ -39,6 +39,7 @@ Description-Content-Type: text/markdown
 ![Github Actions](https://github.com/fabilab/iplotx/actions/workflows/test.yml/badge.svg)
 ![PyPI - Version](https://img.shields.io/pypi/v/iplotx)
 ![RTD](https://readthedocs.org/projects/iplotx/badge/?version=latest)
+[![Coverage Status](https://coveralls.io/repos/github/fabilab/iplotx/badge.svg?branch=main)](https://coveralls.io/github/fabilab/iplotx?branch=main)
 ![pylint](assets/pylint.svg)
 
 # iplotx

iplotx-0.5.0.dist-info/RECORD

@@ -0,0 +1,38 @@
+iplotx/__init__.py,sha256=MKb9UCXKgDHHkeATuJWxYdM-AotfBo2fbWy-Rkbn9Is,509
+iplotx/artists.py,sha256=Bpn6NS8S_B_E4OW88JYW6aEu2bIuIQJmbs2paTmBAoY,522
+iplotx/cascades.py,sha256=OPqF7Huls-HFmDA5MCF6DEZlUeRVaXsbQcHBoKAgNJs,8182
+iplotx/groups.py,sha256=_9KdIiTAi1kXtd2mDywgBJCbqoRq2z-5fzOPf76Wgb8,6287
+iplotx/label.py,sha256=i107wE-9kC_MVWsgWeYG6sRy_ZmyvITNm2laIij9SR0,8761
+iplotx/layout.py,sha256=KxmRLqjo8AYCBAmXez8rIiLU2sM34qhb6ox9AHYwRyE,4839
+iplotx/network.py,sha256=SlmDgc4tbCfvO08QWk-jUXrUfaz6S3xoXQVg6rP1910,11345
+iplotx/plotting.py,sha256=RZj-E_2R8AbXoJmxr_qAC-g_nOudqep-TDSIV4QB9BM,7408
+iplotx/tree.py,sha256=iILQRKUZzcDKIiwI1LheSuixi5y_3PAQrz61vdwi6DU,27448
+iplotx/typing.py,sha256=QLdzV358IiD1CFe88MVp0D77FSx5sSAVUmM_2WPPE8I,1463
+iplotx/version.py,sha256=jzr3_UVrKVs0fo73K5UioUFwKYv5i4rA--sHkaSaQkw,66
+iplotx/vertex.py,sha256=OjDIkJCNU-IhZUVeZTSzGwTlHLrxu27lUThiUuEb6Qs,14497
+iplotx/edge/__init__.py,sha256=0w-BDZpVyR4qM908PM5DzlNVXwwfxAeDNyHNXPWPgcc,26237
+iplotx/edge/arrow.py,sha256=y8xMZY1eR5BXBmkX0_aDIn-3CeqaL6jwGGLw-ndUf50,12867
+iplotx/edge/geometry.py,sha256=-WLdI-BVB12-Zcq1Jc4LqDFoViuOfljTax-YHI1N7cc,13359
+iplotx/edge/leaf.py,sha256=SyGMv2PIOoH0pey8-aMVaZheK3hNe1Qz_okcyWbc4E4,4268
+iplotx/edge/ports.py,sha256=BpkbiEhX4mPBBAhOv4jcKFG4Y8hxXz5GRtVLCC0jbtI,1235
+iplotx/ingest/__init__.py,sha256=tsXDoa7Rs6Y1ulWtjCcUsO4tQIigeQ6ZMiU2PQDyhwQ,4751
+iplotx/ingest/heuristics.py,sha256=715VqgfKek5LOJnu1vTo7RqPgCl-Bb8Cf6o7_Tt57fA,5797
+iplotx/ingest/typing.py,sha256=pi-mn4ULkFjTo_fFdJPUjTHrWzbny4MNgoMylN4mNKM,13940
+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=yKILiE3-ZhBUGSs7eYuhV8tQDyueCosbbgovZZYpSPQ,3664
+iplotx/ingest/providers/tree/biopython.py,sha256=4N_54cVyHHPcASJZGr6pHKE2p5R3i8Cm307SLlSLHLA,1480
+iplotx/ingest/providers/tree/cogent3.py,sha256=JmELbDK7LyybiJzFNbmeqZ4ySJoDajvFfJebpNfFKWo,1073
+iplotx/ingest/providers/tree/ete4.py,sha256=D7usSq0MOjzrk3EoLi834IlaDGwv7_qG6Qt0ptfKqfI,928
+iplotx/ingest/providers/tree/simple.py,sha256=vOAlQbkm2HdlBTQab6s7mjAnLibVmeNOfc6y6UpBqzw,2533
+iplotx/ingest/providers/tree/skbio.py,sha256=O1KUr8tYi28pZ3VVjapgO4Uj-YpMuix3GhOH5je8Lv4,822
+iplotx/style/__init__.py,sha256=4K6EtAKOFth3zS_jdaDCvOEMeZxIgnMM_rtpH_G74io,12253
+iplotx/style/leaf_info.py,sha256=2XckYhvE3FvNYUaQj_CY2HwtYfZA8FUQ7uBXe_ukaWU,938
+iplotx/style/library.py,sha256=yryxQUSHMIwGgeS0Iq1BediVRRaFguJcjhXMj_vsHo8,8007
+iplotx/utils/geometry.py,sha256=UH2gAcM5rYW7ADnJEm7HIJTpPF4UOm8P3vjSVCOGjqM,9192
+iplotx/utils/internal.py,sha256=WWfcZDGK8Ut1y_tOHRGg9wSqY1bwSeLQO7dHM_8Tvwo,107
+iplotx/utils/matplotlib.py,sha256=KpkuwXuSqpYbPVKbrlP8u_1Ry5gy5q60ZBrFiR-do_Q,5284
+iplotx/utils/style.py,sha256=wMWxJykxBD-JmcN8-rSKlWcV6pMfwKgR4EzSpk_NX8k,547
+iplotx-0.5.0.dist-info/METADATA,sha256=QPPJUkwVArD550-tLmUpq11Qaczb7M9xgma8bDHijVc,3958
+iplotx-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+iplotx-0.5.0.dist-info/RECORD,,

iplotx-0.3.1.dist-info/RECORD

@@ -1,32 +0,0 @@
-iplotx/__init__.py,sha256=DIOWUaEo9vgmz8B6hBlurV95BEYmjmUe5BU-jRWrtG4,418
-iplotx/cascades.py,sha256=_J8kxCHJrZmPKaN10e0uROAPsdcLrw41hzozZu1hQcg,8405
-iplotx/groups.py,sha256=H3zIaqlILQaC6Iqgxrf3zSuRVgynQTLLEuuGy6lYgLI,6388
-iplotx/label.py,sha256=m2ryXMh29QFLwdstRphnOPocW_Wnqir9WQscxWN1Z2E,7347
-iplotx/layout.py,sha256=0Mqrs0odQ8Jk4nITvAYgayR6KDm3e-Lq1BY_DKeU3ok,4664
-iplotx/network.py,sha256=rLVfC52PBiTR0I-CCvFPE0dj7t-KCLZwXSSJrpPVzh8,9719
-iplotx/plotting.py,sha256=VU1LYp9peqLa1CmvHjF98BYxezkWUrcCWvd2MPB9n_8,7381
-iplotx/style.py,sha256=NtrKYhTIkf7GPpepsROUbXxbodIc8gu066CdLNAsMQM,12009
-iplotx/tree.py,sha256=YU3UoGV_Zxf_KkP4iIsi09WsL1vBvS3URkG-Uqzqyp4,18393
-iplotx/typing.py,sha256=17TS-EJshNNOdeUC9mmJALiJ3gwI1nRq6AGlVdQRp1E,1384
-iplotx/version.py,sha256=rahYe2_qX2OYwONUMb_Iwaqu5jYjPE7Kl2oak8C_GFc,66
-iplotx/vertex.py,sha256=JCXv-l934jDGdS2fOigOdDKDZ-5Az-7MUqHcQk8Jl18,12715
-iplotx/edge/__init__.py,sha256=W68WienFUneWQ0iVTFGNm8KIBQGvkfXlYq2Kx1lDzU8,23076
-iplotx/edge/arrow.py,sha256=2mF_HwhHkXir3lOYOTp8HW__PQgWRxaHXZN9mvk3hLQ,11452
-iplotx/edge/geometry.py,sha256=7RwtIUOjz6pd1QTUaNwtIivnaM4ZfxVgMjTg1bIqqQA,12827
-iplotx/edge/ports.py,sha256=pno3A7QdQyZGyQJOHVLYszBBeQAh-q2-jkd-lOe31TM,1183
-iplotx/ingest/__init__.py,sha256=dEbdb3LP3QnPKpwA7y6fJl9spCWkCYYtXCQPCGA9oVk,4971
-iplotx/ingest/heuristics.py,sha256=_ZSC9EiCr-eURmhGdufdZdyERpzPrPvRj01nv0rXkiE,6579
-iplotx/ingest/typing.py,sha256=cPEvOT5yjDiXj6Y9E3ShH2uDmepn7YtPtBIZ_cOEp6g,10345
-iplotx/ingest/providers/network/igraph.py,sha256=lCWIlKd2VwxJLoc2W4nivwkrvFjhmXhG9r_sJkFXWh0,2794
-iplotx/ingest/providers/network/networkx.py,sha256=-lb_8jpq7DvoM9lWn43qL6jTqS-VqtpJEgcSJeFz7yQ,4261
-iplotx/ingest/providers/tree/biopython.py,sha256=JFuD7NWV7j-fWt-6q29ApvlKf7Mqrnr_6wSkzSK-e38,1080
-iplotx/ingest/providers/tree/cogent3.py,sha256=LHAFLronzlrlLWl79abXWOoFP-agIdzoQqj6O15xwLE,873
-iplotx/ingest/providers/tree/ete4.py,sha256=vHwfYRazruR7eZfUgEJiSyeUA7UVBsTtR998uoL5bDQ,971
-iplotx/ingest/providers/tree/skbio.py,sha256=fwlITpl71gIKDDoJKB6nmlC-J6A2fXoplX6ul5qXsYc,869
-iplotx/utils/geometry.py,sha256=K5ZBYPmz4-KNm64pDh2p0L6PF5-u57SCVaEd2eWeRv0,8956
-iplotx/utils/internal.py,sha256=WWfcZDGK8Ut1y_tOHRGg9wSqY1bwSeLQO7dHM_8Tvwo,107
-iplotx/utils/matplotlib.py,sha256=T37SMwKNSA-dRKgNkVw5H4fGr5NACtxvBPebDJGdhjk,4516
-iplotx/utils/style.py,sha256=fEi14nc37HQqHxZTPeQaTnFFwbSneY1oDCyv2UbWfKk,22
-iplotx-0.3.1.dist-info/METADATA,sha256=AS5QTNoONMtRiEfOBF2E6iZ_c8RpOQvnHbb6RD79Fgw,3809
-iplotx-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-iplotx-0.3.1.dist-info/RECORD,,