mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-22 16:21:01 +00:00
Fix bug where you couldn't filter imported subelements without also selecting their parents
This commit is contained in:
@@ -1042,6 +1042,8 @@ class IfcImporter:
|
|||||||
def create_aggregate_collections(self):
|
def create_aggregate_collections(self):
|
||||||
if self.ifc_import_settings.has_filter:
|
if self.ifc_import_settings.has_filter:
|
||||||
rel_aggregates = [e.IsDecomposedBy[0] for e in self.elements if e.IsDecomposedBy]
|
rel_aggregates = [e.IsDecomposedBy[0] for e in self.elements if e.IsDecomposedBy]
|
||||||
|
rel_aggregates += [e.Decomposes[0] for e in self.elements if e.Decomposes]
|
||||||
|
rel_aggregates = set(rel_aggregates)
|
||||||
else:
|
else:
|
||||||
rel_aggregates = [a for a in self.file.by_type("IfcRelAggregates") if a.RelatingObject.is_a("IfcElement")]
|
rel_aggregates = [a for a in self.file.by_type("IfcRelAggregates") if a.RelatingObject.is_a("IfcElement")]
|
||||||
|
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ class CopyToContainer(bpy.types.Operator):
|
|||||||
self.file = IfcStore.get_file()
|
self.file = IfcStore.get_file()
|
||||||
objects = list(bpy.data.objects.get(self.obj, context.selected_objects))
|
objects = list(bpy.data.objects.get(self.obj, context.selected_objects))
|
||||||
sprops = context.scene.BIMSpatialProperties
|
sprops = context.scene.BIMSpatialProperties
|
||||||
container_ids = [c.ifc_definition_id for c in sprops.spatial_elements if c.is_selected]
|
container_ids = [c.ifc_definition_id for c in sprops.containers if c.is_selected]
|
||||||
for obj in objects:
|
for obj in objects:
|
||||||
container = ifcopenshell.util.element.get_container(
|
container = ifcopenshell.util.element.get_container(
|
||||||
self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
|
self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
|
||||||
|
|||||||
@@ -54,3 +54,6 @@ class Usecase:
|
|||||||
if not element.is_a("IfcProduct") or not element.ObjectPlacement:
|
if not element.is_a("IfcProduct") or not element.ObjectPlacement:
|
||||||
return
|
return
|
||||||
element.ObjectPlacement = ifcopenshell.util.element.copy(self.file, element.ObjectPlacement)
|
element.ObjectPlacement = ifcopenshell.util.element.copy(self.file, element.ObjectPlacement)
|
||||||
|
element.ObjectPlacement.RelativePlacement = ifcopenshell.util.element.copy_deep(
|
||||||
|
self.file, element.ObjectPlacement.RelativePlacement
|
||||||
|
)
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ class TestCopyClass(test.bootstrap.IFC4):
|
|||||||
new = ifcopenshell.api.run("root.copy_class", self.file, product=element)
|
new = ifcopenshell.api.run("root.copy_class", self.file, product=element)
|
||||||
assert subelement.ObjectPlacement.PlacementRelTo == element.ObjectPlacement
|
assert subelement.ObjectPlacement.PlacementRelTo == element.ObjectPlacement
|
||||||
assert subelement.ObjectPlacement.PlacementRelTo != new.ObjectPlacement
|
assert subelement.ObjectPlacement.PlacementRelTo != new.ObjectPlacement
|
||||||
|
assert element.ObjectPlacement.RelativePlacement != new.ObjectPlacement.RelativePlacement
|
||||||
|
|
||||||
def test_copying_psets_so_changing_properties_of_the_new_element_does_not_affect_the_old(self):
|
def test_copying_psets_so_changing_properties_of_the_new_element_does_not_affect_the_old(self):
|
||||||
element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
|
element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
|
||||||
|
|||||||
Reference in New Issue
Block a user