From d5159be571b540c216e4d9b3cac8167b88998bfc Mon Sep 17 00:00:00 2001 From: rileywong311 Date: Tue, 1 Aug 2023 22:17:45 -0700 Subject: [PATCH] Reformat Brick props order and singularize "brick_entity_classes" --- src/blenderbim/blenderbim/bim/module/brick/operator.py | 2 +- src/blenderbim/blenderbim/bim/module/brick/prop.py | 10 +++++++--- src/blenderbim/blenderbim/bim/module/brick/ui.py | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/module/brick/operator.py b/src/blenderbim/blenderbim/bim/module/brick/operator.py index bc65f87552..6c01e98266 100644 --- a/src/blenderbim/blenderbim/bim/module/brick/operator.py +++ b/src/blenderbim/blenderbim/bim/module/brick/operator.py @@ -130,7 +130,7 @@ class AddBrick(bpy.types.Operator, Operator): tool.Brick, element=tool.Ifc.get_entity(context.active_object) if context.selected_objects else None, namespace=props.namespace, - brick_class=props.brick_entity_classes, + brick_class=props.brick_entity_class, library=library, label=props.new_brick_label, ) diff --git a/src/blenderbim/blenderbim/bim/module/brick/prop.py b/src/blenderbim/blenderbim/bim/module/brick/prop.py index 42cd0e2ce2..9e4bf77592 100644 --- a/src/blenderbim/blenderbim/bim/module/brick/prop.py +++ b/src/blenderbim/blenderbim/bim/module/brick/prop.py @@ -78,18 +78,22 @@ class BIMBrickProperties(PropertyGroup): bricks: CollectionProperty(name="Bricks", type=Brick) active_brick_index: IntProperty(name="Active Brick Index", update=update_active_brick_index) libraries: EnumProperty(name="Libraries", items=get_libraries) + brick_list_root: EnumProperty(name="Brick List Root", items=get_brick_roots) + # namespace manager namespace: EnumProperty(name="Namespace", items=get_namespaces) - brick_entity_classes: EnumProperty(name="Brick Equipment Class", items=get_brick_entity_classes) brick_settings_toggled: BoolProperty(name="Brick Settings Toggled", default=False) - new_brick_label: StringProperty(name="New Brick Label") new_brick_namespace_alias: StringProperty(name="New Brick Namespace Alias") new_brick_namespace_uri: StringProperty(name="New Brick Namespace URI") - brick_list_root: EnumProperty(name="Brick List Root", items=get_brick_roots) + # create brick entity + new_brick_label: StringProperty(name="New Brick Label") brick_entity_create_type: EnumProperty(name="Brick Entity Types", items=get_brick_roots) + brick_entity_class: EnumProperty(name="Brick Equipment Class", items=get_brick_entity_classes) + # create relations brick_create_relations_toggled: BoolProperty(name="Brick Create Relations Toggled", default=False) brick_edit_relations_toggled: BoolProperty(name="Brick Edit Relations Toggled", default=False) new_brick_relation_type: EnumProperty(name="New Brick Relation Type", items=get_brick_relations) new_brick_relation_namespace: EnumProperty(name="New Brick Relation Namespace", items=get_namespaces) new_brick_relation_object: StringProperty(name="New Brick Relation Object") add_relation_failed: BoolProperty(name="Add Relation Failed", default=False) + # create relations split screen split_screen_toggled: BoolProperty(name="Split Screen Toggled", default=False) \ No newline at end of file diff --git a/src/blenderbim/blenderbim/bim/module/brick/ui.py b/src/blenderbim/blenderbim/bim/module/brick/ui.py index 146a23d307..b68416cc37 100644 --- a/src/blenderbim/blenderbim/bim/module/brick/ui.py +++ b/src/blenderbim/blenderbim/bim/module/brick/ui.py @@ -88,7 +88,7 @@ class BIM_PT_brickschema(Panel): row = self.layout.row(align=True) row.prop(data=self.props, property="new_brick_label", text="") - prop_with_search(row, self.props, "brick_entity_classes", text="") + prop_with_search(row, self.props, "brick_entity_class", text="") row.operator("bim.add_brick", text="", icon="ADD") row = self.layout.row(align=True)