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

Qto_Calculator more consistent calculation about the PredefinedType

Browse Source
This commit is contained in:
Massimo Fabbro
2024-04-03 22:11:19 +02:00
committed by Massimo Fabbro
parent 90ed1f9b28
commit 33ceba38a8
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/pset/qto_calculator.py
+11 -11
View File
@@ -268,8 +268,8 @@ class QtoCalculator:
flooring_max_z_value = space_min_z_value flooring_max_z_value = space_min_z_value
for decomposition in decompositions: for decomposition in decompositions:
if ( if (
decomposition.get_info()["PredefinedType"] == "FLOORING" decomposition.is_a() == "IfcCovering"
and decomposition.get_info()["type"] == "IfcCovering" and ifcopenshell.util.element.get_predefined_type(decomposition) == "FLOORING"
): ):
flooring_obj = tool.Ifc.get_object(decomposition) flooring_obj = tool.Ifc.get_object(decomposition)
flooring_z_value = self.get_max_global_z(flooring_obj) flooring_z_value = self.get_max_global_z(flooring_obj)
@@ -287,8 +287,8 @@ class QtoCalculator:
ceiling_min_z_value = space_max_z_value ceiling_min_z_value = space_max_z_value
for decomposition in decompositions: for decomposition in decompositions:
if ( if (
decomposition.get_info()["PredefinedType"] == "CEILING" decomposition.is_a() == "IfcCovering"
and decomposition.get_info()["type"] == "IfcCovering" and ifcopenshell.util.element.get_predefined_type(decomposition) == "CEILING"
): ):
ceiling_obj = tool.Ifc.get_object(decomposition) ceiling_obj = tool.Ifc.get_object(decomposition)
ceiling_z_value = self.get_min_global_z(ceiling_obj) ceiling_z_value = self.get_min_global_z(ceiling_obj)
@@ -390,9 +390,9 @@ class QtoCalculator:
total_gross_ceiling_area = 0 total_gross_ceiling_area = 0
for decomposition in decompositions: for decomposition in decompositions:
decomposition_type = decomposition.get_info()["type"] decomposition_class = decomposition.is_a()
decomposition_predefined_type = decomposition.get_info()["PredefinedType"] decomposition_predefined_type = ifcopenshell.util.element.get_predefined_type(decomposition)
if decomposition_type == "IfcCovering" and decomposition_predefined_type == "CEILING": if decomposition_class == "IfcCovering" and decomposition_predefined_type == "CEILING":
decomposition_obj = tool.Ifc.get_object(decomposition) decomposition_obj = tool.Ifc.get_object(decomposition)
total_gross_ceiling_area += self.get_gross_footprint_area(decomposition_obj) total_gross_ceiling_area += self.get_gross_footprint_area(decomposition_obj)
@@ -406,13 +406,13 @@ class QtoCalculator:
total_net_ceiling_area = 0 total_net_ceiling_area = 0
for decomposition in decompositions: for decomposition in decompositions:
decomposition_type = decomposition.get_info()["type"] decomposition_class = decomposition.is_a()
decomposition_predefined_type = decomposition.get_info()["PredefinedType"] decomposition_predefined_type = ifcopenshell.util.element.get_predefined_type(decomposition)
if decomposition_type == "IfcCovering" and decomposition_predefined_type == "CEILING": if decomposition_class == "IfcCovering" and decomposition_predefined_type == "CEILING":
decomposition_obj = tool.Ifc.get_object(decomposition) decomposition_obj = tool.Ifc.get_object(decomposition)
total_net_ceiling_area += self.get_net_footprint_area(decomposition_obj) total_net_ceiling_area += self.get_net_footprint_area(decomposition_obj)
if decomposition_type == "IfcWall" or decomposition_type == "IfcColumn": if decomposition_class == "IfcWall" or decomposition_class == "IfcColumn":
decomposition_obj = tool.Ifc.get_object(decomposition) decomposition_obj = tool.Ifc.get_object(decomposition)
total_net_ceiling_area -= self.get_net_roofprint_area(decomposition_obj) total_net_ceiling_area -= self.get_net_roofprint_area(decomposition_obj)