Merge branch 'main' of http://gitea.schoenenberger.de/mistangl/kabellaengen

lib/getpositions.py

@@ -355,16 +355,22 @@ def get_rack_positions(msp):
     rack_counter = 1 #Zaehler für Rack Nummerierung
 
     all_layers = list(config.items('GetPos-Layer_Racks'))
-    for (layer,v) in all_layers:
+    
-        selectstr = f'LWPOLYLINE[layer=="{layer}"]'
+    for layer, _ in all_layers:
-        for e in msp.query(selectstr):
+        # Suche nach LWPOLYLINE 
-            #print_polyline(e)
+        lw_query = f'LWPOLYLINE[layer=="{layer}"]'
+        for entity in msp.query(lw_query):
             rack_key = f"Rack_{rack_counter}"
-            ret[rack_key] = list()
+            handle_lwpolyline(entity, rack_key, ret)
-            for x, y, z, start_width, end_width, bulge in e.get_points():  # Gibt Tuple (x, y, start_width, end_width, bulge)
+            rack_counter += 1
-                p = [round(x,1), round(y,1), round(z,1)]
+
-                ret[rack_key].append(p)
+        # Suche nach klassischer POLYLINE
-            rack_counter +=1
+        pl_query = f'POLYLINE[layer=="{layer}"]'
+        for entity in msp.query(pl_query):
+            rack_key = f"Rack_{rack_counter}"
+            handle_polyline(entity, rack_key, ret)
+            rack_counter += 1
+
     return ret
 
 def get_rack_positions_iter(dxf_path):