Parametric quantity breakdowns for cost items are now shown

src/ifcopenshell-python/ifcopenshell/api/cost/assign_cost_item_product.py

@@ -21,13 +21,11 @@ class Usecase:
         self.settings["cost_item"].CostQuantities = list(self.quantities)
 
     def add_quantity_from_related_object(self, element):
-        if element.is_a("IfcTypeObject"):
-            for definition in element.HasPropertySets or []:
-                self.add_quantity_from_qto(definition)
-        else:
-            for relationship in element.IsDefinedBy:
-                if relationship.is_a("IfcRelDefinesByProperties"):
-                    self.add_quantity_from_qto(relationship.RelatingPropertyDefinition)
+        if not element.is_a("IfcObject"):
+            return
+        for relationship in element.IsDefinedBy:
+            if relationship.is_a("IfcRelDefinesByProperties"):
+                self.add_quantity_from_qto(relationship.RelatingPropertyDefinition)
 
     def add_quantity_from_qto(self, qto):
         if not qto.is_a("IfcElementQuantity"):

src/ifcopenshell-python/ifcopenshell/api/cost/data.py

@@ -51,21 +51,43 @@ class Data:
             del data["OwnerHistory"]
             del data["CostValues"]
             data["IsNestedBy"] = []
-            data["Controls"] = []
+            data["Controls"] = {}
             for rel in cost_item.IsNestedBy:
                 [data["IsNestedBy"].append(o.id()) for o in rel.RelatedObjects if o.is_a("IfcCostItem")]
+            parametric_quantities = []
             for rel in cost_item.Controls:
-                [data["Controls"].append(o.id()) for o in rel.RelatedObjects or []]
+                for related_object in rel.RelatedObjects or []:
+                    quantities = cls.get_object_quantities(cost_item, related_object)
+                    data["Controls"][related_object.id()] = quantities
+                    parametric_quantities.extend(quantities)
             cls.cost_items[cost_item.id()] = data
-            cls.load_cost_item_quantities(cost_item, data)
+            cls.load_cost_item_quantities(cost_item, data, parametric_quantities)
             cls.load_cost_item_values(cost_item, data)
         cls.is_loaded = True
 
     @classmethod
-    def load_cost_item_quantities(cls, cost_item, data):
+    def get_object_quantities(cls, cost_item, element):
+        if not element.is_a("IfcObject"):
+            return []
+        results = []
+        for relationship in element.IsDefinedBy:
+            if not relationship.is_a("IfcRelDefinesByProperties"):
+                continue
+            qto = relationship.RelatingPropertyDefinition
+            if not qto.is_a("IfcElementQuantity"):
+                continue
+            for prop in qto.Quantities:
+                if prop in cost_item.CostQuantities or []:
+                    results.append(prop.id())
+        return results
+
+    @classmethod
+    def load_cost_item_quantities(cls, cost_item, data, parametric_quantities):
         data["CostQuantities"] = []
         data["TotalCostQuantity"] = cls.get_total_quantity(cost_item)
         for quantity in cost_item.CostQuantities or []:
+            if quantity.id() in parametric_quantities:
+                continue
             quantity_data = quantity.get_info()
             del quantity_data["Unit"]
             cls.physical_quantities[quantity.id()] = quantity_data