diff --git a/CAD/Code/bin/diff_dimensions.bat b/CAD/Code/bin/diff_dimensions.bat new file mode 100644 index 0000000..adecbf9 --- /dev/null +++ b/CAD/Code/bin/diff_dimensions.bat @@ -0,0 +1,6 @@ +@echo off +REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt + +call setenv.bat + +python "%PROJECT_LIB%\diff_dimensions.py" %* \ No newline at end of file diff --git a/CAD/Code/bin/get_all_differences.bat b/CAD/Code/bin/get_all_differences.bat new file mode 100644 index 0000000..a842619 --- /dev/null +++ b/CAD/Code/bin/get_all_differences.bat @@ -0,0 +1,4 @@ +@echo off +REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt + +call diff_dimensions.bat --type WEICHE --json_2d omniflo_weichen.json --json_dimensions dimensions.json --tolerance 0.05 \ No newline at end of file diff --git a/CAD/Code/bin/get_dimensions.bat b/CAD/Code/bin/get_dimensions.bat new file mode 100644 index 0000000..e720092 --- /dev/null +++ b/CAD/Code/bin/get_dimensions.bat @@ -0,0 +1,10 @@ +@echo off +REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt + +call setenv.bat + +REM Beispielaufruf mit Parametern: +REM --in: Ordner mit .asm-Dateien (optional. Standard: Work) +REM --out: Zielverzeichnis (optional. Standard: Work\stl_export) + +python %PROJECT_LIB%\read_variables.py %* \ No newline at end of file diff --git a/CAD/Code/bin/setenv.bat b/CAD/Code/bin/setenv.bat index e2a8bd1..7d89d19 100644 --- a/CAD/Code/bin/setenv.bat +++ b/CAD/Code/bin/setenv.bat @@ -2,8 +2,12 @@ REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt pushd %~dp0\.. -set PROJECT_DIR=%cd% +for /f "delims=" %%i in ('git rev-parse --show-toplevel') do set SSG_RD_DIR=%%i + +set PROJECT_DIR=%SSG_RD_DIR%\CAD\Code + +set PROJECT_BIN=%PROJECT_DIR%\bin set PROJECT_LIB=%PROJECT_DIR%\lib set PROJECT_WORK=%PROJECT_DIR%\work set PROJECT_DATA=%PROJECT_DIR%\data @@ -12,5 +16,10 @@ set PROJECT_INPUT=%PROJECT_DIR%\input if not exist %PROJECT_WORK% mkdir %PROJECT_WORK% if not exist %PROJECT_INPUT% mkdir %PROJECT_INPUT% +set PROJECT_JSON_BOGEN=%SSG_RD_DIR%\SVGs\Omniflo\python\OFBogen\json +set PROJECT_JSON_WEICHE=%SSG_RD_DIR%\SVGs\Omniflo\python\OFWeiche\json +set PROJECT_JSON_TEFBOGEN=%SSG_RD_DIR%\SVGs\Omniflo\python\TEFBogen\json +set PROJECT_JSON_TEFWEICHE=%SSG_RD_DIR%\SVGs\Omniflo\python\TEFWeiche\json + popd goto :eof \ No newline at end of file diff --git a/CAD/Code/lib/diff_dimensions.py b/CAD/Code/lib/diff_dimensions.py new file mode 100644 index 0000000..aa3b80d --- /dev/null +++ b/CAD/Code/lib/diff_dimensions.py @@ -0,0 +1,291 @@ +#!/usr/bin/env python3 +""" +JSON Integration Script +Erzeugt neue JSON Datei mit den SIVAS-Nummern, dessen Maße von 3D (.par) und 2D (.dwg) nicht übereinstimmen. +""" + +import json +import argparse +import sys +import os +from pathlib import Path +import math + +def load_json_file(file_path): + """ + Lädt eine JSON-Datei und gibt den Inhalt zurück. + + Args: + file_path (str): Pfad zur JSON-Datei + + Returns: + list: JSON-Daten als Liste + + Raises: + FileNotFoundError: Wenn die Datei nicht gefunden wird + json.JSONDecodeError: Wenn die JSON-Datei ungültig ist + """ + try: + with open(file_path, 'r', encoding='utf-8') as f: + return json.load(f) + except FileNotFoundError: + print(f"Fehler: Datei '{file_path}' nicht gefunden.") + sys.exit(1) + except json.JSONDecodeError as e: + print(f"Fehler beim Parsen der JSON-Datei '{file_path}': {e}") + sys.exit(1) + + +def save_json_file(data, file_path): + """ + Speichert Daten in eine JSON-Datei. + + Args: + data (list): Zu speichernde Daten + file_path (str): Pfad zur Ausgabedatei + """ + try: + with open(file_path, 'w', encoding='utf-8') as f: + json.dump(data, f, ensure_ascii=False, indent=2) + print(f"Integrierte Daten erfolgreich in '{file_path}' gespeichert.") + except Exception as e: + print(f"Fehler beim Speichern der Datei '{file_path}': {e}") + sys.exit(1) + + +def integrate_json_data(json_dimensions_data, json_2d_data, tolerance): + """ + Integriert Daten aus JSON_1 in JSON_2 über die Sivasnr. + Nur Einträge mit NICHT übereinstimmenden Objekt_width_mm und Objekt_height_mm werden integriert. + + Args: + json_dimensions_data (dict): Dictionary mit Sivasnr als Key und Dimensionsdaten als Value + json_2d_data (list): Daten aus JSON_2 + tolerance (float): Toleranz für die Übereinstimmung der Objekt-Abmessungen + + Returns: + list: Integrierte Daten + """ + # Erstelle eine Kopie des Dictionary für die Verarbeitung + json_dimensions_dict = json_dimensions_data.copy() + + integrated_data = [] + updated_count = 0 + new_count = 0 + skipped_count = 0 + + # Durchlaufe JSON_2 und aktualisiere mit Daten aus JSON_1 + for json_2d_item in json_2d_data: + sivasnr = json_2d_item['Sivasnr'] + # Konvertiere Sivasnr zu String für Dictionary-Lookup + sivasnr_str = str(sivasnr) + + if sivasnr_str in json_dimensions_dict: + json_dimensions_item = json_dimensions_dict[sivasnr_str] + + # Prüfe Übereinstimmung der Objekt-Abmessungen + # Mapping der Attributnamen: 'breite' -> 'Objekt_width_mm', 'hoehe' -> 'Objekt_height_mm' + dimensions_width = json_dimensions_item.get('breite', 0) + dimensions_height = json_dimensions_item.get('hoehe', 0) + + width_match = round(abs(dimensions_width - json_2d_item.get('Objekte_width_mm', 0)), 3) <= tolerance + height_match = round(abs(dimensions_height - json_2d_item.get('Objekte_height_mm', 0)), 3) <= tolerance + + if not (width_match and height_match): + # Abmessungen stimmen NICHT überein - Eintrag mit Werten aus json_dimensions_data verwenden + width_diff = abs(dimensions_width - json_2d_item.get('Objekte_width_mm', 0)) + height_diff = abs(dimensions_height - json_2d_item.get('Objekte_height_mm', 0)) + print(f"Integriere Sivasnr {sivasnr}: Abmessungen stimmen nicht überein (Toleranz: {tolerance})") + print(f" Width-Differenz: {width_diff:.3f}mm, Height-Differenz: {height_diff:.3f}mm") + print(f" Verwende Werte aus json_dimensions_data") + + # Erstelle einen neuen Eintrag mit den Werten aus json_dimensions_data + # und konvertiere die Attributnamen + integrated_item = { + 'Sivasnr': sivasnr, # Verwende die ursprüngliche Sivasnr aus json_2d_data + 'Objekt_width_mm': dimensions_width, + 'Objekt_height_mm': dimensions_height, + 'w_diff': round(width_diff, 3), + 'h_diff': round(height_diff,3), + 'tolerance': tolerance + } + # Weitere Attribute aus json_dimensions_data hinzufügen (falls vorhanden) + for key, value in json_dimensions_item.items(): + if key not in ['breite', 'hoehe']: + integrated_item[key] = value + integrated_data.append(integrated_item) + updated_count += 1 + else: + # Abmessungen stimmen überein - Eintrag überspringen + print(f"Überspringe Sivasnr {sivasnr}: Abmessungen stimmen überein, w_diff={abs(dimensions_width-json_2d_item.get('Objekte_width_mm', 0))}, h_diff={abs(dimensions_height-json_2d_item.get('Objekte_height_mm', 0))}, (innerhalb der Toleranz)") + skipped_count += 1 + + # Entferne das verarbeitete Item aus dem Dictionary + del json_dimensions_dict[sivasnr_str] + # Wenn Sivasnr nicht in JSON_1 gefunden wird, wird der Eintrag nicht zur Ausgabe hinzugefügt + + # Füge verbleibende Items aus JSON_1 hinzu (die nicht in JSON_2 waren) + for sivasnr_str, json_dimensions_item in json_dimensions_dict.items(): + # Erstelle einen neuen Eintrag mit konvertierten Attributnamen + integrated_item = { + 'Sivasnr': sivasnr_str, # Verwende die String-Version der Sivasnr + 'Objekt_width_mm': json_dimensions_item.get('breite', 0), + 'Objekt_height_mm': json_dimensions_item.get('hoehe', 0) + } + # Weitere Attribute aus json_dimensions_data hinzufügen (falls vorhanden) + for key, value in json_dimensions_item.items(): + if key not in ['breite', 'hoehe']: + integrated_item[key] = value + + integrated_data.append(integrated_item) + new_count += 1 + print(f"Neue Sivasnr {sivasnr_str} aus JSON_1 hinzugefügt (nicht in JSON_2 vorhanden).") + + print(f"\nIntegration abgeschlossen:") + print(f"- {updated_count} Einträge integriert (Abmessungen stimmen nicht überein)") + print(f"- {new_count} neue Einträge hinzugefügt (nur in JSON_1 vorhanden)") + print(f"- {skipped_count} Einträge übersprungen (Abmessungen stimmen überein)") + print(f"- {len(integrated_data)} Einträge gesamt") + + return integrated_data +def main(): + """ + Hauptfunktion des Programms. + """ + parser = argparse.ArgumentParser( + description="Integriert JSON-Daten aus JSON_1 in JSON_2 über die Sivasnr", + formatter_class=argparse.RawDescriptionHelpFormatter, + epilog=""" +Beispiel: + python json_integration.py --json_dimensions file1.json --json_2d file2.json --result result.json + python json_integration.py --type=BOGEN --output_dir /custom/output --json_dimensions file1.json --json_2d file2.json --result result.json + """ + ) + + parser.add_argument( + '--output_dir', + dest='output_dir', + required=False, + help='Ausgabeverzeichnis für integrierte Daten (Standard: PROJECT_WORK)' + ) + + parser.add_argument( + '--json_dimensions', + required=True, + help='Dateiname der ersten JSON-Datei (Quelldaten)', + metavar='[Weiche_3D, Bogen_3D, TEFWeiche_3D, TEFBogen_3D].json' + ) + + parser.add_argument( + '--json_2d', + required=True, + help='Dateiname der zweiten JSON-Datei (Zieldaten)', + metavar='[Weiche_2D, Bogen_2D, TEFWeiche_2D, TEFBogen_2D].json' + ) + + parser.add_argument( + '--tolerance', + type=float, + default=0.05, + required=False, + help='Toleranz in Millimetern, welche als Differenz akzeptiert wird.', + metavar='0.05' + ) + + parser.add_argument( + '--result', + default='Differenzen_2D_3D.json', + required=False, + help='Dateiname für die Ausgabedatei mit integrierten Daten' + ) + + parser.add_argument("--type", type=str, choices=["BOGEN", "WEICHE", "TEFBOGEN", "TEFWEICHE"], help="Art des Exports (BOGEN, WEICHE, TEFBOGEN, TEFWEICHE).") + + if len(sys.argv) == 2 and sys.argv[1] in ("-h", "--help"): + parser.print_help() + sys.exit(0) + + args = parser.parse_args() + + # Umgebungsvariablen & Ordner + output_dir = args.output_dir or os.environ.get("PROJECT_WORK", "./output") + input_3d_dir = os.environ.get("PROJECT_WORK") + bogen = os.environ.get("PROJECT_JSON_BOGEN") + weiche = os.environ.get("PROJECT_JSON_WEICHE") + tefbogen = os.environ.get("PROJECT_JSON_TEFBOGEN") + tefweiche = os.environ.get("PROJECT_JSON_TEFWEICHE") + tolerance = args.tolerance + + if args.type == "BOGEN": + input_dir = bogen + elif args.type == "WEICHE": + input_dir = weiche + elif args.type == "TEFBOGEN": + input_dir = tefbogen + elif args.type == "TEFWEICHE": + input_dir = tefweiche + + + # Erstelle Verzeichnisse falls sie nicht existieren + if not Path(input_dir).exists(): + print(f"Fehler: Eingabeverzeichnis existiert nicht.") + sys.exit(1) + + Path(output_dir).mkdir(parents=True, exist_ok=True) + + # Vollständige Pfade zu den Dateien + json_dimensions_path = Path(input_3d_dir) / args.json_dimensions + json_2d_path = Path(input_dir) / args.json_2d + output_path = Path(output_dir) / args.result + + # Validiere Eingabedateien + if not json_dimensions_path.exists(): + print(f"Fehler: JSON_1 Datei '{json_dimensions_path}' existiert nicht.") + sys.exit(1) + + if not json_2d_path.exists(): + print(f"Fehler: JSON_2 Datei '{json_2d_path}' existiert nicht.") + sys.exit(1) + + + # Lade JSON-Dateien + print(f"Lade JSON_1: {json_dimensions_path}") + json_dimensions_data = load_json_file(json_dimensions_path) + + print(f"Lade JSON_2: {json_2d_path}") + json_2d_data = load_json_file(json_2d_path) + + # # Validiere Datenstruktur + # if not isinstance(json_dimensions_data, list) or not isinstance(json_2d_data, list): + # print("Fehler: Beide JSON-Dateien müssen Arrays (Listen) enthalten.") + # parser.print_help() + # sys.exit(1) + + # # Prüfe ob Sivasnr in allen Einträgen vorhanden ist + # for i, item in enumerate(json_dimensions_data): + # if 'Sivasnr' not in item: + # print(f"Fehler: Sivasnr fehlt in JSON_1 Eintrag {i}") + # parser.print_help() + # sys.exit(1) + + for i, item in enumerate(json_2d_data): + if 'Sivasnr' not in item: + print(f"Fehler: Sivasnr fehlt in JSON_2 Eintrag {i}") + parser.print_help() + sys.exit(1) + + print(f"JSON_1 enthält {len(json_dimensions_data)} Einträge") + print(f"JSON_2 enthält {len(json_2d_data)} Einträge") + + # Integriere Daten + integrated_data = integrate_json_data(json_dimensions_data, json_2d_data, tolerance) + + if len(integrated_data) > 0: + # Speichere integrierte Daten + save_json_file(integrated_data, output_path) + else: + print(f"Dateien enthalten keine Unterschiede") + + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/CAD/Code/lib/read_variables.py b/CAD/Code/lib/read_variables.py new file mode 100644 index 0000000..9164217 --- /dev/null +++ b/CAD/Code/lib/read_variables.py @@ -0,0 +1,103 @@ +import os +import sys +import json +import argparse +import win32com.client + +def read_custom_properties(par_path): + """Liest benutzerdefinierte Variablen 'Mittiges_Koordinatensystem_X/Y_Translation'.""" + try: + app = win32com.client.Dispatch("SolidEdge.Application") + app.Visible = False # Optional auf True für Debug + + doc = app.Documents.Open(par_path) + variables = doc.Variables + + breite = None + hoehe = None + + for i in range(1, variables.Count + 1): + variable = variables.Item(i) + name = variable.Name + value = variable.Value + + if name == 'Mittiges_Koordinatensystem_X_Translation': + breite = round(value*2000, 3) + elif name == 'Mittiges_Koordinatensystem_Y_Translation': + hoehe = round(value*2000, 3) + + doc.Close(False) + + if breite is not None and hoehe is not None: + return breite, hoehe + else: + raise ValueError("Benötigte Variablen nicht gefunden.") + + except Exception as e: + print(f"Fehler beim Lesen von {par_path}: {e}") + return None, None + + finally: + try: + if doc: + doc.Close(False) + except: + pass + + +def extract_all(input_dir): + """Verarbeitet alle .par Dateien im Verzeichnis.""" + result = {} + + for file in os.listdir(input_dir): + if file.lower().endswith(".par"): + par_path = os.path.join(input_dir, file) + print(f"Processing: {file}") + breite, hoehe = read_custom_properties(par_path) + + if breite is not None and hoehe is not None: + key = os.path.splitext(file)[0] # Dateiname ohne .par + result[key] = { + "breite": breite, + "hoehe": hoehe + } + + return result + + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description="Extrahiert 'Breite' und 'Höhe' aus .par-Dateien in JSON.") + parser.add_argument("--in", dest="input_dir", required=False, help="Ordner mit .par-Dateien (Standard: PROJECT_INPUT oder ./input)") + parser.add_argument("--out", dest="output_dir", required=False, help="Ordner für JSON-Ausgabe (Standard: PROJECT_WORK oder ./work)") + + if len(sys.argv) == 2 and sys.argv[1] in ("-h", "--help"): + parser.print_help() + sys.exit(0) + + args = parser.parse_args() + + input_dir = args.input_dir or os.environ.get("PROJECT_INPUT", "./input") + output_dir = args.output_dir or os.environ.get("PROJECT_WORK", "./work") + + # Hole den Namen des Input-Ordners (ohne Pfad) + input_basename = os.path.basename(os.path.normpath(input_dir)) + output_filename = input_basename + ".json" + + # Pfad zur Zieldatei + json_output_path = os.path.join(output_dir, output_filename) + + print(f"Input directory: {input_dir}") + print(f"Output JSON will be saved to: {json_output_path}\n") + + if not os.path.exists(input_dir): + print(f"Input folder not found: {input_dir}") + sys.exit(1) + + os.makedirs(output_dir, exist_ok=True) + + data = extract_all(input_dir) + + with open(json_output_path, "w", encoding="utf-8") as f: + json.dump(data, f, indent=2, ensure_ascii=False) + + print("\nDone! Data saved to:", json_output_path) diff --git a/CAD/OmnifloCAD/WeichenTEFBogenTEFWeichen.dwg b/CAD/OmnifloCAD/WeichenTEFBogenTEFWeichen.dwg index 17bdf45..7110c78 100644 Binary files a/CAD/OmnifloCAD/WeichenTEFBogenTEFWeichen.dwg and b/CAD/OmnifloCAD/WeichenTEFBogenTEFWeichen.dwg differ diff --git a/CAD/stl/Omniflo/834372001.stl b/CAD/stl/Omniflo/834372001.stl new file mode 100644 index 0000000..c27294e Binary files /dev/null and b/CAD/stl/Omniflo/834372001.stl differ diff --git a/CAD/stl/Omniflo/834372002.stl b/CAD/stl/Omniflo/834372002.stl new file mode 100644 index 0000000..2fe2674 Binary files /dev/null and b/CAD/stl/Omniflo/834372002.stl differ diff --git a/CAD/stl/Omniflo/834372004.stl b/CAD/stl/Omniflo/834372004.stl new file mode 100644 index 0000000..5f799c0 Binary files /dev/null and b/CAD/stl/Omniflo/834372004.stl differ diff --git a/CAD/stl/Omniflo/834372005.stl b/CAD/stl/Omniflo/834372005.stl new file mode 100644 index 0000000..2ab69b6 Binary files /dev/null and b/CAD/stl/Omniflo/834372005.stl differ diff --git a/CAD/stl/Omniflo/834372007.stl b/CAD/stl/Omniflo/834372007.stl new file mode 100644 index 0000000..4400597 Binary files /dev/null and b/CAD/stl/Omniflo/834372007.stl differ diff --git a/CAD/stl/Omniflo/834372008.stl b/CAD/stl/Omniflo/834372008.stl new file mode 100644 index 0000000..e92011e Binary files /dev/null and b/CAD/stl/Omniflo/834372008.stl differ diff --git a/CAD/stl/Omniflo/834372010.stl b/CAD/stl/Omniflo/834372010.stl new file mode 100644 index 0000000..e7e3188 Binary files /dev/null and b/CAD/stl/Omniflo/834372010.stl differ diff --git a/CAD/stl/Omniflo/834372011.stl b/CAD/stl/Omniflo/834372011.stl new file mode 100644 index 0000000..36a9594 Binary files /dev/null and b/CAD/stl/Omniflo/834372011.stl differ diff --git a/CAD/stl/Omniflo/834372021.stl b/CAD/stl/Omniflo/834372021.stl new file mode 100644 index 0000000..6a7fea9 Binary files /dev/null and b/CAD/stl/Omniflo/834372021.stl differ diff --git a/CAD/stl/Omniflo/834372027.stl b/CAD/stl/Omniflo/834372027.stl new file mode 100644 index 0000000..082dec8 Binary files /dev/null and b/CAD/stl/Omniflo/834372027.stl differ diff --git a/CAD/stl/Omniflo/834372028.stl b/CAD/stl/Omniflo/834372028.stl new file mode 100644 index 0000000..d66bdf4 Binary files /dev/null and b/CAD/stl/Omniflo/834372028.stl differ diff --git a/CAD/stl/Omniflo/834372030.stl b/CAD/stl/Omniflo/834372030.stl new file mode 100644 index 0000000..0eccebf Binary files /dev/null and b/CAD/stl/Omniflo/834372030.stl differ diff --git a/CAD/stl/Omniflo/834372031.stl b/CAD/stl/Omniflo/834372031.stl new file mode 100644 index 0000000..46bdde0 Binary files /dev/null and b/CAD/stl/Omniflo/834372031.stl differ diff --git a/CAD/stl/Omniflo/834372047.stl b/CAD/stl/Omniflo/834372047.stl new file mode 100644 index 0000000..466f835 Binary files /dev/null and b/CAD/stl/Omniflo/834372047.stl differ diff --git a/CAD/stl/Omniflo/834372048.stl b/CAD/stl/Omniflo/834372048.stl new file mode 100644 index 0000000..b875f61 Binary files /dev/null and b/CAD/stl/Omniflo/834372048.stl differ diff --git a/CAD/stl/Omniflo/834372050.stl b/CAD/stl/Omniflo/834372050.stl new file mode 100644 index 0000000..28c7185 Binary files /dev/null and b/CAD/stl/Omniflo/834372050.stl differ diff --git a/CAD/stl/Omniflo/834372051.stl b/CAD/stl/Omniflo/834372051.stl new file mode 100644 index 0000000..b4677b7 Binary files /dev/null and b/CAD/stl/Omniflo/834372051.stl differ diff --git a/CAD/stl/Omniflo/834372100.stl b/CAD/stl/Omniflo/834372100.stl new file mode 100644 index 0000000..b4edd6e Binary files /dev/null and b/CAD/stl/Omniflo/834372100.stl differ diff --git a/CAD/stl/Omniflo/834372101.stl b/CAD/stl/Omniflo/834372101.stl new file mode 100644 index 0000000..810855f Binary files /dev/null and b/CAD/stl/Omniflo/834372101.stl differ diff --git a/CAD/stl/Omniflo/834372103.stl b/CAD/stl/Omniflo/834372103.stl new file mode 100644 index 0000000..91c53e9 Binary files /dev/null and b/CAD/stl/Omniflo/834372103.stl differ diff --git a/CAD/stl/Omniflo/834372104.stl b/CAD/stl/Omniflo/834372104.stl new file mode 100644 index 0000000..fdfd9d2 Binary files /dev/null and b/CAD/stl/Omniflo/834372104.stl differ diff --git a/CAD/stl/Omniflo/834372106.stl b/CAD/stl/Omniflo/834372106.stl new file mode 100644 index 0000000..f2995c7 Binary files /dev/null and b/CAD/stl/Omniflo/834372106.stl differ diff --git a/CAD/stl/Omniflo/834372107.stl b/CAD/stl/Omniflo/834372107.stl new file mode 100644 index 0000000..748dd72 Binary files /dev/null and b/CAD/stl/Omniflo/834372107.stl differ diff --git a/CAD/stl/Omniflo/834372109.stl b/CAD/stl/Omniflo/834372109.stl new file mode 100644 index 0000000..23ca86e Binary files /dev/null and b/CAD/stl/Omniflo/834372109.stl differ diff --git a/CAD/stl/Omniflo/834372110.stl b/CAD/stl/Omniflo/834372110.stl new file mode 100644 index 0000000..5e6526c Binary files /dev/null and b/CAD/stl/Omniflo/834372110.stl differ diff --git a/CAD/stl/Omniflo/834372115.stl b/CAD/stl/Omniflo/834372115.stl new file mode 100644 index 0000000..f3efc91 Binary files /dev/null and b/CAD/stl/Omniflo/834372115.stl differ diff --git a/CAD/stl/Omniflo/834372116.stl b/CAD/stl/Omniflo/834372116.stl new file mode 100644 index 0000000..3530488 Binary files /dev/null and b/CAD/stl/Omniflo/834372116.stl differ diff --git a/CAD/stl/Omniflo/834372200.stl b/CAD/stl/Omniflo/834372200.stl new file mode 100644 index 0000000..53d0094 Binary files /dev/null and b/CAD/stl/Omniflo/834372200.stl differ diff --git a/CAD/stl/Omniflo/834372201.stl b/CAD/stl/Omniflo/834372201.stl new file mode 100644 index 0000000..4ce7cdf Binary files /dev/null and b/CAD/stl/Omniflo/834372201.stl differ diff --git a/CAD/stl/Omniflo/834372203.stl b/CAD/stl/Omniflo/834372203.stl new file mode 100644 index 0000000..8370c1e Binary files /dev/null and b/CAD/stl/Omniflo/834372203.stl differ diff --git a/CAD/stl/Omniflo/834372204.stl b/CAD/stl/Omniflo/834372204.stl new file mode 100644 index 0000000..dca6803 Binary files /dev/null and b/CAD/stl/Omniflo/834372204.stl differ diff --git a/CAD/stl/Omniflo/834372206.stl b/CAD/stl/Omniflo/834372206.stl new file mode 100644 index 0000000..8df181f Binary files /dev/null and b/CAD/stl/Omniflo/834372206.stl differ diff --git a/CAD/stl/Omniflo/834372207.stl b/CAD/stl/Omniflo/834372207.stl new file mode 100644 index 0000000..5ca2cfd Binary files /dev/null and b/CAD/stl/Omniflo/834372207.stl differ diff --git a/CAD/stl/Omniflo/834372209.stl b/CAD/stl/Omniflo/834372209.stl new file mode 100644 index 0000000..673a830 Binary files /dev/null and b/CAD/stl/Omniflo/834372209.stl differ diff --git a/CAD/stl/Omniflo/834372210.stl b/CAD/stl/Omniflo/834372210.stl new file mode 100644 index 0000000..19f2989 Binary files /dev/null and b/CAD/stl/Omniflo/834372210.stl differ diff --git a/CAD/stl/Omniflo/834372215.stl b/CAD/stl/Omniflo/834372215.stl new file mode 100644 index 0000000..fcf53c7 Binary files /dev/null and b/CAD/stl/Omniflo/834372215.stl differ diff --git a/CAD/stl/Omniflo/834372216.stl b/CAD/stl/Omniflo/834372216.stl new file mode 100644 index 0000000..89a0b1b Binary files /dev/null and b/CAD/stl/Omniflo/834372216.stl differ diff --git a/CAD/stl/Omniflo/834372400.stl b/CAD/stl/Omniflo/834372400.stl new file mode 100644 index 0000000..5ac1c39 Binary files /dev/null and b/CAD/stl/Omniflo/834372400.stl differ diff --git a/CAD/stl/Omniflo/834372401.stl b/CAD/stl/Omniflo/834372401.stl new file mode 100644 index 0000000..771b1ed Binary files /dev/null and b/CAD/stl/Omniflo/834372401.stl differ diff --git a/CAD/stl/Omniflo/834372403.stl b/CAD/stl/Omniflo/834372403.stl new file mode 100644 index 0000000..0f1291c Binary files /dev/null and b/CAD/stl/Omniflo/834372403.stl differ diff --git a/CAD/stl/Omniflo/834372404.stl b/CAD/stl/Omniflo/834372404.stl new file mode 100644 index 0000000..a6cb981 Binary files /dev/null and b/CAD/stl/Omniflo/834372404.stl differ diff --git a/CAD/stl/Omniflo/834372420.stl b/CAD/stl/Omniflo/834372420.stl new file mode 100644 index 0000000..84ff220 Binary files /dev/null and b/CAD/stl/Omniflo/834372420.stl differ diff --git a/Editor2DLibrary/SSG/shapes/img/0_B10030_32px.png b/Editor2DLibrary/SSG/shapes/img/0_B10030_32px.png new file mode 100644 index 0000000..62b4a29 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/0_B10030_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/0_B10030_64px.png b/Editor2DLibrary/SSG/shapes/img/0_B10030_64px.png new file mode 100644 index 0000000..278f132 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/0_B10030_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/obj/834372109.stl b/Editor2DLibrary/SSG/shapes/obj/834372109.stl new file mode 100644 index 0000000..23ca86e Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/obj/834372109.stl differ diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_45.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_45.xml index c1abc84..16e01ae 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_45.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_45.xml @@ -1,4 +1,4 @@ -
Einfach 45° 350/700 links M
+
Einfach 45° 350/700 links M
Doppel 45° 350/700 M
Dreiwege 45° 350/700 M
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml index b3cd462..b397128 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml @@ -1,4 +1,4 @@ -
Einfach 90° 700/700 links M
+
Einfach 90° 700/700 links M
Doppel 90° 700/700 M
Dreiwege 90° 700/700 M
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/0_B10030.txt b/Editor2DLibrary/SSG/shapes/props/0_B10030.txt new file mode 100644 index 0000000..cc9fd04 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/props/0_B10030.txt @@ -0,0 +1,69 @@ +{ + "shapeMode": 0, + "name": "TEF Gerade", + "family": "TEFGerade", + "icon": "SSG/shapes/img/_x0030__B10030_32px.png", + "iconBig": "SSG/shapes/img/_x0030__B10030_64px.png", + "srcSVG": "SSG/shapes/svg/0_B10030.xml", + "width": 158.7402, + "height": 3779.5276, + "depth": 415.748, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "group3d": [ + { + "source": "s_ap110", + "id": "g0", + "width": 158.7402, + "height": 3779.5276, + "depth": 415.748, + "x": 0.0, + "y": 0.0, + "z": 207.874, + "rotation": "0;0;0", + "data": "", + "color": "#FFFF00", + "colorOpacity": 1.0 + } + ], + "connectionPoints": [ + { + "id": "cp1", + "x": 500.0, + "y": 0.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 0.0, + "linkClass": "OmnifloTEF", + "label": "", + "isDimension": true + }, + { + "id": "cp2", + "x": 500.0, + "y": 1000.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 180.0, + "linkClass": "OmnifloTEF", + "label": "", + "isDimension": true + } + ], + "eventClass": "OnInserted,OnDoubleclick,OnPasted,OnLinked,OnRemoved" +} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/834342200.txt b/Editor2DLibrary/SSG/shapes/props/834342200.txt index cbb5d8b..adaa660 100644 --- a/Editor2DLibrary/SSG/shapes/props/834342200.txt +++ b/Editor2DLibrary/SSG/shapes/props/834342200.txt @@ -70,7 +70,7 @@ { "id": "cp4", "x": 500.002, - "y": -33.189, + "y": 0.0, "z": 0.0, "xMin": "", "xMax": "", diff --git a/Editor2DLibrary/SSG/shapes/props/834342201.txt b/Editor2DLibrary/SSG/shapes/props/834342201.txt index 340530a..b948eac 100644 --- a/Editor2DLibrary/SSG/shapes/props/834342201.txt +++ b/Editor2DLibrary/SSG/shapes/props/834342201.txt @@ -70,7 +70,7 @@ { "id": "cp4", "x": 500.002, - "y": -33.189, + "y": 0.0, "z": 0.0, "xMin": "", "xMax": "", diff --git a/Editor2DLibrary/SSG/shapes/props/834372421.txt b/Editor2DLibrary/SSG/shapes/props/834372421.txt index 07300ea..faed026 100644 --- a/Editor2DLibrary/SSG/shapes/props/834372421.txt +++ b/Editor2DLibrary/SSG/shapes/props/834372421.txt @@ -1,19 +1,19 @@ -{ +{ "shapeMode": 0, "name": "Star 1400/1400 P", "family": "OFWeiche", "icon": "SSG/shapes/img/StarWeiche_1400_1400_P_834372421_32px.png", "iconBig": "SSG/shapes/img/StarWeiche_1400_1400_P_834372421_64px.png", "srcSVG": "SSG/shapes/svg/834372421.xml", - "width": 5291.3386, - "height": 5291.3386, + "width": 5292.971, + "height": 5292.971, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 500.0, + "x": 500.0, + "y": 0.0, "z": 0.0, "xMin": "", "xMax": "", @@ -24,7 +24,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 270.0, + "direction": 0, "linkClass": "Omniflo", "label": "", "isDimension": true @@ -43,7 +43,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 90.0, + "direction": 270, "linkClass": "Omniflo", "label": "", "isDimension": true @@ -62,7 +62,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 180.0, + "direction": 90, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/OFDeltaWeiche.txt b/Editor2DLibrary/SSG/shapes/props/OFDeltaWeiche.txt index 1366964..40741bd 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFDeltaWeiche.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFDeltaWeiche.txt @@ -1,55 +1,17 @@ -{ +{ "shapeMode": 0, "name": "Delta 1400/700 M", "family": "OFWeiche", "icon": "SSG/shapes/img/DeltaWeiche_1400_700_M_834372400_32px.png", "iconBig": "SSG/shapes/img/DeltaWeiche_1400_700_M_834372400_64px.png", "srcSVG": "SSG/shapes/svg/OFDeltaWeiche.xml", - "width": 5291.3386, - "height": 2645.6693, + "width": 5293.046, + "height": 2848.915, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 270.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 90.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", "x": 500.0, "y": 0.0, "z": 0.0, @@ -62,7 +24,45 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp2", + "x": 0.0, + "y": 928.967, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 270, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 1000.0, + "y": 928.967, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/OFStarWeiche.txt b/Editor2DLibrary/SSG/shapes/props/OFStarWeiche.txt index a4d5a9b..440437f 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFStarWeiche.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFStarWeiche.txt @@ -1,19 +1,19 @@ -{ +{ "shapeMode": 0, "name": "Star 1400/1400 M", "family": "OFWeiche", "icon": "SSG/shapes/img/StarWeiche_1400_1400_M_834372420_32px.png", "iconBig": "SSG/shapes/img/StarWeiche_1400_1400_M_834372420_64px.png", "srcSVG": "SSG/shapes/svg/OFStarWeiche.xml", - "width": 5291.3386, - "height": 5291.3386, + "width": 5292.971, + "height": 5292.971, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 500.0, + "x": 500.0, + "y": 0.0, "z": 0.0, "xMin": "", "xMax": "", @@ -24,7 +24,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 270.0, + "direction": 0, "linkClass": "Omniflo", "label": "", "isDimension": true @@ -43,7 +43,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 90.0, + "direction": 270, "linkClass": "Omniflo", "label": "", "isDimension": true @@ -62,7 +62,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 180.0, + "direction": 90, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeicheDoppel45.txt b/Editor2DLibrary/SSG/shapes/props/OFWeicheDoppel45.txt index c4c91f0..dae5b08 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeicheDoppel45.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeicheDoppel45.txt @@ -1,56 +1,18 @@ -{ +{ "shapeMode": 0, "name": "Doppel 45° 350/700 M", "family": "OFWeiche", "icon": "SSG/shapes/img/Weiche_45_350_700_D_M_834372100_32px.png", "iconBig": "SSG/shapes/img/Weiche_45_350_700_D_M_834372100_64px.png", "srcSVG": "SSG/shapes/svg/OFWeicheDoppel45.xml", - "width": 2645.6693, - "height": 2645.6693, + "width": 2759.084, + "height": 2702.346, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 315.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 45.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", - "x": 500.0, + "x": 500.001, "y": 1000.0, "z": 0.0, "xMin": "", @@ -66,6 +28,44 @@ "linkClass": "Omniflo", "label": "", "isDimension": true + }, + { + "id": "cp2", + "x": 20.38, + "y": 20.808, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 315, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 979.621, + "y": 20.808, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 45, + "linkClass": "Omniflo", + "label": "", + "isDimension": true } ], "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeicheDoppel90.txt b/Editor2DLibrary/SSG/shapes/props/OFWeicheDoppel90.txt index 729d814..9cba4db 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeicheDoppel90.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeicheDoppel90.txt @@ -1,57 +1,19 @@ -{ +{ "shapeMode": 0, "name": "Doppel 90° 700/700 M", "family": "OFWeiche", "icon": "SSG/shapes/img/Weiche_90_700_700_D_M_834372109_32px.png", "iconBig": "SSG/shapes/img/Weiche_90_700_700_D_M_834372109_64px.png", "srcSVG": "SSG/shapes/svg/OFWeicheDoppel90.xml", - "width": 5291.3386, - "height": 2645.6693, + "width": 5294.093, + "height": 2725.836, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 270.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 90.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", "x": 500.0, - "y": 1000.0, + "y": 999.999, "z": 0.0, "xMin": "", "xMax": "", @@ -66,6 +28,44 @@ "linkClass": "Omniflo", "label": "", "isDimension": true + }, + { + "id": "cp2", + "x": 0.0, + "y": 29.173, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 270, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 1000.0, + "y": 29.173, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90, + "linkClass": "Omniflo", + "label": "", + "isDimension": true } ], "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeicheDreiwege45.txt b/Editor2DLibrary/SSG/shapes/props/OFWeicheDreiwege45.txt index a6ab856..b3ba386 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeicheDreiwege45.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeicheDreiwege45.txt @@ -1,56 +1,18 @@ -{ +{ "shapeMode": 0, "name": "Dreiwege 45° 350/700 M", "family": "OFWeiche", "icon": "SSG/shapes/img/Weiche_45_350_700_T_M_834372200_32px.png", "iconBig": "SSG/shapes/img/Weiche_45_350_700_T_M_834372200_64px.png", "srcSVG": "SSG/shapes/svg/OFWeicheDreiwege45.xml", - "width": 2645.6693, - "height": 2645.6693, + "width": 2759.084, + "height": 2702.346, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 315.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 45.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", - "x": 500.0, + "x": 500.001, "y": 1000.0, "z": 0.0, "xMin": "", @@ -68,9 +30,9 @@ "isDimension": true }, { - "id": "cp4", - "x": 500.0, - "y": 486.0, + "id": "cp2", + "x": 20.38, + "y": 20.808, "z": 0.0, "xMin": "", "xMax": "", @@ -81,7 +43,45 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 315, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 979.621, + "y": 20.808, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 45, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp4", + "x": 500.001, + "y": 496.504, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90.0, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeicheDreiwege90.txt b/Editor2DLibrary/SSG/shapes/props/OFWeicheDreiwege90.txt index 5370e43..15c6d0d 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeicheDreiwege90.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeicheDreiwege90.txt @@ -1,57 +1,19 @@ -{ +{ "shapeMode": 0, "name": "Dreiwege 90° 700/700 M", "family": "OFWeiche", "icon": "SSG/shapes/img/Weiche_90_700_700_T_M_834372209_32px.png", "iconBig": "SSG/shapes/img/Weiche_90_700_700_T_M_834372209_64px.png", "srcSVG": "SSG/shapes/svg/OFWeicheDreiwege90.xml", - "width": 5291.3386, - "height": 2645.6693, + "width": 5294.093, + "height": 2725.836, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 270.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 90.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", "x": 500.0, - "y": 1000.0, + "y": 999.999, "z": 0.0, "xMin": "", "xMax": "", @@ -68,9 +30,9 @@ "isDimension": true }, { - "id": "cp4", - "x": 500.0, - "y": 486.0, + "id": "cp2", + "x": 0.0, + "y": 29.173, "z": 0.0, "xMin": "", "xMax": "", @@ -81,7 +43,45 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 270, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 1000.0, + "y": 29.173, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp4", + "x": 500.0, + "y": 500.843, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90.0, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeicheEinfach45.txt b/Editor2DLibrary/SSG/shapes/props/OFWeicheEinfach45.txt index e14b64e..5b4f041 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeicheEinfach45.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeicheEinfach45.txt @@ -1,19 +1,19 @@ -{ +{ "shapeMode": 0, "name": "Einfach 45° 350/700 links M", "family": "OFWeiche", - "icon": "SSG/shapes/img/Weiche_45_400_750_L_M_834372007_32px.png", - "iconBig": "SSG/shapes/img/Weiche_45_400_750_L_M_834372007_64px.png", + "icon": "SSG/shapes/img/Weiche_45_350_700_L_M_834372001_32px.png", + "iconBig": "SSG/shapes/img/Weiche_45_350_700_L_M_834372001_64px.png", "srcSVG": "SSG/shapes/svg/OFWeicheEinfach45.xml", - "width": 1322.8346, - "height": 2645.6693, + "width": 1581.91, + "height": 2702.346, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 0.0, + "x": 872.075, + "y": 496.504, "z": 0.0, "xMin": "", "xMax": "", @@ -24,14 +24,14 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 315.0, + "direction": 0.0, "linkClass": "Omniflo", "label": "", "isDimension": true }, { "id": "cp2", - "x": 1000.0, + "x": 872.075, "y": 1000.0, "z": 0.0, "xMin": "", @@ -50,8 +50,8 @@ }, { "id": "cp3", - "x": 1000.0, - "y": 486.0, + "x": 35.547, + "y": 20.808, "z": 0.0, "xMin": "", "xMax": "", @@ -62,7 +62,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 315, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeicheEinfach90.txt b/Editor2DLibrary/SSG/shapes/props/OFWeicheEinfach90.txt index 755af92..0feec86 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeicheEinfach90.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeicheEinfach90.txt @@ -1,19 +1,19 @@ -{ +{ "shapeMode": 0, "name": "Einfach 90° 700/700 links M", "family": "OFWeiche", - "icon": "SSG/shapes/img/Weiche_90_700_700_L_M_834372030_32px.png", - "iconBig": "SSG/shapes/img/Weiche_90_700_700_L_M_834372030_64px.png", + "icon": "SSG/shapes/img/Weiche_90_700_700_L_M_834372027_32px.png", + "iconBig": "SSG/shapes/img/Weiche_90_700_700_L_M_834372027_64px.png", "srcSVG": "SSG/shapes/svg/OFWeicheEinfach90.xml", - "width": 2645.6693, - "height": 2645.6693, + "width": 2849.433, + "height": 2725.87, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 0.0, + "x": 928.979, + "y": 500.849, "z": 0.0, "xMin": "", "xMax": "", @@ -24,14 +24,14 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 270.0, + "direction": 0.0, "linkClass": "Omniflo", "label": "", "isDimension": true }, { "id": "cp2", - "x": 1000.0, + "x": 928.979, "y": 1000.0, "z": 0.0, "xMin": "", @@ -50,8 +50,8 @@ }, { "id": "cp3", - "x": 1000.0, - "y": 486.0, + "x": 0.0, + "y": 29.173, "z": 0.0, "xMin": "", "xMax": "", @@ -62,7 +62,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 270, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelDoppel.txt b/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelDoppel.txt index b4a2e5a..5817ff3 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelDoppel.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelDoppel.txt @@ -1,55 +1,17 @@ -{ +{ "shapeMode": 0, "name": "Doppel Parallel 200/750 M", "family": "OFWeiche", "icon": "SSG/shapes/img/Weiche_Parallel_200_750_D_M_834372115_32px.png", "iconBig": "SSG/shapes/img/Weiche_Parallel_200_750_D_M_834372115_64px.png", "srcSVG": "SSG/shapes/svg/OFWeicheParallelDoppel.xml", - "width": 1511.811, - "height": 2834.6457, + "width": 1670.894, + "height": 2833.869, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", "x": 500.0, "y": 1000.0, "z": 0.0, @@ -66,6 +28,44 @@ "linkClass": "Omniflo", "label": "", "isDimension": true + }, + { + "id": "cp2", + "x": 47.592, + "y": 0.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 360, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 952.408, + "y": 0.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true } ], "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelDreiwege.txt b/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelDreiwege.txt index 92c547e..c2d8db0 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelDreiwege.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelDreiwege.txt @@ -1,55 +1,17 @@ -{ +{ "shapeMode": 0, "name": "Dreiwege Parallel 200/750 M", "family": "OFWeiche", "icon": "SSG/shapes/img/Weiche_Parallel_200_750_T_M_834372215_32px.png", "iconBig": "SSG/shapes/img/Weiche_Parallel_200_750_T_M_834372215_64px.png", "srcSVG": "SSG/shapes/svg/OFWeicheParallelDreiwege.xml", - "width": 1511.811, - "height": 2834.6457, + "width": 1670.894, + "height": 2833.869, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", "x": 500.0, "y": 1000.0, "z": 0.0, @@ -68,9 +30,9 @@ "isDimension": true }, { - "id": "cp4", - "x": 500.0, - "y": 520.0, + "id": "cp2", + "x": 47.592, + "y": 0.0, "z": 0.0, "xMin": "", "xMax": "", @@ -81,7 +43,45 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 360, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 952.408, + "y": 0.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp4", + "x": 500.0, + "y": 519.872, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 90.0, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelEinfach.txt b/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelEinfach.txt index 4308b99..48706c5 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelEinfach.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeicheParallelEinfach.txt @@ -1,19 +1,19 @@ -{ +{ "shapeMode": 0, "name": "Einfach Parallel 200/750 links M", "family": "OFWeiche", "icon": "SSG/shapes/img/Weiche_Parallel_200_750_L_M_834372047_32px.png", "iconBig": "SSG/shapes/img/Weiche_Parallel_200_750_L_M_834372047_64px.png", "srcSVG": "SSG/shapes/svg/OFWeicheParallelEinfach.xml", - "width": 755.9055, - "height": 2834.6457, + "width": 1037.817, + "height": 2833.869, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 0.0, + "x": 805.005, + "y": 519.872, "z": 0.0, "xMin": "", "xMax": "", @@ -31,7 +31,7 @@ }, { "id": "cp2", - "x": 1000.0, + "x": 805.005, "y": 1000.0, "z": 0.0, "xMin": "", @@ -50,8 +50,8 @@ }, { "id": "cp3", - "x": 1000.0, - "y": 520.0, + "x": 76.623, + "y": 0.0, "z": 0.0, "xMin": "", "xMax": "", @@ -62,7 +62,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 360, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDoppel.txt b/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDoppel.txt index 2b4ac55..ae0bab0 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDoppel.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDoppel.txt @@ -1,56 +1,18 @@ -{ +{ "shapeMode": 0, "name": "Weichenkörper Doppel 22.5° M", "family": "OFWeiche", "icon": "SSG/shapes/img/Weichenkoerper_D_M_834342100_32px.png", "iconBig": "SSG/shapes/img/Weichenkoerper_D_M_834342100_64px.png", "srcSVG": "SSG/shapes/svg/OFWeichenkoerperDoppel.xml", - "width": 767.2441, - "height": 1285.0394, + "width": 914.174, + "height": 1315.463, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 338.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 22.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", - "x": 500.0, + "x": 500.002, "y": 1000.0, "z": 0.0, "xMin": "", @@ -66,6 +28,44 @@ "linkClass": "Omniflo", "label": "", "isDimension": true + }, + { + "id": "cp2", + "x": 80.363, + "y": 23.134, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 337.5, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 919.633, + "y": 23.134, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 22.5, + "linkClass": "Omniflo", + "label": "", + "isDimension": true } ], "eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved" diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDreiwege.txt b/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDreiwege.txt index 3f19696..eb3da50 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDreiwege.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperDreiwege.txt @@ -1,56 +1,18 @@ -{ +{ "shapeMode": 0, "name": "Weichenkörper Dreiwege 22.5° M", "family": "OFWeiche", "icon": "SSG/shapes/img/Weichenkoerper_T_M_834342200_32px.png", "iconBig": "SSG/shapes/img/Weichenkoerper_T_M_834342200_64px.png", "srcSVG": "SSG/shapes/svg/OFWeichenkoerperDreiwege.xml", - "width": 767.2441, - "height": 1360.6299, + "width": 914.174, + "height": 1360.62, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 54.627, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 338.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, - "y": 54.627, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 22.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp3", - "x": 500.0, + "x": 500.002, "y": 1000.0, "z": 0.0, "xMin": "", @@ -67,9 +29,47 @@ "label": "", "isDimension": true }, + { + "id": "cp2", + "x": 80.363, + "y": 55.556, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 337.5, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp3", + "x": 919.632, + "y": 55.556, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 22.5, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, { "id": "cp4", - "x": 500.0, + "x": 500.002, "y": 0.0, "z": 0.0, "xMin": "", @@ -81,7 +81,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 90.0, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperEinfach.txt b/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperEinfach.txt index a8ce8bd..3d3af4f 100644 --- a/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperEinfach.txt +++ b/Editor2DLibrary/SSG/shapes/props/OFWeichenkoerperEinfach.txt @@ -1,19 +1,19 @@ -{ +{ "shapeMode": 0, "name": "Weichenkörper Einfach 22.5° links M", "family": "OFWeiche", "icon": "SSG/shapes/img/Weichenkoerper_L_M_834342011_32px.png", "iconBig": "SSG/shapes/img/Weichenkoerper_L_M_834342011_64px.png", "srcSVG": "SSG/shapes/svg/OFWeichenkoerperEinfach.xml", - "width": 383.622, - "height": 1360.6299, + "width": 659.455, + "height": 1360.62, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", - "x": 0.0, - "y": 54.627, + "x": 693.126, + "y": 0.0, "z": 0.0, "xMin": "", "xMax": "", @@ -24,14 +24,14 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 338.0, + "direction": 0.0, "linkClass": "Omniflo", "label": "", "isDimension": true }, { "id": "cp2", - "x": 1000.0, + "x": 693.126, "y": 1000.0, "z": 0.0, "xMin": "", @@ -50,8 +50,8 @@ }, { "id": "cp3", - "x": 1000.0, - "y": 0.0, + "x": 111.404, + "y": 22.367, "z": 0.0, "xMin": "", "xMax": "", @@ -62,7 +62,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 337.5, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/svg/0_B10030.xml b/Editor2DLibrary/SSG/shapes/svg/0_B10030.xml new file mode 100644 index 0000000..f586d56 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/0_B10030.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/834372421.xml b/Editor2DLibrary/SSG/shapes/svg/834372421.xml index 6146ccf..a45b741 100644 --- a/Editor2DLibrary/SSG/shapes/svg/834372421.xml +++ b/Editor2DLibrary/SSG/shapes/svg/834372421.xml @@ -1,9 +1,29 @@  - - - - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFDeltaWeiche.xml b/Editor2DLibrary/SSG/shapes/svg/OFDeltaWeiche.xml index 6e233de..45d570b 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFDeltaWeiche.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFDeltaWeiche.xml @@ -1,8 +1,22 @@  - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFStarWeiche.xml b/Editor2DLibrary/SSG/shapes/svg/OFStarWeiche.xml index c5cb0b4..f48a3c0 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFStarWeiche.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFStarWeiche.xml @@ -1,8 +1,29 @@  - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeicheDoppel45.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeicheDoppel45.xml index a530117..2a73680 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeicheDoppel45.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeicheDoppel45.xml @@ -1,9 +1,21 @@  - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeicheDoppel90.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeicheDoppel90.xml index f9e0317..9b39da3 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeicheDoppel90.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeicheDoppel90.xml @@ -1,8 +1,21 @@  - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeicheDreiwege45.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeicheDreiwege45.xml index c71e31e..022cfda 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeicheDreiwege45.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeicheDreiwege45.xml @@ -1,9 +1,22 @@  - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeicheDreiwege90.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeicheDreiwege90.xml index 16e7026..1242623 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeicheDreiwege90.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeicheDreiwege90.xml @@ -1,8 +1,22 @@  - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeicheEinfach45.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeicheEinfach45.xml index b52e996..e1b01dc 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeicheEinfach45.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeicheEinfach45.xml @@ -1,8 +1,20 @@  - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeicheEinfach90.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeicheEinfach90.xml index 419b770..56a2758 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeicheEinfach90.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeicheEinfach90.xml @@ -1,8 +1,20 @@  - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelDoppel.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelDoppel.xml index 4d24520..7ef2318 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelDoppel.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelDoppel.xml @@ -1,9 +1,21 @@  - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelDreiwege.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelDreiwege.xml index 9409545..8c528e7 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelDreiwege.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelDreiwege.xml @@ -1,9 +1,22 @@  - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelEinfach.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelEinfach.xml index e5eebc5..6c689bf 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelEinfach.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeicheParallelEinfach.xml @@ -1,9 +1,20 @@  - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperDoppel.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperDoppel.xml index e50c311..52a6b89 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperDoppel.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperDoppel.xml @@ -1,9 +1,15 @@  - - - - + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperDreiwege.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperDreiwege.xml index 630b1a4..66b8d05 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperDreiwege.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperDreiwege.xml @@ -1,9 +1,16 @@  - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperEinfach.xml b/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperEinfach.xml index 71279d6..0261774 100644 --- a/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperEinfach.xml +++ b/Editor2DLibrary/SSG/shapes/svg/OFWeichenkoerperEinfach.xml @@ -1,9 +1,15 @@  - - - - + + + + + + + + + + \ No newline at end of file diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 1eacbb2..ae8b23b 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -90,7 +90,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -5607,6 +5607,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + + @@ -5689,6 +5692,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + + @@ -30557,7 +30563,7 @@ me.x - + diff --git a/SVGs/Omniflo/Antriebst.links_TEF_links.svg b/SVGs/Omniflo/Antriebst.links_TEF_links.svg deleted file mode 100644 index db69fa4..0000000 --- a/SVGs/Omniflo/Antriebst.links_TEF_links.svg +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Antriebst.rechts_TEF_rechts.svg b/SVGs/Omniflo/Antriebst.rechts_TEF_rechts.svg deleted file mode 100644 index 607f9d5..0000000 --- a/SVGs/Omniflo/Antriebst.rechts_TEF_rechts.svg +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Umlenkspannst.links_TEF_rechts.svg b/SVGs/Omniflo/Umlenkspannst.links_TEF_rechts.svg deleted file mode 100644 index 4be89bf..0000000 --- a/SVGs/Omniflo/Umlenkspannst.links_TEF_rechts.svg +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Umlenkspannst.rechts_TEF_links.svg b/SVGs/Omniflo/Umlenkspannst.rechts_TEF_links.svg deleted file mode 100644 index c5fb897..0000000 --- a/SVGs/Omniflo/Umlenkspannst.rechts_TEF_links.svg +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/DeltaWeiche_1400_700_M_834372400.svg b/SVGs/Omniflo/Weichen/neu_backup/DeltaWeiche_1400_700_M_834372400.svg deleted file mode 100644 index 4a1f8a7..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/DeltaWeiche_1400_700_M_834372400.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/DeltaWeiche_1600_800_M_834372403.svg b/SVGs/Omniflo/Weichen/neu_backup/DeltaWeiche_1600_800_M_834372403.svg deleted file mode 100644 index 75c0005..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/DeltaWeiche_1600_800_M_834372403.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/StarWeiche_1400_1400_M_834372420.svg b/SVGs/Omniflo/Weichen/neu_backup/StarWeiche_1400_1400_M_834372420.svg deleted file mode 100644 index dced021..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/StarWeiche_1400_1400_M_834372420.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_D_M_834372100.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_D_M_834372100.svg deleted file mode 100644 index 718604a..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_D_M_834372100.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_L_M_834372001.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_L_M_834372001.svg deleted file mode 100644 index 9a42947..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_L_M_834372001.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_R_M_834372004.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_R_M_834372004.svg deleted file mode 100644 index afc5ec0..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_R_M_834372004.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_T_M_834372200.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_T_M_834372200.svg deleted file mode 100644 index a45afaa..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_350_700_T_M_834372200.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_D_M_834372103.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_D_M_834372103.svg deleted file mode 100644 index 1b35539..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_D_M_834372103.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_L_M_834372007.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_L_M_834372007.svg deleted file mode 100644 index 9bba600..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_L_M_834372007.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_R_M_834372010.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_R_M_834372010.svg deleted file mode 100644 index 4a62a3b..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_R_M_834372010.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_T_M_834372203.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_T_M_834372203.svg deleted file mode 100644 index fa4054b..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_45_400_750_T_M_834372203.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_D_M_834372106.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_D_M_834372106.svg deleted file mode 100644 index c38e69c..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_D_M_834372106.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_L_M_834372021.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_L_M_834372021.svg deleted file mode 100644 index b8f1655..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_L_M_834372021.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_R_M_834372024.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_R_M_834372024.svg deleted file mode 100644 index 043a06c..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_R_M_834372024.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_T_M_834372206.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_T_M_834372206.svg deleted file mode 100644 index d06b550..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_500_600_T_M_834372206.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_D_M_834372109.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_D_M_834372109.svg deleted file mode 100644 index e58f5dd..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_D_M_834372109.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_L_M_834372027.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_L_M_834372027.svg deleted file mode 100644 index 651e872..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_L_M_834372027.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_R_M_834372030.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_R_M_834372030.svg deleted file mode 100644 index 77e29dc..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_R_M_834372030.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_T_M_834372209.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_T_M_834372209.svg deleted file mode 100644 index 928b420..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_90_700_700_T_M_834372209.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_D_M_834372115.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_D_M_834372115.svg deleted file mode 100644 index b75ff2e..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_D_M_834372115.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_L_M_834372047.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_L_M_834372047.svg deleted file mode 100644 index 820fffe..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_L_M_834372047.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_R_M_834372050.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_R_M_834372050.svg deleted file mode 100644 index c16461a..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_R_M_834372050.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_T_M_834372215.svg b/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_T_M_834372215.svg deleted file mode 100644 index f8668d9..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weiche_Parallel_200_750_T_M_834372215.svg +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_D_M_834342100.svg b/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_D_M_834342100.svg deleted file mode 100644 index dbd4f56..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_D_M_834342100.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_L_M_834342011.svg b/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_L_M_834342011.svg deleted file mode 100644 index d5d18fb..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_L_M_834342011.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_R_M_834342001.svg b/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_R_M_834342001.svg deleted file mode 100644 index a5ce664..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_R_M_834342001.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_T_M_834342200.svg b/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_T_M_834342200.svg deleted file mode 100644 index ac06700..0000000 --- a/SVGs/Omniflo/Weichen/neu_backup/Weichenkörper_T_M_834342200.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/Weichen/outputdir_Kopie/StarWeiche_1400_1400_P_834372420.svg b/SVGs/Omniflo/Weichen/outputdir_Kopie/StarWeiche_1400_1400_P_834372420.svg deleted file mode 100644 index 206eebe..0000000 --- a/SVGs/Omniflo/Weichen/outputdir_Kopie/StarWeiche_1400_1400_P_834372420.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SVGs/Omniflo/python/OFWeiche/1_omniflo_weichen.py b/SVGs/Omniflo/python/OFWeiche/1_omniflo_weichen.py index a974762..c0079ee 100644 --- a/SVGs/Omniflo/python/OFWeiche/1_omniflo_weichen.py +++ b/SVGs/Omniflo/python/OFWeiche/1_omniflo_weichen.py @@ -25,15 +25,17 @@ def modify_json_values(json_file): json.dump(data, f, indent=2, ensure_ascii=False) print("All changes saved!") -def process_einzelweiche_items(data,WeichenKoerperWidth, WeichenkProfileWidth,BogenProfileWidth, WeichenGerade): # Filter matching items +def process_einzelweiche_items(data, WeichenKoerperWidth, WeichenkProfileWidth, BogenProfileWidth, WeichenGerade): + # Filter matching items with additional Sivasnr check filtered_items = [ item for item in data if (item.get("SivasnrTEF") is None and item.get("KurvenRichtung") == 1 and - item.get("Schaltungstyp") == "M") + item.get("Schaltungstyp") == "M" and + str(item.get("Sivasnr", "")).isdigit()) ] - print(f"Found {len(filtered_items)} matching records") + print(f"Found {len(filtered_items)} matching records with numeric Sivasnr") print("="*50) # Process each item @@ -123,8 +125,38 @@ def process_einzelweiche_items(data,WeichenKoerperWidth, WeichenkProfileWidth,Bo BogenProfileWidth/2 * math.sin(angle_rad), 3) print(f"OFWeiche_CP3_y_mm calculated update: {item['OFWeiche_CP3_y_mm']}") - # 1. Find similar items with Schaltungstyp=P (update all CP points) + # NEW: First find exact ProfilTyp matches and update them current_profil = item["ProfilTyp"] + exact_matches = [x for x in data + if x["ProfilTyp"] == current_profil and + x is not item and # Exclude the current item + x.get("SivasnrTEF") is None] + + if exact_matches: + print(f"\nFound {len(exact_matches)} items with identical ProfilTyp") + for match in exact_matches: + print(f"Updating identical ProfilTyp item: {match['Sivasnr']}") + + fields_to_copy = [ + "OFWeiche_center_line_width_mm", + "OFWeiche_center_line_height_mm", + "Objekt_width_mm", + "Objekt_height_mm", + "OFWeiche_CP1_x_mm", + "OFWeiche_CP1_y_mm", + "OFWeiche_CP2_x_mm", + "OFWeiche_CP2_y_mm", + "OFWeiche_CP3_x_mm", + "OFWeiche_CP3_y_mm" + ] + + for field in fields_to_copy: + old_val = match.get(field) + match[field] = item[field] + print(f" {field}: {old_val} → {match[field]}") + else: + print("No similar items with identical ProfilTyp found") + # 1. Find similar items with Schaltungstyp=P (update all CP points) if "S" in current_profil: prefix = current_profil.rsplit(" ", 1)[0] @@ -140,7 +172,6 @@ def process_einzelweiche_items(data,WeichenKoerperWidth, WeichenkProfileWidth,Bo for similar in similar_items_p: print(f"Updating similar item: {similar['ProfilTyp']} (Sivasnr: {similar['Sivasnr']})") - # Update all fields including CP points fields_to_copy = [ "OFWeiche_center_line_width_mm", @@ -259,17 +290,17 @@ def process_einzelweiche_items(data,WeichenKoerperWidth, WeichenkProfileWidth,Bo print("No R-type P-type counterparts found") else: print("No L→R similar items found") - -def process_doppelweiche_items(data,BogenProfileWidth, WeichenGerade): - # Filter Doppelweiche type items +def process_doppelweiche_items(data, BogenProfileWidth, WeichenGerade): + # Filter Doppelweiche type items with numeric Sivasnr check filtered_items = [ item for item in data if (item.get("WeichenTyp") == "Doppelweiche" and item.get("Schaltungstyp") == "M" and - item.get("SivasnrTEF") is None) + item.get("SivasnrTEF") is None and + str(item.get("Sivasnr", "")).isdigit()) ] - print(f"\n\nFound {len(filtered_items)} Doppelweiche type records") + print(f"\n\nFound {len(filtered_items)} Doppelweiche type records with numeric Sivasnr") print("="*50) # Process each Doppelweiche item @@ -351,8 +382,39 @@ def process_doppelweiche_items(data,BogenProfileWidth, WeichenGerade): item["OFWeiche_CP3_y_mm"] = item["OFWeiche_CP2_y_mm"] print(f"OFWeiche_CP3_y_mm set: {item['OFWeiche_CP3_y_mm']}") - # 1. Find similar items (D-type P-type) + # NEW: First find exact ProfilTyp matches and update them current_profil = item["ProfilTyp"] + exact_matches = [x for x in data + if x["ProfilTyp"] == current_profil and + x is not item and # Exclude the current item + x.get("SivasnrTEF") is None] + + if exact_matches: + print(f"\nFound {len(exact_matches)} items with identical ProfilTyp") + for match in exact_matches: + print(f"Updating identical ProfilTyp item: {match['Sivasnr']}") + + fields_to_copy = [ + "OFWeiche_center_line_width_mm", + "OFWeiche_center_line_height_mm", + "Objekt_width_mm", + "Objekt_height_mm", + "OFWeiche_CP1_x_mm", + "OFWeiche_CP1_y_mm", + "OFWeiche_CP2_x_mm", + "OFWeiche_CP2_y_mm", + "OFWeiche_CP3_x_mm", + "OFWeiche_CP3_y_mm" + ] + + for field in fields_to_copy: + old_val = match.get(field) + match[field] = item[field] + print(f" {field}: {old_val} → {match[field]}") + else: + print("No similar items with identical ProfilTyp found") + + # 1. Find similar items (D-type P-type) if "S D" in current_profil: d_p_profil = current_profil.replace("MIT M", "MIT P") @@ -454,10 +516,10 @@ def process_doppelweiche_items(data,BogenProfileWidth, WeichenGerade): print(f" {field}: {old_val} → {similar[field]}") # Add CP4 point (T-type specific) - similar["OFWeiche_CP4_x_mm"] = round(item["Objekt_width_mm"]/2, 3) + similar["OFWeiche_CP4_x_mm"] = round(similar["Objekt_width_mm"]/2, 3) print(f" OFWeiche_CP4_x_mm added: {similar['OFWeiche_CP4_x_mm']}") - similar["OFWeiche_CP4_y_mm"] = round(item["Objekt_height_mm"] - WeichenGerade, 3) + similar["OFWeiche_CP4_y_mm"] = round(similar["Objekt_height_mm"] - WeichenGerade, 3) print(f" OFWeiche_CP4_y_mm added: {similar['OFWeiche_CP4_y_mm']}") # 3. Find T-type P-type counterparts @@ -494,7 +556,7 @@ def process_doppelweiche_items(data,BogenProfileWidth, WeichenGerade): similar_t_p[field] = similar[field] print(f" {field}: {old_val} → {similar_t_p[field]}") - # Add save confirmation prompt + # Add save confirmation prompt save_choice = input(f"Confirm update for this item? (Enter to confirm, 'n' to cancel): ").lower() if save_choice == 'n': print("Update for this item cancelled") @@ -511,7 +573,8 @@ def process_deltaweiche_items(data, WeichenkProfileWidth): item for item in data if (item.get("WeichenTyp") == "Dreifachweiche" and item.get("Schaltungstyp") == "M" and - item.get("SivasnrTEF") is None) + item.get("SivasnrTEF") is None)and + str(item.get("Sivasnr", "")).isdigit() ] print(f"\n\nFound {len(filtered_items)} deltaweiche type records") @@ -572,7 +635,38 @@ def process_deltaweiche_items(data, WeichenkProfileWidth): print(f"OFWeiche_CP2_y_mm: {item['OFWeiche_CP2_y_mm']}") print(f"OFWeiche_CP3_x_mm: {item['OFWeiche_CP3_x_mm']}") print(f"OFWeiche_CP3_y_mm: {item['OFWeiche_CP3_y_mm']}") + + # NEW: First find exact ProfilTyp matches and update them + current_profil = item["ProfilTyp"] + exact_matches = [x for x in data + if x["ProfilTyp"] == current_profil and + x is not item and # Exclude the current item + x.get("SivasnrTEF") is None] + if exact_matches: + print(f"\nFound {len(exact_matches)} items with identical ProfilTyp") + for match in exact_matches: + print(f"Updating identical ProfilTyp item: {match['Sivasnr']}") + + fields_to_copy = [ + "OFWeiche_center_line_width_mm", + "OFWeiche_center_line_height_mm", + "Objekt_width_mm", + "Objekt_height_mm", + "OFWeiche_CP1_x_mm", + "OFWeiche_CP1_y_mm", + "OFWeiche_CP2_x_mm", + "OFWeiche_CP2_y_mm", + "OFWeiche_CP3_x_mm", + "OFWeiche_CP3_y_mm" + ] + + for field in fields_to_copy: + old_val = match.get(field) + match[field] = item[field] + print(f" {field}: {old_val} → {match[field]}") + else: + print("No similar items with identical ProfilTyp found") # Find similar items (P-type) if "WEICHE S C DELTA" in item["ProfilTyp"]: similar_profil = item["ProfilTyp"].replace("KPL. MIT M", "KPL. MIT P") diff --git a/SVGs/Omniflo/python/OFWeiche/JSON/omniflo_weichen_output.json b/SVGs/Omniflo/python/OFWeiche/JSON/omniflo_weichen_output.json index ee71ff1..09f680a 100644 --- a/SVGs/Omniflo/python/OFWeiche/JSON/omniflo_weichen_output.json +++ b/SVGs/Omniflo/python/OFWeiche/JSON/omniflo_weichen_output.json @@ -45,6 +45,52 @@ } ] }, + { + "Sivasnr": "OFWeicheEinfach45", + "ProfilTyp": "WEICHE S 45°-L-350/700, KPL. MIT M", + "WeichenTyp": "Einzelweiche", + "KurvenWinkel": 45, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 350.129, + "OFWeiche_center_line_height_mm": 700.123, + "Objekt_width_mm": 418.55, + "Objekt_height_mm": 715.001, + "OFWeiche_CP1_x_mm": 365.007, + "OFWeiche_CP1_y_mm": 355.001, + "KurvenRichtung": 1, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 365.007, + "OFWeiche_CP2_y_mm": 715.001, + "OFWeiche_CP3_x_mm": 14.878, + "OFWeiche_CP3_y_mm": 14.878, + "Objekt_width_px": 1581.91, + "Objekt_height_px": 2702.346, + "calculated_SVG_width_px": 585.384, + "calculated_SVG_height_px": 1000.0, + "scale_factor": 1.398599, + "scale_factor_RD_Width": 1.70828, + "scale_factor_RD_Height": 1, + "connectionPoints": [ + { + "id": "cp1", + "x": 872.075, + "y": 496.504, + "direction": 0.0 + }, + { + "id": "cp2", + "x": 872.075, + "y": 1000.0, + "direction": 180.0 + }, + { + "id": "cp3", + "x": 35.547, + "y": 20.808, + "direction": 315 + } + ] + }, { "Sivasnr": 834372002, "ProfilTyp": "WEICHE S 45°-L-350/700, KPL. MIT P", @@ -711,6 +757,52 @@ } ] }, + { + "Sivasnr": "OFWeicheEinfach90", + "ProfilTyp": "WEICHE S 90°-L-700/700, KPL. MIT M", + "WeichenTyp": "Einzelweiche", + "KurvenWinkel": 90, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 700.374, + "OFWeiche_center_line_height_mm": 700.185, + "Objekt_width_mm": 753.918, + "Objekt_height_mm": 721.225, + "OFWeiche_CP1_x_mm": 700.374, + "OFWeiche_CP1_y_mm": 361.225, + "KurvenRichtung": 1, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 700.374, + "OFWeiche_CP2_y_mm": 721.225, + "OFWeiche_CP3_x_mm": 0.0, + "OFWeiche_CP3_y_mm": 21.04, + "Objekt_width_px": 2849.433, + "Objekt_height_px": 2725.87, + "calculated_SVG_width_px": 1000.0, + "calculated_SVG_height_px": 956.636, + "scale_factor": 1.326404, + "scale_factor_RD_Width": 1, + "scale_factor_RD_Height": 1.04533, + "connectionPoints": [ + { + "id": "cp1", + "x": 928.979, + "y": 500.849, + "direction": 0.0 + }, + { + "id": "cp2", + "x": 928.979, + "y": 1000.0, + "direction": 180.0 + }, + { + "id": "cp3", + "x": 0.0, + "y": 29.173, + "direction": 270 + } + ] + }, { "Sivasnr": 834372028, "ProfilTyp": "WEICHE S 90°-L-700/700, KPL. MIT P", @@ -933,6 +1025,52 @@ } ] }, + { + "Sivasnr": "OFWeicheParallelEinfach", + "ProfilTyp": "WEICHE S PARALLEL-L-200/750, KPL. MIT M", + "WeichenTyp": "Einzelweiche", + "KurvenWinkel": 0, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 200.007, + "OFWeiche_center_line_height_mm": 749.8, + "Objekt_width_mm": 274.591, + "Objekt_height_mm": 749.8, + "OFWeiche_CP1_x_mm": 221.047, + "OFWeiche_CP1_y_mm": 389.8, + "KurvenRichtung": 1, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 221.047, + "OFWeiche_CP2_y_mm": 749.8, + "OFWeiche_CP3_x_mm": 21.04, + "OFWeiche_CP3_y_mm": 0.0, + "Objekt_width_px": 1037.817, + "Objekt_height_px": 2833.869, + "calculated_SVG_width_px": 366.219, + "calculated_SVG_height_px": 1000.0, + "scale_factor": 1.333689, + "scale_factor_RD_Width": 2.730607, + "scale_factor_RD_Height": 1, + "connectionPoints": [ + { + "id": "cp1", + "x": 805.005, + "y": 519.872, + "direction": 0.0 + }, + { + "id": "cp2", + "x": 805.005, + "y": 1000.0, + "direction": 180.0 + }, + { + "id": "cp3", + "x": 76.623, + "y": 0.0, + "direction": 360 + } + ] + }, { "Sivasnr": 834372048, "ProfilTyp": "WEICHE S PARALLEL-L-200/750, KPL. MIT P", @@ -1117,6 +1255,52 @@ } ] }, + { + "Sivasnr": "OFWeicheDoppel45", + "ProfilTyp": "WEICHE S D 45°-350/700, KPL. MIT M", + "WeichenTyp": "Doppelweiche", + "KurvenWinkel": 45, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 700.258, + "OFWeiche_center_line_height_mm": 700.123, + "Objekt_width_mm": 730.013, + "Objekt_height_mm": 715.001, + "OFWeiche_CP1_x_mm": 365.007, + "OFWeiche_CP1_y_mm": 715.001, + "KurvenRichtung": 3, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 14.878, + "OFWeiche_CP2_y_mm": 14.878, + "OFWeiche_CP3_x_mm": 715.136, + "OFWeiche_CP3_y_mm": 14.878, + "Objekt_width_px": 2759.084, + "Objekt_height_px": 2702.346, + "calculated_SVG_width_px": 1000.0, + "calculated_SVG_height_px": 979.436, + "scale_factor": 1.369839, + "scale_factor_RD_Width": 1, + "scale_factor_RD_Height": 1.020996, + "connectionPoints": [ + { + "id": "cp1", + "x": 500.001, + "y": 1000.0, + "direction": 180.0 + }, + { + "id": "cp2", + "x": 20.38, + "y": 20.808, + "direction": 315 + }, + { + "id": "cp3", + "x": 979.621, + "y": 20.808, + "direction": 45 + } + ] + }, { "Sivasnr": 834372101, "ProfilTyp": "WEICHE S D 45°-350/700, KPL. MIT P", @@ -1564,6 +1748,52 @@ } ] }, + { + "Sivasnr": "OFWeicheDoppel90", + "ProfilTyp": "WEICHE S D 90°-700/700, KPL. MIT M", + "WeichenTyp": "Doppelweiche", + "KurvenWinkel": 90, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 1400.739, + "OFWeiche_center_line_height_mm": 700.176, + "Objekt_width_mm": 1400.739, + "Objekt_height_mm": 721.216, + "OFWeiche_CP1_x_mm": 700.37, + "OFWeiche_CP1_y_mm": 721.216, + "KurvenRichtung": 3, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 0.0, + "OFWeiche_CP2_y_mm": 21.04, + "OFWeiche_CP3_x_mm": 1400.739, + "OFWeiche_CP3_y_mm": 21.04, + "Objekt_width_px": 5294.093, + "Objekt_height_px": 2725.836, + "calculated_SVG_width_px": 1000.0, + "calculated_SVG_height_px": 514.883, + "scale_factor": 0.713909, + "scale_factor_RD_Width": 1, + "scale_factor_RD_Height": 1.942189, + "connectionPoints": [ + { + "id": "cp1", + "x": 500.0, + "y": 999.999, + "direction": 180.0 + }, + { + "id": "cp2", + "x": 0.0, + "y": 29.173, + "direction": 270 + }, + { + "id": "cp3", + "x": 1000.0, + "y": 29.173, + "direction": 90 + } + ] + }, { "Sivasnr": 834372110, "ProfilTyp": "WEICHE S D 90°-700/700, KPL. MIT P", @@ -1713,6 +1943,52 @@ } ] }, + { + "Sivasnr": "OFWeicheParallelDoppel", + "ProfilTyp": "WEICHE S D PARALLEL-200/750, KPL. MIT M", + "WeichenTyp": "Doppelweiche", + "KurvenWinkel": 0, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 400.014, + "OFWeiche_center_line_height_mm": 749.8, + "Objekt_width_mm": 442.094, + "Objekt_height_mm": 749.8, + "OFWeiche_CP1_x_mm": 221.047, + "OFWeiche_CP1_y_mm": 749.8, + "KurvenRichtung": 3, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 21.04, + "OFWeiche_CP2_y_mm": 0.0, + "OFWeiche_CP3_x_mm": 421.054, + "OFWeiche_CP3_y_mm": 0.0, + "Objekt_width_px": 1670.894, + "Objekt_height_px": 2833.869, + "calculated_SVG_width_px": 589.616, + "calculated_SVG_height_px": 1000.0, + "scale_factor": 1.333689, + "scale_factor_RD_Width": 1.696019, + "scale_factor_RD_Height": 1, + "connectionPoints": [ + { + "id": "cp1", + "x": 500.0, + "y": 1000.0, + "direction": 180.0 + }, + { + "id": "cp2", + "x": 47.592, + "y": 0.0, + "direction": 360 + }, + { + "id": "cp3", + "x": 952.408, + "y": 0.0, + "direction": 0 + } + ] + }, { "Sivasnr": 834372116, "ProfilTyp": "WEICHE S D PARALLEL-200/750, KPL. MIT P", @@ -1813,6 +2089,60 @@ } ] }, + { + "Sivasnr": "OFWeicheDreiwege45", + "ProfilTyp": "WEICHE S T 45°-350/700, KPL. MIT M", + "WeichenTyp": "Dreiwegeweiche", + "KurvenWinkel": 45, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 700.258, + "OFWeiche_center_line_height_mm": 700.123, + "Objekt_width_mm": 730.013, + "Objekt_height_mm": 715.001, + "OFWeiche_CP1_x_mm": 365.007, + "OFWeiche_CP1_y_mm": 715.001, + "KurvenRichtung": 7, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 14.878, + "OFWeiche_CP2_y_mm": 14.878, + "OFWeiche_CP3_x_mm": 715.136, + "OFWeiche_CP3_y_mm": 14.878, + "OFWeiche_CP4_x_mm": 365.007, + "OFWeiche_CP4_y_mm": 355.001, + "Objekt_width_px": 2759.084, + "Objekt_height_px": 2702.346, + "calculated_SVG_width_px": 1000.0, + "calculated_SVG_height_px": 979.436, + "scale_factor": 1.369839, + "scale_factor_RD_Width": 1, + "scale_factor_RD_Height": 1.020996, + "connectionPoints": [ + { + "id": "cp4", + "x": 500.001, + "y": 496.504, + "direction": 90.0 + }, + { + "id": "cp1", + "x": 500.001, + "y": 1000.0, + "direction": 180.0 + }, + { + "id": "cp2", + "x": 20.38, + "y": 20.808, + "direction": 315 + }, + { + "id": "cp3", + "x": 979.621, + "y": 20.808, + "direction": 45 + } + ] + }, { "Sivasnr": 834372201, "ProfilTyp": "WEICHE S T 45°-350/700, KPL. MIT P", @@ -2308,6 +2638,60 @@ } ] }, + { + "Sivasnr": "OFWeicheDreiwege90", + "ProfilTyp": "WEICHE S T 90°-700/700, KPL. MIT M", + "WeichenTyp": "Dreiwegeweiche", + "KurvenWinkel": 90, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 1400.739, + "OFWeiche_center_line_height_mm": 700.176, + "Objekt_width_mm": 1400.739, + "Objekt_height_mm": 721.216, + "OFWeiche_CP1_x_mm": 700.37, + "OFWeiche_CP1_y_mm": 721.216, + "KurvenRichtung": 7, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 0.0, + "OFWeiche_CP2_y_mm": 21.04, + "OFWeiche_CP3_x_mm": 1400.739, + "OFWeiche_CP3_y_mm": 21.04, + "OFWeiche_CP4_x_mm": 700.37, + "OFWeiche_CP4_y_mm": 361.216, + "Objekt_width_px": 5294.093, + "Objekt_height_px": 2725.836, + "calculated_SVG_width_px": 1000.0, + "calculated_SVG_height_px": 514.883, + "scale_factor": 0.713909, + "scale_factor_RD_Width": 1, + "scale_factor_RD_Height": 1.942189, + "connectionPoints": [ + { + "id": "cp4", + "x": 500.0, + "y": 500.843, + "direction": 90.0 + }, + { + "id": "cp1", + "x": 500.0, + "y": 999.999, + "direction": 180.0 + }, + { + "id": "cp2", + "x": 0.0, + "y": 29.173, + "direction": 270 + }, + { + "id": "cp3", + "x": 1000.0, + "y": 29.173, + "direction": 90 + } + ] + }, { "Sivasnr": 834372210, "ProfilTyp": "WEICHE S T 90°-700/700, KPL. MIT P", @@ -2473,6 +2857,60 @@ } ] }, + { + "Sivasnr": "OFWeicheParallelDreiwege", + "ProfilTyp": "WEICHE S T PARALLEL-200/750, KPL. MIT M", + "WeichenTyp": "Dreiwegeweiche", + "KurvenWinkel": 0, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 400.014, + "OFWeiche_center_line_height_mm": 749.8, + "Objekt_width_mm": 442.094, + "Objekt_height_mm": 749.8, + "OFWeiche_CP1_x_mm": 221.047, + "OFWeiche_CP1_y_mm": 749.8, + "KurvenRichtung": 7, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 21.04, + "OFWeiche_CP2_y_mm": 0.0, + "OFWeiche_CP3_x_mm": 421.054, + "OFWeiche_CP3_y_mm": 0.0, + "OFWeiche_CP4_x_mm": 221.047, + "OFWeiche_CP4_y_mm": 389.8, + "Objekt_width_px": 1670.894, + "Objekt_height_px": 2833.869, + "calculated_SVG_width_px": 589.616, + "calculated_SVG_height_px": 1000.0, + "scale_factor": 1.333689, + "scale_factor_RD_Width": 1.696019, + "scale_factor_RD_Height": 1, + "connectionPoints": [ + { + "id": "cp4", + "x": 500.0, + "y": 519.872, + "direction": 90.0 + }, + { + "id": "cp1", + "x": 500.0, + "y": 1000.0, + "direction": 180.0 + }, + { + "id": "cp2", + "x": 47.592, + "y": 0.0, + "direction": 360 + }, + { + "id": "cp3", + "x": 952.408, + "y": 0.0, + "direction": 0 + } + ] + }, { "Sivasnr": 834372216, "ProfilTyp": "WEICHE S T PARALLEL-200/750, KPL. MIT P", @@ -2573,6 +3011,52 @@ } ] }, + { + "Sivasnr": "OFDeltaWeiche", + "ProfilTyp": "WEICHE S C DELTA 1400/700, KPL. MIT M", + "WeichenTyp": "Dreifachweiche", + "KurvenWinkel": 90, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 1400.462, + "OFWeiche_center_line_height_mm": 700.237, + "Objekt_width_mm": 1400.462, + "Objekt_height_mm": 753.781, + "OFWeiche_CP1_x_mm": 700.231, + "OFWeiche_CP1_y_mm": 0, + "KurvenRichtung": 7, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 0, + "OFWeiche_CP2_y_mm": 700.237, + "OFWeiche_CP3_x_mm": 1400.462, + "OFWeiche_CP3_y_mm": 700.237, + "Objekt_width_px": 5293.046, + "Objekt_height_px": 2848.915, + "calculated_SVG_width_px": 1000.0, + "calculated_SVG_height_px": 538.237, + "scale_factor": 0.71405, + "scale_factor_RD_Width": 1, + "scale_factor_RD_Height": 1.857918, + "connectionPoints": [ + { + "id": "cp1", + "x": 500.0, + "y": 0.0, + "direction": 0 + }, + { + "id": "cp2", + "x": 0.0, + "y": 928.967, + "direction": 270 + }, + { + "id": "cp3", + "x": 1000.0, + "y": 928.967, + "direction": 90 + } + ] + }, { "Sivasnr": 834372401, "ProfilTyp": "WEICHE S C DELTA 1400/700, KPL. MIT P", @@ -2816,6 +3300,102 @@ } ] }, + { + "Sivasnr": "OFStarWeiche", + "ProfilTyp": "WEICHE S C STAR 1400/1400, KPL. MIT M", + "WeichenTyp": "Sternweiche", + "KurvenWinkel": 0, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 1400.442, + "OFWeiche_center_line_height_mm": 1400.442, + "Objekt_width_mm": 1400.442, + "Objekt_height_mm": 1400.442, + "OFWeiche_CP1_x_mm": 700.221, + "OFWeiche_CP1_y_mm": 0, + "KurvenRichtung": 7, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 1400.442, + "OFWeiche_CP2_y_mm": 700.221, + "OFWeiche_CP3_x_mm": 700.221, + "OFWeiche_CP3_y_mm": 1400.442, + "OFWeiche_CP4_x_mm": 0, + "OFWeiche_CP4_y_mm": 700.221, + "Objekt_width_px": 5292.971, + "Objekt_height_px": 5292.971, + "calculated_SVG_width_px": 1000.0, + "calculated_SVG_height_px": 1000.0, + "scale_factor": 0.71406, + "scale_factor_RD_Width": 1, + "scale_factor_RD_Height": 1.0, + "connectionPoints": [ + { + "id": "cp1", + "x": 500.0, + "y": 0.0, + "direction": 0 + }, + { + "id": "cp2", + "x": 1000.0, + "y": 500.0, + "direction": 270 + }, + { + "id": "cp3", + "x": 500.0, + "y": 1000.0, + "direction": 90 + } + ] + }, + { + "Sivasnr": 834372421, + "ProfilTyp": "WEICHE S C STAR 1400/1400, KPL. MIT P", + "WeichenTyp": "Sternweiche", + "KurvenWinkel": 0, + "Schaltungstyp": "P", + "OFWeiche_center_line_width_mm": 1400.442, + "OFWeiche_center_line_height_mm": 1400.442, + "Objekt_width_mm": 1400.442, + "Objekt_height_mm": 1400.442, + "OFWeiche_CP1_x_mm": 700.221, + "OFWeiche_CP1_y_mm": 0, + "KurvenRichtung": 7, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 1400.442, + "OFWeiche_CP2_y_mm": 700.221, + "OFWeiche_CP3_x_mm": 700.221, + "OFWeiche_CP3_y_mm": 1400.442, + "OFWeiche_CP4_x_mm": 0, + "OFWeiche_CP4_y_mm": 700.221, + "Objekt_width_px": 5292.971, + "Objekt_height_px": 5292.971, + "calculated_SVG_width_px": 1000.0, + "calculated_SVG_height_px": 1000.0, + "scale_factor": 0.71406, + "scale_factor_RD_Width": 1, + "scale_factor_RD_Height": 1.0, + "connectionPoints": [ + { + "id": "cp1", + "x": 500.0, + "y": 0.0, + "direction": 0 + }, + { + "id": "cp2", + "x": 1000.0, + "y": 500.0, + "direction": 270 + }, + { + "id": "cp3", + "x": 500.0, + "y": 1000.0, + "direction": 90 + } + ] + }, { "Sivasnr": 834342011, "ProfilTyp": "WEICHENKOERPER S -L-, KPL. MIT M", @@ -2862,6 +3442,52 @@ } ] }, + { + "Sivasnr": "OFWeichenkoerperEinfach", + "ProfilTyp": "WEICHENKOERPER S -L-, KPL. MIT M", + "WeichenTyp": "Einzelweiche", + "KurvenWinkel": 22.5, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 101.5, + "OFWeiche_center_line_height_mm": 360, + "Objekt_width_mm": 174.482, + "Objekt_height_mm": 360, + "OFWeiche_CP1_x_mm": 120.938, + "OFWeiche_CP1_y_mm": 0.0, + "KurvenRichtung": 1, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 120.938, + "OFWeiche_CP2_y_mm": 360, + "OFWeiche_CP3_x_mm": 19.438, + "OFWeiche_CP3_y_mm": 8.052, + "Objekt_width_px": 659.455, + "Objekt_height_px": 1360.62, + "calculated_SVG_width_px": 484.672, + "calculated_SVG_height_px": 1000.0, + "scale_factor": 2.777778, + "scale_factor_RD_Width": 2.063251, + "scale_factor_RD_Height": 1, + "connectionPoints": [ + { + "id": "cp1", + "x": 693.126, + "y": 0.0, + "direction": 0.0 + }, + { + "id": "cp2", + "x": 693.126, + "y": 1000.0, + "direction": 180.0 + }, + { + "id": "cp3", + "x": 111.404, + "y": 22.367, + "direction": 337.5 + } + ] + }, { "Sivasnr": 834342001, "ProfilTyp": "WEICHENKOERPER S -R-, KPL. MIT M", @@ -3046,6 +3672,52 @@ } ] }, + { + "Sivasnr": "OFWeichenkoerperDoppel", + "ProfilTyp": "WEICHENKOERPER S D, KPL. MIT M", + "WeichenTyp": "Doppelweiche", + "KurvenWinkel": 22.5, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 203, + "OFWeiche_center_line_height_mm": 340, + "Objekt_width_mm": 241.877, + "Objekt_height_mm": 348.052, + "OFWeiche_CP1_x_mm": 120.939, + "OFWeiche_CP1_y_mm": 348.052, + "KurvenRichtung": 3, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 19.438, + "OFWeiche_CP2_y_mm": 8.052, + "OFWeiche_CP3_x_mm": 222.438, + "OFWeiche_CP3_y_mm": 8.052, + "Objekt_width_px": 914.174, + "Objekt_height_px": 1315.463, + "calculated_SVG_width_px": 694.945, + "calculated_SVG_height_px": 1000.0, + "scale_factor": 2.873134, + "scale_factor_RD_Width": 1.438963, + "scale_factor_RD_Height": 1, + "connectionPoints": [ + { + "id": "cp1", + "x": 500.002, + "y": 1000.0, + "direction": 180.0 + }, + { + "id": "cp2", + "x": 80.363, + "y": 23.134, + "direction": 337.5 + }, + { + "id": "cp3", + "x": 919.633, + "y": 23.134, + "direction": 22.5 + } + ] + }, { "Sivasnr": 834342101, "ProfilTyp": "WEICHENKOERPER S D, KPL. MIT P", @@ -3111,7 +3783,7 @@ "OFWeiche_CP3_x_mm": 222.438, "OFWeiche_CP3_y_mm": 20, "OFWeiche_CP4_x_mm": 120.939, - "OFWeiche_CP4_y_mm": -11.948, + "OFWeiche_CP4_y_mm": 0.0, "Objekt_width_px": 914.174, "Objekt_height_px": 1360.62, "calculated_SVG_width_px": 671.881, @@ -3123,7 +3795,61 @@ { "id": "cp4", "x": 500.002, - "y": -33.189, + "y": 0.0, + "direction": 90.0 + }, + { + "id": "cp1", + "x": 500.002, + "y": 1000.0, + "direction": 180.0 + }, + { + "id": "cp2", + "x": 80.363, + "y": 55.556, + "direction": 337.5 + }, + { + "id": "cp3", + "x": 919.632, + "y": 55.556, + "direction": 22.5 + } + ] + }, + { + "Sivasnr": "OFWeichenkoerperDreiwege", + "ProfilTyp": "WEICHENKOERPER S T, KPL. MIT M", + "WeichenTyp": "Dreiwegeweiche", + "KurvenWinkel": 22.5, + "Schaltungstyp": "M", + "OFWeiche_center_line_width_mm": 203, + "OFWeiche_center_line_height_mm": 360.0, + "Objekt_width_mm": 241.877, + "Objekt_height_mm": 360.0, + "OFWeiche_CP1_x_mm": 120.939, + "OFWeiche_CP1_y_mm": 360.0, + "KurvenRichtung": 7, + "SivasnrTEF": null, + "OFWeiche_CP2_x_mm": 19.438, + "OFWeiche_CP2_y_mm": 20, + "OFWeiche_CP3_x_mm": 222.438, + "OFWeiche_CP3_y_mm": 20, + "OFWeiche_CP4_x_mm": 120.939, + "OFWeiche_CP4_y_mm": 0.0, + "Objekt_width_px": 914.174, + "Objekt_height_px": 1360.62, + "calculated_SVG_width_px": 671.881, + "calculated_SVG_height_px": 1000.0, + "scale_factor": 2.777778, + "scale_factor_RD_Width": 1.488359, + "scale_factor_RD_Height": 1, + "connectionPoints": [ + { + "id": "cp4", + "x": 500.002, + "y": 0.0, "direction": 90.0 }, { @@ -3165,7 +3891,7 @@ "OFWeiche_CP3_x_mm": 222.438, "OFWeiche_CP3_y_mm": 20, "OFWeiche_CP4_x_mm": 120.939, - "OFWeiche_CP4_y_mm": -11.948, + "OFWeiche_CP4_y_mm": 0.0, "Objekt_width_px": 914.174, "Objekt_height_px": 1360.62, "calculated_SVG_width_px": 671.881, @@ -3177,7 +3903,7 @@ { "id": "cp4", "x": 500.002, - "y": -33.189, + "y": 0.0, "direction": 90.0 }, { diff --git a/cleanLocalShapes.bat b/cleanLocalShapes.bat index 0cd72ef..55dd340 100644 --- a/cleanLocalShapes.bat +++ b/cleanLocalShapes.bat @@ -1,14 +1,14 @@ -del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\shape_*.txt" -del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\Copy_*.txt" -del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\shape_*.xml" -del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\Copy_*.xml" - - -del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\shape_*.txt" -del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\Copy_*.txt" -del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\shape_*.xml" -del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\Copy_*.xml" +del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\shape_*.txt" +del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\Copy_*.txt" +del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\shape_*.xml" +del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\Copy_*.xml" +del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\obj\shape_*.stl" +del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\shape_*.txt" +del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\Copy_*.txt" +del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\shape_*.xml" +del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\Copy_*.xml" +del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\obj\shape_*.stl" pause \ No newline at end of file