m.stangl/kabellaengen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mit curser weiter bearbeitet. Schaltschrankelemente werden jettz auch von getpositions raus geschrieben

Browse Source
This commit is contained in:
Michael Stangl
2025-07-15 08:02:56 +02:00
parent a2d22500c4
commit 95f8f6722b
4 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/getpositions.py
+5 -4
View File
@@ -182,7 +182,7 @@ class CompareBuffer:
l.append(b)
return l
def extract_input_positions(insert_iterable) -> tuple[dict, dict, dict]:
def extract_input_positions(insert_iterable) -> tuple[dict, dict, dict, dict]:
all_sensors = dict()
all_cables = dict()
all_schaltschrank = dict()
@@ -216,7 +216,7 @@ def extract_input_positions(insert_iterable) -> tuple[dict, dict, dict]:
# die noch übrigen Blöcke melden
missing_attribs, double_ids = get_errors_double_and_attributes(wp)
return all_sensors, double_ids, missing_attribs
return all_sensors, all_schaltschrank, double_ids, missing_attribs
def get_errors_double_and_attributes(wp: CompareBuffer) -> tuple[dict, dict]:
missing_attribs = dict()
@@ -664,9 +664,9 @@ if __name__ == '__main__':
if args.sensors:
# Sensoren auslesen
if use_iter:
res_sens, res_double, missing_attribs = get_input_positions_iter(dxf_path)
res_sens, res_schaltschrank_elemente, res_double, missing_attribs = get_input_positions_iter(dxf_path)
else:
res_sens, res_double, missing_attribs = get_input_positions(msp)
res_sens, res_schaltschrank_elemente, res_double, missing_attribs = get_input_positions(msp)
if args.errors and len(res_double) > 0:
print("Duplicate blocks found. Writing errors-file.")
@@ -675,6 +675,7 @@ if __name__ == '__main__':
output_results['sensors'] = res_sens
output_results['schaltschrank_elemente'] = res_schaltschrank_elemente
#output_results['cables'] = res_cables
if args.console: