[FIX] Weichentyp im json für die dynamische Erzeugung der Oberfläche für Deltaweichen korrigiert; [CHANGE] Drehung der Omniflo Objekte wird nun interaktiv durch den Benutzer angegeben wie zuvor in Bihler

2026-07-22 08:07:24 +02:00
parent 67acbd8f38
commit 63e4e9ef32
7 changed files with 241 additions and 205 deletions
@@ -332,12 +332,13 @@
 ;;               z.B. "APB 60" oder "APB 110" (nil = keine Einschraenkung)
 ;; Rueckgabe: (eintrag hoehe drehung) oder nil bei Abbruch
 (defun omni:bogen-dialog (winkel init-hoehe init-drehung profiltyp / dcl-pfad dat boegen-liste
-                           profil-liste ergebnis dlg-hoehe dlg-drehung profil)
+                           profil-liste ergebnis dlg-hoehe profil)
  (if (null *OMNI-BOEGEN*) (omni:load-data))

  ;; Defaults
+  ;; Hinweis: init-drehung wird nicht mehr verwendet - die Drehung wird nach
+  ;; dem Einfuegen interaktiv abgefragt (omni:insert-dxf mit drehung=nil).
  (if (null init-hoehe) (setq init-hoehe (ssg-cfg-or "omniflo" "default_hoehe" "2000")))
-  (if (null init-drehung) (setq init-drehung (ssg-cfg-or "omniflo" "default_drehung" "0")))

  ;; Boegen nach Winkel filtern
  (setq boegen-liste (omni:filter *OMNI-BOEGEN* "KurvenWinkel" winkel))
@@ -388,9 +389,8 @@
          (end_list)
          (set_tile "bogenart" "0")

-          ;; Hoehe und Drehung initialisieren
+          ;; Hoehe initialisieren (Drehung erfolgt interaktiv nach dem Einfuegen)
          (set_tile "val_hoehe" init-hoehe)
-          (set_tile "val_drehung" init-drehung)

          ;; Startwerte anzeigen
          (omni:bogen-dlg-update "0")
@@ -403,16 +403,15 @@
            (strcat
              "(setq ergebnis (atoi (get_tile \"bogenart\")))"
              "(setq dlg-hoehe (get_tile \"val_hoehe\"))"
-              "(setq dlg-drehung (get_tile \"val_drehung\"))"
              "(done_dialog 1)"))
          (action_tile "cancel" "(done_dialog 0)")

          (start_dialog)
          (unload_dialog dat)

-          ;; Gewaehlten Eintrag mit Hoehe/Drehung zurueckgeben
+          ;; Gewaehlten Eintrag mit Hoehe zurueckgeben (drehung=nil -> interaktiv)
          (if ergebnis
-            (list (nth ergebnis *OMNI-DLG-BOEGEN*) dlg-hoehe dlg-drehung)
+            (list (nth ergebnis *OMNI-DLG-BOEGEN*) dlg-hoehe nil)
            nil
          )
        )
@@ -766,13 +765,14 @@
 ;; weichentyp = "Einzelweiche", "Doppelweiche", "Dreiwegeweiche" oder nil fuer alle
 ;; init-hoehe / init-drehung = Vorbelegung (optional, fuer Edit-Modus)
 ;; Rueckgabe: (eintrag hoehe drehung) oder nil bei Abbruch
-(defun omni:weichen-dialog (winkel weichentyp init-hoehe init-drehung / dcl-pfad dat basis-liste
-                             profil-liste ergebnis dlg-hoehe dlg-drehung)
+(defun omni:weichen-dialog (winkel weichentyp init-hoehe init-drehung breite / dcl-pfad dat basis-liste
+                             profil-liste ergebnis dlg-hoehe)
  (if (null *OMNI-WEICHEN*) (omni:load-data))

  ;; Defaults
+  ;; Hinweis: init-drehung wird nicht mehr verwendet - die Drehung wird nach
+  ;; dem Einfuegen interaktiv abgefragt (omni:insert-dxf mit drehung=nil).
  (if (null init-hoehe) (setq init-hoehe (ssg-cfg-or "omniflo" "default_hoehe" "2000")))
-  (if (null init-drehung) (setq init-drehung (ssg-cfg-or "omniflo" "default_drehung" "0")))

  ;; Weichen nach Winkel filtern (nil = alle Winkel)
  (if winkel
@@ -788,6 +788,14 @@
        basis-liste))
  )

