Merge remote-tracking branch 'upstream/hotfixes' into release

Author: fit-alessandro-berti

pm4py/meta.py

@@ -20,7 +20,7 @@
 Contact: info@processintelligence.solutions
 '''
 __name__ = "pm4py"
-VERSION = "2.7.19.1"
+VERSION = "2.7.19.2"
 
 __version__ = VERSION
 __doc__ = "Process mining for Python"

pm4py/objects/bpmn/layout/variants/graphviz_new.py

@@ -20,30 +20,59 @@
 Contact: info@processintelligence.solutions
 '''
 from pm4py.objects.bpmn.obj import BPMN
-from typing import Optional, Dict, Any
-
+from typing import Optional, Dict, Any, Tuple, List
 from copy import copy
 import tempfile
 
 
+def _get_node_center(layout, node) -> Tuple[float, float]:
+    """Get the center point of a node."""
+    node_layout = layout.get(node)
+    x = node_layout.get_x() + node_layout.get_width() / 2
+    y = node_layout.get_y() + node_layout.get_height() / 2
+    return (x, y)
+
+
+def _get_node_boundary_point(layout, node, target_point: Tuple[float, float]) -> Tuple[float, float]:
+    """
+    Calculate the intersection point on the node boundary
+    towards a target point.
+    """
+    node_layout = layout.get(node)
+    x = node_layout.get_x()
+    y = node_layout.get_y()
+    w = node_layout.get_width()
+    h = node_layout.get_height()
+
+    cx, cy = x + w / 2, y + h / 2
+    tx, ty = target_point
+
+    dx = tx - cx
+    dy = ty - cy
+
+    if dx == 0 and dy == 0:
+        return (cx, y)  # Default to top edge
+
+    # Calculate intersection with rectangle boundary
+    if dx == 0:
+        return (cx, y if dy < 0 else y + h)
+    if dy == 0:
+        return (x if dx < 0 else x + w, cy)
+
+    # Check intersection with each edge
+    scale_x = (w / 2) / abs(dx)
+    scale_y = (h / 2) / abs(dy)
+    scale = min(scale_x, scale_y)
+
+    return (cx + dx * scale, cy + dy * scale)
+
+
 def apply(
-    bpmn_graph: BPMN, parameters: Optional[Dict[Any, Any]] = None
+        bpmn_graph: BPMN, parameters: Optional[Dict[Any, Any]] = None
 ) -> BPMN:
     """
-    Layouts the BPMN graphviz using directly the information about node positioning
-    and edges waypoints provided in the SVG obtained from Graphviz.
-
-    Parameters
-    -----------------
-    bpmn_graph
-        BPMN graph
-    parameters
-        Optional parameters of the method
-
-    Returns
-    ----------------
-    layouted_bpmn
-        Layouted BPMN
+    Layouts the BPMN graph using node positioning and edge waypoints from Graphviz SVG.
+    Ensures edges connect properly to node boundaries.
     """
     if parameters is None:
         parameters = {}
