Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-11 06:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

you can now edit a structural connection coordinate system

Browse Source
This commit is contained in:
Jesusbill
2021-05-12 17:43:07 +02:00
parent 0276c8271e
commit 75ed4dcdd8
6 changed files with 114 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/structural/__init__.py
+5 -5
View File
@@ -23,9 +23,9 @@ classes = (
operator.EnableEditingStructuralItemAxis,
operator.DisableEditingStructuralItemAxis,
operator.EditStructuralItemAxis,
operator.EnableEditingStructuralItemConnectionCS,
operator.DisableEditingStructuralItemConnectionCS,
operator.EditStructuralItemConnectionCS,
operator.EnableEditingStructuralConnectionCS,
operator.DisableEditingStructuralConnectionCS,
operator.EditStructuralConnectionCS,
operator.AddStructuralLoadCase,
operator.EditStructuralLoadCase,
operator.RemoveStructuralLoadCase,
@@ -41,10 +41,10 @@ classes = (
prop.BIMStructuralProperties,
prop.BIMObjectStructuralProperties,
ui.BIM_PT_structural_analysis_models,
ui.BIM_PT_structural_boundary_conditions,
ui.BIM_PT_connected_structural_members,
ui.BIM_PT_structural_member,
ui.BIM_PT_structural_connection,
ui.BIM_PT_structural_boundary_conditions,
ui.BIM_PT_connected_structural_members,
ui.BIM_UL_structural_analysis_models,
ui.BIM_UL_structural_activities,
ui.BIM_PT_structural_load_cases,
src/blenderbim/blenderbim/bim/module/structural/operator.py
+40 -33
View File
@@ -441,8 +441,8 @@ class EditStructuralItemAxis(bpy.types.Operator):
return {"FINISHED"}
class EnableEditingStructuralItemConnectionCS(bpy.types.Operator):
bl_idname = "bim.enable_editing_structural_item_connection_cs"
class EnableEditingStructuralConnectionCS(bpy.types.Operator):
bl_idname = "bim.enable_editing_structural_connection_cs"
bl_label = "Enable Editing Structural Item Connection CS"
def execute(self, context):
@@ -452,65 +452,72 @@ class EnableEditingStructuralItemConnectionCS(bpy.types.Operator):
self.file = IfcStore.get_file()
item = self.file.by_id(oprops.ifc_definition_id)
z_axis = Vector(item.Axis.DirectionRatios).normalized() @ obj.matrix_world if item.Axis else None
x_axis = (obj.data.vertices[1].co - obj.data.vertices[0].co).normalized()
location = obj.data.vertices[0].co
empty = bpy.data.objects.new("Item Connection CS", None)
empty.empty_display_type = "ARROWS"
if z_axis:
y_axis = (z_axis.cross(x_axis)).normalized()
empty.matrix_world = Matrix(
(
(x_axis[0], y_axis[0], z_axis[0], location[0]),
(x_axis[1], y_axis[1], z_axis[1], location[1]),
(x_axis[2], y_axis[2], z_axis[2], location[2]),
(0, 0, 0, 1),
)
)
else:
empty.location = location
empty.rotation_mode = "QUATERNION"
empty.rotation_quaternion = x_axis.to_track_quat("X", "Z")
empty.location = location
props.axis_angle = degrees(empty.rotation_euler[0])
props.axis_empty = empty
if item.ConditionCoordinateSystem is not None:
z_axis = Vector(item.ConditionCoordinateSystem.Axis.DirectionRatios).normalized() @ obj.matrix_world if item.ConditionCoordinateSystem.Axis else None
x_axis = Vector(item.ConditionCoordinateSystem.RefDirection.DirectionRatios).normalized() @ obj.matrix_world if item.ConditionCoordinateSystem.RefDirection else None
if z_axis:
y_axis = (z_axis.cross(x_axis)).normalized()
x_axis = (y_axis.cross(z_axis)).normalized()
empty.matrix_world = Matrix(
(
(x_axis[0], y_axis[0], z_axis[0], location[0]),
(x_axis[1], y_axis[1], z_axis[1], location[1]),
(x_axis[2], y_axis[2], z_axis[2], location[2]),
(0, 0, 0, 1),
)
)
props.ccs_x_angle = degrees(empty.rotation_euler[0])
props.ccs_y_angle = degrees(empty.rotation_euler[1])
props.ccs_z_angle = degrees(empty.rotation_euler[2])
props.ccs_empty = empty
context.scene.collection.objects.link(empty)
props.is_editing_axis = True
props.is_editing_connection_cs = True
return {"FINISHED"}
class DisableEditingStructuralItemConnectionCS(bpy.types.Operator):
bl_idname = "bim.disable_editing_structural_item_connection_cs"
bl_label = "Disable Editing Structural Item Connection CS"
class DisableEditingStructuralConnectionCS(bpy.types.Operator):
bl_idname = "bim.disable_editing_structural_connection_cs"
bl_label = "Disable Editing Structural Connection CS"
def execute(self, context):
obj = bpy.context.active_object
props = obj.BIMStructuralProperties
props.is_editing_axis = False
if props.axis_empty:
bpy.data.objects.remove(props.axis_empty)
props.is_editing_connection_cs = False
if props.ccs_empty:
bpy.data.objects.remove(props.ccs_empty)
return {"FINISHED"}
class EditStructuralItemConnectionCS(bpy.types.Operator):
bl_idname = "bim.edit_structural_item_connection_cs"
bl_label = "Edit Structural Item Connection CS"
class EditStructuralConnectionCS(bpy.types.Operator):
bl_idname = "bim.edit_structural_connection_cs"
bl_label = "Edit Structural Connection CS"
def execute(self, context):
obj = bpy.context.active_object
oprops = obj.BIMObjectProperties
props = obj.BIMStructuralProperties
relative_matrix = props.axis_empty.matrix_world @ obj.matrix_world.inverted()
relative_matrix = props.ccs_empty.matrix_world @ obj.matrix_world.inverted()
x_axis = relative_matrix.col[0][0:3]
z_axis = relative_matrix.col[2][0:3]
self.file = IfcStore.get_file()
ifcopenshell.api.run(
"structural.edit_structural_item_connection_cs",
"structural.edit_structural_connection_cs",
self.file,
structural_item=self.file.by_id(oprops.ifc_definition_id),
axis=z_axis,
ref_direction=x_axis,
)
bpy.ops.bim.disable_editing_structural_item_axis()
bpy.ops.bim.disable_editing_structural_connection_cs()
return {"FINISHED"}
src/blenderbim/blenderbim/bim/module/structural/ui.py
+10 -6
View File
@@ -66,6 +66,7 @@ class BIM_PT_structural_boundary_conditions(Panel):
bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW"
bl_context = "object"
# bl_parent_id = "BIM_PT_structural_connection"
@classmethod
def poll(cls, context):
@@ -95,6 +96,7 @@ class BIM_PT_connected_structural_members(Panel):
bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW"
bl_context = "object"
# bl_parent_id = "BIM_PT_structural_connection"
@classmethod
def poll(cls, context):
@@ -218,15 +220,17 @@ class BIM_PT_structural_connection(Panel):
if self.props.is_editing_connection_cs:
row = self.layout.row(align=True)
row.label(text="Editing Connection CS")
row.operator("bim.edit_structural_item_connection_cs", text="", icon="CHECKMARK")
row.operator("bim.disable_editing_structural_item_connection_cs", text="", icon="CANCEL")
row.operator("bim.edit_structural_connection_cs", text="", icon="CHECKMARK")
row.operator("bim.disable_editing_structural_connection_cs", text="", icon="CANCEL")
row = self.layout.row(align=True)
row.prop(self.props, "ccs_x_angle")
row.prop(self.props, "ccs_y_angle")
row.prop(self.props, "ccs_z_angle")
row.prop(self.props, "ccs_x_angle", text="X Angle")
row = self.layout.row(align=True)
row.prop(self.props, "ccs_y_angle", text="Y Angle")
row = self.layout.row(align=True)
row.prop(self.props, "ccs_z_angle", text="Z Angle")
else:
row = self.layout.row()
row.operator("bim.enable_editing_structural_item_connection_cs", text="Edit Connection CS", icon="GREASEPENCIL")
row.operator("bim.enable_editing_structural_connection_cs", text="Edit Connection CS", icon="GREASEPENCIL")
else:
row = self.layout.row()
row.label(text="TODO")