iplotx 1.5.1__py3-none-any.whl → 1.6.0__py3-none-any.whl

iplotx/edge/__init__.py

@@ -367,21 +367,13 @@ class EdgeCollection(mpl.collections.PatchCollection):
 
             # Leaf rotation
             edge_stylei = rotate_style(self._style, index=i, key=(v1, v2))
-            if edge_stylei.get("curved", False):
-                tension = edge_stylei.get("tension", 5)
-                ports = edge_stylei.get("ports", (None, None))
-            elif edge_stylei.get("arc", False):
-                tension = edge_stylei.get("tension", 1)
-                ports = None
-            else:
-                tension = 0
-                ports = None
 
             # Scale shrink by dpi
             dpi = self.figure.dpi if hasattr(self, "figure") else 72.0
             shrink = dpi / 72.0 * edge_stylei.pop("shrink", 0)
 
-            # False is a synonym for "none"
+            # Edge geometry and waypoints
+            # waypoints: False is a synonym for "none"
             waypoints = edge_stylei.get("waypoints", "none")
             if waypoints is False or waypoints is np.False_:
                 waypoints = "none"
@@ -391,10 +383,32 @@ class EdgeCollection(mpl.collections.PatchCollection):
                 raise ValueError(
                     "Could not determine automatically type of edge waypoints.",
                 )
-            if waypoints != "none":
-                ports = edge_stylei.get("ports", (None, None))
 
+            # Waypoints, curved, and arc have a complex logic
+            # TODO: This could be simplified I suppose
+            has_waypoints = waypoints != "none"
+            curved = edge_stylei.get("curved", False)
             arc = edge_stylei.get("arc", False)
+            ports = edge_stylei.get("ports", (None, None))
+
+            # For now, we establish a hierarchy from the most specialised to
+            # the most common cases. Each specialisation silences lower levels
+            # Tension and ports are entirely enslaved to the
+            # waypoint/arc/curved geometry settings.
+            # NOTE: The idea here is to not punish users for slight style
+            # inconsistencies that may well stem from fallback libraries
+            if has_waypoints:
+                tension = 0
+                arc = False
+            elif arc:
+                tension = edge_stylei.get("tension", 1)
+                ports = None
+                curved = False
+            elif curved:
+                tension = edge_stylei.get("tension", 5)
+            else:
+                tension = 0
+                ports = None
 
             # Compute actual edge path
             path, angles = _compute_edge_path(
@@ -406,6 +420,7 @@ class EdgeCollection(mpl.collections.PatchCollection):
                 tension=tension,
                 waypoints=waypoints,
                 ports=ports,
+                curved=curved,
                 arc=arc,
                 layout_coordinate_system=self._vertex_collection.get_layout_coordinate_system(),
                 shrink=shrink,

iplotx/edge/geometry.py

@@ -239,6 +239,7 @@ def _compute_edge_path_straight(
 
 def _compute_edge_path_waypoints(
     waypoints,
+    curved,
     vcoord_data,
     vpath_fig,
     vsize_fig,
@@ -277,8 +278,19 @@ def _compute_edge_path_waypoints(
                 + vcoord_fig[i]
             )
 
-        points = [vshorts[0]] + list(waypoints) + [vshorts[1]]
-        codes = ["MOVETO"] + ["LINETO"] * len(waypoints) + ["LINETO"]
+        if not curved:
+            points = [vshorts[0]] + list(waypoints) + [vshorts[1]]
+            codes = ["MOVETO"] + ["LINETO"] * len(waypoints) + ["LINETO"]
+        else:
+            points = [vshorts[0]]
+            for i, waypoint in enumerate(waypoints):
+                if i != 0:
+                    points.append(0.5 * (points[-1] + waypoint))
+                points.append(waypoint)
+                points.append(waypoint)
+            points.append(vshorts[1])
+            codes = ["MOVETO"] + ["CURVE4"] * (len(points) - 1)
+
         angles = tuple(thetas)
 
     elif waypoints in ("x0y1", "y0x1"):
@@ -587,6 +599,7 @@ def _compute_edge_path(
     tension: float = 0,
     waypoints: str | tuple[float, float] | Sequence[tuple[float, float]] | np.ndarray = "none",
     ports: Pair[Optional[str]] = (None, None),
+    curved: bool = False,
     arc: bool = False,
     layout_coordinate_system: str = "cartesian",
     **kwargs,
@@ -600,6 +613,7 @@ def _compute_edge_path(
     if waypoints != "none":
         return _compute_edge_path_waypoints(
             waypoints,
+            curved,
             *args,
             layout_coordinate_system=layout_coordinate_system,
             ports=ports,

iplotx/version.py

@@ -2,4 +2,4 @@
 iplotx version information module.
 """
 
-__version__ = "1.5.1"
+__version__ = "1.6.0"

{iplotx-1.5.1.dist-info → iplotx-1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iplotx
-Version: 1.5.1
+Version: 1.6.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.5.1.dist-info → iplotx-1.6.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=2-ElWE7kiH17_8qfp3S7cxPYli-UBakrm7tAh8DbG2E,66
+iplotx/version.py,sha256=FuQ50YfUAzVu7Ebc11JUJcD5XAW6-g-5gcQOldsIb-U,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/__init__.py,sha256=mp_JRGeJWPXZNpQ6vTgTdzgVO1YxcZMKuVKarJGuLnY,27522
 iplotx/edge/arrow.py,sha256=ymup2YT_0GVYMtZw_DSKrZqFHG_ysYteEhmoL6T8Mu4,17563
-iplotx/edge/geometry.py,sha256=Vt1Y_wH2Fto_rgrQbuhXUzsfBpjQLti8Qws-oAGLcUw,19745
+iplotx/edge/geometry.py,sha256=Qyi7Q7sOGAFXU6gFeWFLm6OoGetEasrfv8HzgSWO2gY,20210
 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.5.1.dist-info/METADATA,sha256=8-x0TGoqdL4oRbC3MtMnYii8ZNbiRZmATGze3RbW3mE,5407
-iplotx-1.5.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-iplotx-1.5.1.dist-info/RECORD,,
+iplotx-1.6.0.dist-info/METADATA,sha256=dyJUY-7XhULve7DdsDLjEjqIO8o7EtXauCkqEpSt0B4,5407
+iplotx-1.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+iplotx-1.6.0.dist-info/RECORD,,