iplotx 1.4.1__py3-none-any.whl → 1.5.0__py3-none-any.whl

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/version.py

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

iplotx/vertex.py

@@ -14,6 +14,7 @@ import matplotlib as mpl
 from matplotlib.collections import PatchCollection
 from matplotlib.patches import (
     Patch,
+    PathPatch,
     Polygon,
     Ellipse,
     Circle,
@@ -393,7 +394,7 @@ class VertexCollection(PatchCollection):
 
 
 def make_patch(
-    marker: str = "o",
+    marker: str | Polygon | mpl.path.Path = "o",
     size: float | Sequence[float] = 20,
     **kwargs,
 ) -> tuple[Patch, float]:
@@ -475,6 +476,23 @@ def make_patch(
             ][::-1],
             **kwargs,
         )
+    elif isinstance(marker, Polygon):
+        xy = marker.get_xy()
+        xy_sizes = xy.max(axis=0) - xy.min(axis=0)
+        art = Polygon(
+            xy * size / xy_sizes,
+            **kwargs,
+        )
+    elif isinstance(marker, mpl.path.Path):
+        xy = marker.vertices
+        xy_sizes = xy.max(axis=0) - xy.min(axis=0)
+        art = PathPatch(
+            mpl.path.Path(
+                xy * size / xy_sizes,
+                codes=marker.codes,
+            ),
+            **kwargs,
+        )
     else:
         raise KeyError(f"Unknown marker: {marker}")
 

{iplotx-1.4.1.dist-info → iplotx-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iplotx
-Version: 1.4.1
+Version: 1.5.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.4.1.dist-info → iplotx-1.5.0.dist-info}/RECORD

@@ -3,15 +3,15 @@ iplotx/artists.py,sha256=2dBDT240zGwKb6tIc_y9pXeyU3LuYeF9wjj2tvi4KJo,730
 iplotx/label.py,sha256=7eS8ByadrhdIFOZz19U4VrS-oXY_ndFYNB-D4RZbFqI,9573
 iplotx/plotting.py,sha256=RyAdvaHSpuyJkf8DF3SJBvEXBrPmJEdovUyAlBWQvqU,16228
 iplotx/typing.py,sha256=QLdzV358IiD1CFe88MVp0D77FSx5sSAVUmM_2WPPE8I,1463
-iplotx/version.py,sha256=pDHOlKcY4NkjVyT63s4sF7EXMk_RlMLYxzkdejRQNr8,66
-iplotx/vertex.py,sha256=_yYyvusn4vYvi6RBEW6CHa3vnbv43GnZylnMIaK4bG0,16040
+iplotx/version.py,sha256=dHoG6x6aINBmE0KlFSrXNW1gCmtIOfGa2oJaCjtGZlE,66
+iplotx/vertex.py,sha256=Ta48M_6ZT8xKQWdI5XHiRxTt2LlJ9vshiDk34OzKYlY,16585
 iplotx/art3d/vertex.py,sha256=Xf8Um30X2doCd8KdNN7332F6BxC4k72Mb_GeRAuzQfQ,2545
 iplotx/art3d/edge/__init__.py,sha256=uw1U_mMXqcZAvea-7JbU1PUKULQD1CMMrbwY02tiWRQ,8529
 iplotx/art3d/edge/arrow.py,sha256=14BFXY9kDOUGPZl2fMD9gRVGyaaN5kyd-l6ikBg6WHU,3601
 iplotx/art3d/edge/geometry.py,sha256=76VUmpPG-4Mls7x_994dMwdDPrWWnjT7nHJsHfwK_hA,2467
 iplotx/edge/__init__.py,sha256=8iHtkrEaxseh308VWlTgbZ7OJECqkRwSq-oJzejxH5U,26837
 iplotx/edge/arrow.py,sha256=ymup2YT_0GVYMtZw_DSKrZqFHG_ysYteEhmoL6T8Mu4,17563
-iplotx/edge/geometry.py,sha256=dczXCLCn5vlFm_SwXXh_gwf0h7irILSCdNIDKTuuqmA,19646
+iplotx/edge/geometry.py,sha256=Vt1Y_wH2Fto_rgrQbuhXUzsfBpjQLti8Qws-oAGLcUw,19745
 iplotx/edge/leaf.py,sha256=SyGMv2PIOoH0pey8-aMVaZheK3hNe1Qz_okcyWbc4E4,4268
 iplotx/edge/ports.py,sha256=BpkbiEhX4mPBBAhOv4jcKFG4Y8hxXz5GRtVLCC0jbtI,1235
 iplotx/ingest/__init__.py,sha256=k1Q-7lSdotMR4RkF1x0t19RFsTknohX0L507Dw69WyU,5035
@@ -43,6 +43,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=p_53Oamof0RI4mtV8HrdDtZbgVqUxeUZ_KDvLZSiBUQ,8604
 iplotx/utils/style.py,sha256=vyNP80nDYVinqm6_9ltCJCtjK35ZcGlHvOskNv3eQBc,4225
-iplotx-1.4.1.dist-info/METADATA,sha256=8ZAla76ojuZ1bfzsj3gTS-agA44OIz0Ze18Hc-p3Gcg,5407
-iplotx-1.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-iplotx-1.4.1.dist-info/RECORD,,
+iplotx-1.5.0.dist-info/METADATA,sha256=smIckmasPHKrTHRupED_eiRfm7O0UkesY-r-4CpJGvM,5407
+iplotx-1.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+iplotx-1.5.0.dist-info/RECORD,,