Rechtsschreibkorrektur
This commit is contained in:
+26
-26
@@ -260,9 +260,9 @@ def gefaellegerade_erstellung(
|
||||
):
|
||||
"""erstellung des blockes falls die gefaelle strecke mit einem kreisel verbunden ist, mehrere variation von selben weil diese nötig sind sobald man die richtigen inserts bekommen"""
|
||||
if hasattr(objekt, "foerderer_richtung"):
|
||||
voerder_richtung = objekt.foerderer_richtung
|
||||
foerder_richtung = objekt.foerderer_richtung
|
||||
else:
|
||||
voerder_richtung = None
|
||||
foerder_richtung = None
|
||||
|
||||
laenge = objekt.laenge
|
||||
upper_hoehe_gefaelle = objekt.h1
|
||||
@@ -293,7 +293,7 @@ def gefaellegerade_erstellung(
|
||||
if (
|
||||
(drehung0 == "GUZS" and drehung1 == "GUZS" and hight_position == "higher")
|
||||
or (
|
||||
voerder_richtung == "Auf"
|
||||
foerder_richtung == "Auf"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == False)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == True)
|
||||
@@ -302,7 +302,7 @@ def gefaellegerade_erstellung(
|
||||
and drehung1 == "GUZS"
|
||||
)
|
||||
or (
|
||||
voerder_richtung == "Ab"
|
||||
foerder_richtung == "Ab"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == True)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == False)
|
||||
@@ -314,7 +314,7 @@ def gefaellegerade_erstellung(
|
||||
# Schaut bei ungleicher Orentierung
|
||||
((drehung0 == "UZS" and drehung1 == "GUZS" and hight_position == "higher"))
|
||||
or (
|
||||
voerder_richtung == "Auf"
|
||||
foerder_richtung == "Auf"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == False)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == True)
|
||||
@@ -322,7 +322,7 @@ def gefaellegerade_erstellung(
|
||||
and (drehung0 == "GUZS" and drehung1 == "UZS")
|
||||
)
|
||||
or (
|
||||
voerder_richtung == "Ab"
|
||||
foerder_richtung == "Ab"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == True)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == False)
|
||||
@@ -339,7 +339,7 @@ def gefaellegerade_erstellung(
|
||||
or (am_kreisel != None and drehung0 == "GUZS" and drehung1 == "GUZS")
|
||||
or (drehung0 == "UZS" and drehung1 == "GUZS" and hight_position == "lower")
|
||||
or (
|
||||
voerder_richtung == "Auf"
|
||||
foerder_richtung == "Auf"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == True)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == False)
|
||||
@@ -347,7 +347,7 @@ def gefaellegerade_erstellung(
|
||||
and (drehung0 == "UZS" and drehung1 == "GUZS")
|
||||
)
|
||||
or (
|
||||
voerder_richtung == "Ab"
|
||||
foerder_richtung == "Ab"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == False)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == True)
|
||||
@@ -362,7 +362,7 @@ def gefaellegerade_erstellung(
|
||||
elif (
|
||||
(drehung0 == "UZS" and drehung1 == "UZS" and hight_position == "higher")
|
||||
or (
|
||||
voerder_richtung == "Auf"
|
||||
foerder_richtung == "Auf"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == False)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == True)
|
||||
@@ -371,7 +371,7 @@ def gefaellegerade_erstellung(
|
||||
and drehung1 == "UZS"
|
||||
)
|
||||
or (
|
||||
voerder_richtung == "Ab"
|
||||
foerder_richtung == "Ab"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == True)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == False)
|
||||
@@ -381,7 +381,7 @@ def gefaellegerade_erstellung(
|
||||
)
|
||||
or (drehung0 == "GUZS" and drehung1 == "UZS" and hight_position == "higher")
|
||||
or (
|
||||
voerder_richtung == "Auf"
|
||||
foerder_richtung == "Auf"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == False)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == True)
|
||||
@@ -389,7 +389,7 @@ def gefaellegerade_erstellung(
|
||||
and (drehung0 == "UZS" and drehung1 == "GUZS")
|
||||
)
|
||||
or (
|
||||
voerder_richtung == "Ab"
|
||||
foerder_richtung == "Ab"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == True)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == False)
|
||||
@@ -409,7 +409,7 @@ def gefaellegerade_erstellung(
|
||||
)
|
||||
or (drehung0 == "GUZS" and drehung1 == "UZS" and hight_position == "lower")
|
||||
or (
|
||||
voerder_richtung == "Auf"
|
||||
foerder_richtung == "Auf"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == True)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == False)
|
||||
@@ -417,7 +417,7 @@ def gefaellegerade_erstellung(
|
||||
and (drehung0 == "GUZS" and drehung1 == "UZS")
|
||||
)
|
||||
or (
|
||||
voerder_richtung == "Ab"
|
||||
foerder_richtung == "Ab"
|
||||
and (
|
||||
(am_kreisel == 1 and erster_kreisel_höher == False)
|
||||
or (am_kreisel == 2 and erster_kreisel_höher == True)
|
||||
@@ -434,7 +434,7 @@ def gefaellegerade_erstellung(
|
||||
block_es = block_methoden.dreh_block(
|
||||
block_es, doc, lib_doc, math.radians(winkel_es)
|
||||
)
|
||||
if voerder_richtung == "Auf":
|
||||
if foerder_richtung == "Auf":
|
||||
start = (x, y + dy - esoffset_y, upper_hoehe_gefaelle + esoffset_z)
|
||||
ende = (x, y1, z1)
|
||||
block_vario.add_blockref(
|
||||
@@ -447,7 +447,7 @@ def gefaellegerade_erstellung(
|
||||
dxfattribs={"rotation": 180, "layer": layer, "color": color},
|
||||
)
|
||||
return start, ende
|
||||
elif voerder_richtung == "Ab":
|
||||
elif foerder_richtung == "Ab":
|
||||
start = (x, y1, z1)
|
||||
ende = (x, y - dy + esoffset_y, lower_hoehe_gefaelle + esoffset_z)
|
||||
block_vario.add_blockref(
|
||||
@@ -478,7 +478,7 @@ def gefaellegerade_erstellung(
|
||||
block_as = block_methoden.dreh_block(
|
||||
block_as, doc, lib_doc, math.radians(winkel_as)
|
||||
)
|
||||
if voerder_richtung == "Auf":
|
||||
if foerder_richtung == "Auf":
|
||||
start = (x, y1, z1)
|
||||
ende = (x, y - dy + asoffset_y, lower_hoehe_gefaelle)
|
||||
block_vario.add_blockref(
|
||||
@@ -491,7 +491,7 @@ def gefaellegerade_erstellung(
|
||||
dxfattribs={"rotation": 180, "layer": layer, "color": color},
|
||||
)
|
||||
return start, ende
|
||||
elif voerder_richtung == "Ab":
|
||||
elif foerder_richtung == "Ab":
|
||||
start = (x, y + dy - asoffset_y, upper_hoehe_gefaelle - asoffset_z)
|
||||
ende = (x, y1, z1)
|
||||
block_vario.add_blockref(
|
||||
@@ -525,7 +525,7 @@ def gefaellegerade_erstellung(
|
||||
)
|
||||
else:
|
||||
if (drehung0 == "GUZS" and drehung1 == "GUZS") or (
|
||||
voerder_richtung != None and drehung0 == "GUZS" and drehung1 == "GUZS"
|
||||
foerder_richtung != None and drehung0 == "GUZS" and drehung1 == "GUZS"
|
||||
):
|
||||
block_as = "200000241_AS-Element_90_rechts"
|
||||
block_methoden.import_block(block_as, lib_doc, doc)
|
||||
@@ -550,8 +550,8 @@ def gefaellegerade_erstellung(
|
||||
and hight_position == "lower"
|
||||
)
|
||||
)
|
||||
or (voerder_richtung == "Auf" and drehung0 == "UZS" and drehung1 == "GUZS")
|
||||
or (voerder_richtung == "Ab" and drehung0 == "GUZS" and drehung1 == "UZS")
|
||||
or (foerder_richtung == "Auf" and drehung0 == "UZS" and drehung1 == "GUZS")
|
||||
or (foerder_richtung == "Ab" and drehung0 == "GUZS" and drehung1 == "UZS")
|
||||
):
|
||||
block_as = "200000241_AS-Element_90_rechts"
|
||||
block_methoden.import_block(block_as, lib_doc, doc)
|
||||
@@ -564,7 +564,7 @@ def gefaellegerade_erstellung(
|
||||
lib_doc, block_es
|
||||
)
|
||||
elif (drehung0 == "UZS" and drehung1 == "UZS") or (
|
||||
voerder_richtung != None and drehung0 == "UZS" and drehung1 == "UZS"
|
||||
foerder_richtung != None and drehung0 == "UZS" and drehung1 == "UZS"
|
||||
):
|
||||
block_as = "200000217_AS-Element_90_links"
|
||||
block_methoden.import_block(block_as, lib_doc, doc)
|
||||
@@ -591,8 +591,8 @@ def gefaellegerade_erstellung(
|
||||
)
|
||||
)
|
||||
)
|
||||
or (voerder_richtung == "Auf" and drehung0 == "GUZS" and drehung1 == "UZS")
|
||||
or (voerder_richtung == "Ab" and drehung0 == "UZS" and drehung1 == "GUZS")
|
||||
or (foerder_richtung == "Auf" and drehung0 == "GUZS" and drehung1 == "UZS")
|
||||
or (foerder_richtung == "Ab" and drehung0 == "UZS" and drehung1 == "GUZS")
|
||||
):
|
||||
|
||||
block_as = "200000217_AS-Element_90_links"
|
||||
@@ -644,7 +644,7 @@ def gefaellegerade_erstellung(
|
||||
dxfattribs={"layer": es_layer, "color": es_color},
|
||||
)
|
||||
return
|
||||
if voerder_richtung == "Auf":
|
||||
if foerder_richtung == "Auf":
|
||||
start = (x, y + dy - esoffset_y, upper_hoehe_gefaelle + esoffset_z)
|
||||
ende = (x, y - dy + asoffset, lower_hoehe_gefaelle - asoffset_z)
|
||||
|
||||
@@ -667,7 +667,7 @@ def gefaellegerade_erstellung(
|
||||
dxfattribs={"rotation": 180, "layer": es_layer, "color": es_color},
|
||||
)
|
||||
return start, ende
|
||||
elif voerder_richtung == "Ab":
|
||||
elif foerder_richtung == "Ab":
|
||||
start = (x, y + dy - asoffset_y, upper_hoehe_gefaelle - asoffset_z)
|
||||
ende = (x, y - dy + esoffset_y, lower_hoehe_gefaelle + esoffset_z)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user