Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-24 12:46:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Door fixes

Browse Source 
1) do not create new ifc representation if editing was canceled (similar to 25c650f4c)
2) plan and profile representations now  are optional (similar to 50d71d5ea)
This commit is contained in:
Andrej730
2023-02-10 17:59:51 +05:00
parent 9e383959c8
commit f458aa9932
1 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/model/door.py
+38 -25
View File
@@ -29,7 +29,7 @@ import blenderbim.core.geometry as core
from blenderbim.bim.helper import convert_property_group_from_si from blenderbim.bim.helper import convert_property_group_from_si
from blenderbim.bim.ifc import IfcStore from blenderbim.bim.ifc import IfcStore
from blenderbim.bim.module.model.window import create_bm_window, create_bm_box from blenderbim.bim.module.model.window import create_bm_window, create_bm_box
from blenderbim.bim.module.model.helper import get_ifc_context_or_create, replace_ifc_representation_for_object from blenderbim.bim.module.model.helper import replace_ifc_representation_for_object
from mathutils import Vector, Matrix from mathutils import Vector, Matrix
from pprint import pprint from pprint import pprint
@@ -76,34 +76,38 @@ def update_door_modifier_representation(context):
} }
# ELEVATION_VIEW representation # ELEVATION_VIEW representation
ifc_context = get_ifc_context_or_create(ifc_file, "Model", "Profile", "ELEVATION_VIEW") profile = ifcopenshell.util.representation.get_context(ifc_file, "Model", "Profile", "ELEVATION_VIEW")
representation_data["context"] = ifc_context if profile:
elevation_representation = ifcopenshell.api.run("geometry.add_door_representation", ifc_file, **representation_data) representation_data["context"] = profile
replace_ifc_representation_for_object(ifc_file, ifc_context, obj, elevation_representation) elevation_representation = ifcopenshell.api.run(
"geometry.add_door_representation", ifc_file, **representation_data
)
replace_ifc_representation_for_object(ifc_file, profile, obj, elevation_representation)
# MODEL_VIEW representation # MODEL_VIEW representation
ifc_context = ifcopenshell.util.representation.get_context(ifc_file, "Model", "Body", "MODEL_VIEW") body = ifcopenshell.util.representation.get_context(ifc_file, "Model", "Body", "MODEL_VIEW")
representation_data["context"] = ifc_context representation_data["context"] = body
model_representation = ifcopenshell.api.run("geometry.add_door_representation", ifc_file, **representation_data) model_representation = ifcopenshell.api.run("geometry.add_door_representation", ifc_file, **representation_data)
replace_ifc_representation_for_object(ifc_file, ifc_context, obj, model_representation) replace_ifc_representation_for_object(ifc_file, body, obj, model_representation)
# PLAN_VIEW representation # PLAN_VIEW representation
ifc_context = get_ifc_context_or_create(ifc_file, "Plan", "Body", "PLAN_VIEW") plan = ifcopenshell.util.representation.get_context(ifc_file, "Plan", "Body", "PLAN_VIEW")
representation_data["context"] = ifc_context if plan:
plan_representation = ifcopenshell.api.run("geometry.add_door_representation", ifc_file, **representation_data) representation_data["context"] = plan
replace_ifc_representation_for_object(ifc_file, ifc_context, obj, plan_representation) plan_representation = ifcopenshell.api.run("geometry.add_door_representation", ifc_file, **representation_data)
replace_ifc_representation_for_object(ifc_file, plan, obj, plan_representation)
# adding switch representation at the end instead of changing order of representations # adding switch representation at the end instead of changing order of representations
# to prevent #2744 # to prevent #2744
core.switch_representation( core.switch_representation(
tool.Ifc, tool.Ifc,
tool.Geometry, tool.Geometry,
obj=obj, obj=obj,
representation=model_representation, representation=model_representation,
should_reload=True, should_reload=True,
is_global=True, is_global=True,
should_sync_changes_first=True, should_sync_changes_first=True,
) )
ifc_element.OperationType = props.door_type ifc_element.OperationType = props.door_type
@@ -489,10 +493,19 @@ class CancelEditingDoor(bpy.types.Operator, tool.Ifc.Operator):
# restore previous settings since editing was canceled # restore previous settings since editing was canceled
for prop_name in data: for prop_name in data:
setattr(props, prop_name, data[prop_name]) setattr(props, prop_name, data[prop_name])
update_door_modifier_representation(context)
body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
blenderbim.core.geometry.switch_representation(
tool.Ifc,
tool.Geometry,
obj=obj,
representation=body,
should_reload=True,
is_global=True,
should_sync_changes_first=False,
)
props.is_editing = -1 props.is_editing = -1
return {"FINISHED"} return {"FINISHED"}