+  ;; Optional nach Breite filtern (z.B. Weichenkombinationen Delta 1400/700 vs. 1600/800)
+  (if breite
+    (setq basis-liste
+      (vl-remove-if-not
+        '(lambda (e) (= (cdr (assoc "Breite" e)) breite))
+        basis-liste))
+  )
+
  (if (null basis-liste)
    (progn
      (alert (ssg-textf "omni-weiche-keine-gefunden"
@@ -823,9 +831,8 @@
          (end_list)
          (set_tile "profiltyp" "0")

-          ;; Hoehe und Drehung initialisieren
+          ;; Hoehe initialisieren (Drehung erfolgt interaktiv nach dem Einfuegen)
          (set_tile "val_hoehe" init-hoehe)
-          (set_tile "val_drehung" init-drehung)

          ;; Startwerte anzeigen
          (omni:weichen-dlg-update "0")
@@ -846,16 +853,15 @@
            (strcat
              "(setq ergebnis (atoi (get_tile \"profiltyp\")))"
              "(setq dlg-hoehe (get_tile \"val_hoehe\"))"
-              "(setq dlg-drehung (get_tile \"val_drehung\"))"
              "(done_dialog 1)"))
          (action_tile "cancel" "(done_dialog 0)")

          (start_dialog)
          (unload_dialog dat)

-          ;; Gewaehlten Eintrag mit Hoehe/Drehung zurueckgeben
+          ;; Gewaehlten Eintrag mit Hoehe zurueckgeben (drehung=nil -> interaktiv)
          (if ergebnis
-            (list (nth ergebnis *OMNI-DLG-WEICHEN*) dlg-hoehe dlg-drehung)
+            (list (nth ergebnis *OMNI-DLG-WEICHEN*) dlg-hoehe nil)
            nil
          )
        )
@@ -876,7 +882,7 @@
 ;; hoehe       = Hoehe in mm als String (wird als HOEHE-Attribut gesetzt)
 ;; drehung     = Drehwinkel in Grad als String (Block-Rotation)
 ;; Rueckgabe: Einfuegepunkt oder nil bei Abbruch
-(defun omni:insert-dxf (sivasnr-str hoehe drehung / dxf-pfad omniflo-pfad pt angleDeg winkel-rad drehung-anzeige blockEnt attribs layer-name)
+(defun omni:insert-dxf (sivasnr-str hoehe drehung / dxf-pfad omniflo-pfad pt angleDeg drehung-anzeige blockEnt attribs layer-name)
  (setq omniflo-pfad (getenv "DXFM_OMNIFLO"))
  (if (null omniflo-pfad)
    (progn
@@ -899,17 +905,15 @@
              (setvar "ATTREQ" 0)
              (setvar "ATTDIA" 0)

-              ;; Drehwinkel aus Dialog uebernehmen, sonst interaktiv am Einfuegepunkt abfragen
+              ;; Drehwinkel aus Dialog uebernehmen, sonst zunaechst ungedreht
+              ;; einfuegen und den Winkel erst nach dem Einfuegen abfragen
+              ;; (Nutzer kann die Orientierung am eingefuegten Objekt erkennen)
              (if drehung
                (progn
                  (setq angleDeg (atof drehung))
                  (setq drehung-anzeige drehung)
                )
-                (progn
-                  (setq winkel-rad (getangle pt (ssg-text "omni-prompt-drehwinkel")))
-                  (setq angleDeg (if winkel-rad (* winkel-rad (/ 180.0 pi)) 0.0))
-                  (setq drehung-anzeige (rtos angleDeg 2 1))
-                )
+                (setq angleDeg 0.0)
              )

              ;; Hoehe als Z-Koordinate auf den Einfuegepunkt anwenden
@@ -930,6 +934,23 @@

              (setq blockEnt (entlast))

+              ;; Drehwinkel interaktiv abfragen: ROTATE-Befehl mit der Entity
+              ;; und Basispunkt starten, dann per 'pause' die Winkeleingabe dem
+              ;; Nutzer ueberlassen (Objekt dreht sich beim Ziehen sichtbar mit).
+              ;; WICHTIG: Ohne 'pause' wuerde die nachfolgende CMDACTIVE-Schleife
+              ;; die Winkelabfrage sofort mit "" (=0 Grad) beenden.
+              (if (and (null drehung) blockEnt (= (cdr (assoc 0 (entget blockEnt))) "INSERT"))
+                (progn
+                  (command "_.ROTATE" blockEnt "" pt pause)
+                  (while (> (getvar "CMDACTIVE") 0) (command pause))
+                  (setq angleDeg (* (cdr (assoc 50 (entget blockEnt))) (/ 180.0 pi)))
+                  (setq drehung-anzeige (rtos angleDeg 2 1))
+                )
+              )
+              (if (null drehung-anzeige)
+                (setq drehung-anzeige (rtos angleDeg 2 1))
+              )
+
              (if (and blockEnt (= (cdr (assoc 0 (entget blockEnt))) "INSERT"))
                (progn
                  ;; HOEHE und DREHUNG Attribute setzen
@@ -996,7 +1017,7 @@

 ;; --- Omniflo / Weiche 90 Grad ---
 (defun c:OMNI_W90_Einfach ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 90 "Einzelweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 90 "Einzelweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1005,7 +1026,7 @@
 )

 (defun c:OMNI_W90_Doppel ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 90 "Doppelweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 90 "Doppelweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1014,7 +1035,7 @@
 )

 (defun c:OMNI_W90_Dreiwege ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 90 "Dreiwegeweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 90 "Dreiwegeweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1024,7 +1045,7 @@

 ;; --- Omniflo / Weiche 45 Grad ---
 (defun c:OMNI_W45_Einfach ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 45 "Einzelweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 45 "Einzelweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1033,7 +1054,7 @@
 )

 (defun c:OMNI_W45_Doppel ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 45 "Doppelweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 45 "Doppelweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1042,7 +1063,7 @@
 )

 (defun c:OMNI_W45_Dreiwege ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 45 "Dreiwegeweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 45 "Dreiwegeweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1052,7 +1073,7 @@

 ;; --- Omniflo / Weichen Parallel ---
 (defun c:OMNI_WP_Einfach ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 0 "Einzelweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 0 "Einzelweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1061,7 +1082,7 @@
 )

 (defun c:OMNI_WP_Doppel ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 0 "Doppelweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 0 "Doppelweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1070,7 +1091,7 @@
 )

 (defun c:OMNI_WP_Dreiwege ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 0 "Dreiwegeweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 0 "Dreiwegeweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1080,7 +1101,7 @@

 ;; --- Omniflo / Weichenkoerper ---
 (defun c:OMNI_WK_Einfach ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 22.5 "Einzelweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 22.5 "Einzelweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1089,7 +1110,7 @@
 )

 (defun c:OMNI_WK_Doppel ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 22.5 "Doppelweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 22.5 "Doppelweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1098,7 +1119,7 @@
 )

 (defun c:OMNI_WK_Dreiwege ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog 22.5 "Dreiwegeweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog 22.5 "Dreiwegeweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1107,8 +1128,17 @@
 )

 ;; --- Omniflo / Weichenkombinationen ---
-(defun c:OMNI_WKomb_Delta ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog nil "Deltaweiche" nil nil))
+(defun c:OMNI_WKomb_Delta_1400 ( / dlg-result)
+  (setq dlg-result (omni:weichen-dialog nil "Deltaweiche" nil nil 1400))
+  (if dlg-result
+    (omni:insert-from-entry dlg-result)
+    (princ (ssg-text "omni-abbruch-weiche"))
+  )
+  (princ)
+)
+
+(defun c:OMNI_WKomb_Delta_1600 ( / dlg-result)
+  (setq dlg-result (omni:weichen-dialog nil "Deltaweiche" nil nil 1600))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1117,7 +1147,7 @@
 )

 (defun c:OMNI_WKomb_Star ( / dlg-result)
-  (setq dlg-result (omni:weichen-dialog nil "Sternweiche" nil nil))
+  (setq dlg-result (omni:weichen-dialog nil "Sternweiche" nil nil nil))
  (if dlg-result
    (omni:insert-from-entry dlg-result)
    (princ (ssg-text "omni-abbruch-weiche"))
@@ -1230,7 +1260,7 @@
    (progn
      (setq winkel     (cdr (assoc "KurvenWinkel" eintrag)))
      (setq weichentyp (cdr (assoc "WeichenTyp" eintrag)))
-      (setq dlg-result (omni:weichen-dialog winkel weichentyp hoehe drehung))
+      (setq dlg-result (omni:weichen-dialog winkel weichentyp hoehe drehung nil))
    )
  )

@@ -1239,9 +1269,11 @@
  )

  ;; 5. Neuen Eintrag und Werte extrahieren
+  ;; Drehung: Dialog liefert keine Drehung mehr (interaktiv beim Neu-Einfuegen);
+  ;; beim Edit wird die bestehende Blockdrehung beibehalten (in-place Neuaufbau).
  (setq new-eintrag (car dlg-result))
  (setq new-hoehe   (cadr dlg-result))
-  (setq new-drehung (caddr dlg-result))
+  (setq new-drehung (or (caddr dlg-result) drehung))
  (setq sivasnr-str (omni:sivasid-to-str (omni:val new-eintrag "Sivasnr")))

  ;; 6. DXF-Datei pruefen
@@ -50,7 +50,8 @@ SSG_LIB
 │   │   ├── Doppel                 → OMNI_WK_Doppel
 │   │   └── Dreiwege               → OMNI_WK_Dreiwege
 │   ├── Weichenkombinationen
-│   │   ├── Delta                  → OMNI_WKomb_Delta
+│   │   ├── Delta 1400/700         → OMNI_WKomb_Delta_1400
+│   │   ├── Delta 1600/800         → OMNI_WKomb_Delta_1600
 │   │   └── Star                   → OMNI_WKomb_Star
 │   ├── TEF Elemente
 │   │   ├── Umlenkspannst. rechts  → OMNI_TEF_UmlenkR
@@ -99,7 +100,7 @@ Einfuegen von Omniflo-Standardkomponenten (Boegen, Geraden, Weichen, TEF-Element
 | `OMNI_APB_*` | Boegen einfuegen (90, 67.5, 45, 22.5, 180 Grad) |
 | `OMNI_AP60/AP110/APG110` | Aluprofil-Geraden einfuegen |
 | `OMNI_W90/W45/WP/WK_*` | Weichen einfuegen (Einfach, Doppel, Dreiwege) |
-| `OMNI_WKomb_Delta/Star` | Weichenkombinationen einfuegen |
+| `OMNI_WKomb_Delta_1400/1600, OMNI_WKomb_Star` | Weichenkombinationen einfuegen |
 | `OMNI_TEF_*` | TEF-Elemente einfuegen (Umlenk-/Antriebsstationen, Gerade) |
 | `OMNI_KettenFoerderer` | Kettenfoerderer einfuegen |

@@ -732,7 +732,7 @@
  {
    "Sivasnr": 834372400,
    "ProfilTyp": "WEICHE S C DELTA 1400/700, KPL. M",
-    "WeichenTyp": "Dreifachweiche",
+    "WeichenTyp": "Deltaweiche",
    "KurvenWinkel": 90,
    "Schaltungstyp": "M",
    "Breite": 1400,
@@ -756,7 +756,7 @@
  {
    "Sivasnr": 834372403,
    "ProfilTyp": "WEICHE S C DELTA 1600/800, KPL. M",
-    "WeichenTyp": "Dreifachweiche",
+    "WeichenTyp": "Deltaweiche",
    "KurvenWinkel": 90,
    "Schaltungstyp": "M",
    "Breite": 1600,
@@ -768,7 +768,7 @@
  {
    "Sivasnr": 834372404,
    "ProfilTyp": "WEICHE S C DELTA 1600/800, KPL. P",
-    "WeichenTyp": "Dreifachweiche",
+    "WeichenTyp": "Deltaweiche",
    "KurvenWinkel": 90,
    "Schaltungstyp": "P",
    "Breite": 1600,
@@ -780,7 +780,7 @@
  {
    "Sivasnr": "0_BG071090+834372404+0_BG071090",
    "ProfilTyp": "WEICHE S C DELTA 1600/800, KPL. MIT P mit TEF beideseitig",
-    "WeichenTyp": "Dreifachweiche",
+    "WeichenTyp": "Deltaweiche",
    "KurvenWinkel": 90,
    "Schaltungstyp": "P",
    "Breite": 1600,
@@ -792,7 +792,7 @@
  {
    "Sivasnr": "0_BG071090+834372404",
    "ProfilTyp": "WEICHE S C DELTA 1600/800, KPL. MIT P mit TEF links",
-    "WeichenTyp": "Dreifachweiche",
+    "WeichenTyp": "Deltaweiche",
    "KurvenWinkel": 90,
    "Schaltungstyp": "P",
    "Breite": 1600,
@@ -804,7 +804,7 @@
  {
    "Sivasnr": "834372404+0_BG071090",
    "ProfilTyp": "WEICHE S C DELTA 1600/800, KPL. MIT P mit TEF rechts",
-    "WeichenTyp": "Dreifachweiche",
+    "WeichenTyp": "Deltaweiche",
    "KurvenWinkel": 90,
    "Schaltungstyp": "P",
    "Breite": 1600,
@@ -56,11 +56,6 @@ omniflo_boegen : dialog {
      label = "Hoehe (mm):";
      edit_width = 10;
    }
-    : edit_box {
-      key = "val_drehung";
-      label = "Drehung (Grad):";
-      edit_width = 10;
-    }
  }

  ok_cancel;
@@ -67,11 +67,6 @@ omniflo_weichen : dialog {
      label = "Hoehe (mm):";
      edit_width = 10;
    }
-    : edit_box {
-      key = "val_drehung";
-      label = "Drehung (Grad):";
-      edit_width = 10;
-    }
  }

  ok_cancel;
@@ -335,364 +335,370 @@
      <MenuMacro UID="MM_00075">
        <Macro>
          <Name>Delta 1400/700 M</Name>
-          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta</Command>
+          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta_1400</Command>
        </Macro>
      </MenuMacro>
      <MenuMacro UID="MM_00076">
+        <Macro>
+          <Name>Delta 1600/800 M</Name>
+          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta_1600</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00077">
        <Macro>
          <Name>Star 1400/1400 M</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Star</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00078">
+      <MenuMacro UID="MM_00079">
        <Macro>
          <Name>TEF Antriebst. rechts</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_AntriebR</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00079">
+      <MenuMacro UID="MM_00080">
        <Macro>
          <Name>TEF Umlenkspannst. rechts</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_UmlenkR</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00081">
+      <MenuMacro UID="MM_00082">
        <Macro>
          <Name>TEF Antriebst. links</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_AntriebL</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00082">
+      <MenuMacro UID="MM_00083">
        <Macro>
          <Name>TEF Umlenkspannst. links</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_UmlenkL</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00084">
+      <MenuMacro UID="MM_00085">
        <Macro>
          <Name>TEF Gerade auf Linie</Name>
          <Command>^C^C(ssg-ensure "TEFInsert") TEF_FOERDERER_LINIE</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00085">
+      <MenuMacro UID="MM_00086">
        <Macro>
          <Name>TEF Gerade</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_Gerade</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00087">
+      <MenuMacro UID="MM_00088">
        <Macro>
          <Name>Stopper AP</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_STOPPER</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00088">
+      <MenuMacro UID="MM_00089">
        <Macro>
          <Name>Scanner</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_SCANNER</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00089">
+      <MenuMacro UID="MM_00090">
        <Macro>
          <Name>Bürstenbremse</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_BUERSTENBREMSE</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00090">
+      <MenuMacro UID="MM_00091">
        <Macro>
          <Name>KettenFoerderer</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_KettenFoerderer</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00092">
+      <MenuMacro UID="MM_00093">
        <Macro>
          <Name>TV W-W kpl</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_W</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00093">
+      <MenuMacro UID="MM_00094">
        <Macro>
          <Name>TV W-AP110 kpl</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP110</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00094">
+      <MenuMacro UID="MM_00095">
        <Macro>
          <Name>TV W-AP60 oben kpl.</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP60</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00095">
+      <MenuMacro UID="MM_00096">
        <Macro>
          <Name>TV W-AP110-W kpl</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP110_W</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00096">
+      <MenuMacro UID="MM_00097">
        <Macro>
          <Name>TV W-AP oben kpl</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00097">
+      <MenuMacro UID="MM_00098">
        <Macro>
          <Name>TV 80</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_80</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00098">
+      <MenuMacro UID="MM_00099">
        <Macro>
          <Name>TV 50</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_50</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00099">
+      <MenuMacro UID="MM_00100">
        <Macro>
          <Name>Endplatte Al-Profil AP schraubbar</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_ENDPLATTE</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00100">
+      <MenuMacro UID="MM_00101">
        <Macro>
          <Name>Anschlag AP-Ende fuer Spulenzug</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_ANSCHLAG</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00101">
+      <MenuMacro UID="MM_00102">
        <Macro>
          <Name>TV-A fuer AP110/AP60 kpl</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_A_AP110_AP60</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00102">
+      <MenuMacro UID="MM_00103">
        <Macro>
          <Name>TV-A fuer AP60/ST</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_A_AP60_ST</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00103">
+      <MenuMacro UID="MM_00104">
        <Macro>
          <Name>TV-A fuer AP110/ST kpl</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_A_AP110_ST</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00104">
+      <MenuMacro UID="MM_00105">
        <Macro>
          <Name>TV-SW II fuer SW-SW</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_II_SW_SW</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00105">
+      <MenuMacro UID="MM_00106">
        <Macro>
          <Name>TV-SW III fuer SW-AP110-SW</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_III_AP110_SW</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00106">
+      <MenuMacro UID="MM_00107">
        <Macro>
          <Name>TV-SW III fuer SW-AP110</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_III_AP110</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00107">
+      <MenuMacro UID="MM_00108">
        <Macro>
          <Name>TV-SW IV fuer Anschluss SW-AP60</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_IV_AP60</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00108">
+      <MenuMacro UID="MM_00109">
        <Macro>
          <Name>TV-SW IV fuer SW-ST</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_IV_ST</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00109">
+      <MenuMacro UID="MM_00110">
        <Macro>
          <Name>Muffe</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_MUFFE</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00111">
+      <MenuMacro UID="MM_00112">
        <Macro>
          <Name>APB 110 R400/45 140 nur fuer Delta</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R400_45_140</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00112">
+      <MenuMacro UID="MM_00113">
        <Macro>
          <Name>APB 110 R550/45 194 nur fuer Delta</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_45_194</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00113">
+      <MenuMacro UID="MM_00114">
        <Macro>
          <Name>APBW 110 R550/22,5 360x248,5</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_360</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00114">
+      <MenuMacro UID="MM_00115">
        <Macro>
          <Name>APBW 110 R550/22,5 410x298,5</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_410A</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00115">
+      <MenuMacro UID="MM_00116">
        <Macro>
          <Name>APBW 110 R550/22,5 410x78,5</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_410B</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00116">
+      <MenuMacro UID="MM_00117">
        <Macro>
          <Name>APBW 110 R550/22,5 410x98,5</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_410C</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00117">
+      <MenuMacro UID="MM_00118">
        <Macro>
          <Name>APBW 110 R550/67,5 360x598,5</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_360</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00118">
+      <MenuMacro UID="MM_00119">
        <Macro>
          <Name>APBW 110 R400/67,5 260x398,5</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R400_675_260</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00119">
+      <MenuMacro UID="MM_00120">
        <Macro>
          <Name>APBW 110 R550/45 77x160</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_45_77</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00120">
+      <MenuMacro UID="MM_00121">
        <Macro>
          <Name>APBW 110 R550/67,5 125x83,5</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_125</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00121">
+      <MenuMacro UID="MM_00122">
        <Macro>
          <Name>APBW 110 R750/90 200x290</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R750_90_200</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00122">
+      <MenuMacro UID="MM_00123">
        <Macro>
          <Name>APBW 110 R650/90 300x190</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R650_90_300</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00123">
+      <MenuMacro UID="MM_00124">
        <Macro>
          <Name>APBW 110 R550/67,5 208x347</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_208</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00124">
+      <MenuMacro UID="MM_00125">
        <Macro>
          <Name>APBW 110 R550/67,5 58x497</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_58</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00125">
+      <MenuMacro UID="MM_00126">
        <Macro>
          <Name>Element bearbeiten</Name>
          <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_EDIT</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00127">
+      <MenuMacro UID="MM_00128">
        <Macro>
          <Name>Export Sivas</Name>
          <Command>^C^C(ssg-ensure "count_sep_scan") ZAEHLE_SEP_SCAN (ssg-ensure "export") EXPORTSIVAS</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00128">
+      <MenuMacro UID="MM_00129">
        <Macro>
          <Name>Export CSV</Name>
          <Command>^C^C(ssg-ensure "export") EXPORTCSV</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00130">
+      <MenuMacro UID="MM_00131">
        <Macro>
          <Name>Umschalten 2D und 3D</Name>
          <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_DIM_SWITCH</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00131">
+      <MenuMacro UID="MM_00132">
        <Macro>
          <Name>Sprache</Name>
          <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_SPRACHE</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00134">
+      <MenuMacro UID="MM_00135">
        <Macro>
          <Name>Alle Tests ausfuehren</Name>
          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_run_all.lsp")) SSG_RUN_ALL_TESTS</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00136">
+      <MenuMacro UID="MM_00137">
        <Macro>
          <Name>Kreisel</Name>
          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_kreisel.lsp")) TEST_KREISEL</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00137">
+      <MenuMacro UID="MM_00138">
        <Macro>
          <Name>Foerderer</Name>
          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_foerderer.lsp")) TEST_FOERDERER</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00138">
+      <MenuMacro UID="MM_00139">
        <Macro>
          <Name>Foerderer-Linienzug</Name>
          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_linienzug.lsp")) TEST_LINIENZUG</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00139">
+      <MenuMacro UID="MM_00140">
        <Macro>
          <Name>Omniflo</Name>
          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_omniflo.lsp")) TEST_OMNIFLO</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00140">
+      <MenuMacro UID="MM_00141">
        <Macro>
          <Name>Gefaellestrecke</Name>
          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_gefaellestrecke.lsp")) TEST_GEFAELLESTRECKE</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00141">
+      <MenuMacro UID="MM_00142">
        <Macro>
          <Name>Export CSV/Sivas ALL</Name>
          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_export_all.lsp")) TEST_EXPORT_ALL</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00153">
+      <MenuMacro UID="MM_00154">
        <Macro>
          <Name>Kreisel bearbeiten</Name>
          <Command>(ssg-ensure "KreiselInsert") KreiselEdit</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00154">
+      <MenuMacro UID="MM_00155">
        <Macro>
          <Name>Omniflo Element bearbeiten</Name>
          <Command>(ssg-ensure "OmniModulInsert") OMNI_EDIT</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00155">
+      <MenuMacro UID="MM_00156">
        <Macro>
          <Name>Gefaellestrecke bearbeiten</Name>
          <Command>(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_EDIT</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00156">
+      <MenuMacro UID="MM_00157">
        <Macro>
          <Name>VarioFoerderer bearbeiten</Name>
          <Command>(ssg-ensure "VarioFoerderer") VARIOFOERDERER_EDIT</Command>
        </Macro>
      </MenuMacro>
-      <MenuMacro UID="MM_00158">
+      <MenuMacro UID="MM_00159">
        <Macro>
          <Name>SSG Bearbeiten (Auto)</Name>
          <Command>(ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT</Command>
@@ -709,9 +715,9 @@
          <Name>SSG_LIB</Name>
          <PopMenuRef pUID="PM_00005"/>
          <PopMenuRef pUID="PM_00045"/>
-          <PopMenuRef pUID="PM_00126"/>
-          <PopMenuRef pUID="PM_00129"/>
-          <PopMenuRef pUID="PM_00133"/>
+          <PopMenuRef pUID="PM_00127"/>
+          <PopMenuRef pUID="PM_00130"/>
+          <PopMenuRef pUID="PM_00134"/>
        </PopMenu>
        <PopMenu UID="PM_00005">
          <Name>ILS</Name>
@@ -932,20 +938,20 @@
          <PopMenuRef pUID="PM_00066"/>
          <PopMenuRef pUID="PM_00070"/>
          <PopMenuRef pUID="PM_00074"/>
-          <PopMenuRef pUID="PM_00077"/>
-          <PopMenuRef pUID="PM_00086"/>
+          <PopMenuRef pUID="PM_00078"/>
+          <PopMenuRef pUID="PM_00087"/>
          <PopMenuItem>
            <NameRef>~KettenFoerderer</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00090"/>
+              <MacroRef MenuMacroID="MM_00091"/>
            </MenuItem>
          </PopMenuItem>
-          <PopMenuRef pUID="PM_00091"/>
-          <PopMenuRef pUID="PM_00110"/>
+          <PopMenuRef pUID="PM_00092"/>
+          <PopMenuRef pUID="PM_00111"/>
          <PopMenuItem>
            <NameRef>Element bearbeiten</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00125"/>
+              <MacroRef MenuMacroID="MM_00126"/>
            </MenuItem>
          </PopMenuItem>
        </PopMenu>
@@ -1105,299 +1111,305 @@
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>Star 1400/1400 M</NameRef>
+            <NameRef>Delta 1600/800 M</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00076"/>
            </MenuItem>
          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Star 1400/1400 M</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00077"/>
+            </MenuItem>
+          </PopMenuItem>
        </PopMenu>
-        <PopMenu UID="PM_00077">
+        <PopMenu UID="PM_00078">
          <Name>TEF Elemente</Name>
          <PopMenuItem>
            <NameRef>TEF Antriebst. rechts</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00078"/>
+              <MacroRef MenuMacroID="MM_00079"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>TEF Umlenkspannst. rechts</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00079"/>
+              <MacroRef MenuMacroID="MM_00080"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem IsSeparator="true"/>
          <PopMenuItem>
            <NameRef>TEF Antriebst. links</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00081"/>
+              <MacroRef MenuMacroID="MM_00082"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>TEF Umlenkspannst. links</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00082"/>
+              <MacroRef MenuMacroID="MM_00083"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem IsSeparator="true"/>
          <PopMenuItem>
            <NameRef>TEF Gerade auf Linie</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00084"/>
+              <MacroRef MenuMacroID="MM_00085"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>TEF Gerade</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00085"/>
+              <MacroRef MenuMacroID="MM_00086"/>
            </MenuItem>
          </PopMenuItem>
        </PopMenu>
-        <PopMenu UID="PM_00086">
+        <PopMenu UID="PM_00087">
          <Name>Anbaugruppen</Name>
          <PopMenuItem>
            <NameRef>Stopper AP</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00087"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>Scanner</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00088"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>Bürstenbremse</NameRef>
+            <NameRef>Scanner</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00089"/>
            </MenuItem>
          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Bürstenbremse</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00090"/>
+            </MenuItem>
+          </PopMenuItem>
        </PopMenu>
-        <PopMenu UID="PM_00091">
+        <PopMenu UID="PM_00092">
          <Name>Verbinder</Name>
          <PopMenuItem>
            <NameRef>~TV W-W kpl</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00092"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>~TV W-AP110 kpl</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00093"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV W-AP60 oben kpl.</NameRef>
+            <NameRef>~TV W-AP110 kpl</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00094"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV W-AP110-W kpl</NameRef>
+            <NameRef>~TV W-AP60 oben kpl.</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00095"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV W-AP oben kpl</NameRef>
+            <NameRef>~TV W-AP110-W kpl</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00096"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV 80</NameRef>
+            <NameRef>~TV W-AP oben kpl</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00097"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV 50</NameRef>
+            <NameRef>~TV 80</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00098"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~Endplatte Al-Profil AP schraubbar</NameRef>
+            <NameRef>~TV 50</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00099"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~Anschlag AP-Ende fuer Spulenzug</NameRef>
+            <NameRef>~Endplatte Al-Profil AP schraubbar</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00100"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV-A fuer AP110/AP60 kpl</NameRef>
+            <NameRef>~Anschlag AP-Ende fuer Spulenzug</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00101"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV-A fuer AP60/ST</NameRef>
+            <NameRef>~TV-A fuer AP110/AP60 kpl</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00102"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV-A fuer AP110/ST kpl</NameRef>
+            <NameRef>~TV-A fuer AP60/ST</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00103"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV-SW II fuer SW-SW</NameRef>
+            <NameRef>~TV-A fuer AP110/ST kpl</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00104"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV-SW III fuer SW-AP110-SW</NameRef>
+            <NameRef>~TV-SW II fuer SW-SW</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00105"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV-SW III fuer SW-AP110</NameRef>
+            <NameRef>~TV-SW III fuer SW-AP110-SW</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00106"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV-SW IV fuer Anschluss SW-AP60</NameRef>
+            <NameRef>~TV-SW III fuer SW-AP110</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00107"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~TV-SW IV fuer SW-ST</NameRef>
+            <NameRef>~TV-SW IV fuer Anschluss SW-AP60</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00108"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~Muffe</NameRef>
+            <NameRef>~TV-SW IV fuer SW-ST</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00109"/>
            </MenuItem>
          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>~Muffe</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00110"/>
+            </MenuItem>
+          </PopMenuItem>
        </PopMenu>
-        <PopMenu UID="PM_00110">
+        <PopMenu UID="PM_00111">
          <Name>Boegen fuer Weichen</Name>
          <PopMenuItem>
            <NameRef>~APB 110 R400/45 140 nur fuer Delta</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00111"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>~APB 110 R550/45 194 nur fuer Delta</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00112"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R550/22,5 360x248,5</NameRef>
+            <NameRef>~APB 110 R550/45 194 nur fuer Delta</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00113"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R550/22,5 410x298,5</NameRef>
+            <NameRef>~APBW 110 R550/22,5 360x248,5</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00114"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R550/22,5 410x78,5</NameRef>
+            <NameRef>~APBW 110 R550/22,5 410x298,5</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00115"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R550/22,5 410x98,5</NameRef>
+            <NameRef>~APBW 110 R550/22,5 410x78,5</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00116"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R550/67,5 360x598,5</NameRef>
+            <NameRef>~APBW 110 R550/22,5 410x98,5</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00117"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R400/67,5 260x398,5</NameRef>
+            <NameRef>~APBW 110 R550/67,5 360x598,5</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00118"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R550/45 77x160</NameRef>
+            <NameRef>~APBW 110 R400/67,5 260x398,5</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00119"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R550/67,5 125x83,5</NameRef>
+            <NameRef>~APBW 110 R550/45 77x160</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00120"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R750/90 200x290</NameRef>
+            <NameRef>~APBW 110 R550/67,5 125x83,5</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00121"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R650/90 300x190</NameRef>
+            <NameRef>~APBW 110 R750/90 200x290</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00122"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R550/67,5 208x347</NameRef>
+            <NameRef>~APBW 110 R650/90 300x190</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00123"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
-            <NameRef>~APBW 110 R550/67,5 58x497</NameRef>
+            <NameRef>~APBW 110 R550/67,5 208x347</NameRef>
            <MenuItem>
              <MacroRef MenuMacroID="MM_00124"/>
            </MenuItem>
          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>~APBW 110 R550/67,5 58x497</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00125"/>
+            </MenuItem>
+          </PopMenuItem>
        </PopMenu>
-        <PopMenu UID="PM_00126">
+        <PopMenu UID="PM_00127">
          <Name>Export</Name>
          <PopMenuItem>
            <NameRef>Export Sivas</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00127"/>
+              <MacroRef MenuMacroID="MM_00128"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>Export CSV</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00128"/>
+              <MacroRef MenuMacroID="MM_00129"/>
            </MenuItem>
          </PopMenuItem>
        </PopMenu>
-        <PopMenu UID="PM_00129">
+        <PopMenu UID="PM_00130">
          <Name>Konfiguration</Name>
          <PopMenuItem>
            <NameRef>Umschalten 2D und 3D</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00130"/>
+              <MacroRef MenuMacroID="MM_00131"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>Sprache</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00131"/>
+              <MacroRef MenuMacroID="MM_00132"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
@@ -1407,84 +1419,84 @@
            </MenuItem>
          </PopMenuItem>
        </PopMenu>
-        <PopMenu UID="PM_00133">
+        <PopMenu UID="PM_00134">
          <Name>Tests</Name>
          <PopMenuItem>
            <NameRef>Alle Tests ausfuehren</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00134"/>
+              <MacroRef MenuMacroID="MM_00135"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem IsSeparator="true"/>
          <PopMenuItem>
            <NameRef>Kreisel</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00136"/>
+              <MacroRef MenuMacroID="MM_00137"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>Foerderer</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00137"/>
+              <MacroRef MenuMacroID="MM_00138"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>Foerderer-Linienzug</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00138"/>
+              <MacroRef MenuMacroID="MM_00139"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>Omniflo</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00139"/>
+              <MacroRef MenuMacroID="MM_00140"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>Gefaellestrecke</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00140"/>
+              <MacroRef MenuMacroID="MM_00141"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>Export CSV/Sivas ALL</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00141"/>
+              <MacroRef MenuMacroID="MM_00142"/>
            </MenuItem>
          </PopMenuItem>
        </PopMenu>
-        <PopMenu UID="PM_00152">
+        <PopMenu UID="PM_00153">
          <Alias>POP501</Alias>
          <Name>SSG_LIB Edit Context</Name>
          <PopMenuItem>
            <NameRef>Kreisel bearbeiten</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00153"/>
+              <MacroRef MenuMacroID="MM_00154"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>Omniflo Element bearbeiten</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00154"/>
+              <MacroRef MenuMacroID="MM_00155"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>Gefaellestrecke bearbeiten</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00155"/>
+              <MacroRef MenuMacroID="MM_00156"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem>
            <NameRef>VarioFoerderer bearbeiten</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00156"/>
+              <MacroRef MenuMacroID="MM_00157"/>
            </MenuItem>
          </PopMenuItem>
          <PopMenuItem IsSeparator="true"/>
          <PopMenuItem>
            <NameRef>SSG Bearbeiten (Auto)</NameRef>
            <MenuItem>
-              <MacroRef MenuMacroID="MM_00158"/>
+              <MacroRef MenuMacroID="MM_00159"/>
            </MenuItem>
          </PopMenuItem>
        </PopMenu>
@@ -72,7 +72,8 @@
 [Doppel 22.5 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WK_Doppel
 [<-Dreiwege 22.5 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WK_Dreiwege
 [->Weichenkombinationen]
-[Delta 1400/700 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta
+[Delta 1400/700 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta_1400
+[Delta 1600/800 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta_1600
 [<-Star 1400/1400 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Star
 [->TEF Elemente]
 [TEF Antriebst. rechts]^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_AntriebR