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

Fix #3605. Bug where invalid representation type was created when booleans are added / removed.

Browse Source
This commit is contained in:
Dion Moult
2023-08-20 17:11:57 +10:00
parent f84c4ab2e5
commit d26a2580ea
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/api/geometry/add_boolean.py
+16 -2
View File
@@ -39,15 +39,29 @@ class Usecase:
def execute(self): def execute(self):
self.settings["unit_scale"] = ifcopenshell.util.unit.calculate_unit_scale(self.file) self.settings["unit_scale"] = ifcopenshell.util.unit.calculate_unit_scale(self.file)
self.settings["representation"].RepresentationType = "Clipping"
if self.settings["type"] == "IfcHalfSpaceSolid": if self.settings["type"] == "IfcHalfSpaceSolid":
result = self.create_half_space_solid() result = self.create_half_space_solid()
elif self.settings["type"] == "Mesh": elif self.settings["type"] == "Mesh":
if self.settings["blender_obj"]: if self.settings["blender_obj"]:
result = self.create_blender_mesh() result = self.create_blender_mesh()
representation_type = "Clipping"
items = [] items = []
for item in self.settings["representation"].Items: for item in self.settings["representation"].Items:
items.append(self.file.createIfcBooleanResult(self.settings["operator"], item, result)) if self.settings["operator"] == "DIFFERENCE":
queue = [item]
while queue:
queue_item = queue.pop()
if queue_item.is_a() == "IfcBooleanResult":
representation_type = "CSG"
break
if queue_item.is_a("IfcBooleanClippingResult"):
queue.append(item.FirstOperand)
queue.append(item.SecondOperand)
items.append(self.file.createIfcBooleanClippingResult(self.settings["operator"], item, result))
else:
representation_type = "CSG"
items.append(self.file.createIfcBooleanResult(self.settings["operator"], item, result))
self.settings["representation"].RepresentationType = representation_type
self.settings["representation"].Items = items self.settings["representation"].Items = items
def create_half_space_solid(self): def create_half_space_solid(self):
src/ifcopenshell-python/ifcopenshell/api/geometry/remove_boolean.py
+7 -2
View File
@@ -42,8 +42,13 @@ class Usecase:
self.file.remove(item) self.file.remove(item)
ifcopenshell.util.element.remove_deep2(self.file, second_operand) ifcopenshell.util.element.remove_deep2(self.file, second_operand)
if not [i for i in representation.Items if i.is_a("IfcBooleanResult")]: item_classes = {i.is_a() for i in representation.Items}
representation.RepresentationType == "SweptSolid" if "IfcBooleanResult" in item_classes:
representation.RepresentationType = "CSG"
elif "IfcBooleanClippingResult" in item_classes:
representation.RepresentationType = "Clipping"
else:
representation.RepresentationType = "SweptSolid"
def get_representation(self, item): def get_representation(self, item):
for inverse in self.file.get_inverse(item): for inverse in self.file.get_inverse(item):