Alle Programme so weit angepasst, dass Programmkette läuft.

lib/routing.py

@@ -85,21 +85,36 @@ def draw_graph(G:nx.Graph, an:Anlage):
     
     edge_colors = [G[u][v].get('color', 'black') for u, v in G.edges()]
     
-    nx.draw(G, pos, with_labels=False, node_size=10, font_size=8, edge_color=edge_colors)
+    nx.draw(G, pos, with_labels=True, node_size=10, font_size=8, edge_color=edge_colors, node_color='none')
+    nx.draw_networkx_nodes(G, pos, linewidths= 0.5, edgecolors = 'red', node_color = 'none')
     plt.show()
 
 def prepare_data(rawdata:dict):
     sensors = rawdata["sensors"]
+    dsensors = dict()
+    for sname, sdata in sensors.items():
+        dsensors[sname] = Point(sdata["pos"])
+
     subdists = rawdata["distributors"]
+    dsubdists = dict()
+    for dname, pos in subdists.items():
+        dsubdists[dname] = Point(pos)
+
     racks = rawdata["racks"]
-    mapping = rawdata["mapping"]
     dracks = dict()
-    for rname,lp in racks:
-        if rname not in dracks:
-            dracks[rname] = list()
-        dracks[rname].append(Point(lp))
+    for rname,lp in racks.items():
+    #     if rname not in dracks:
+    #         dracks[rname] = list()
+        # dracks[rname].append(Point(lp))
+        ltemp = list()
+        for p in lp:
+            ltemp.append(Point(p))
+        dracks[rname] = ltemp
+        
+    mapping = rawdata["mappings"]
     
-    return (sensors, subdists, dracks, mapping)
+    
+    return (dracks, dsensors, dsubdists, mapping)
 
 
 if __name__ == "__main__":
@@ -130,8 +145,8 @@ if __name__ == "__main__":
 
     # Ausgabe schreiben
     if args.write:
-            basename = os.path.splitext(args.write)[0]
-            write_results(to_json(cable_paths), work_dir, f"{basename}.json")
+        basename = os.path.splitext(args.write)[0]
+        write_results(to_json(cable_paths), work_dir, f"{basename}.json")