vf_*.lsp: verbleibende deutsche Meldungen auf ssg-text/ssg-textf umgestellt
Betrifft VarioFoerderer-Kern, Standard-/Etage-Aufbau und Linienzug (inkl. altem Vorwaerts-Nachbau-Modus und Vario_Kette_Merge-Diagnose). Neue Keys in lang/de_DE.json und lang/en_GB.json ergaenzt. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
+25
-26
@@ -547,23 +547,22 @@
|
||||
(progn
|
||||
(if (= best-winkel 0)
|
||||
(progn
|
||||
(princ (strcat "\n\n6/11: Horizontale Zwischenstrecke (0 Grad, L="
|
||||
(rtos L_VF 2 2) " mm)"))
|
||||
(princ (ssg-textf "vfs-schritt6-horizontal" (list (rtos L_VF 2 2))))
|
||||
(setq aktueller-punkt
|
||||
(insert-inclined-scaled-block "Staustrecke_SP_1000_mm" aktueller-punkt
|
||||
L_VF 0 hz))
|
||||
)
|
||||
(if (= richtung "Auf")
|
||||
(progn
|
||||
(princ (strcat "\n\n6/11: Steigungsstrecke ("
|
||||
(itoa (- (- best-winkel 3))) " Grad, L=" (rtos L_VF 2 2) " mm)"))
|
||||
(princ (ssg-textf "vfs-schritt6-steigung"
|
||||
(list (itoa (- (- best-winkel 3))) (rtos L_VF 2 2))))
|
||||
(setq aktueller-punkt
|
||||
(insert-inclined-scaled-block "Staustrecke_SP_1000_mm" aktueller-punkt
|
||||
L_VF (- (- best-winkel 3)) hz))
|
||||
)
|
||||
(progn
|
||||
(princ (strcat "\n\n6/11: Gefaellestrecke ("
|
||||
(itoa (+ best-winkel 3)) " Grad, L=" (rtos L_VF 2 2) " mm)"))
|
||||
(princ (ssg-textf "vfs-schritt6-gefaelle"
|
||||
(list (itoa (+ best-winkel 3)) (rtos L_VF 2 2))))
|
||||
(setq aktueller-punkt
|
||||
(insert-inclined-scaled-block "Staustrecke_SP_1000_mm" aktueller-punkt
|
||||
L_VF (+ best-winkel 3) hz))
|
||||
@@ -571,7 +570,7 @@
|
||||
)
|
||||
)
|
||||
)
|
||||
(princ "\n\n6/11: (uebersprungen)")
|
||||
(princ (ssg-text "vfs-schritt6-skip"))
|
||||
)
|
||||
|
||||
;; 7. 2. Vertikalbogen
|
||||
@@ -594,22 +593,22 @@
|
||||
(setq bogen-dx (car bogen-mass) bogen-dz (caddr bogen-mass))
|
||||
(if (= best-winkel 0)
|
||||
(progn
|
||||
(princ (strcat "\n\n7/11: " bogen-name " (3 Grad geneigt)"))
|
||||
(princ (ssg-textf "vfs-schritt7-bogen1" (list bogen-name)))
|
||||
(setq aktueller-punkt
|
||||
(insert-rotated-block-with-ks bogen-name aktueller-punkt
|
||||
0 bogen-dx bogen-dz hz))
|
||||
)
|
||||
(if (= richtung "Auf")
|
||||
(progn
|
||||
(princ (strcat "\n\n7/11: " bogen-name
|
||||
" (" (itoa (- 3 best-winkel)) " Grad geneigt)"))
|
||||
(princ (ssg-textf "vfs-schritt7-bogen-winkel"
|
||||
(list bogen-name (itoa (- 3 best-winkel)))))
|
||||
(setq aktueller-punkt
|
||||
(insert-rotated-block-with-ks bogen-name aktueller-punkt
|
||||
(- 3 best-winkel) bogen-dx bogen-dz hz))
|
||||
)
|
||||
(progn
|
||||
(princ (strcat "\n\n7/11: " bogen-name
|
||||
" (" (itoa (+ best-winkel 3)) " Grad geneigt)"))
|
||||
(princ (ssg-textf "vfs-schritt7-bogen-winkel"
|
||||
(list bogen-name (itoa (+ best-winkel 3)))))
|
||||
(setq aktueller-punkt
|
||||
(insert-rotated-block-with-ks bogen-name aktueller-punkt
|
||||
(+ best-winkel 3) bogen-dx bogen-dz hz))
|
||||
@@ -632,7 +631,7 @@
|
||||
(if (null hz) (setq hz 0.0))
|
||||
(setq hz (float hz))
|
||||
;; Motorstation
|
||||
(princ "\n\n[VF-Ausgang] Motorstation (500 mm, 3 Grad geneigt)")
|
||||
(princ (ssg-text "vfs-ausgang-motorstation"))
|
||||
(setq aktueller-punkt
|
||||
(insert-rotated-block-with-ks (strcat "Vario_Motorstation_500mm_" (vf-motorseite-aktuell)) aktueller-punkt
|
||||
(ssg-cfg-or "vario" "gefaelle_winkel" 3)
|
||||
@@ -641,17 +640,17 @@
|
||||
;; GF2 (optional, verbindet Motorstation mit der Auslauf-Neigung)
|
||||
(if (> L_GF2 0.1)
|
||||
(progn
|
||||
(princ (strcat "\n[VF-Ausgang] Gefaellestrecke GF2 (3 Grad, L=" (rtos L_GF2 2 2) " mm)"))
|
||||
(princ (ssg-textf "vfs-ausgang-gf2" (list (rtos L_GF2 2 2))))
|
||||
(setq aktueller-punkt
|
||||
(insert-inclined-scaled-block "Staustrecke_SP_1000_mm" aktueller-punkt
|
||||
L_GF2 (ssg-cfg-or "vario" "gefaelle_winkel" 3) hz))
|
||||
)
|
||||
(princ "\n[VF-Ausgang] GF2 (kein / uebersprungen)")
|
||||
(princ (ssg-text "vfs-ausgang-gf2-skip"))
|
||||
)
|
||||
;; Separator (optional, nur Standard-VF)
|
||||
(if mit-separator
|
||||
(progn
|
||||
(princ "\n[VF-Ausgang] Separator (300 mm, 3 Grad geneigt)")
|
||||
(princ (ssg-text "vfs-ausgang-separator"))
|
||||
(setq aktueller-punkt
|
||||
(insert-rotated-block-with-ks "Staustrecke_Separator_SP_300_mm" aktueller-punkt
|
||||
(ssg-cfg-or "vario" "gefaelle_winkel" 3)
|
||||
@@ -678,7 +677,7 @@
|
||||
(if (null hz) (setq hz 0.0))
|
||||
(setq hz (float hz))
|
||||
(setq es-block (strcat "ES_Element_90_" seite))
|
||||
(princ (strcat "\n\n11/11: " es-block " (hz=" (rtos hz 2 1) grad-zeichen ")"))
|
||||
(princ (ssg-textf "vfs-schritt11-es" (list es-block (rtos hz 2 1) grad-zeichen)))
|
||||
(insert-block-by-ks es-block aktueller-punkt hz)
|
||||
)
|
||||
|
||||
@@ -697,7 +696,7 @@
|
||||
(setq endpunkt (vfs-es-teil aktueller-punkt seite hz))
|
||||
|
||||
(princ "\n\n=========================================")
|
||||
(princ "\n>>> Standard VarioFoerderer eingefuegt!")
|
||||
(princ (ssg-text "vfs-eingefuegt"))
|
||||
endpunkt
|
||||
)
|
||||
|
||||
@@ -1288,11 +1287,11 @@
|
||||
(defun c:VARIOFOERDERER_NACHRUESTEN ( / ss i ent ed bname attribs xd typ hz
|
||||
n-neu n-skip default-hz)
|
||||
(ssg-start "VARIOFOERDERER_NACHRUESTEN" nil)
|
||||
(princ "\n=== VF-Bestandsbloecke nachruesten (SSG_VF_EDIT-Marker) ===")
|
||||
(princ (ssg-text "vfs-nachruesten-titel"))
|
||||
(setq ss (ssget '((0 . "INSERT") (2 . "VF_*"))))
|
||||
(if (null ss)
|
||||
(progn
|
||||
(princ "\nKeine VF_n-Bloecke ausgewaehlt - abgebrochen.")
|
||||
(princ (ssg-text "vfs-nachruesten-keine-bloecke"))
|
||||
(ssg-end)
|
||||
(exit)))
|
||||
(setq i 0 n-neu 0 n-skip 0 default-hz 0.0)
|
||||
@@ -1303,7 +1302,7 @@
|
||||
(cond
|
||||
;; Schon markiert (standard/etage) -> ueberspringen
|
||||
((and xd (member (car xd) '("standard" "etage")))
|
||||
(princ (strcat "\n " bname ": bereits markiert (" (car xd) ") - uebersprungen"))
|
||||
(princ (ssg-textf "vfs-nachruesten-bereits-markiert" (list bname (car xd))))
|
||||
(setq n-skip (1+ n-skip)))
|
||||
(t
|
||||
(setq attribs (ssg-attrib-read ent))
|
||||
@@ -1311,17 +1310,17 @@
|
||||
(setq typ
|
||||
(if (or (assoc "GF_Bogen_R_60" attribs) (assoc "GF_Bogen_L_60" attribs))
|
||||
"etage" "standard"))
|
||||
(princ (strcat "\n " bname ": erkannt als Typ '" typ "'"))
|
||||
(setq hz (getreal (strcat "\n Baurichtung hz in Grad [" (rtos default-hz 2 1) "]: ")))
|
||||
(princ (ssg-textf "vfs-nachruesten-erkannt" (list bname typ)))
|
||||
(setq hz (getreal (ssg-textf "vfs-nachruesten-prompt-hz" (list (rtos default-hz 2 1)))))
|
||||
(if (null hz) (setq hz default-hz))
|
||||
(setq default-hz hz)
|
||||
(vf-edit-xdata-schreiben ent typ hz)
|
||||
(princ (strcat " -> markiert (hz=" (rtos hz 2 1) ")"))
|
||||
(princ (ssg-textf "vfs-nachruesten-markiert" (list (rtos hz 2 1))))
|
||||
(setq n-neu (1+ n-neu)))
|
||||
)
|
||||
(setq i (1+ i))
|
||||
)
|
||||
(princ (strcat "\n=== Fertig: " (itoa n-neu) " markiert, " (itoa n-skip) " uebersprungen ==="))
|
||||
(princ (ssg-textf "vfs-nachruesten-fertig" (list (itoa n-neu) (itoa n-skip))))
|
||||
(ssg-end)
|
||||
(princ)
|
||||
)
|
||||
@@ -1336,7 +1335,7 @@
|
||||
"standard"
|
||||
'berechne-standard
|
||||
'variofoerderer-einfuegen
|
||||
"Standard VarioFoerderer (AS/ES 90 Grad, horizontal versetzt)")
|
||||
(ssg-text "vfc-typ-standard-beschreibung"))
|
||||
|
||||
(princ "\n>>> vf_standard.lsp geladen - Typ 'standard' registriert")
|
||||
(princ)
|
||||
|
||||
Reference in New Issue
Block a user