iplotx 1.4.1__tar.gz → 1.4.2__tar.gz

{iplotx-1.4.1 → iplotx-1.4.2}/PKG-INFO

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

{iplotx-1.4.1 → iplotx-1.4.2}/docs/source/sg_execution_times.rst

@@ -6,7 +6,7 @@
 
 Computation times
 =================
-**00:00.158** total execution time for 80 files **from all galleries**:
+**00:00.092** total execution time for 82 files **from all galleries**:
 
 .. container::
 
@@ -32,8 +32,11 @@ Computation times
    * - Example
      - Time
      - Mem (MB)
-   * - :ref:`sphx_glr_gallery_style_plot_edge_geometries.py` (``../../gallery/style/plot_edge_geometries.py``)
-     - 00:00.158
+   * - :ref:`sphx_glr_gallery_other_plot_multiarc.py` (``../../gallery/other/plot_multiarc.py``)
+     - 00:00.060
+     - 0.0
+   * - :ref:`sphx_glr_gallery_other_plot_filled_edges.py` (``../../gallery/other/plot_filled_edges.py``)
+     - 00:00.032
      - 0.0
    * - :ref:`sphx_glr_gallery_basic_plot_3d.py` (``../../gallery/basic/plot_3d.py``)
      - 00:00.000
@@ -173,6 +176,9 @@ Computation times
    * - :ref:`sphx_glr_gallery_style_plot_depthshade.py` (``../../gallery/style/plot_depthshade.py``)
      - 00:00.000
      - 0.0
+   * - :ref:`sphx_glr_gallery_style_plot_edge_geometries.py` (``../../gallery/style/plot_edge_geometries.py``)
+     - 00:00.000
+     - 0.0
    * - :ref:`sphx_glr_gallery_style_plot_edgepadding.py` (``../../gallery/style/plot_edgepadding.py``)
      - 00:00.000
      - 0.0

iplotx-1.4.2/gallery/other/plot_filled_edges.py

@@ -0,0 +1,36 @@
+"""
+Filled edges
+============
+
+Most of the time edges have no "filling", but what if they did? Then you would
+get this crazy example.
+
+.. tip::
+  Edges are not supposed to be filled, use at your own risk!
+"""
+
+import networkx as nx
+import matplotlib.pyplot as plt
+import iplotx as ipx
+
+g = nx.Graph()
+g.add_edges_from([(0, 1), (1, 2), (0, 2)])
+
+layout = [(0, 0), (1, 0), (2, 0)]
+
+artist = ipx.network(
+    g,
+    layout,
+    edge_arc=True,
+    edge_tension=-1,
+    vertex_facecolor="#005F73",
+    vertex_edgecolor="#001219",
+    vertex_linewidth=2,
+)[0]
+
+edge_artist = artist.get_edges()
+edge_artist.set_facecolors([
+    "#94D2BD66",
+    "#EE9B0066",
+    "#AE201266",
+])

iplotx-1.4.2/gallery/other/plot_multiarc.py

@@ -0,0 +1,24 @@
+"""
+Multiarc
+========
+
+This example shows how to plot a bunch of arcs.
+"""
+
+import igraph as ig
+import matplotlib.pyplot as plt
+import iplotx as ipx
+
+g = ig.Graph.Ring(4, directed=True)
+layout = [[1, 0], [0, 1], [-1, 0], [0, -1]]
+
+ipx.network(
+    g,
+    layout,
+    vertex_labels=True,
+    aspect=1,
+    edge_tension=1,
+    edge_arc=True,
+    edge_arrow={"marker": ">","width": 6},
+    edge_linewidth=3,
+)

{iplotx-1.4.1 → iplotx-1.4.2}/iplotx/edge/geometry.py

@@ -466,15 +466,17 @@ def _compute_edge_path_arc(
             )
         angle_start = atan2(*(vs[0] - center)[::-1])
         angle_end = atan2(*(vs[1] - center)[::-1])
-        if (np.abs(tension) > 1) and (np.abs(angle_end - angle_start) < np.pi):
-            if angle_end > angle_start:
-                angle_start += 2 * np.pi
-            else:
-                angle_end += 2 * np.pi
+
+        # Figure out how to draw the correct arc of the two
+        if (tension > 0) and (angle_end < angle_start):
+            angle_end += 2 * np.pi
+        elif (tension < 0) and (angle_end > angle_start):
+            angle_start += 2 * np.pi
+
         # print(f"angle_start: {np.degrees(angle_start):.2f}")
         # print(f"angle_end: {np.degrees(angle_end):.2f}")
 
-        naux = 30
+        naux = max(30, int(np.ceil(np.degrees(np.abs(angle_end - angle_start)))) // 3)
         angles = np.linspace(angle_start, angle_end, naux + 2)[1:-1]
         auxs = center + np.array([np.cos(angles), np.sin(angles)]).T * np.linalg.norm(
             vs[0] - center

{iplotx-1.4.1 → iplotx-1.4.2}/iplotx/version.py

@@ -2,4 +2,4 @@
 iplotx version information module.
 """
 
-__version__ = "1.4.1"
+__version__ = "1.4.2"

{iplotx-1.4.1 → iplotx-1.4.2}/tests/test_igraph.py

@@ -239,7 +239,7 @@ class GraphTestRunner(unittest.TestCase):
         layout = [[0, 0], [1, 0], [2, 0], [3, 0]]
 
         fig, ax = plt.subplots()
-        ipx.plot(
+        ipx.graph(
             g,
             layout=layout,
             ax=ax,
@@ -248,6 +248,21 @@ class GraphTestRunner(unittest.TestCase):
             margins=0.2,
         )
 
+    @image_comparison(baseline_images=["multiarc45"])
+    def test_multiarc(self):
+        g = ig.Graph.Ring(4, directed=True)
+        layout = [[1, 0], [0, 1], [-1, 0], [0, -1]]
+
+        fig, ax = plt.subplots()
+        ipx.graph(
+            g,
+            layout,
+            ax=ax,
+            edge_arc=True,
+            edge_tension=1,
+            aspect=1,
+        )
+
 
 class ClusteringTestRunner(unittest.TestCase):
     @property