Kreisel-Attributreihenfolge neu (ID/Bezeichnung/Artinr. zuerst), Artinr.=6200 ergaenzt, N_RAMPEN->ANZAHL_RAMPEN (inkl. Export-Fallback)
This commit is contained in:
+20
-9
@@ -71,18 +71,24 @@
|
|||||||
(setq *kreisel-default-hoehe* (ssg-cfg-or "kreisel" "default_hoehe" 2000.0))
|
(setq *kreisel-default-hoehe* (ssg-cfg-or "kreisel" "default_hoehe" 2000.0))
|
||||||
|
|
||||||
;; Attribut-Definitionen: ((TAG DEFAULT) ...)
|
;; Attribut-Definitionen: ((TAG DEFAULT) ...)
|
||||||
|
;; Anzeige-/Attributreihenfolge im Block (ID zuerst, dann Bezeichnung,
|
||||||
|
;; Artinr. fest 6200, Montage-/Hoehendaten, dann Ausstattung).
|
||||||
|
;; NUMMER steht am Ende (wird intern fuer Nummerierung/Blockname
|
||||||
|
;; benoetigt; Entfernen erfordert Refactor der Nummernvergabe).
|
||||||
(setq *kreisel-attrib-defs*
|
(setq *kreisel-attrib-defs*
|
||||||
'(("Bezeichnung" "")
|
'(("ID" "")
|
||||||
("DREHRICHTUNG" "UZS")
|
("Bezeichnung" "")
|
||||||
("ANZAHL_SEPARATOR" "2")
|
("Artinr." "6200")
|
||||||
|
("MONTAGEHOEHE_m" "0.000")
|
||||||
|
("HOEHE" "0")
|
||||||
("KREISELART" "STANDARD")
|
("KREISELART" "STANDARD")
|
||||||
|
("ABSTAND" "2300")
|
||||||
|
("ANZAHL_SEPARATOR" "2")
|
||||||
("ANZAHL_SCANNER" "0")
|
("ANZAHL_SCANNER" "0")
|
||||||
("N_RAMPEN" "0")
|
("ANZAHL_RAMPEN" "0")
|
||||||
("DREHUNG" "0")
|
("DREHRICHTUNG" "UZS")
|
||||||
("ABSTAND" "2300")
|
("DREHUNG" "0")
|
||||||
("NUMMER" "0")
|
("NUMMER" "0"))
|
||||||
("HOEHE" "0")
|
|
||||||
("ID" ""))
|
|
||||||
)
|
)
|
||||||
|
|
||||||
;; Eckrad-Einstellungen
|
;; Eckrad-Einstellungen
|
||||||
@@ -353,6 +359,11 @@
|
|||||||
(setq attribs (subst (cons "HOEHE" block-hoehe)
|
(setq attribs (subst (cons "HOEHE" block-hoehe)
|
||||||
(assoc "HOEHE" attribs) attribs))
|
(assoc "HOEHE" attribs) attribs))
|
||||||
|
|
||||||
|
;; Montagehoehe in Metern ableiten (Default = HOEHE / 1000, mm->m).
|
||||||
|
;; Bleibt ein normales Attribut und kann vom Benutzer geaendert werden.
|
||||||
|
(setq attribs (subst (cons "MONTAGEHOEHE_m" (rtos (/ z-hoehe 1000.0) 2 3))
|
||||||
|
(assoc "MONTAGEHOEHE_m" attribs) attribs))
|
||||||
|
|
||||||
;; Abgeleitete Masse
|
;; Abgeleitete Masse
|
||||||
(setq radius (/ *kreisel-durchmesser* 2.0))
|
(setq radius (/ *kreisel-durchmesser* 2.0))
|
||||||
(setq pin-y (- radius *kreisel-pin-abstand*))
|
(setq pin-y (- radius *kreisel-pin-abstand*))
|
||||||
|
|||||||
+1
-1
@@ -210,7 +210,7 @@ def build_kreisel_merkmale(block):
|
|||||||
"Anzahl der Separatoren": attribs.get("ANZAHL_SEPARATOR", attribs.get("N_SEPARATOREN", "2")),
|
"Anzahl der Separatoren": attribs.get("ANZAHL_SEPARATOR", attribs.get("N_SEPARATOREN", "2")),
|
||||||
"Kreiselart": attribs.get("KREISELART", "STANDARD"),
|
"Kreiselart": attribs.get("KREISELART", "STANDARD"),
|
||||||
"Anzahl der Scanner": attribs.get("ANZAHL_SCANNER", attribs.get("N_SCANNER", "0")),
|
"Anzahl der Scanner": attribs.get("ANZAHL_SCANNER", attribs.get("N_SCANNER", "0")),
|
||||||
"Anzahl der Rampen": attribs.get("N_RAMPEN", "0"),
|
"Anzahl der Rampen": attribs.get("ANZAHL_RAMPEN", attribs.get("N_RAMPEN", "0")),
|
||||||
"Höhe in m": hoehe_m,
|
"Höhe in m": hoehe_m,
|
||||||
"Drehrichtung": attribs.get("DREHRICHTUNG", "UZS"),
|
"Drehrichtung": attribs.get("DREHRICHTUNG", "UZS"),
|
||||||
"Drehung": block.get("rotation", 0.0),
|
"Drehung": block.get("rotation", 0.0),
|
||||||
|
|||||||
+1
-1
@@ -234,7 +234,7 @@ def build_kreisel_details(block):
|
|||||||
"Abstand (Kreiselachse A - Kreiselachse) in Meter": abstand_m,
|
"Abstand (Kreiselachse A - Kreiselachse) in Meter": abstand_m,
|
||||||
"Anzahl der Separatoren": attribs.get("ANZAHL_SEPARATOR", attribs.get("N_SEPARATOREN", "2")),
|
"Anzahl der Separatoren": attribs.get("ANZAHL_SEPARATOR", attribs.get("N_SEPARATOREN", "2")),
|
||||||
"Anzahl der Scanner": attribs.get("ANZAHL_SCANNER", attribs.get("N_SCANNER", "0")),
|
"Anzahl der Scanner": attribs.get("ANZAHL_SCANNER", attribs.get("N_SCANNER", "0")),
|
||||||
"Anzahl der Rampen": attribs.get("N_RAMPEN", "0"),
|
"Anzahl der Rampen": attribs.get("ANZAHL_RAMPEN", attribs.get("N_RAMPEN", "0")),
|
||||||
"Drehrichtung": attribs.get("DREHRICHTUNG", "UZS"),
|
"Drehrichtung": attribs.get("DREHRICHTUNG", "UZS"),
|
||||||
"Drehung": block.get("rotation", 0.0),
|
"Drehung": block.get("rotation", 0.0),
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user