Doors - clean up + black format

This commit is contained in:
Andrej730
2023-02-06 17:21:25 +05:00
parent 7522a3a2ab
commit e1456533f2
8 changed files with 197 additions and 241 deletions
@@ -24,7 +24,9 @@ from mathutils import Vector
import collections
def create_ifc_door_lining_items(builder: ShapeBuilder, size: Vector, thickness: Vector, position:Vector=V(0,0,0).freeze()):
def create_ifc_door_lining_items(
builder: ShapeBuilder, size: Vector, thickness: Vector, position: Vector = V(0,0,0).freeze()
):
"""`thickness` of the profile is defined as list in the following order: `(SIDE, TOP)`
`thickness` can be also defined just as 1 float value.
@@ -44,7 +46,8 @@ def create_ifc_door_lining_items(builder: ShapeBuilder, size: Vector, thickness:
return items
def create_ifc_box(builder: ShapeBuilder, size: Vector, position:Vector=V(0,0,0).freeze()):
def create_ifc_box(builder: ShapeBuilder, size: Vector, position: Vector = V(0,0,0).freeze()):
rect = builder.rectangle(size.xy)
box = builder.extrude(rect, size.z, position=position, extrusion_vector=V(0,0,1))
return box
@@ -59,61 +62,51 @@ class Usecase:
# http://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcDoorLiningProperties.htm
# http://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcDoorPanelProperties.htm
self.settings = {"unit_scale": ifcopenshell.util.unit.calculate_unit_scale(self.file)}
# TODO: remove upper window from default props after tests
# TODO: check default values with blender props
self.settings.update(
{
"context": None, # IfcGeometricRepresentationContext
"overall_height": self.convert_si_to_unit(0.9),
"overall_width": self.convert_si_to_unit(0.6),
# DOUBLE_DOOR_DOUBLE_SWING, DOUBLE_DOOR_FOLDING, DOUBLE_DOOR_LIFTING_VERTICAL,
# DOUBLE_DOOR_SINGLE_SWING, DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_LEFT,
# DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_RIGHT, DOUBLE_DOOR_SLIDING,
# DOUBLE_SWING_LEFT, DOUBLE_SWING_RIGHT, FOLDING_TO_LEFT,
# FOLDING_TO_RIGHT, LIFTING_HORIZONTAL, LIFTING_VERTICAL_LEFT,
# LIFTING_VERTICAL_RIGHT, REVOLVING, REVOLVING_VERTICAL,
# ROLLINGUP, SINGLE_SWING_LEFT, SINGLE_SWING_RIGHT, SLIDING_TO_LEFT,
"overall_height": self.convert_si_to_unit(2.0),
"overall_width": self.convert_si_to_unit(0.9),
# DOUBLE_DOOR_DOUBLE_SWING, DOUBLE_DOOR_FOLDING, DOUBLE_DOOR_LIFTING_VERTICAL,
# DOUBLE_DOOR_SINGLE_SWING, DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_LEFT,
# DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_RIGHT, DOUBLE_DOOR_SLIDING,
# DOUBLE_SWING_LEFT, DOUBLE_SWING_RIGHT, FOLDING_TO_LEFT,
# FOLDING_TO_RIGHT, LIFTING_HORIZONTAL, LIFTING_VERTICAL_LEFT,
# LIFTING_VERTICAL_RIGHT, REVOLVING, REVOLVING_VERTICAL,
# ROLLINGUP, SINGLE_SWING_LEFT, SINGLE_SWING_RIGHT, SLIDING_TO_LEFT,
# SLIDING_TO_RIGHT, SWING_FIXED_LEFT, SWING_FIXED_RIGHT
# TODO: take into account door types
"operation_type": "SINGLE_SWING_LEFT", # door type
"operation_type": "SINGLE_SWING_LEFT", # door type
"lining_properties": {
"LiningDepth": self.convert_si_to_unit(0.050),
"LiningThickness": self.convert_si_to_unit(0.050),
# offset from the outer side of the wall (by Y-axis)
"LiningOffset": self.convert_si_to_unit(0.050),
"LiningOffset": self.convert_si_to_unit(0.0),
# offset from the wall
"LiningToPanelOffsetX": self.convert_si_to_unit(0.025),
"LiningToPanelOffsetX": self.convert_si_to_unit(0.025),
# offset from the elevation view rectangle (unlike windows)
"LiningToPanelOffsetY": self.convert_si_to_unit(0.025),
# transom - vertical distance between door and window panels
"TransomThickness": self.convert_si_to_unit(0.000),
# TransomOffset - distance from the bottom door opening
# to the beginning of the transom
# unlike windows TransomOffset which goes to the center of the transom
"TransomOffset": self.convert_si_to_unit(1.525),
"ShapeAspectStyle": None, # DEPRECATED
# Casing cover wall faces around the opening
# on the left, right and upper sides
# Casing should be either on both sides of the wall or no casing
# If `LiningOffset` is present then therefore casing is not possible on outer wall
# therefore there will be no casing on inner wall either
"CasingDepth": self.convert_si_to_unit(0.025),
"CasingThickness": self.convert_si_to_unit(0.075), # by Z-axis
# TODO: link to wall thickness?
# therefore there will be no casing on inner wall either
"CasingDepth": self.convert_si_to_unit(0.005),
"CasingThickness": self.convert_si_to_unit(0.075), # by Z-axis
# Threshold covers the bottom side of the opening
"ThresholdDepth": self.convert_si_to_unit(0.025),
"ThresholdThickness": self.convert_si_to_unit(0.025), # by Z-axis
# offset to X-axis
# TODO: offset goes by Z-axis?
"ThresholdOffset": self.convert_si_to_unit(0.025),
# transom - vertical distance between door and window panels
"TransomThickness": self.convert_si_to_unit(0.050),
# TransomOffset - distance from the bottom door opening
# to the beginning of the transom
# unlike windows TransomOffset which goes to the center of the transom
"TransomOffset": self.convert_si_to_unit(0.6),
"ShapeAspectStyle": None, # DEPRECATED
"ThresholdDepth": self.convert_si_to_unit(0.1),
"ThresholdThickness": self.convert_si_to_unit(0.025), # by Z-axis
# offset by Y-axis
"ThresholdOffset": self.convert_si_to_unit(0.000),
},
"panel_properties": {
"PanelDepth": self.convert_si_to_unit(0.030), # by Y
"PanelDepth": self.convert_si_to_unit(0.035), # by Y
"PanelWidth": 1.0, # as ratio to the clear door opening
"FrameDepth": self.convert_si_to_unit(0.035), # by Y
"FrameThickness": self.convert_si_to_unit(0.035), # by X
@@ -129,13 +122,13 @@ class Usecase:
for key, value in settings.items():
self.settings[key] = value
def execute(self):
def execute(self):
builder = ShapeBuilder(self.file)
overall_height = self.settings["overall_height"]
overall_width = self.settings["overall_width"]
door_type = self.settings["operation_type"]
if door_type not in ('SINGLE_SWING_LEFT', 'SINGLE_SWING_RIGHT'):
if door_type not in ("SINGLE_SWING_LEFT", "SINGLE_SWING_RIGHT"):
raise NotImplementedError(f'Door type "{door_type}" is not currently supported.')
if self.settings["context"].TargetView == "ELEVATION_VIEW":
@@ -147,36 +140,36 @@ class Usecase:
lining_props = self.settings["lining_properties"]
# lining params
lining_depth = lining_props['LiningDepth']
lining_thickness_default = lining_props['LiningThickness']
lining_offset = lining_props['LiningOffset']
lining_to_panel_offset_x = lining_props['LiningToPanelOffsetX']
lining_to_panel_offset_y_full = lining_props['LiningToPanelOffsetY']
lining_depth = lining_props["LiningDepth"]
lining_thickness_default = lining_props["LiningThickness"]
lining_offset = lining_props["LiningOffset"]
lining_to_panel_offset_x = lining_props["LiningToPanelOffsetX"]
lining_to_panel_offset_y_full = lining_props["LiningToPanelOffsetY"]
transom_thickness = lining_props['TransomThickness'] / 2
transfom_offset = lining_props['TransomOffset']
transom_thickness = lining_props["TransomThickness"] / 2
transfom_offset = lining_props["TransomOffset"]
if transom_thickness == 0:
transfom_offset = 0
window_lining_height = overall_height - transfom_offset - transom_thickness
top_lining_thickness = transom_thickness or lining_thickness_default
panel_lining_overlap_x = max(lining_thickness_default - lining_to_panel_offset_x, 0)
panel_top_lining_overlap_x = max(top_lining_thickness - lining_to_panel_offset_x, 0)
door_opening_width = (overall_width - lining_to_panel_offset_x * 2)
panel_lining_overlap_x = max(lining_thickness_default - lining_to_panel_offset_x, 0)
panel_top_lining_overlap_x = max(top_lining_thickness - lining_to_panel_offset_x, 0)
door_opening_width = overall_width - lining_to_panel_offset_x * 2
threshold_thickness = lining_props['ThresholdThickness']
threshold_depth = lining_props['ThresholdDepth']
threshold_offset = lining_props['ThresholdOffset']
threshold_thickness = lining_props["ThresholdThickness"]
threshold_depth = lining_props["ThresholdDepth"]
threshold_offset = lining_props["ThresholdOffset"]
threshold_width = overall_width - lining_thickness_default * 2
casing_thickness = lining_props['CasingThickness']
casing_depth = lining_props['CasingDepth']
casing_thickness = lining_props["CasingThickness"]
casing_depth = lining_props["CasingDepth"]
# panel params
panel_depth = panel_props['PanelDepth']
panel_width = door_opening_width * panel_props['PanelWidth']
frame_depth = panel_props['FrameDepth']
frame_thickness = panel_props['FrameThickness']
panel_depth = panel_props["PanelDepth"]
panel_width = door_opening_width * panel_props["PanelWidth"]
frame_depth = panel_props["FrameDepth"]
frame_thickness = panel_props["FrameThickness"]
frame_height = window_lining_height - lining_to_panel_offset_x * 2
glass_thickness = self.convert_si_to_unit(0.01)
@@ -186,7 +179,7 @@ class Usecase:
else:
panel_height = overall_height - lining_to_panel_offset_x - threshold_thickness
lining_height = overall_height
# add lining
lining_size = V(overall_width, lining_depth, lining_height)
lining_thickness = [lining_thickness_default, top_lining_thickness]
@@ -197,7 +190,6 @@ class Usecase:
# create 2d representation
if self.settings["context"].TargetView == "PLAN_VIEW":
items_2d = []
# create lining
@@ -215,13 +207,14 @@ class Usecase:
lining = builder.rectangle(V(lining_thickness_default, lining_depth))
items_2d.append(lining)
items_2d.append(builder.mirror(lining, mirror_axes=V(1,0), mirror_point=V(overall_width/2, 0), create_copy=True))
items_2d.append(
builder.mirror(lining, mirror_axes=V(1, 0), mirror_point=V(overall_width / 2, 0), create_copy=True)
)
# create semi-semi-circle
semicircle = builder.create_ellipse_curve(panel_width-panel_depth,
panel_width,
trim_points_mask=(0,1),
position=V(panel_depth, 0))
semicircle = builder.create_ellipse_curve(
panel_width - panel_depth, panel_width, trim_points_mask=(0, 1), position=V(panel_depth, 0)
)
items_2d.append(semicircle)
# create door
@@ -229,8 +222,8 @@ class Usecase:
items_2d.append(door)
builder.translate([semicircle, door], V(lining_to_panel_offset_x, lining_depth))
if door_type == 'SINGLE_SWING_RIGHT':
if door_type == "SINGLE_SWING_RIGHT":
builder.mirror([semicircle, door], mirror_axes=V(1,0), mirror_point=V(overall_width/2, 0))
representation_2d = builder.get_representation(self.settings["context"], items_2d)
@@ -250,10 +243,9 @@ class Usecase:
second_lining_position = V(0, lining_to_panel_offset_y_full, 0)
second_lining_thickness = [min(th, lining_to_panel_offset_x) for th in lining_thickness]
second_lining = create_ifc_door_lining_items(builder,
second_lining_size,
second_lining_thickness,
second_lining_position)
second_lining = create_ifc_door_lining_items(
builder, second_lining_size, second_lining_thickness, second_lining_position
)
lining_items.extend(second_lining)
main_lining = create_ifc_door_lining_items(builder, main_lining_size, lining_thickness)
@@ -271,30 +263,24 @@ class Usecase:
casing_items = []
if not lining_offset and casing_thickness:
casing_wall_overlap = max(casing_thickness - lining_thickness_default, 0)
casing_size = V(overall_width + casing_wall_overlap*2, casing_depth, overall_height+casing_wall_overlap)
casing_size = V(overall_width + casing_wall_overlap*2, casing_depth, overall_height + casing_wall_overlap)
casing_position = V(-casing_wall_overlap, -casing_depth, 0)
outer_casing_items = create_ifc_door_lining_items(builder, casing_size, casing_thickness, casing_position)
casing_items.extend(outer_casing_items)
inner_casing_thickness = [
casing_thickness-panel_lining_overlap_x,
casing_thickness-panel_top_lining_overlap_x
casing_thickness - panel_lining_overlap_x,
casing_thickness - panel_top_lining_overlap_x,
]
inner_casing_position = V(-casing_wall_overlap, lining_depth, 0)
inner_casing_items = create_ifc_door_lining_items(builder, casing_size, inner_casing_thickness, inner_casing_position)
inner_casing_items = create_ifc_door_lining_items(
builder, casing_size, inner_casing_thickness, inner_casing_position
)
casing_items.extend(inner_casing_items)
# add door panel
panel_size = V(
panel_width,
panel_depth,
panel_height
)
panel_position = V(
lining_to_panel_offset_x,
lining_to_panel_offset_y_full,
threshold_thickness
)
panel_size = V(panel_width, panel_depth, panel_height)
panel_position = V(lining_to_panel_offset_x, lining_to_panel_offset_y_full, threshold_thickness)
panel_items = [create_ifc_box(builder, panel_size, panel_position)]
# add on top window
@@ -303,21 +289,13 @@ class Usecase:
frame_items = []
glass_items = []
else:
window_lining_thickness = [lining_thickness_default] * 3
window_lining_thickness = [lining_thickness_default] * 3
window_lining_thickness.append(transom_thickness)
window_lining_size = V(
overall_width,
lining_depth,
window_lining_height
)
window_position = V(0, 0, overall_height-window_lining_height)
frame_size = V(
door_opening_width,
frame_depth,
frame_height
)
window_lining_size = V(overall_width, lining_depth, window_lining_height)
window_position = V(0, 0, overall_height - window_lining_height)
frame_size = V(door_opening_width, frame_depth, frame_height)
window_lining_items, frame_items, glass_items = create_ifc_window(
builder,
builder,
window_lining_size,
window_lining_thickness,
lining_to_panel_offset_x,
@@ -325,10 +303,10 @@ class Usecase:
frame_size,
frame_thickness,
glass_thickness,
window_position
window_position,
)
lining_offset_items = lining_items+panel_items+window_lining_items+frame_items+glass_items
lining_offset_items = lining_items + panel_items + window_lining_items + frame_items + glass_items
builder.translate(lining_offset_items, V(0, lining_offset, 0))
ouput_items = lining_offset_items + threshold_items + casing_items
@@ -41,12 +41,9 @@ DEFAULT_PANEL_SCHEMAS = {
"TRIPLE_PANEL_VERTICAL": [[0, 1, 2]],
}
def create_ifc_window_frame_simple(
builder,
size: Vector,
thickness: Vector,
position: Vector = V(0,0,0)):
"""`thickness` of the profile is defined as list in the following order:
def create_ifc_window_frame_simple(builder, size: Vector, thickness: Vector, position: Vector = V(0,0,0).freeze()):
"""`thickness` of the profile is defined as list in the following order:
`(LEFT, TOP, RIGHT, BOTTOM)`
`thickness` can be also defined just as 1 float value.
@@ -59,21 +56,14 @@ def create_ifc_window_frame_simple(
panel_rect = builder.rectangle(size=size*V(1,0,1))
inner_rect_size = size - V(th_left+th_right, 0, th_bottom+th_up)
inner_rect = builder.rectangle(
size=inner_rect_size*V(1, 0, 1),
position=V(th_left, 0, th_bottom)
)
inner_rect_size = size - V(th_left + th_right, 0, th_bottom + th_up)
inner_rect = builder.rectangle(size=inner_rect_size * V(1, 0, 1), position=V(th_left, 0, th_bottom))
panel_profile = builder.profile(panel_rect, inner_curves=inner_rect)
panel_extruded = builder.extrude(
panel_profile,
size.y,
extrusion_vector=V(0, 1, 0),
position=position
)
panel_extruded = builder.extrude(panel_profile, size.y, extrusion_vector=V(0, 1, 0), position=position)
return panel_extruded
def create_ifc_window(
builder,
lining_size: Vector,
@@ -83,8 +73,8 @@ def create_ifc_window(
frame_size,
frame_thickness,
glass_thickness,
position: Vector):
position: Vector,
):
lining_items = []
main_lining_size = lining_size
@@ -102,28 +92,21 @@ def create_ifc_window(
second_lining_position = V(0, lining_to_panel_offset_y_full, 0)
second_lining_thickness = [min(th, lining_to_panel_offset_x) for th in lining_thickness]
second_lining = create_ifc_window_frame_simple(builder,
second_lining_size,
second_lining_thickness,
second_lining_position)
second_lining = create_ifc_window_frame_simple(
builder, second_lining_size, second_lining_thickness, second_lining_position
)
lining_items.append(second_lining)
main_lining = create_ifc_window_frame_simple(builder, main_lining_size, lining_thickness)
lining_items.append(main_lining)
frame_position = V(
lining_to_panel_offset_x,
lining_to_panel_offset_y_full,
lining_to_panel_offset_x
)
frame_position = V(lining_to_panel_offset_x, lining_to_panel_offset_y_full, lining_to_panel_offset_x)
frame_extruded = create_ifc_window_frame_simple(builder, frame_size, frame_thickness, frame_position)
glass_position = frame_position + V(0, frame_size.y / 2 - glass_thickness / 2, 0)
glass_rect = builder.deep_copy(frame_extruded.SweptArea.InnerCurves[0])
glass = builder.extrude(
glass_rect, glass_thickness, extrusion_vector=V(0, 1, 0), position=glass_position
)
glass = builder.extrude(glass_rect, glass_thickness, extrusion_vector=V(0, 1, 0), position=glass_position)
output_items = [lining_items, [frame_extruded], [glass]]
builder.translate(chain(*output_items), position)
@@ -211,7 +194,6 @@ class Usecase:
built_panels = []
window_items = []
lining_props = self.settings["lining_properties"]
lining_thickness = lining_props["LiningThickness"]
lining_depth = lining_props["LiningDepth"]
@@ -295,7 +277,7 @@ class Usecase:
# create window panel
current_window_items = create_ifc_window(
builder,
builder,
window_lining_size,
window_lining_thickness,
lining_to_panel_offset_x,
@@ -303,7 +285,7 @@ class Usecase:
frame_size,
frame_thickness,
glass_thickness,
window_panel_position
window_panel_position,
)
built_panels.append(panel_i)
window_items.extend(chain(*current_window_items))