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

Merge pull request #1 from luzpaz/ArchStairs_Improvement_9

Browse Source 
Typo fix for Archstair_Improvement9
This commit is contained in:
paul
2018-10-04 03:30:04 +08:00
committed by Yorik van Havre
parent 294100d95e
commit 1e23a42068
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,7 +332,7 @@ class _Stairs(ArchComponent.Component):
# TODO - To be combined into Width when PropertyLengthList is available # TODO - To be combined into Width when PropertyLengthList is available
if not "WidthOfLanding" in pl: if not "WidthOfLanding" in pl:
obj.addProperty("App::PropertyFloatList","WidthOfLanding","Stairs",QT_TRANSLATE_NOOP("App::Property","The width of a Landing (2nd edge and after - 1st edge follow Width property")) obj.addProperty("App::PropertyFloatList","WidthOfLanding","Stairs",QT_TRANSLATE_NOOP("App::Property","The width of a Landing (Second edge and after - First edge follows Width property"))
# steps properties # steps properties
if not "NumberOfSteps" in pl: if not "NumberOfSteps" in pl:
@@ -691,7 +691,7 @@ class _Stairs(ArchComponent.Component):
def vbaseFollowLastSement(obj, vBase): def vbaseFollowLastSement(obj, vBase):
if obj.LastSegment: if obj.LastSegment:
lastSegmentAbsTop = obj.LastSegment.AbsTop lastSegmentAbsTop = obj.LastSegment.AbsTop
vBase = Vector(vBase.x, vBase.y,lastSegmentAbsTop.z) # use Last Segment top's z-coordinate vBase = Vector(vBase.x, vBase.y,lastSegmentAbsTop.z) # use Last Segment top's z-coordinate
return vBase return vBase
@@ -910,7 +910,7 @@ class _Stairs(ArchComponent.Component):
lastSegmentAbsTop = obj.LastSegment.AbsTop lastSegmentAbsTop = obj.LastSegment.AbsTop
print("lastSegmentAbsTop is: ") print("lastSegmentAbsTop is: ")
print(lastSegmentAbsTop) print(lastSegmentAbsTop)
vBase = Vector(vBase.x, vBase.y,lastSegmentAbsTop.z) # use Last Segment top's z-coordinate vBase = Vector(vBase.x, vBase.y,lastSegmentAbsTop.z) # use Last Segment top's z-coordinate
obj.AbsTop = vBase.add(Vector(0,0,h)) obj.AbsTop = vBase.add(Vector(0,0,h))
vNose = DraftVecUtils.scaleTo(vLength,-abs(obj.Nosing.Value)) vNose = DraftVecUtils.scaleTo(vLength,-abs(obj.Nosing.Value))
@@ -1059,7 +1059,7 @@ class _Stairs(ArchComponent.Component):
hstep = h/obj.NumberOfSteps hstep = h/obj.NumberOfSteps
obj.RiserHeight = hstep obj.RiserHeight = hstep
else: else:
h = obj.RiserHeightEnforce.Value * (obj.NumberOfSteps) h = obj.RiserHeightEnforce.Value * (obj.NumberOfSteps)
hstep = obj.RiserHeightEnforce.Value hstep = obj.RiserHeightEnforce.Value
obj.RiserHeight = hstep obj.RiserHeight = hstep
if obj.Landings == "At center": if obj.Landings == "At center":
@@ -1069,7 +1069,7 @@ class _Stairs(ArchComponent.Component):
if obj.LastSegment: if obj.LastSegment:
lastSegmentAbsTop = obj.LastSegment.AbsTop lastSegmentAbsTop = obj.LastSegment.AbsTop
p1 = Vector(p1.x, p1.y,lastSegmentAbsTop.z) # use Last Segment top's z-coordinate p1 = Vector(p1.x, p1.y,lastSegmentAbsTop.z) # use Last Segment top's z-coordinate
obj.AbsTop = p1.add(Vector(0,0,h)) obj.AbsTop = p1.add(Vector(0,0,h))
p2 = p1.add(DraftVecUtils.scale(vLength,landing-1).add(Vector(0,0,landing*hstep))) p2 = p1.add(DraftVecUtils.scale(vLength,landing-1).add(Vector(0,0,landing*hstep)))
@@ -1079,7 +1079,7 @@ class _Stairs(ArchComponent.Component):
p3 = p2.add(DraftVecUtils.scaleTo(vLength,obj.LandingDepth.Value)) p3 = p2.add(DraftVecUtils.scaleTo(vLength,obj.LandingDepth.Value))
else: else:
p3 = p2.add(DraftVecUtils.scaleTo(vLength,obj.Width.Value)) p3 = p2.add(DraftVecUtils.scaleTo(vLength,obj.Width.Value))
if obj.Flight in ["HalfTurnLeft", "HalfTurnRight"]: if obj.Flight in ["HalfTurnLeft", "HalfTurnRight"]:
if (obj.Align == "Left" and obj.Flight == "HalfTurnLeft") or (obj.Align == "Right" and obj.Flight == "HalfTurnRight"): if (obj.Align == "Left" and obj.Flight == "HalfTurnLeft") or (obj.Align == "Right" and obj.Flight == "HalfTurnRight"):
p3r = p2 p3r = p2