Orderstruktur der Library in 2d und 3d unterteilt, Dateien entsprechend verschoben, Pfade in Variablen im gesamten Verzeichnis entsprechend korrigiert; Vario Vertikalbögen für 2d und 3d erzeugt;
This commit is contained in:
@@ -153,7 +153,7 @@ def build_row_layout(data_dir, results_dir):
|
||||
}]
|
||||
"""
|
||||
sources = load_omniflo_data(data_dir)
|
||||
omniflo_dir = os.path.join(data_dir, "omniflo")
|
||||
omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
|
||||
|
||||
rows = []
|
||||
cursor_y = 0.0
|
||||
|
||||
@@ -314,7 +314,7 @@ def process_all(data_dir, cfg_path, results_dir, single_nr=None, dry_run=False):
|
||||
out_dir = os.path.join(results_dir, "omniflo")
|
||||
os.makedirs(out_dir, exist_ok=True)
|
||||
|
||||
omniflo_dir = os.path.join(data_dir, "omniflo")
|
||||
omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
|
||||
processed = 0
|
||||
skipped = 0
|
||||
errors = 0
|
||||
|
||||
@@ -257,7 +257,7 @@ def process_dxf(data_dir, label, json_file, filter_func, insertion_func,
|
||||
with open(json_path, "r", encoding="utf-8") as f:
|
||||
items = json.load(f)
|
||||
|
||||
omniflo_dir = os.path.join(data_dir, "omniflo")
|
||||
omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
|
||||
filtered = [item for item in items if filter_func(item)]
|
||||
if number:
|
||||
filtered = [item for item in filtered if str(item["Sivasnr"]) == str(number)]
|
||||
|
||||
+3
-3
@@ -713,7 +713,7 @@ def _check_and_clean_ks(msp, k_name, sivasnr, force=False):
|
||||
def process_k1set(data_dir, results_dir, number=None, force=False):
|
||||
"""Setzt K1-Block an alle Boegen und Weichen."""
|
||||
sources = load_omniflo_data(data_dir)
|
||||
omniflo_dir = os.path.join(data_dir, "omniflo")
|
||||
omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
|
||||
|
||||
all_items = []
|
||||
for b in sources["boegen"]:
|
||||
@@ -768,7 +768,7 @@ def process_k1set(data_dir, results_dir, number=None, force=False):
|
||||
|
||||
def _process_kset(k_name, funcs, data_dir, results_dir, number=None, force=False):
|
||||
"""Generische Verarbeitung fuer K2/K3: iteriert ueber SWITCH_FILTERS."""
|
||||
omniflo_dir = os.path.join(data_dir, "omniflo")
|
||||
omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
|
||||
|
||||
for key, k_func in funcs.items():
|
||||
label, json_file, filter_func = SWITCH_FILTERS[key]
|
||||
@@ -828,7 +828,7 @@ def process_k3set(data_dir, results_dir, number=None, force=False):
|
||||
|
||||
def process_k4set(data_dir, results_dir, number=None, force=False):
|
||||
"""Setzt K4-Block (oberes K1-Linienende) an Weichen ohne Doppel/Dreifach/Delta."""
|
||||
omniflo_dir = os.path.join(data_dir, "omniflo")
|
||||
omniflo_dir = os.environ.get("DXFM_OMNIFLO") or os.path.join(data_dir, "omniflo")
|
||||
|
||||
for key, k4_func in K4_FUNCS.items():
|
||||
label, json_file, filter_func = SWITCH_FILTERS[key]
|
||||
|
||||
Reference in New Issue
Block a user