Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-18 22:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #6014. Incorrect units used for position matrix when detecting profiles. Fix by @brunoperdigao

Browse Source
This commit is contained in:
Dion Moult
2025-01-25 15:20:01 +11:00
parent 38835a4092
commit 83368d7ee1
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/bim/module/model/slab.py
-2
View File
@@ -605,7 +605,6 @@ def disable_editing_extrusion_profile(context):
element = tool.Ifc.get_entity(obj) element = tool.Ifc.get_entity(obj)
body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW") body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
profile_mesh = obj.data
bonsai.core.geometry.switch_representation( bonsai.core.geometry.switch_representation(
tool.Ifc, tool.Ifc,
tool.Geometry, tool.Geometry,
@@ -705,7 +704,6 @@ class EditExtrusionProfile(bpy.types.Operator, tool.Ifc.Operator):
ifcopenshell.util.element.replace_attribute(inverse, old_profile, profile) ifcopenshell.util.element.replace_attribute(inverse, old_profile, profile)
ifcopenshell.util.element.remove_deep2(tool.Ifc.get(), old_profile) ifcopenshell.util.element.remove_deep2(tool.Ifc.get(), old_profile)
profile_mesh = obj.data
bonsai.core.geometry.switch_representation( bonsai.core.geometry.switch_representation(
tool.Ifc, tool.Ifc,
tool.Geometry, tool.Geometry,
src/bonsai/bonsai/tool/model.py
+10 -10
View File
@@ -1708,8 +1708,8 @@ class Model(bonsai.core.tool.Model):
if len(loop) == 1 and all([is_in_group(v, "IFCCIRCLE") for v in loop[0].verts]): if len(loop) == 1 and all([is_in_group(v, "IFCCIRCLE") for v in loop[0].verts]):
v1, v2 = loop[0].verts v1, v2 = loop[0].verts
mid = v1.co.lerp(v2.co, 0.5) mid = v1.co.lerp(v2.co, 0.5)
mid = (position_i @ (mid / unit_scale)).to_2d() mid = ((position_i @ mid) / unit_scale).to_2d()
v1 = (position_i @ (v1.co / unit_scale)).to_2d() v1 = ((position_i @ v1.co) / unit_scale).to_2d()
radius = (mid - v1).length radius = (mid - v1).length
curves.append( curves.append(
tmp.createIfcCircle(tmp.createIfcAxis2Placement2D(tmp.createIfcCartesianPoint(list(mid))), radius) tmp.createIfcCircle(tmp.createIfcAxis2Placement2D(tmp.createIfcCartesianPoint(list(mid))), radius)
@@ -1749,7 +1749,7 @@ class Model(bonsai.core.tool.Model):
if tmp.schema != "IFC2X3" and any([is_in_group(v, "IFCARCINDEX") for v in loop_verts]): if tmp.schema != "IFC2X3" and any([is_in_group(v, "IFCARCINDEX") for v in loop_verts]):
# We need to specify segments # We need to specify segments
coord_list = [list((position_i @ (v.co / unit_scale)).to_2d()) for v in loop_verts] coord_list = [list(((position_i @ v.co) / unit_scale).to_2d()) for v in loop_verts]
points = tmp.createIfcCartesianPointList2D(coord_list) points = tmp.createIfcCartesianPointList2D(coord_list)
i = 0 i = 0
segments = [] segments = []
@@ -1775,14 +1775,14 @@ class Model(bonsai.core.tool.Model):
curves.append(tmp.createIfcIndexedPolyCurve(points, segments)) curves.append(tmp.createIfcIndexedPolyCurve(points, segments))
elif tmp.schema == "IFC2X3": elif tmp.schema == "IFC2X3":
points = [ points = [
tmp.createIfcCartesianPoint(list((position_i @ (v.co / unit_scale)).to_2d())) tmp.createIfcCartesianPoint(list(((position_i @ v.co) / unit_scale).to_2d()))
for v in loop_verts for v in loop_verts
] ]
if is_closed: if is_closed:
points.append(points[0]) points.append(points[0])
curves.append(tmp.createIfcPolyline(points)) curves.append(tmp.createIfcPolyline(points))
else: # Pure straight polyline, no segments required else: # Pure straight polyline, no segments required
coord_list = [list((position_i @ (v.co / unit_scale)).to_2d()) for v in loop_verts] coord_list = [list(((position_i @ v.co) / unit_scale).to_2d()) for v in loop_verts]
if is_closed: if is_closed:
coord_list.append(coord_list[0]) coord_list.append(coord_list[0])
points = tmp.createIfcCartesianPointList2D(coord_list) points = tmp.createIfcCartesianPointList2D(coord_list)
@@ -1926,8 +1926,8 @@ class Model(bonsai.core.tool.Model):
if len(loop) == 1 and all([is_in_group(v, "IFCCIRCLE") for v in loop[0].verts]): if len(loop) == 1 and all([is_in_group(v, "IFCCIRCLE") for v in loop[0].verts]):
v1, v2 = loop[0].verts v1, v2 = loop[0].verts
mid = v1.co.lerp(v2.co, 0.5) mid = v1.co.lerp(v2.co, 0.5)
mid = (position_i @ (mid / unit_scale)).to_2d() mid = ((position_i @ mid) / unit_scale).to_2d()
v1 = (position_i @ (v1.co / unit_scale)).to_2d() v1 = ((position_i @ v1.co) / unit_scale).to_2d()
radius = (mid - v1).length radius = (mid - v1).length
curves.append( curves.append(
tmp.createIfcCircle(tmp.createIfcAxis2Placement2D(tmp.createIfcCartesianPoint(list(mid))), radius) tmp.createIfcCircle(tmp.createIfcAxis2Placement2D(tmp.createIfcCartesianPoint(list(mid))), radius)
@@ -1968,7 +1968,7 @@ class Model(bonsai.core.tool.Model):
if tmp.schema != "IFC2X3" and any([is_in_group(v, "IFCARCINDEX") for v in loop_verts]): if tmp.schema != "IFC2X3" and any([is_in_group(v, "IFCARCINDEX") for v in loop_verts]):
# We need to specify segments # We need to specify segments
coord_list: list[list[float]] = [ coord_list: list[list[float]] = [
list((position_i @ (v.co / unit_scale)).to_2d()) for v in loop_verts list(((position_i @ v.co) / unit_scale).to_2d()) for v in loop_verts
] ]
points = tmp.createIfcCartesianPointList2D(coord_list) points = tmp.createIfcCartesianPointList2D(coord_list)
i = 0 i = 0
@@ -1995,14 +1995,14 @@ class Model(bonsai.core.tool.Model):
curves.append(tmp.createIfcIndexedPolyCurve(points, segments)) curves.append(tmp.createIfcIndexedPolyCurve(points, segments))
elif tmp.schema == "IFC2X3": elif tmp.schema == "IFC2X3":
points = [ points = [
tmp.createIfcCartesianPoint(list((position_i @ (v.co / unit_scale)).to_2d())) tmp.createIfcCartesianPoint(list(((position_i @ v.co) / unit_scale).to_2d()))
for v in loop_verts for v in loop_verts
] ]
if is_closed: if is_closed:
points.append(points[0]) points.append(points[0])
curves.append(tmp.createIfcPolyline(points)) curves.append(tmp.createIfcPolyline(points))
else: # Pure straight polyline, no segments required else: # Pure straight polyline, no segments required
coord_list = [list((position_i @ (v.co / unit_scale)).to_2d()) for v in loop_verts] coord_list = [list(((position_i @ v.co) / unit_scale).to_2d()) for v in loop_verts]
if is_closed: if is_closed:
coord_list.append(coord_list[0]) coord_list.append(coord_list[0])
points = tmp.createIfcCartesianPointList2D(coord_list) points = tmp.createIfcCartesianPointList2D(coord_list)