From 4d4ab634047ed936b4854d772b0bcac85801974b Mon Sep 17 00:00:00 2001
From: Massimo Fabbro <maxfb87@yahoo.it>
Date: Thu, 10 Nov 2022 22:55:01 +0100
Subject: [PATCH] Finish mapping Qto_BeamBaseQuantities

---
 .../bim/module/pset/calc_quantity_function_mapper.py   | 10 +++++-----
 .../blenderbim/bim/module/pset/qto_calculator.py       | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/blenderbim/blenderbim/bim/module/pset/calc_quantity_function_mapper.py b/src/blenderbim/blenderbim/bim/module/pset/calc_quantity_function_mapper.py
index b0ab783e70..ed1093da0d 100644
--- a/src/blenderbim/blenderbim/bim/module/pset/calc_quantity_function_mapper.py
+++ b/src/blenderbim/blenderbim/bim/module/pset/calc_quantity_function_mapper.py
@@ -308,9 +308,9 @@ mapper = {
         'GrossWeight' : None,
     },
     'Qto_ColumnBaseQuantities' : {
-        'Length' : "get_linear_length",
+        'Length' : "get_length",
         'CrossSectionArea' : "get_cross_section_area",
-        'OuterSurfaceArea' : None,
+        'OuterSurfaceArea' : { "function_name" : "get_lateral_area", "args" : ", exclude_end_areas = True, angle_z1 = 0, angle_z2 = 360" },
         'GrossSurfaceArea' : "get_gross_surface_area",
         'NetSurfaceArea' : "get_net_surface_area",
         'GrossVolume' : "get_gross_volume",
@@ -471,10 +471,10 @@ mapper = {
     },
     'Qto_BeamBaseQuantities' : {
         'Length' : "get_length",
-        'CrossSectionArea' : { "function_name" : "get_end_area", "args" : ", exclude_side_areas = True" },
-        'GrossSurfaceArea' : { "function_name" : "get_gross_lateral_area", "args" : ", exclude_end_areas = False, angle_z1 = 0, angle_z2 = 360" },
+        'CrossSectionArea' : "get_cross_section_area",
+        'GrossSurfaceArea' : "get_gross_surface_area",
         'OuterSurfaceArea' : { "function_name" : "get_lateral_area", "args" : ", exclude_end_areas = True, angle_z1 = 0, angle_z2 = 360" },
-        'NetSurfaceArea' : { "function_name" : "get_lateral_area", "args" : ", exclude_end_areas = False, angle_z1 = 0, angle_z2 = 360" },
+        'NetSurfaceArea' : "get_net_surface_area",
         'GrossVolume' : "get_gross_volume",
         'NetVolume' : "get_net_volume",
         'GrossWeight' : None,
diff --git a/src/blenderbim/blenderbim/bim/module/pset/qto_calculator.py b/src/blenderbim/blenderbim/bim/module/pset/qto_calculator.py
index 2b26c602a7..5c8fa13188 100644
--- a/src/blenderbim/blenderbim/bim/module/pset/qto_calculator.py
+++ b/src/blenderbim/blenderbim/bim/module/pset/qto_calculator.py
@@ -251,12 +251,13 @@ class QtoCalculator:
             if item.is_a("IfcExtrudedAreaSolid"):
                 mesh = self.create_mesh_from_shape(item.SweptArea)
                 area = self.get_mesh_area(mesh)
-                bpy.data.meshes.remove(mesh)
+                self.delete_mesh(mesh)
                 return area
             elif item.is_a("IfcBooleanClippingResult"):
                 item = item.FirstOperand
             else:
-                break
+                area = self.get_end_area(obj, exclude_side_areas = True)
+                return area
         # TODO handle other types of sections, and then fall back to mesh parsing
 
     def get_gross_surface_area(self, o, vg_index=None):
@@ -295,20 +296,21 @@ class QtoCalculator:
         o_mesh = bmesh.new()
         o_mesh.from_mesh(o.data)
         volume = o_mesh.calc_volume()
-        bm.free()
+        o_mesh.free()
         return volume
 
     def get_gross_volume(self, o):
         if not self.has_openings(o):
             return self.get_net_volume(o)
 
+        element = tool.Ifc.get_entity(o)
         mesh = self.get_gross_element_mesh(element)
         bm = self.get_bmesh_from_mesh(mesh)
 
         gross_volume = bm.calc_volume()
 
         bm.free()
-        bpy.data.meshes.remove(mesh)
+        self.delete_mesh(mesh)
 
         return gross_volume