@@ -53,7 +82,7 @@ def apply(
 
     layout = bpmn_graph.get_layout()
 
-    filename_svg = tempfile.NamedTemporaryFile(suffix=".svg")
+    filename_svg = tempfile.NamedTemporaryFile(suffix=".svg", delete=False)
     filename_svg.close()
 
     vis_parameters = copy(parameters)
@@ -64,36 +93,45 @@ def apply(
     gviz = bpmn_visualizer.apply(bpmn_graph, parameters=vis_parameters)
     bpmn_visualizer.save(gviz, filename_svg.name)
 
-    # print(filename_svg.name)
-
     nodes_p, edges_p = svg_pos_parser.apply(filename_svg.name)
 
+    # First pass: layout all nodes
     for node in list(bpmn_graph.get_nodes()):
         node_id = str(id(node))
         if node_id in nodes_p:
             node_info = nodes_p[node_id]
             if node_info["polygon"] is not None:
-                min_x = min(x[0] for x in node_info["polygon"])
-                max_x = max(x[0] for x in node_info["polygon"])
-                min_y = min(x[1] for x in node_info["polygon"])
-                max_y = max(x[1] for x in node_info["polygon"])
+                min_x = min(p[0] for p in node_info["polygon"])
+                max_x = max(p[0] for p in node_info["polygon"])
+                min_y = min(p[1] for p in node_info["polygon"])
+                max_y = max(p[1] for p in node_info["polygon"])
 
-                width = max_x - min_x
-                height = max_y - min_y
-
-                layout.get(node).set_width(width)
-                layout.get(node).set_height(height)
+                layout.get(node).set_width(max_x - min_x)
+                layout.get(node).set_height(max_y - min_y)
                 layout.get(node).set_x(min_x)
                 layout.get(node).set_y(min_y)
 
+    # Second pass: layout edges with proper connection points
     for flow in list(bpmn_graph.get_flows()):
         flow_id = (str(id(flow.source)), str(id(flow.target)))
         if flow_id in edges_p:
             flow_info = edges_p[flow_id]
-            if flow_info["waypoints"] is not None:
+            if flow_info["waypoints"] is not None and len(flow_info["waypoints"]) >= 2:
                 flow.del_waypoints()
 
-                for wayp in flow_info["waypoints"]:
+                waypoints = list(flow_info["waypoints"])
+
+                # Adjust start point to source node boundary
+                if len(waypoints) > 1:
+                    start_boundary = _get_node_boundary_point(layout, flow.source, waypoints[1])
+                    waypoints[0] = start_boundary
+
+                # Adjust end point to target node boundary
+                if len(waypoints) > 1:
+                    end_boundary = _get_node_boundary_point(layout, flow.target, waypoints[-2])
+                    waypoints[-1] = end_boundary
+
+                for wayp in waypoints:
                     flow.add_waypoint(wayp)
 
     return bpmn_graph

pm4py/vis.py

@@ -1989,6 +1989,7 @@ def view_powl(
     format: str = constants.DEFAULT_FORMAT_GVIZ_VIEW,
     bgcolor: str = "white",
     variant_str: str = "basic",
+    rankdir: str = "TB",
     graph_title: Optional[str] = None,
 ):
     """
@@ -2002,6 +2003,7 @@ def view_powl(
     :param powl: POWL model
     :param format: Format of the visualization (default: png)
     :param bgcolor: Background color (default: white)
+    :param rankdir: Graph direction ("LR" or "TB")
     :param variant_str: Variant of the visualization to be used ("basic" or "net")
     :param graph_title: Title of the visualization (if provided)
 
@@ -2026,7 +2028,7 @@ def view_powl(
     fmt = _extract_format(format)
     from pm4py.visualization.powl import visualizer as powl_visualizer
 
-    params = _setup_parameters(fmt, bgcolor, graph_title=graph_title)
+    params = _setup_parameters(fmt, bgcolor, rankdir, graph_title=graph_title)
     gviz = powl_visualizer.apply(powl, variant=variant, parameters=params)
 
     powl_visualizer.view(gviz, parameters=params)

pm4py/visualization/powl/variants/basic.py

@@ -50,6 +50,7 @@ class Parameters(Enum):
     ENABLE_DEEPCOPY = "enable_deepcopy"
     FONT_SIZE = "font_size"
     BGCOLOR = "bgcolor"
+    RANKDIR = "rankdir"
     ENABLE_GRAPH_TITLE = "enable_graph_title"
     GRAPH_TITLE = "graph_title"
 
@@ -82,20 +83,25 @@ def apply(powl: POWL, parameters: Optional[Dict[Any, Any]] = None) -> Digraph:
 
     filename = tempfile.NamedTemporaryFile(suffix=".gv")
 
+    rankdir = exec_utils.get_param_value(Parameters.RANKDIR, parameters, "TB")
+    bgcolor = exec_utils.get_param_value(
+        Parameters.BGCOLOR, parameters, fillcolor
+    )
+
     viz = Digraph("powl", filename=filename.name, engine="dot")
     viz.attr("node", shape="ellipse", fixedsize="false")
     viz.attr(nodesep="1")
     viz.attr(ranksep="1")
     viz.attr(compound="true")
     viz.attr(overlap="scale")
     viz.attr(splines="true")
-    viz.attr(rankdir="TB")
+    viz.attr(rankdir=rankdir)
     viz.attr(style="filled")
-    viz.attr(fillcolor=fillcolor)
+    viz.attr(fillcolor=bgcolor)
 
     color_map = exec_utils.get_param_value(Parameters.COLOR_MAP, {}, {})
 
-    repr_powl(powl, viz, color_map, level=0)
+    repr_powl(powl, viz, color_map, level=0, base_color=bgcolor)
     viz.format = "svg"
 
     return viz
@@ -204,12 +210,12 @@ def add_order_edge(
             )
 
 
-def repr_powl(powl, viz, color_map, level):
+def repr_powl(powl, viz, color_map, level, base_color):
     font_size = "18"
     this_node_id = str(id(powl))
 
     current_color = darken_color(
-        fillcolor, amount=opacity_change_ratio * level
+        base_color, amount=opacity_change_ratio * level
     )
 
     if isinstance(powl, FrequentTransition):
@@ -305,7 +311,9 @@ def repr_powl(powl, viz, color_map, level):
             block.attr(style="filled")
             block.attr(fillcolor=current_color)
             for child in powl.children:
-                repr_powl(child, block, color_map, level=level + 1)
+                repr_powl(
+                    child, block, color_map, level=level + 1, base_color=base_color
+                )
             for child in powl.children:
                 for child2 in powl.children:
                     if transitive_reduction.is_edge(child, child2):
@@ -332,9 +340,13 @@ def repr_powl(powl, viz, color_map, level):
                     )
                 do = powl.children[0]
                 redo = powl.children[1]
-                repr_powl(do, block, color_map, level=level + 1)
+                repr_powl(
+                    do, block, color_map, level=level + 1, base_color=base_color
+                )
                 add_operator_edge(block, this_node_id, do)
-                repr_powl(redo, block, color_map, level=level + 1)
+                repr_powl(
+                    redo, block, color_map, level=level + 1, base_color=base_color
+                )
                 add_operator_edge(block, this_node_id, redo, style="dashed")
             elif powl.operator == Operator.XOR:
                 with importlib.resources.path(
@@ -351,7 +363,9 @@ def repr_powl(powl, viz, color_map, level):
                         fixedsize="true",
                     )
                 for child in powl.children:
-                    repr_powl(child, block, color_map, level=level + 1)
+                    repr_powl(
+                        child, block, color_map, level=level + 1, base_color=base_color
+                    )
                     add_operator_edge(block, this_node_id, child)
 
 

pm4py/visualization/powl/variants/net.py

@@ -312,8 +312,12 @@ def apply(
 
     nodes, edges = simplify_and_gateways(nodes, edges)
 
-    rankdir = "LR"
-    bgcolor = constants.DEFAULT_BGCOLOR
+    rankdir = exec_utils.get_param_value(
+        Parameters.RANKDIR, parameters, constants.DEFAULT_RANKDIR_GVIZ
+    )
+    bgcolor = exec_utils.get_param_value(
+        Parameters.BGCOLOR, parameters, constants.DEFAULT_BGCOLOR
+    )
 
     filename = tempfile.NamedTemporaryFile(suffix=".gv")
     viz = Digraph(