Skip to content

Commit

Permalink
fix(context-diagram): Fix edge direction
Browse files Browse the repository at this point in the history
  • Loading branch information
@huyenngn
huyenngn committed Apr 30, 2024
1 parent 292e67e commit 2d2fbb1
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 40 deletions.
79 changes: 39 additions & 40 deletions capellambse_context_diagrams/collectors/exchanges.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ class ExchangeCollector(metaclass=abc.ABCMeta):
),
}

"""Source or target Component of the interface."""
outgoing_edges: dict[str, common.GenericElement]
incoming_edges: dict[str, common.GenericElement]

def __init__(
self,
diagram: (
Expand All @@ -65,8 +61,6 @@ def __init__(
self.get_target = operator.attrgetter(trg)
self.get_alloc_fex = operator.attrgetter(alloc_fex)
self.get_alloc_functions = operator.attrgetter(fncs)
self.incoming_edges = {}
self.outgoing_edges = {}

def get_functions_and_exchanges(
self, comp: common.GenericElement, interface: common.GenericElement
Expand All @@ -78,7 +72,7 @@ def get_functions_and_exchanges(
"""Return `Function`s, incoming and outgoing
`FunctionalExchange`s for given `Component` and `interface`.
"""
functions, outgoings, incomings = [], {}, {}
functions, incomings, outgoings = [], {}, {}
alloc_functions = self.get_alloc_functions(comp)
for fex in self.get_alloc_fex(interface):
source = self.get_source(fex)
Expand All @@ -99,25 +93,32 @@ def get_functions_and_exchanges(

def collect_context(
self, comp: common.GenericElement, interface: common.GenericElement
) -> dict[str, t.Any]:
functions, outgoings, incomings = self.get_functions_and_exchanges(
) -> tuple[
dict[str, t.Any],
dict[str, common.GenericElement],
dict[str, common.GenericElement],
]:
functions, incomings, outgoings = self.get_functions_and_exchanges(
comp, interface
)
self.outgoing_edges |= outgoings
self.incoming_edges |= incomings
components = []
for cmp in comp.components:
fncs, incs, outs = self.get_functions_and_exchanges(cmp, interface)
fncs, _, _ = self.get_functions_and_exchanges(cmp, interface)
functions.extend(fncs)
self.outgoing_edges |= outs
self.incoming_edges |= incs
if fncs:
components.append(self.collect_context(cmp, interface))
return {
"element": comp,
"functions": functions,
"components": components,
}
c, incs, outs = self.collect_context(cmp, interface)
components.append(c)
incomings |= incs
outgoings |= outs
return (
{
"element": comp,
"functions": functions,
"components": components,
},
incomings,
outgoings,
)

def make_ports_and_update_children_size(
self,
Expand Down Expand Up @@ -188,6 +189,9 @@ class InterfaceContextCollector(ExchangeCollector):
left: common.GenericElement
"""Source or target Component of the interface."""
right: common.GenericElement
"""Source or target Component of the interface."""
outgoing_edges: dict[str, common.GenericElement]
incoming_edges: dict[str, common.GenericElement]

def __init__(
self,
Expand All @@ -196,6 +200,8 @@ def __init__(
params: dict[str, t.Any],
) -> None:
super().__init__(diagram, data, params)
self.incoming_edges = {}
self.outgoing_edges = {}
self.get_left_and_right()

def get_left_and_right(self) -> None:
Expand Down Expand Up @@ -235,23 +241,15 @@ def make_boxes(cntxt: dict[str, t.Any]) -> _elkjs.ELKInputChild | None:

try:
comp = self.get_source(self.obj)
left_context = self.collect_context(comp, self.obj)
inc_port_ids = set(
ex.target.uuid for ex in self.incoming_edges.values()
)
out_port_ids = set(
ex.source.uuid for ex in self.outgoing_edges.values()
)
left_context, incs, outs = self.collect_context(comp, self.obj)
inc_port_ids = set(ex.target.uuid for ex in incs.values())
out_port_ids = set(ex.source.uuid for ex in outs.values())
port_spread = len(out_port_ids) - len(inc_port_ids)

_comp = self.get_target(self.obj)
right_context = self.collect_context(_comp, self.obj)
_inc_port_ids = set(
ex.target.uuid for ex in self.outgoing_edges.values()
)
_out_port_ids = set(
ex.source.uuid for ex in self.incoming_edges.values()
)
right_context, _, _ = self.collect_context(_comp, self.obj)
_inc_port_ids = set(ex.target.uuid for ex in outs.values())
_out_port_ids = set(ex.source.uuid for ex in incs.values())
_port_spread = len(_out_port_ids) - len(_inc_port_ids)

left_context["functions"] = get_capella_order(
Expand All @@ -260,12 +258,13 @@ def make_boxes(cntxt: dict[str, t.Any]) -> _elkjs.ELKInputChild | None:
right_context["functions"] = get_capella_order(
_comp, right_context["functions"]
)
if port_spread < _port_spread:
if port_spread >= _port_spread:
self.incoming_edges = incs
self.outgoing_edges = outs
else:
self.incoming_edges = outs
self.outgoing_edges = incs
left_context, right_context = right_context, left_context
self.outgoing_edges, self.incoming_edges = (
self.incoming_edges,
self.outgoing_edges,
)

if left_child := make_boxes(left_context):
self.data["children"].append(left_child)
Expand All @@ -287,7 +286,7 @@ def collect(self) -> None:
)
src, tgt = generic.exchange_data_collector(ex_data)

if ex in self.incoming_edges:
if ex in self.incoming_edges.values():
self.data["edges"][-1]["sources"] = [tgt.uuid]
self.data["edges"][-1]["targets"] = [src.uuid]

Expand Down
11 changes: 11 additions & 0 deletions tests/test_interface_diagrams.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,14 @@ def test_interface_diagrams_get_rendered(
diag = obj.context_diagram

assert diag.nodes


def test_interface_diagrams_with_nested_components(
model: capellambse.MelodyModel,
) -> None:
obj = model.by_uuid("fbb7f735-3c1f-48de-9791-179d35ca7b98")

diag = obj.context_diagram
diag.invalidate_cache()

assert diag.render("svgdiagram")

0 comments on commit 2d2fbb1

Please sign in to comment.