iplotx 1.0.1__tar.gz → 1.1.0__tar.gz

{iplotx-1.0.1 → iplotx-1.1.0}/PKG-INFO

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

{iplotx-1.0.1 → iplotx-1.1.0}/docs/source/sg_execution_times.rst

@@ -6,7 +6,7 @@
 
 Computation times
 =================
-**00:00.497** total execution time for 76 files **from all galleries**:
+**00:00.542** total execution time for 77 files **from all galleries**:
 
 .. container::
 
@@ -32,8 +32,8 @@ Computation times
    * - Example
      - Time
      - Mem (MB)
-   * - :ref:`sphx_glr_gallery_tree_plot_scalebar.py` (``../../gallery/tree/plot_scalebar.py``)
-     - 00:00.497
+   * - :ref:`sphx_glr_gallery_tree_plot_double_tree.py` (``../../gallery/tree/plot_double_tree.py``)
+     - 00:00.542
      - 0.0
    * - :ref:`sphx_glr_gallery_basic_plot_3d.py` (``../../gallery/basic/plot_3d.py``)
      - 00:00.000
@@ -233,6 +233,9 @@ Computation times
    * - :ref:`sphx_glr_gallery_tree_plot_leafedges_and_cascades.py` (``../../gallery/tree/plot_leafedges_and_cascades.py``)
      - 00:00.000
      - 0.0
+   * - :ref:`sphx_glr_gallery_tree_plot_scalebar.py` (``../../gallery/tree/plot_scalebar.py``)
+     - 00:00.000
+     - 0.0
    * - :ref:`sphx_glr_gallery_tree_plot_skbio_tree.py` (``../../gallery/tree/plot_skbio_tree.py``)
      - 00:00.000
      - 0.0

iplotx-1.1.0/gallery/tree/plot_double_tree.py

@@ -0,0 +1,56 @@
+"""
+Double tree
+===========
+
+This example shows how to use `iplotx` to plot two trees facing each other, which is typical in coevolutionary studies.
+"""
+
+from ete4 import Tree
+from matplotlib import pyplot as plt
+import iplotx as ipx
+
+tree1 = Tree(
+    "((),((),(((),()),((),()))));",
+)
+
+
+tree2 = Tree(
+    "((),((),(),((),())),());",
+)
+
+fig, ax = plt = plt.subplots(figsize=(9, 4))
+
+# Plot first tree on the left
+ipx.plotting.tree(
+    tree1,
+    ax=ax,
+    aspect=1,
+    edge_color="tomato",
+    leaf_deep=True,
+)
+
+# Plot second tree on the right, facing left
+ipx.plotting.tree(
+    tree2,
+    ax=ax,
+    aspect=1,
+    edge_color="steelblue",
+    layout="horizontal",
+    layout_orientation="left",
+    layout_start=(11, 0),
+    leaf_deep=True,
+)
+
+# Add lines connecting corresponding leaves
+matches = [
+    (0, 0),
+    (1, 4),
+    (2, 5),
+    (3, 2),
+    (4, 1),
+    (5, 5),
+]
+for y1, y2 in matches:
+    ax.plot(
+        [5.2, 6.8], [y1, y2], color="gray", linewidth=2,
+    )

{iplotx-1.0.1 → iplotx-1.1.0}/iplotx/layout.py

@@ -2,7 +2,10 @@
 Layout functions, currently limited to trees.
 """
 
-from typing import Any
+from typing import (
+    Any,
+    Optional,
+)
 from collections.abc import (
     Hashable,
     Callable,
@@ -99,6 +102,8 @@ def _horizontal_tree_layout_right(
 
 def _horizontal_tree_layout(
     orientation="right",
+    start: tuple[float, float] = (0, 0),
+    span: Optional[float] = None,
     **kwargs,
 ) -> dict[Hashable, list[float]]:
     """Horizontal tree layout."""
@@ -110,11 +115,24 @@ def _horizontal_tree_layout(
     if orientation == "left":
         for key in layout:
             layout[key][0] *= -1
+
+    if span is not None:
+        cur_span = len(layout) - 1
+        for key in layout:
+            layout[key][1] = float(layout[key][1]) * span / cur_span
+
+    if start != (0, 0):
+        for key in layout:
+            layout[key][0] += start[0]
+            layout[key][1] += start[1]
+
     return layout
 
 
 def _vertical_tree_layout(
     orientation="descending",
+    start: tuple[float, float] = (0, 0),
+    span: Optional[float] = None,
     **kwargs,
 ) -> dict[Hashable, list[float]]:
     """Vertical tree layout."""
@@ -125,6 +143,17 @@ def _vertical_tree_layout(
         layout[key] = value[::-1]
         # Orient vertically
         layout[key][1] *= sign
+
+    if span is not None:
+        cur_span = len(layout) - 1
+        for key in layout:
+            layout[key][0] = float(layout[key][0]) * span / cur_span
+
+    if start != (0, 0):
+        for key in layout:
+            layout[key][0] += start[0]
+            layout[key][1] += start[1]
+
     return layout
 
 

{iplotx-1.0.1 → iplotx-1.1.0}/iplotx/version.py

@@ -2,4 +2,4 @@
 iplotx version information module.
 """
 
-__version__ = "1.0.1"
+__version__ = "1.1.0"