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

Minor code review fix

Browse Source
This commit is contained in:
Dion Moult
2021-04-22 10:53:25 +10:00
parent 8b35a3aadd
commit d3ca647cd5
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/cost/__init__.py
+2
View File
@@ -5,9 +5,11 @@ classes = (
operator.AddCostSchedule, operator.AddCostSchedule,
operator.RemoveCostSchedule, operator.RemoveCostSchedule,
operator.EditCostSchedule, operator.EditCostSchedule,
operator.EditCostItem,
operator.EnableEditingCostSchedule, operator.EnableEditingCostSchedule,
operator.EnableEditingCostItems, operator.EnableEditingCostItems,
operator.EnableEditingCostItem, operator.EnableEditingCostItem,
operator.DisableEditingCostItem,
operator.DisableEditingCostSchedule, operator.DisableEditingCostSchedule,
operator.AddCostItem, operator.AddCostItem,
operator.AddSummaryCostItem, operator.AddSummaryCostItem,
src/blenderbim/blenderbim/bim/module/cost/operator.py
+1 -5
View File
@@ -228,7 +228,7 @@ class EnableEditingCostItem(bpy.types.Operator):
for attribute in IfcStore.get_schema().declaration_by_name("IfcCostItem").all_attributes(): for attribute in IfcStore.get_schema().declaration_by_name("IfcCostItem").all_attributes():
data_type = ifcopenshell.util.attribute.get_primitive_type(attribute) data_type = ifcopenshell.util.attribute.get_primitive_type(attribute)
if data_type == "entity": if data_type == "entity" or isinstance(data_type, tuple):
continue continue
new = props.cost_item_attributes.add() new = props.cost_item_attributes.add()
new.name = attribute.name() new.name = attribute.name()
@@ -237,10 +237,6 @@ class EnableEditingCostItem(bpy.types.Operator):
new.data_type = data_type new.data_type = data_type
if data_type == "string": if data_type == "string":
new.string_value = "" if new.is_null else data[attribute.name()] new.string_value = "" if new.is_null else data[attribute.name()]
elif data_type == "boolean":
new.bool_value = False if new.is_null else data[attribute.name()]
elif data_type == "integer":
new.int_value = 0 if new.is_null else data[attribute.name()]
elif data_type == "enum": elif data_type == "enum":
new.enum_items = json.dumps(ifcopenshell.util.attribute.get_enum_items(attribute)) new.enum_items = json.dumps(ifcopenshell.util.attribute.get_enum_items(attribute))
if data[attribute.name()]: if data[attribute.name()]:
src/blenderbim/blenderbim/bim/module/cost/ui.py
+3 -3
View File
@@ -62,9 +62,6 @@ class BIM_PT_cost_schedules(Panel):
if attribute.is_optional: if attribute.is_optional:
row.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="") row.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="")
# row = self.layout.row(align=True)
# row.label(text="X Summary Cost Items")
def draw_editable_cost_item_ui(self, cost_schedule_id): def draw_editable_cost_item_ui(self, cost_schedule_id):
self.layout.template_list( self.layout.template_list(
"BIM_UL_cost_items", "BIM_UL_cost_items",
@@ -125,6 +122,9 @@ class BIM_UL_cost_items(UIList):
if props.active_cost_item_id == item.ifc_definition_id: if props.active_cost_item_id == item.ifc_definition_id:
row.operator("bim.edit_cost_item", text="", icon="CHECKMARK") row.operator("bim.edit_cost_item", text="", icon="CHECKMARK")
row.operator("bim.disable_editing_cost_item", text="", icon="CANCEL") row.operator("bim.disable_editing_cost_item", text="", icon="CANCEL")
elif props.active_cost_item_id:
row.operator("bim.add_cost_item", text="", icon="ADD").cost_item = item.ifc_definition_id
row.operator("bim.remove_cost_item", text="", icon="X").cost_item = item.ifc_definition_id
else: else:
row.operator( row.operator(
"bim.enable_editing_cost_item", text="", icon="GREASEPENCIL" "bim.enable_editing_cost_item", text="", icon="GREASEPENCIL"