diff --git a/capellambse_context_diagrams/__init__.py b/capellambse_context_diagrams/__init__.py
index 34febf92..d142e28e 100644
--- a/capellambse_context_diagrams/__init__.py
+++ b/capellambse_context_diagrams/__init__.py
@@ -81,7 +81,11 @@ def register_classes() -> None:
(
ctx.SystemFunction,
DiagramType.SAB,
- {"render_styles": styling.BLUE_ACTOR_FNCS},
+ {
+ "display_symbols_as_boxes": True,
+ "display_parent_relation": True,
+ "render_styles": styling.BLUE_ACTOR_FNCS,
+ },
),
(
la.LogicalComponent,
@@ -112,7 +116,10 @@ def register_classes() -> None:
(
pa.PhysicalFunction,
DiagramType.PAB,
- {"render_styles": styling.BLUE_ACTOR_FNCS},
+ {
+ "display_parent_relation": True,
+ "render_styles": styling.BLUE_ACTOR_FNCS,
+ },
),
]
patch_styles(supported_classes)
diff --git a/capellambse_context_diagrams/collectors/default.py b/capellambse_context_diagrams/collectors/default.py
index e94b33d9..aba09d7e 100644
--- a/capellambse_context_diagrams/collectors/default.py
+++ b/capellambse_context_diagrams/collectors/default.py
@@ -25,12 +25,6 @@ def collector(
diagram: context.ContextDiagram, params: dict[str, t.Any] | None = None
) -> _elkjs.ELKInputData:
"""Collect context data from ports of centric box."""
- diagram.display_parent_relation = (params or {}).pop(
- "display_parent_relation", diagram.display_parent_relation
- )
- diagram.display_derived_interfaces = (params or {}).pop(
- "display_derived_interfaces", diagram.display_derived_interfaces
- )
data = generic.collector(diagram, no_symbol=True)
ports = port_collector(diagram.target, diagram.type)
centerbox = data["children"][0]
@@ -41,7 +35,6 @@ def collector(
ex_datas: list[generic.ExchangeData] = []
edges: common.ElementList[fa.AbstractExchange]
for ex in (edges := list(chain.from_iterable(connections.values()))):
-
if is_hierarchical := exchanges.is_hierarchical(ex, centerbox):
if not diagram.display_parent_relation:
continue
@@ -61,8 +54,7 @@ def collector(
continue
global_boxes = {centerbox["id"]: centerbox}
made_boxes = {centerbox["id"]: centerbox}
- to_delete = set()
- to_delete.add(centerbox["id"])
+ boxes_to_delete = {centerbox["id"]}
def _make_box_and_update_globals(
obj: t.Any,
@@ -77,17 +69,19 @@ def _make_box_and_update_globals(
return box
if diagram.display_parent_relation:
- if diagram.target.owner:
- box = _make_box_and_update_globals(
- diagram.target.owner,
- no_symbol=diagram.display_symbols_as_boxes,
- layout_options=makers.DEFAULT_LABEL_LAYOUT_OPTIONS,
- )
- box["children"] = [centerbox]
- del data["children"][0]
- all_owners = generic.get_all_owners(diagram.target)
- start = 0
- common_owner = diagram.target
+ try:
+ if not isinstance(diagram.target.owner, generic.PackageTypes):
+ box = _make_box_and_update_globals(
+ diagram.target.owner,
+ no_symbol=diagram.display_symbols_as_boxes,
+ layout_options=makers.DEFAULT_LABEL_LAYOUT_OPTIONS,
+ )
+ box["children"] = [centerbox]
+ del data["children"][0]
+ except AttributeError:
+ pass
+ diagram_target_owners = generic.get_all_owners(diagram.target)
+ common_owners = []
stack_heights: dict[str, float | int] = {
"input": -makers.NEIGHBOR_VMARGIN,
@@ -117,57 +111,63 @@ def _make_box_and_update_globals(
if diagram.display_parent_relation:
current = child
- while (
- current
- and not isinstance(current, generic.PackageTypes)
- and current.uuid not in all_owners
- ):
+ while current and current.uuid not in diagram_target_owners:
+ try:
+ if isinstance(current.owner, generic.PackageTypes):
+ break
+ if not (
+ parent_box := global_boxes.get(current.owner.uuid)
+ ):
+ parent_box = _make_box_and_update_globals(
+ current.owner,
+ no_symbol=diagram.display_symbols_as_boxes,
+ layout_options=makers.DEFAULT_LABEL_LAYOUT_OPTIONS,
+ )
+ new_box = global_boxes.get(current.uuid, current)
+ for box in (
+ children := parent_box.setdefault("children", [])
+ ):
+ if box["id"] == current.uuid:
+ box = new_box
+ break
+ else:
+ children.append(new_box)
+ boxes_to_delete.add(current.uuid)
+ current = current.owner
+ except AttributeError:
+ break
+ common_owners.append(current.uuid)
+
+ stack_heights[side] += makers.NEIGHBOR_VMARGIN + height
+
+ if diagram.display_parent_relation and diagram.target.owner:
+ current = diagram.target.owner
+ common_owner_uuid = current.uuid
+ for owner in diagram_target_owners[::-1]:
+ if owner in common_owners:
+ common_owner_uuid = owner
+ break
+ while current and current.uuid != common_owner_uuid:
+ try:
+ if isinstance(current.owner, generic.PackageTypes):
+ break
if not (parent_box := global_boxes.get(current.owner.uuid)):
parent_box = _make_box_and_update_globals(
current.owner,
no_symbol=diagram.display_symbols_as_boxes,
layout_options=makers.DEFAULT_LABEL_LAYOUT_OPTIONS,
)
- new_box = global_boxes.get(current.uuid, current)
for box in (children := parent_box.setdefault("children", [])):
if box["id"] == current.uuid:
- box = new_box
+ box = global_boxes.pop(current.uuid)
break
else:
- children.append(new_box)
- to_delete.add(current.uuid)
+ children.append(global_boxes.pop(current.uuid))
current = current.owner
- try:
- if all_owners.index(current.uuid, start) > start:
- common_owner = current
- except ValueError:
- pass
-
- stack_heights[side] += makers.NEIGHBOR_VMARGIN + height
-
- if diagram.display_parent_relation and diagram.target.owner:
- current = diagram.target.owner
- while (
- current
- and not isinstance(current, generic.PackageTypes)
- and current != common_owner
- ):
- if not (parent_box := global_boxes.get(current.owner.uuid)):
- parent_box = _make_box_and_update_globals(
- current.owner,
- no_symbol=diagram.display_symbols_as_boxes,
- layout_options=makers.DEFAULT_LABEL_LAYOUT_OPTIONS,
- )
- for box in (children := parent_box.setdefault("children", [])):
- if box["id"] == current.uuid:
- box = global_boxes.pop(current.uuid)
- break
- else:
- children.append(global_boxes.pop(current.uuid))
-
- current = current.owner
+ except AttributeError:
+ break
- for uuid in to_delete:
+ for uuid in boxes_to_delete:
del global_boxes[uuid]
data["children"].extend(global_boxes.values())
if diagram.display_parent_relation:
diff --git a/capellambse_context_diagrams/collectors/generic.py b/capellambse_context_diagrams/collectors/generic.py
index bddf57e7..51e9f3c3 100644
--- a/capellambse_context_diagrams/collectors/generic.py
+++ b/capellambse_context_diagrams/collectors/generic.py
@@ -234,7 +234,7 @@ def move_edges(
target_owner_uuids = get_all_owners(c.target)
common_owner_uuid = None
for owner in source_owner_uuids:
- if owner in set(target_owner_uuids):
+ if owner in target_owner_uuids:
common_owner_uuid = owner
break
@@ -247,7 +247,6 @@ def move_edges(
if edge["id"] == c.uuid:
owner_box.setdefault("edges", []).append(edge)
edges_to_remove.append(edge["id"])
-
data["edges"] = [
e for e in data["edges"] if e["id"] not in edges_to_remove
]
diff --git a/capellambse_context_diagrams/context.py b/capellambse_context_diagrams/context.py
index 13904739..a5072bdc 100644
--- a/capellambse_context_diagrams/context.py
+++ b/capellambse_context_diagrams/context.py
@@ -343,6 +343,18 @@ def render(self, fmt: str | None, /, **params) -> t.Any:
def _create_diagram(self, params: dict[str, t.Any]) -> cdiagram.Diagram:
transparent_background = params.pop("transparent_background", False)
+ self.display_parent_relation = params.pop(
+ "display_parent_relation", self.display_parent_relation
+ )
+ self.display_derived_interfaces = params.pop(
+ "display_derived_interfaces", self.display_derived_interfaces
+ )
+ self.display_symbols_as_boxes = params.pop(
+ "display_symbols_as_boxes", self.display_symbols_as_boxes
+ )
+ self.slim_center_box = params.pop(
+ "slim_center_box", self.slim_center_box
+ )
data = params.get("elkdata") or get_elkdata(self, params)
layout = try_to_layout(data)
add_context(layout, params.get("is_legend", False))
diff --git a/capellambse_context_diagrams/serializers.py b/capellambse_context_diagrams/serializers.py
index 36a91389..42d5adc3 100644
--- a/capellambse_context_diagrams/serializers.py
+++ b/capellambse_context_diagrams/serializers.py
@@ -257,7 +257,7 @@ class type that stores all previously named classes.
for i in child.get("children", []): # type: ignore
if i["type"] == "edge":
- self._edges.setdefault(i["id"], (i, ref, element))
+ self._edges.setdefault(i["id"], (i, ref, parent))
else:
self.deserialize_child(i, ref, element)
diff --git a/tests/data/ContextDiagram.aird b/tests/data/ContextDiagram.aird
index 4593a8de..1437a998 100644
--- a/tests/data/ContextDiagram.aird
+++ b/tests/data/ContextDiagram.aird
@@ -62,7 +62,7 @@
-
+