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

Fix #4769. Bug where editing grids didn't work with non-SI units.

Browse Source 
I really don't know how this mistake lasted this long.
This commit is contained in:
Dion Moult
2024-09-07 13:48:42 +10:00
parent c5fc86d148
commit 8b1d3a0c5d
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/api/grid/create_axis_curve.py
+9 -10
View File
@@ -72,15 +72,14 @@ def create_axis_curve(
class Usecase: class Usecase:
def execute(self): def execute(self):
existing_curve = self.settings["grid_axis"].AxisCurve existing_curve = self.settings["grid_axis"].AxisCurve
if existing_curve and len(self.file.get_inverse(existing_curve)) == 1:
ifcopenshell.util.element.remove_deep(self.file, existing_curve)
self.file.remove(existing_curve)
self.settings["unit_scale"] = ifcopenshell.util.unit.calculate_unit_scale(self.file) self.settings["unit_scale"] = ifcopenshell.util.unit.calculate_unit_scale(self.file)
grid = [i for i in self.file.get_inverse(self.settings["grid_axis"]) if i.is_a("IfcGrid")][0] grid = [i for i in self.file.get_inverse(self.settings["grid_axis"]) if i.is_a("IfcGrid")][0]
grid_matrix_i = Matrix(ifcopenshell.util.placement.get_local_placement(grid.ObjectPlacement))
grid_matrix_i.translation *= self.settings["unit_scale"]
grid_matrix_i = grid_matrix_i.inverted()
points = [ points = [
Matrix(ifcopenshell.util.placement.get_local_placement(grid.ObjectPlacement)).inverted() grid_matrix_i @ (self.settings["axis_curve"].matrix_world @ v.co)
@ (self.settings["axis_curve"].matrix_world @ v.co)
for v in self.settings["axis_curve"].data.vertices[0:2] for v in self.settings["axis_curve"].data.vertices[0:2]
] ]
self.settings["grid_axis"].AxisCurve = self.file.createIfcPolyline( self.settings["grid_axis"].AxisCurve = self.file.createIfcPolyline(
@@ -90,13 +89,13 @@ class Usecase:
] ]
) )
def create_cartesian_point(self, x, y, z=None): if existing_curve:
ifcopenshell.util.element.remove_deep2(self.file, existing_curve)
def create_cartesian_point(self, x, y):
x = self.convert_si_to_unit(x) x = self.convert_si_to_unit(x)
y = self.convert_si_to_unit(y) y = self.convert_si_to_unit(y)
if z is None: return self.file.createIfcCartesianPoint((x, y))
return self.file.createIfcCartesianPoint((x, y))
z = self.convert_si_to_unit(z)
return self.file.createIfcCartesianPoint((x, y, z))
def convert_si_to_unit(self, co): def convert_si_to_unit(self, co):
return co / self.settings["unit_scale"] return co / self.settings["unit_scale"]