kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Arch] fix Arch_Stairs stringer code (#8639)

Browse Source
This commit is contained in:
Roy-043
2023-02-25 00:43:46 +01:00
committed by GitHub
parent 5ba786a70d
commit f713036c24
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Mod/Arch/ArchStairs.py
View File

@@ -1042,16 +1042,15 @@ class _Stairs(ArchComponent.Component):
self.pseudosteps.append(step)
# structure
lProfile = []
struct = None
p1 = p1.add(DraftVecUtils.neg(vNose))
p2 = p1.add(Vector(0,0,-(abs(fHeight) - obj.TreadThickness.Value)))
p3 = p1.add(vLength)
p4 = p3.add(Vector(0,0,-(abs(fHeight) - obj.TreadThickness.Value)))
p3 = p2.add(vLength)
p4 = p1.add(vLength)
if obj.Structure == "Massive":
if obj.StructureThickness.Value:
struct = Part.Face(Part.makePolygon([p1,p2,p4,p3,p1]))
struct = Part.Face(Part.makePolygon([p1,p2,p3,p4,p1]))
evec = vWidth
mvec = FreeCAD.Vector(0,0,0)
if obj.StructureOffset.Value:
@@ -1064,19 +1063,24 @@ class _Stairs(ArchComponent.Component):
struct = struct.extrude(evec)
elif obj.Structure in ["One stringer","Two stringers"]:
if obj.StringerWidth.Value and obj.StructureThickness.Value:
p1b = p1.add(Vector(0,0,-fHeight))
reslength = fHeight/math.tan(a)
p1c = p1.add(DraftVecUtils.scaleTo(vLength,reslength))
p5b = None
p5c = None
if obj.TreadThickness.Value and p5:
reslength = obj.StructureThickness.Value/math.sin(a)
p5b = p5.add(DraftVecUtils.scaleTo(vLength,-reslength))
p1b = p1.add(DraftVecUtils.scaleTo(vLength,reslength))
p1c = p1.add(Vector(0,0,-fHeight))
reslength = obj.StructureThickness.Value/math.cos(a)
p1d = p1c.add(Vector(0,0,-reslength))
reslength = obj.StructureThickness.Value*math.tan(a/2)
p2 = p1b.add(DraftVecUtils.scaleTo(vLength,reslength)).add(Vector(0,0,-obj.StructureThickness.Value))
p3 = p4.add(DraftVecUtils.scaleTo(vLength,reslength)).add(Vector(0,0,-obj.StructureThickness.Value))
if obj.TreadThickness.Value:
reslength = obj.TreadThickness.Value/math.tan(a)
p5c = p5b.add(DraftVecUtils.scaleTo(vLength,-reslength)).add(Vector(0,0,-obj.TreadThickness.Value))
pol = Part.Face(Part.makePolygon([p1c,p1b,p2,p3,p4,p5,p5b,p5c,p1c]))
p3c = p4.add(DraftVecUtils.scaleTo(vLength,reslength)).add(Vector(0,0,obj.TreadThickness.Value))
reslength = obj.StructureThickness.Value/math.sin(a)
p3b = p3c.add(DraftVecUtils.scaleTo(vLength,reslength))
pol = Part.Face(Part.makePolygon([p1b,p1c,p1d,p2,p3,p3b,p3c,p4,p1b]))
else:
pol = Part.Face(Part.makePolygon([p1c,p1b,p2,p3,p4,p5,p1c]))
reslength = obj.StructureThickness.Value/math.sin(a)
p3b = p4.add(DraftVecUtils.scaleTo(vLength,reslength))
pol = Part.Face(Part.makePolygon([p1b,p1c,p1d,p2,p3,p3b,p1b]))
evec = DraftVecUtils.scaleTo(vWidth,obj.StringerWidth.Value)
if obj.Structure == "One stringer":
if obj.StructureOffset.Value: