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:
+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