From a4920bf072ee28034280413bf9da2e3f8611863d Mon Sep 17 00:00:00 2001 From: lertlmaier Date: Wed, 28 May 2025 11:45:41 +0200 Subject: [PATCH] =?UTF-8?q?Tunnel=20Indizes=20in=20Ausgabe=20todraw=20hinz?= =?UTF-8?q?ugef=C3=BCgr,=20damit=20Tunnel=20anders=20o.=20garnicht=20gezei?= =?UTF-8?q?chnet=20werden=20k=C3=B6nnen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/plant.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/plant.py b/lib/plant.py index 5cd87d5..86e7a7c 100644 --- a/lib/plant.py +++ b/lib/plant.py @@ -447,6 +447,14 @@ class Anlage(): return errors + def coord_is_in_tunnel(self, coord): + for tname, pos in self._tunnels.items(): + if coord == pos[0]: + return True + elif coord == pos[1]: + return True + return False + def join_racks(self): @@ -590,12 +598,18 @@ class Anlage(): pfade["errors_routing"].append((sname, dname)) continue pfad_coords = self._nodeids.get_points(pfad_nodes) - #tuplecoords = [(p.x, p.y) for p in pfad_coords] + ld = dict() + ld['id'] = f"{dname}-{sname}" ld["coords"]= [{"x":round(p.x,1), "y":round(p.y,1)} for p in pfad_coords] ld["length"]= round(pfad_length,1) - ld["nodes"]=pfad_nodes + #ld["nodes"]=pfad_nodes + ld['tunnel_indices'] = list() + for i, p in enumerate(pfad_coords): + if self.coord_is_in_tunnel(p): + ld['tunnel_indices'].append(i) + pfade["kabel"].append(ld) return pfade