Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-16 21:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix toggle_cost_item_parent

Browse Source
This commit is contained in:
Sigma Dimensions
2023-05-09 13:25:21 +01:00
parent 184c9f87b2
commit ede3edcf1e
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/cost/prop.py
+1 -1
View File
@@ -137,7 +137,7 @@ class CostItemType(PropertyGroup):
def update_cost_item_parent(self, context): def update_cost_item_parent(self, context):
cost_item = tool.Cost.get_highlighted_cost_item() cost_item = tool.Cost.get_highlighted_cost_item()
tool.Cost.toggle_cost_item_parent(cost_item=cost_item) tool.Cost.toggle_cost_item_parent_change(cost_item=cost_item)
def update_active_cost_item_elements(self, context): def update_active_cost_item_elements(self, context):
src/blenderbim/blenderbim/bim/module/cost/ui.py
+10 -3
View File
@@ -51,7 +51,7 @@ class BIM_PT_cost_schedules(Panel):
row = self.layout.row() row = self.layout.row()
row.prop(self.props, "cost_schedule_predefined_types") row.prop(self.props, "cost_schedule_predefined_types")
row.operator("bim.add_cost_schedule", icon="ADD", text="Add new") row.operator("bim.add_cost_schedule", icon="ADD", text="Add")
for schedule in CostSchedulesData.data["schedules"]: for schedule in CostSchedulesData.data["schedules"]:
self.draw_cost_schedule_ui(schedule) self.draw_cost_schedule_ui(schedule)
@@ -594,7 +594,7 @@ class BIM_UL_cost_items_trait:
layout.label(text=text) layout.label(text=text)
def draw_uom_column(self, layout, cost_item): def draw_uom_column(self, layout, cost_item):
layout.label(text=cost_item["UnitBasisUnitSymbol"] or "?" if cost_item["UnitBasisValueComponent"] else "-") layout.label(text=cost_item["UnitBasisUnitSymbol"] or "-" if cost_item["UnitBasisValueComponent"] else "-")
def draw_order_operator(self, row, ifc_definition_id, cost_item): def draw_order_operator(self, row, ifc_definition_id, cost_item):
if cost_item["NestingIndex"] is not None: if cost_item["NestingIndex"] is not None:
@@ -608,7 +608,14 @@ class BIM_UL_cost_items_trait:
op.new_index = cost_item["NestingIndex"] - 1 op.new_index = cost_item["NestingIndex"] - 1
def draw_total_quantity_column(self, layout, cost_item): def draw_total_quantity_column(self, layout, cost_item):
layout.label(text="{0:.2f}".format(cost_item["TotalCostQuantity"]) + f" {cost_item['UnitSymbol'] or '?'}") layout.label(text="{0:.2f}".format(cost_item["TotalCostQuantity"]) + f" {cost_item['UnitSymbol'] or '-'}")
# if cost_item["DerivedTotalCostQuantity"] not in [None, 0]:
# layout.label(text="{0:.2f}".format(cost_item["DerivedTotalCostQuantity"]) + f" {cost_item['DerivedUnitSymbol'] or '-'}")
# else:
# if cost_item["TotalCostQuantity"] == 0:
# layout.label(text="-")
# else:
# layout.label(text="{0:.2f}".format(cost_item["TotalCostQuantity"]) + f" {cost_item['UnitSymbol'] or '-'}")
class BIM_UL_cost_items(BIM_UL_cost_items_trait, UIList): class BIM_UL_cost_items(BIM_UL_cost_items_trait, UIList):
src/blenderbim/blenderbim/core/cost.py
+2 -3
View File
@@ -268,9 +268,8 @@ def highlight_product_cost_item(spatial, cost, cost_item):
else: else:
return "Cost schedule is not active" return "Cost schedule is not active"
def toggle_cost_item_parent(cost, cost_item):
def toggle_cost_item_parent_change(cost, cost_item): cost.toggle_cost_item_parent(cost_item)
cost.toggle_cost_item_parent_change(cost_item)
def change_parent_cost_item(ifc, cost, new_parent): def change_parent_cost_item(ifc, cost, new_parent):