From 9257f275afe55c73335a7e68ae8a73d6346528c6 Mon Sep 17 00:00:00 2001 From: Jesusbill Date: Mon, 15 Mar 2021 01:39:35 +0100 Subject: [PATCH] Import structural curve connections + small fixes --- src/ifcblenderexport/blenderbim/bim/import_ifc.py | 4 +++- src/ifcblenderexport/blenderbim/bim/module/structural/prop.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ifcblenderexport/blenderbim/bim/import_ifc.py b/src/ifcblenderexport/blenderbim/bim/import_ifc.py index 1dfbcfe26b..8eee020496 100644 --- a/src/ifcblenderexport/blenderbim/bim/import_ifc.py +++ b/src/ifcblenderexport/blenderbim/bim/import_ifc.py @@ -713,6 +713,8 @@ class IfcImporter: def create_structural_elements(self): self.create_curve_products(self.file.by_type("IfcStructuralCurveMember")) + self.create_curve_products(self.file.by_type("IfcStructuralCurveConnection")) + # self.create_curve_products(self.file.by_type("IfcStructuralPointConnection")) def create_curve_products(self, products): if self.ifc_import_settings.should_use_cpu_multiprocessing: @@ -724,7 +726,7 @@ class IfcImporter: ) else: iterator = ifcopenshell.geom.iterator( - self.settings_2d, self.file, include=self.file.by_type("IfcAnnotation") + self.settings_2d, self.file, include=products ) valid_file = iterator.initialize() if not valid_file: diff --git a/src/ifcblenderexport/blenderbim/bim/module/structural/prop.py b/src/ifcblenderexport/blenderbim/bim/module/structural/prop.py index 36c99a29cf..b54fdc807c 100644 --- a/src/ifcblenderexport/blenderbim/bim/module/structural/prop.py +++ b/src/ifcblenderexport/blenderbim/bim/module/structural/prop.py @@ -21,6 +21,6 @@ class StructuralAnalysisModel(PropertyGroup): class BIMStructuralProperties(PropertyGroup): structural_analysis_model_attributes: CollectionProperty(name="Structural Analysis Model Attributes", type=Attribute) is_editing: BoolProperty(name="Is Editing", default=False) - structural_analysis_models: CollectionProperty(name="structural_analysis_models", type=StructuralAnalysisModel) + structural_analysis_models: CollectionProperty(name="Structural Analysis Models", type=StructuralAnalysisModel) active_structural_analysis_model_index: IntProperty(name="Active Structural Analysis Model Index") active_structural_analysis_model_id: IntProperty(name="Active Structural Analysis Model Id")