export_csv: Separator-TYP (VF/GF) bauzeitig je Separator statt vom Wrapper-Blocknamen ableiten
csv:wrapper-strecke-typ (voriger Ansatz) las den Streckentyp aus dem VF_n/GF_n-Wrapper-Blocknamen - falsch, weil ein einzelner Wrapper intern mehrfach zwischen Foerderer- und Gefaellestrecke-Abschnitten wechseln kann (HundM05 VF_1: 4 Separatoren, 2x VF, 2x GF). Jede Separator-Einfuegestelle in vf_linienzug.lsp/Gefaellestrecke.lsp/vf_standard.lsp/vf_etage.lsp markiert das frisch eingefuegte Staustrecke_Separator_SP_300_mm-Insert jetzt direkt per XDATA (ssg-sep-typ-xdata-schreiben/-lesen, ssg_ks_insert.lsp). Der Export liest den Marker am verpackten Original (nested-ent), nicht mehr am Wrapper. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
c95a94c175
commit
2f56729308
7 files changed
+102
-10
No files matched your search
@@ -3474,6 +3474,7 @@
|
||||
(defun vfl-sep-hz (pt hz / ep)
|
||||
(princ (ssg-text "vfl-sep-horizontal-info"))
|
||||
(setq ep (gf-insert-hz-with-ks "Staustrecke_Separator_SP_300_mm" pt hz 0 *vfk-separator-laenge* 0))
|
||||
(ssg-sep-typ-xdata-schreiben (entlast) "VF")
|
||||
(setq *vfl-acc-separator* (1+ *vfl-acc-separator*))
|
||||
ep)
|
||||
|
||||
@@ -6204,6 +6205,7 @@
|
||||
(setq w (ssg-cfg-or "vario" "gefaelle_winkel" 3))
|
||||
(setq sep-endpunkt
|
||||
(gf-insert-hz-with-ks "Staustrecke_Separator_SP_300_mm" (car frame) hz w *vfk-separator-laenge* 0))
|
||||
(ssg-sep-typ-xdata-schreiben (entlast) "VF")
|
||||
(setq *vfl-acc-separator* (1+ *vfl-acc-separator*))
|
||||
(make-frame-from-dir sep-endpunkt (hz-winkel->xu hz w))
|
||||
)
|
||||
@@ -6222,6 +6224,7 @@
|
||||
(setq w-eff (if (= typ "GF") winkel (ssg-cfg-or "vario" "gefaelle_winkel" 3)))
|
||||
(setq sep-endpunkt
|
||||
(gf-insert-hz-with-ks "Staustrecke_Separator_SP_300_mm" (car frame) hz w-eff *vfk-separator-laenge* 0))
|
||||
(ssg-sep-typ-xdata-schreiben (entlast) typ)
|
||||
(setq sep-frame (make-frame-from-dir sep-endpunkt (hz-winkel->xu hz w-eff)))
|
||||
(if (boundp '*vfl-acc-separator*)
|
||||
(setq *vfl-acc-separator* (1+ *vfl-acc-separator*))) ; Separator vor ES
|
||||
@@ -7249,6 +7252,7 @@
|
||||
(gf-insert-hz-with-ks "Staustrecke_Separator_SP_300_mm"
|
||||
(car frame) hz-neu winkel *vfk-separator-laenge* 0)
|
||||
(hz-winkel->xu hz-neu winkel)))
|
||||
(ssg-sep-typ-xdata-schreiben (entlast) "GF")
|
||||
(setq *vfl-acc-separator* (1+ *vfl-acc-separator*))
|
||||
)
|
||||
)
|
||||
@@ -7272,6 +7276,7 @@
|
||||
(gf-insert-hz-with-ks "Staustrecke_Separator_SP_300_mm"
|
||||
(car frame) hz-neu winkel *vfk-separator-laenge* 0)
|
||||
(hz-winkel->xu hz-neu winkel)))
|
||||
(ssg-sep-typ-xdata-schreiben (entlast) "GF")
|
||||
(setq *vfl-acc-separator* (1+ *vfl-acc-separator*))
|
||||
(setq letzter-typ "Separator")
|
||||
(setq p-aktuell (car frame))
|
||||
@@ -9919,6 +9924,7 @@
|
||||
(gf-insert-hz-with-ks "Staustrecke_Separator_SP_300_mm"
|
||||
(car frame) hz winkel *vfk-separator-laenge* 0)
|
||||
(hz-winkel->xu hz winkel)))
|
||||
(ssg-sep-typ-xdata-schreiben (entlast) "GF")
|
||||
(setq *vfl-acc-separator* (1+ *vfl-acc-separator*))))
|
||||
(setq frame (vfl-insert-gf-segment (car frame) hz deltaL winkel))
|
||||
(vfl-acc-gf-seg (/ deltaL (cos (* winkel (/ pi 180.0)))) winkel)
|
||||
@@ -9929,6 +9935,7 @@
|
||||
(gf-insert-hz-with-ks "Staustrecke_Separator_SP_300_mm"
|
||||
(car frame) hz winkel *vfk-separator-laenge* 0)
|
||||
(hz-winkel->xu hz winkel)))
|
||||
(ssg-sep-typ-xdata-schreiben (entlast) "GF")
|
||||
(setq *vfl-acc-separator* (1+ *vfl-acc-separator*)))))
|
||||
((= typ "Bogen")
|
||||
(setq bwinkel (nth 3 seg) bseite (nth 4 seg) klass (nth 5 seg))
|
||||
@@ -10254,6 +10261,7 @@
|
||||
(gf-insert-hz-with-ks "Staustrecke_Separator_SP_300_mm"
|
||||
(car frame) hz winkel *vfk-separator-laenge* 0)
|
||||
(hz-winkel->xu hz winkel)))
|
||||
(ssg-sep-typ-xdata-schreiben (entlast) "GF")
|
||||
(setq *vfl-acc-separator* (1+ *vfl-acc-separator*))))
|
||||
(setq frame (vfl-insert-gf-segment (car frame) hz deltaL winkel))
|
||||
(vfl-acc-gf-seg (/ deltaL (cos (* winkel (/ pi 180.0)))) winkel)
|
||||
@@ -10264,6 +10272,7 @@
|
||||
(gf-insert-hz-with-ks "Staustrecke_Separator_SP_300_mm"
|
||||
(car frame) hz winkel *vfk-separator-laenge* 0)
|
||||
(hz-winkel->xu hz winkel)))
|
||||
(ssg-sep-typ-xdata-schreiben (entlast) "GF")
|
||||
(setq *vfl-acc-separator* (1+ *vfl-acc-separator*)))))
|
||||
((= typ "Bogen")
|
||||
(setq bwinkel (nth 3 seg) bseite (nth 4 seg) klass (nth 5 seg))
|
||||
|
||||
Reference in new issue
Block a user