m.stangl/plant2dxf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Paar namen änderungen

Browse Source
This commit is contained in:
Paul Wolok
2026-01-15 10:12:42 +01:00
parent 53e42c6bc3
commit 2cf0cf688e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Elemente/VarioFoerderer.py
+2 -2
View File
@@ -52,8 +52,8 @@ class VarioFoerderer(BaseModel):
winkel = float(merkmale.get("Winkel")), winkel = float(merkmale.get("Winkel")),
h0 = h0, h0 = h0,
h1 =h1, h1 =h1,
hat_motor = bool(merkmale.get("hatMotor")), hat_motor = bool(merkmale.get("Motorstation_hinten")),
hat_umlenk = bool(merkmale.get("hatUmlenkung")), hat_umlenk = bool(merkmale.get("Spannstation_vorn")),
drehung = float(merkmale.get("Drehung")), drehung = float(merkmale.get("Drehung")),
foerderer_richtung =merkmale.get("Förderrichtung"), foerderer_richtung =merkmale.get("Förderrichtung"),
gefaelle_laenge = gefaelle_laenge, gefaelle_laenge = gefaelle_laenge,
lib/as_es_methoden.py
+9 -9
View File
@@ -4,7 +4,7 @@ import plant2dxf
import block_methoden import block_methoden
RADIUS = 400 RADIUS = 400
def erstellung_gefaelle_block_verbunenden_am_einen(msp,x, y, doc, lib_doc, upper_hoehe_gefaehlle, lower_hoehe_gefaehlle, hoehe_gefaehlle, drehung0, laenge,blockname,config, hight = None, block_vario = None, vario_richtung = None, verbungden_höher = None,gefaelle_block=None,start = None,ende = None,mit_horizontal_verbunden = None): def erstellung_gefaelle_block_verbunenden_am_einen(msp,x, y, doc, lib_doc, upper_hoehe_gefaehlle, lower_hoehe_gefaehlle, hoehe_gefaehlle, drehung0, laenge,blockname,config, hight = None, block_vario = None, vario_richtung = None, verbunden_höher = None,gefaelle_block=None,start = None,ende = None,mit_horizontal_verbunden = None):
halbe_laenge = laenge / 2 halbe_laenge = laenge / 2
dy = halbe_laenge * math.cos(0) dy = halbe_laenge * math.cos(0)
asoffset = float(config.get("ILS 2.0 Gefällestrecke", "asoffset")) asoffset = float(config.get("ILS 2.0 Gefällestrecke", "asoffset"))
@@ -17,26 +17,26 @@ def erstellung_gefaelle_block_verbunenden_am_einen(msp,x, y, doc, lib_doc, upper
esoffset_z = esoffset * math.sin(math.radians(winkel_es)) esoffset_z = esoffset * math.sin(math.radians(winkel_es))
block_as = None block_as = None
block_es = None block_es = None
if (( hight == "higher" and drehung0 == "GUZS" )or (vario_richtung == "Auf"and verbungden_höher == False and drehung0 == "GUZS")or if (( hight == "higher" and drehung0 == "GUZS" )or (vario_richtung == "Auf"and verbunden_höher == False and drehung0 == "GUZS")or
(vario_richtung == "Ab" and verbungden_höher == True and drehung0 == "GUZS")or (vario_richtung == "Horizontal" and drehung0 == "GUZS" and (mit_horizontal_verbunden == "unten_drehung_0_or_-90" or mit_horizontal_verbunden == "oben_drehung_-180_or_-270"))): (vario_richtung == "Ab" and verbunden_höher == True and drehung0 == "GUZS")or (vario_richtung == "Horizontal" and drehung0 == "GUZS" and (mit_horizontal_verbunden == "unten_drehung_0_or_-90" or mit_horizontal_verbunden == "oben_drehung_-180_or_-270"))):
block_as = "200000241_AS-Element_90_rechts" block_as = "200000241_AS-Element_90_rechts"
block_methoden.import_block(block_as,lib_doc,doc) block_methoden.import_block(block_as,lib_doc,doc)
layer, color = block_methoden.get_insert_color_layer(lib_doc, block_as) layer, color = block_methoden.get_insert_color_layer(lib_doc, block_as)
elif ((hight == "lower" and drehung0 == "GUZS") or (vario_richtung == "Auf"and verbungden_höher == True and drehung0 == "GUZS") or elif ((hight == "lower" and drehung0 == "GUZS") or (vario_richtung == "Auf"and verbunden_höher == True and drehung0 == "GUZS") or
(vario_richtung == "Ab" and verbungden_höher == False and drehung0 == "GUZS")or (vario_richtung == "Horizontal" and drehung0 == "GUZS" and (mit_horizontal_verbunden == "oben_drehung_0_or_-90" or mit_horizontal_verbunden == "unten_drehung_-180_or_-270"))): (vario_richtung == "Ab" and verbunden_höher == False and drehung0 == "GUZS")or (vario_richtung == "Horizontal" and drehung0 == "GUZS" and (mit_horizontal_verbunden == "oben_drehung_0_or_-90" or mit_horizontal_verbunden == "unten_drehung_-180_or_-270"))):
block_es = "200000146_ES-Element_90_rechts" block_es = "200000146_ES-Element_90_rechts"
block_methoden.import_block(block_es,lib_doc,doc) block_methoden.import_block(block_es,lib_doc,doc)
layer, color = block_methoden.get_insert_color_layer(lib_doc, block_es) layer, color = block_methoden.get_insert_color_layer(lib_doc, block_es)
elif ((hight == "higher" and drehung0 == "UZS")or (vario_richtung == "Auf"and verbungden_höher == False and drehung0 == "UZS") or elif ((hight == "higher" and drehung0 == "UZS")or (vario_richtung == "Auf"and verbunden_höher == False and drehung0 == "UZS") or
(vario_richtung == "Ab" and verbungden_höher == True and drehung0 == "UZS")or (vario_richtung == "Horizontal" and drehung0 == "UZS" and (mit_horizontal_verbunden == "unten_drehung_0_or_-90" or mit_horizontal_verbunden == "oben_drehung_-180_or_-270"))): (vario_richtung == "Ab" and verbunden_höher == True and drehung0 == "UZS")or (vario_richtung == "Horizontal" and drehung0 == "UZS" and (mit_horizontal_verbunden == "unten_drehung_0_or_-90" or mit_horizontal_verbunden == "oben_drehung_-180_or_-270"))):
block_as = "200000217_AS-Element_90_links" block_as = "200000217_AS-Element_90_links"
block_methoden.import_block(block_as,lib_doc,doc) block_methoden.import_block(block_as,lib_doc,doc)
layer, color = block_methoden.get_insert_color_layer(lib_doc, block_as) layer, color = block_methoden.get_insert_color_layer(lib_doc, block_as)
elif (( hight == "lower" and drehung0 == "UZS") or (vario_richtung == "Auf" and verbungden_höher == True and drehung0 == "UZS") or elif (( hight == "lower" and drehung0 == "UZS") or (vario_richtung == "Auf" and verbunden_höher == True and drehung0 == "UZS") or
(vario_richtung == "Ab" and verbungden_höher == False and drehung0 == "UZS")or (vario_richtung == "Horizontal" and drehung0 == "UZS" and (mit_horizontal_verbunden == "oben_drehung_0_or_-90" or mit_horizontal_verbunden == "unten_drehung_-180_or_-270"))): (vario_richtung == "Ab" and verbunden_höher == False and drehung0 == "UZS")or (vario_richtung == "Horizontal" and drehung0 == "UZS" and (mit_horizontal_verbunden == "oben_drehung_0_or_-90" or mit_horizontal_verbunden == "unten_drehung_-180_or_-270"))):
block_es = "400102632_ES-Element_90_links" block_es = "400102632_ES-Element_90_links"
block_methoden.import_block(block_es,lib_doc,doc) block_methoden.import_block(block_es,lib_doc,doc)
layer, color = block_methoden.get_insert_color_layer(lib_doc, block_es) layer, color = block_methoden.get_insert_color_layer(lib_doc, block_es)