From 2ccf25f7eb1416d679260de936f226f8bdacd366 Mon Sep 17 00:00:00 2001 From: Sigma Dimensions <79010126+myoualid@users.noreply.github.com> Date: Mon, 26 Dec 2022 07:04:11 +0100 Subject: [PATCH] Display Scheduled Resource Usage as a property within rersource tree --- src/blenderbim/blenderbim/bim/module/resource/prop.py | 1 + src/blenderbim/blenderbim/bim/module/resource/ui.py | 1 + src/blenderbim/blenderbim/tool/resource.py | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/blenderbim/blenderbim/bim/module/resource/prop.py b/src/blenderbim/blenderbim/bim/module/resource/prop.py index 789bd9985c..329ad9aa9c 100644 --- a/src/blenderbim/blenderbim/bim/module/resource/prop.py +++ b/src/blenderbim/blenderbim/bim/module/resource/prop.py @@ -78,6 +78,7 @@ def update_active_resource_index(self, context): class Resource(PropertyGroup): name: StringProperty(name="Name", update=updateResourceName) ifc_definition_id: IntProperty(name="IFC Definition ID") + schedule_usage: FloatProperty(name="Schedule Usage") has_children: BoolProperty(name="Has Children") is_expanded: BoolProperty(name="Is Expanded") level_index: IntProperty(name="Level Index") diff --git a/src/blenderbim/blenderbim/bim/module/resource/ui.py b/src/blenderbim/blenderbim/bim/module/resource/ui.py index 1a816a37c6..73774a31cb 100644 --- a/src/blenderbim/blenderbim/bim/module/resource/ui.py +++ b/src/blenderbim/blenderbim/bim/module/resource/ui.py @@ -244,6 +244,7 @@ class BIM_UL_resources(UIList): else: row.label(text="", icon="DOT") row.prop(item, "name", emboss=False, text="", icon=icon_map[resource["type"]]) + row.prop(item, "schedule_usage", text="", emboss=False) if context.active_object and not props.active_resource_id: oprops = context.active_object.BIMObjectProperties row = layout.row(align=True) diff --git a/src/blenderbim/blenderbim/tool/resource.py b/src/blenderbim/blenderbim/tool/resource.py index 62b884c6e1..9d725bde16 100644 --- a/src/blenderbim/blenderbim/tool/resource.py +++ b/src/blenderbim/blenderbim/tool/resource.py @@ -68,7 +68,8 @@ class Resource(blenderbim.core.tool.Resource): props.is_resource_update_enabled = False for item in tprops.resources: resource = tool.Ifc.get().by_id(item.ifc_definition_id) - item.name = resource.Name if resource else "Unnamed" + item.name = resource.Name if resource.Name else "Unnamed" + item.schedule_usage = resource.Usage.ScheduleUsage or 1 if resource.Usage else 0 props.is_resource_update_enabled = True @classmethod