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

[ArchCurtainWall] Fix Vert-Horiz Mullion Mix-up & Support Swap

Browse Source 
Fix #21845
Curtain wall vertical/horizontal mullion mix-up
- https://github.com/FreeCAD/FreeCAD/issues/21845

Support/Feature #21866
Swap Horizontal Vertical does not work #21866
https://github.com/FreeCAD/FreeCAD/issues/21866
This commit is contained in:
Paul Lee
2025-06-15 16:29:44 +08:00
committed by Yorik van Havre
parent 55696b6a57
commit 147e97d407
1 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/Mod/BIM/ArchCurtainWall.py
View File

@@ -279,16 +279,52 @@ class CurtainWall(ArchComponent.Component):
if not vdir.Length:
vdir = FreeCAD.Vector(0,0,1)
vdir.normalize()
basevector = face.valueAt(fp[1],fp[3]).sub(face.valueAt(fp[0],fp[2]))
a = basevector.getAngle(vdir)
if (a <= math.pi/2+ANGLETOLERANCE) and (a >= math.pi/2-ANGLETOLERANCE):
facedir = True
vertsec = obj.VerticalSections
horizsec = obj.HorizontalSections
else:
facedir = False
vertsec = obj.HorizontalSections
horizsec = obj.VerticalSections
# Check if face if vertical in the first place
# Fix issue in 'Curtain wall vertical/horizontal mullion mix-up'
# https://github.com/FreeCAD/FreeCAD/issues/21845
#
p = face.findPlane() # Curve face (surface) seems return no Plane
if p:
if -0.001 < p.Axis[2] < 0.001: # i.e. face is vertical (normal pointing horizon)
faceVert = True
# Support 'Swap Horizontal Vertical'
# See issue 'Swap Horizontal Vertical does not work'
# https://github.com/FreeCAD/FreeCAD/issues/21866
if obj.SwapHorizontalVertical:
vertsec = obj.HorizontalSections
horizsec = obj.VerticalSections
else:
vertsec = obj.VerticalSections
horizsec = obj.HorizontalSections
else:
faceVert = False
# Guess algorithm if face is not vertical
if not faceVert:
# TODO 2025.6.15 : Need a more robust algorithm below
# See issue 'Curtain wall vertical/horizontal mullion mix-up'
# https://github.com/FreeCAD/FreeCAD/issues/21845
# Partially improved by checking 'if face is vertical' above
#
basevector = face.valueAt(fp[1],fp[3]).sub(face.valueAt(fp[0],fp[2]))
a = basevector.getAngle(vdir)
if (a <= math.pi/2+ANGLETOLERANCE) and (a >= math.pi/2-ANGLETOLERANCE):
facedir = True
if obj.SwapHorizontalVertical:
vertsec = obj.HorizontalSections
horizsec = obj.VerticalSections
else:
vertsec = obj.VerticalSections
horizsec = obj.HorizontalSections
else:
facedir = False
if obj.SwapHorizontalVertical:
vertsec = obj.VerticalSections
horizsec = obj.HorizontalSections
else:
vertsec = obj.HorizontalSections
horizsec = obj.VerticalSections
hstep = (fp[1]-fp[0])
if vertsec: