diff --git a/src/blenderbim/blenderbim/bim/module/cost/__init__.py b/src/blenderbim/blenderbim/bim/module/cost/__init__.py index f5fb62433b..65b68aeca9 100644 --- a/src/blenderbim/blenderbim/bim/module/cost/__init__.py +++ b/src/blenderbim/blenderbim/bim/module/cost/__init__.py @@ -6,11 +6,16 @@ classes = ( operator.RemoveCostSchedule, operator.EditCostSchedule, operator.EditCostItem, + operator.EditCostItemQuantity, operator.EnableEditingCostSchedule, operator.EnableEditingCostItems, operator.EnableEditingCostItem, + operator.EnableEditingCostItemQuantities, + operator.EnableEditingCostItemQuantity, + operator.EnableEditingCostItemValues, operator.DisableEditingCostItem, operator.DisableEditingCostSchedule, + operator.DisableEditingCostItemQuantity, operator.AddCostItem, operator.AddSummaryCostItem, operator.ExpandCostItem, @@ -18,6 +23,8 @@ classes = ( operator.RemoveCostItem, operator.AssignControl, operator.UnassignControl, + operator.AddCostItemQuantity, + operator.RemoveCostItemQuantity, prop.CostItem, prop.BIMCostProperties, ui.BIM_PT_cost_schedules, diff --git a/src/blenderbim/blenderbim/bim/module/cost/operator.py b/src/blenderbim/blenderbim/bim/module/cost/operator.py index 26c31f0c03..6e7a2e40dc 100644 --- a/src/blenderbim/blenderbim/bim/module/cost/operator.py +++ b/src/blenderbim/blenderbim/bim/module/cost/operator.py @@ -242,6 +242,7 @@ class EnableEditingCostItem(bpy.types.Operator): if data[attribute.name()]: new.enum_value = data[attribute.name()] props.active_cost_item_id = self.cost_item + props.cost_item_editing_type = "ATTRIBUTES" return {"FINISHED"} @@ -327,3 +328,132 @@ class UnassignControl(bpy.types.Operator): ) Data.load(self.file) return {"FINISHED"} + + +class EnableEditingCostItemQuantities(bpy.types.Operator): + bl_idname = "bim.enable_editing_cost_item_quantities" + bl_label = "Enable Editing Cost Item Quantities" + cost_item: bpy.props.IntProperty() + + def execute(self, context): + props = context.scene.BIMCostProperties + props.active_cost_item_id = self.cost_item + props.cost_item_editing_type = "QUANTITIES" + return {"FINISHED"} + + +class EnableEditingCostItemValues(bpy.types.Operator): + bl_idname = "bim.enable_editing_cost_item_values" + bl_label = "Enable Editing Cost Item Values" + cost_item: bpy.props.IntProperty() + + def execute(self, context): + props = context.scene.BIMCostProperties + props.active_cost_item_id = self.cost_item + props.cost_item_editing_type = "VALUES" + return {"FINISHED"} + + +class AddCostItemQuantity(bpy.types.Operator): + bl_idname = "bim.add_cost_item_quantity" + bl_label = "Add Cost Item Quantity" + cost_item: bpy.props.IntProperty() + ifc_class: bpy.props.StringProperty() + + def execute(self, context): + self.file = IfcStore.get_file() + ifcopenshell.api.run( + "cost.add_cost_item_quantity", + self.file, + cost_item=self.file.by_id(self.cost_item), + ifc_class=self.ifc_class, + ) + Data.load(self.file) + return {"FINISHED"} + + +class RemoveCostItemQuantity(bpy.types.Operator): + bl_idname = "bim.remove_cost_item_quantity" + bl_label = "Add Cost Item Quantity" + cost_item: bpy.props.IntProperty() + physical_quantity: bpy.props.IntProperty() + + def execute(self, context): + self.file = IfcStore.get_file() + ifcopenshell.api.run( + "cost.remove_cost_item_quantity", + self.file, + cost_item=self.file.by_id(self.cost_item), + physical_quantity=self.file.by_id(self.physical_quantity), + ) + Data.load(self.file) + return {"FINISHED"} + + +class EnableEditingCostItemQuantity(bpy.types.Operator): + bl_idname = "bim.enable_editing_cost_item_quantity" + bl_label = "Enable Editing Cost Item Quantity" + physical_quantity: bpy.props.IntProperty() + + def execute(self, context): + self.props = context.scene.BIMCostProperties + while len(self.props.quantity_attributes) > 0: + self.props.quantity_attributes.remove(0) + self.props.active_cost_item_quantity_id = self.physical_quantity + data = Data.physical_quantities[self.physical_quantity] + + for attribute in IfcStore.get_schema().declaration_by_name(data["type"]).all_attributes(): + data_type = ifcopenshell.util.attribute.get_primitive_type(attribute) + if data_type == "entity": + continue + new = self.props.quantity_attributes.add() + new.name = attribute.name() + new.is_null = data[attribute.name()] is None + new.is_optional = attribute.optional() + new.data_type = data_type + if data_type == "string": + new.string_value = "" if new.is_null else data[attribute.name()] + elif data_type == "float": + new.float_value = 0.0 if new.is_null else data[attribute.name()] + elif data_type == "integer": + new.int_value = 0 if new.is_null else data[attribute.name()] + return {"FINISHED"} + + +class DisableEditingCostItemQuantity(bpy.types.Operator): + bl_idname = "bim.disable_editing_cost_item_quantity" + bl_label = "Disable Editing Cost Item Quantity" + + def execute(self, context): + props = context.scene.BIMCostProperties + props.active_cost_item_quantity_id = 0 + return {"FINISHED"} + + +class EditCostItemQuantity(bpy.types.Operator): + bl_idname = "bim.edit_cost_item_quantity" + bl_label = "Edit Cost Item Quantity" + physical_quantity: bpy.props.IntProperty() + + def execute(self, context): + props = context.scene.BIMCostProperties + attributes = {} + for attribute in props.quantity_attributes: + if attribute.is_null: + attributes[attribute.name] = None + else: + if attribute.data_type == "string": + attributes[attribute.name] = attribute.string_value + if attribute.data_type == "float": + attributes[attribute.name] = attribute.float_value + if attribute.data_type == "integer": + attributes[attribute.name] = attribute.int_value + self.file = IfcStore.get_file() + ifcopenshell.api.run( + "cost.edit_cost_item_quantity", + self.file, + **{"physical_quantity": self.file.by_id(self.physical_quantity), "attributes": attributes}, + ) + Data.load(IfcStore.get_file()) + bpy.ops.bim.disable_editing_cost_item_quantity() + return {"FINISHED"} diff --git a/src/blenderbim/blenderbim/bim/module/cost/prop.py b/src/blenderbim/blenderbim/bim/module/cost/prop.py index 4be8e8399e..6ec1b57444 100644 --- a/src/blenderbim/blenderbim/bim/module/cost/prop.py +++ b/src/blenderbim/blenderbim/bim/module/cost/prop.py @@ -16,6 +16,24 @@ from bpy.props import ( ) +quantitytypes_enum = [] + + +def purge(): + global quantitytypes_enum + quantitytypes_enum = [] + + +def getQuantityTypes(self, context): + global quantitytypes_enum + if len(quantitytypes_enum) == 0 and IfcStore.get_schema(): + quantitytypes_enum.clear() + quantitytypes_enum = [ + (t.name(), t.name(), "") for t in IfcStore.get_schema().declaration_by_name("IfcPhysicalSimpleQuantity").subtypes() + ] + return quantitytypes_enum + + def updateCostItemName(self, context): if self.name == "Unnamed": return @@ -46,6 +64,10 @@ class BIMCostProperties(PropertyGroup): active_cost_schedule_id: IntProperty(name="Active Cost Schedule Id") cost_items: CollectionProperty(name="Work Calendar", type=CostItem) active_cost_item_id: IntProperty(name="Active Cost Id") + cost_item_editing_type: StringProperty(name="Cost Item Editing Type") active_cost_item_index: IntProperty(name="Active Cost Item Index") cost_item_attributes: CollectionProperty(name="Task Attributes", type=Attribute) contracted_cost_items: StringProperty(name="Contracted Cost Items", default="[]") + quantity_types: EnumProperty(items=getQuantityTypes, name="Quantity Types") + active_cost_item_quantity_id: IntProperty(name="Active Cost Item Quantity Id") + quantity_attributes: CollectionProperty(name="Quantity Attributes", type=Attribute) diff --git a/src/blenderbim/blenderbim/bim/module/cost/ui.py b/src/blenderbim/blenderbim/bim/module/cost/ui.py index 8523ba70ed..916b457613 100644 --- a/src/blenderbim/blenderbim/bim/module/cost/ui.py +++ b/src/blenderbim/blenderbim/bim/module/cost/ui.py @@ -72,7 +72,12 @@ class BIM_PT_cost_schedules(Panel): "active_cost_item_index", ) if self.props.active_cost_item_id: - self.draw_editable_cost_item_attributes_ui() + if self.props.cost_item_editing_type == "ATTRIBUTES": + self.draw_editable_cost_item_attributes_ui() + elif self.props.cost_item_editing_type == "QUANTITIES": + self.draw_editable_cost_item_quantities_ui() + elif self.props.cost_item_editing_type == "VALUES": + self.draw_editable_cost_item_values_ui() def draw_editable_cost_item_attributes_ui(self): for attribute in self.props.cost_item_attributes: @@ -88,11 +93,64 @@ class BIM_PT_cost_schedules(Panel): if attribute.is_optional: row.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="") + def draw_editable_cost_item_quantities_ui(self): + row = self.layout.row(align=True) + row.prop(self.props, "quantity_types", text="") + op = row.operator("bim.add_cost_item_quantity", text="", icon="ADD") + op.cost_item = self.props.active_cost_item_id + op.ifc_class = self.props.quantity_types + + for quantity_id in Data.cost_items[self.props.active_cost_item_id]["CostQuantities"]: + quantity = Data.physical_quantities[quantity_id] + value = quantity[[k for k in quantity.keys() if "Value" in k][0]] + row = self.layout.row(align=True) + row.label(text=quantity["Name"]) + row.label(text=str(value)) + if self.props.active_cost_item_quantity_id and self.props.active_cost_item_quantity_id == quantity_id: + op = row.operator("bim.edit_cost_item_quantity", text="", icon="CHECKMARK") + op.physical_quantity = quantity_id + row.operator("bim.disable_editing_cost_item_quantity", text="", icon="CANCEL") + elif self.props.active_cost_item_quantity_id: + op = row.operator("bim.remove_cost_item_quantity", text="", icon="X") + op.cost_item = self.props.active_cost_item_id + op.physical_quantity = quantity_id + else: + op = row.operator("bim.enable_editing_cost_item_quantity", text="", icon="GREASEPENCIL") + op.physical_quantity = quantity_id + op = row.operator("bim.remove_cost_item_quantity", text="", icon="X") + op.cost_item = self.props.active_cost_item_id + op.physical_quantity = quantity_id + + if self.props.active_cost_item_quantity_id and self.props.active_cost_item_quantity_id == quantity_id: + box = self.layout.box() + self.draw_editable_cost_item_quantity_ui(box) + + def draw_editable_cost_item_quantity_ui(self, layout): + for attribute in self.props.quantity_attributes: + row = layout.row(align=True) + if attribute.data_type == "string": + row.prop(attribute, "string_value", text=attribute.name) + elif attribute.data_type == "boolean": + row.prop(attribute, "bool_value", text=attribute.name) + elif attribute.data_type == "integer": + row.prop(attribute, "int_value", text=attribute.name) + elif attribute.data_type == "float": + row.prop(attribute, "float_value", text=attribute.name) + elif attribute.data_type == "enum": + row.prop(attribute, "enum_value", text=attribute.name) + if attribute.is_optional: + row.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="") + + def draw_editable_cost_item_values_ui(self): + row = self.layout.row(align=True) + row.label(text="Editing values!") + class BIM_UL_cost_items(UIList): def draw_item(self, context, layout, data, item, icon, active_data, active_propname): if item: props = context.scene.BIMCostProperties + cost_item = Data.cost_items[item.ifc_definition_id] row = layout.row(align=True) for i in range(0, item.level_index): row.label(text="", icon="BLANK1") @@ -109,10 +167,20 @@ class BIM_UL_cost_items(UIList): row.label(text="", icon="DOT") row.prop(item, "name", emboss=False, text="") + row.label(text="M3") + op = row.operator("bim.enable_editing_cost_item_quantities", text="", icon="PROPERTIES") + op.cost_item = item.ifc_definition_id + row.label(text=str(cost_item["TotalCostQuantities"])) + + op = row.operator("bim.enable_editing_cost_item_values", text="", icon="DISC") + op.cost_item = item.ifc_definition_id + row.label(text="$100") + row.label(text="$1500", icon="CON_TRANSLIKE") + if context.active_object: oprops = context.active_object.BIMObjectProperties row = layout.row(align=True) - if oprops.ifc_definition_id in Data.cost_items[item.ifc_definition_id]["Controls"]: + if oprops.ifc_definition_id in cost_item["Controls"]: op = row.operator("bim.unassign_control", text="", icon="KEYFRAME_HLT", emboss=False) op.cost_item = item.ifc_definition_id else: diff --git a/src/ifcopenshell-python/ifcopenshell/api/cost/add_cost_item_quantity.py b/src/ifcopenshell-python/ifcopenshell/api/cost/add_cost_item_quantity.py new file mode 100644 index 0000000000..e3c92fbda4 --- /dev/null +++ b/src/ifcopenshell-python/ifcopenshell/api/cost/add_cost_item_quantity.py @@ -0,0 +1,18 @@ +import ifcopenshell.api + + +class Usecase: + def __init__(self, file, **settings): + self.file = file + self.settings = {"cost_item": None, "ifc_class": "IfcQuantityCount"} + for key, value in settings.items(): + self.settings[key] = value + + def execute(self): + quantity = self.file.create_entity(self.settings["ifc_class"], Name="Unnamed") + quantity[3] = 0.0 + cost_item = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcCostItem") + quantities = list(self.settings["cost_item"].CostQuantities or []) + quantities.append(quantity) + self.settings["cost_item"].CostQuantities = quantities + return quantity diff --git a/src/ifcopenshell-python/ifcopenshell/api/cost/data.py b/src/ifcopenshell-python/ifcopenshell/api/cost/data.py index ba83cebdf0..b938dd9cda 100644 --- a/src/ifcopenshell-python/ifcopenshell/api/cost/data.py +++ b/src/ifcopenshell-python/ifcopenshell/api/cost/data.py @@ -5,17 +5,20 @@ class Data: is_loaded = False cost_schedules = {} cost_items = {} + physical_quantities = {} @classmethod def purge(cls): cls.is_loaded = False cls.cost_schedules = {} cls.cost_items = {} + cls.physical_quantities = {} @classmethod def load(cls, file): cls.cost_schedules = {} cls.cost_items = {} + cls.physical_quantities = {} for cost_schedule in file.by_type("IfcCostSchedule"): data = cost_schedule.get_info() @@ -36,7 +39,6 @@ class Data: data = cost_item.get_info() del data["OwnerHistory"] del data["CostValues"] - del data["CostQuantities"] data["RelatedObjects"] = [] data["Controls"] = [] for rel in cost_item.IsNestedBy: @@ -44,4 +46,16 @@ class Data: for rel in cost_item.Controls: [data["Controls"].append(o.id()) for o in rel.RelatedObjects or []] cls.cost_items[cost_item.id()] = data + cls.load_cost_item_quantities(cost_item, data) cls.is_loaded=True + + @classmethod + def load_cost_item_quantities(cls, cost_item, data): + data["CostQuantities"] = [] + data["TotalCostQuantities"] = 0.0 + for quantity in cost_item.CostQuantities or []: + quantity_data = quantity.get_info() + del quantity_data["Unit"] + cls.physical_quantities[quantity.id()] = quantity_data + data["CostQuantities"].append(quantity.id()) + data["TotalCostQuantities"] += quantity[3] diff --git a/src/ifcopenshell-python/ifcopenshell/api/cost/edit_cost_item_quantity.py b/src/ifcopenshell-python/ifcopenshell/api/cost/edit_cost_item_quantity.py new file mode 100644 index 0000000000..bbf845d1f7 --- /dev/null +++ b/src/ifcopenshell-python/ifcopenshell/api/cost/edit_cost_item_quantity.py @@ -0,0 +1,10 @@ +class Usecase: + def __init__(self, file, **settings): + self.file = file + self.settings = {"physical_quantity": None, "attributes": {}} + for key, value in settings.items(): + self.settings[key] = value + + def execute(self): + for name, value in self.settings["attributes"].items(): + setattr(self.settings["physical_quantity"], name, value) diff --git a/src/ifcopenshell-python/ifcopenshell/api/cost/remove_cost_item_quantity.py b/src/ifcopenshell-python/ifcopenshell/api/cost/remove_cost_item_quantity.py new file mode 100644 index 0000000000..c7d83ba240 --- /dev/null +++ b/src/ifcopenshell-python/ifcopenshell/api/cost/remove_cost_item_quantity.py @@ -0,0 +1,14 @@ +class Usecase: + def __init__(self, file, **settings): + self.file = file + self.settings = {"cost_item": None, "physical_quantity": None} + for key, value in settings.items(): + self.settings[key] = value + + def execute(self): + if len(self.file.get_inverse(self.settings["physical_quantity"])) == 1: + self.file.remove(self.settings["physical_quantity"]) + return + quantities = list(self.settings["cost_item"].CostQuantities or []) + quantities.remove(self.settings["physical_quantity"]) + self.settings["cost_item"].CostQuantities = quantities