Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-09 17:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1551. Support mixed geolocation workarounds of both object placement and cartesian point.

Browse Source
This commit is contained in:
Dion Moult
2021-07-06 12:20:04 +10:00
parent cca28231ee
commit 75d67cd719
9 changed files with 59 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/__init__.py
-1
View File
@@ -84,7 +84,6 @@ if bpy is not None:
prop.GlobalId, prop.GlobalId,
prop.BIMObjectProperties, prop.BIMObjectProperties,
prop.BIMMaterialProperties, prop.BIMMaterialProperties,
prop.ItemSlotMap,
prop.BIMMeshProperties, prop.BIMMeshProperties,
ui.BIM_PT_section_plane, ui.BIM_PT_section_plane,
ui.BIM_UL_generic, ui.BIM_UL_generic,
src/blenderbim/blenderbim/bim/export_ifc.py
+1 -1
View File
@@ -103,7 +103,7 @@ class IfcExporter:
ifc_matrix[2][3] *= self.unit_scale ifc_matrix[2][3] *= self.unit_scale
props = bpy.context.scene.BIMGeoreferenceProperties props = bpy.context.scene.BIMGeoreferenceProperties
if props.has_blender_offset and props.blender_offset_type == "OBJECT_PLACEMENT": if props.has_blender_offset and obj.BIMObjectProperties.blender_offset_type == "OBJECT_PLACEMENT":
ifc_matrix = ifcopenshell.util.geolocation.global2local( ifc_matrix = ifcopenshell.util.geolocation.global2local(
ifc_matrix, ifc_matrix,
float(props.blender_eastings) * self.unit_scale, float(props.blender_eastings) * self.unit_scale,
src/blenderbim/blenderbim/bim/import_ifc.py
+41 -37
View File
@@ -229,18 +229,19 @@ class IfcImporter:
self.set_default_context() self.set_default_context()
self.profile_code("Setting default context") self.profile_code("Setting default context")
def is_element_far_away(self, element): def is_element_far_away(self, element, is_meters=True):
try: try:
return self.is_point_far_away(element.ObjectPlacement.RelativePlacement.Location) return self.is_point_far_away(element.ObjectPlacement.RelativePlacement.Location, is_meters=is_meters)
except: except:
pass pass
def is_point_far_away(self, point): def is_point_far_away(self, point, is_meters=True):
# Arbitrary threshold based on experience # Locations greater than 1km are not considered "small sites" according to the georeferencing guide
limit = 1000 if is_meters else (1000 / self.unit_scale)
coords = point coords = point
if hasattr(point, "Coordinates"): if hasattr(point, "Coordinates"):
coords = point.Coordinates coords = point.Coordinates
return abs(coords[0]) > 1000000 or abs(coords[1]) > 1000000 or abs(coords[2]) > 1000000 return abs(coords[0]) > limit or abs(coords[1]) > limit or abs(coords[2]) > limit
def process_element_filter(self): def process_element_filter(self):
if not self.ifc_import_settings.ifc_selector: if not self.ifc_import_settings.ifc_selector:
@@ -340,7 +341,6 @@ class IfcImporter:
props.blender_x_axis_abscissa = str(placement.RefDirection.DirectionRatios[0]) props.blender_x_axis_abscissa = str(placement.RefDirection.DirectionRatios[0])
props.blender_x_axis_ordinate = str(placement.RefDirection.DirectionRatios[1]) props.blender_x_axis_ordinate = str(placement.RefDirection.DirectionRatios[1])
props.has_blender_offset = True props.has_blender_offset = True
props.blender_offset_type = "OBJECT_PLACEMENT"
def guess_absolute_coordinate(self): def guess_absolute_coordinate(self):
# Civil BIM applications like to work in absolute coordinates, where the ObjectPlacement is 0,0,0 but each # Civil BIM applications like to work in absolute coordinates, where the ObjectPlacement is 0,0,0 but each
@@ -353,7 +353,6 @@ class IfcImporter:
props.blender_northings = str(offset_point[1]) props.blender_northings = str(offset_point[1])
props.blender_orthogonal_height = str(offset_point[2]) props.blender_orthogonal_height = str(offset_point[2])
props.has_blender_offset = True props.has_blender_offset = True
props.blender_offset_type = "CARTESIAN_POINT"
def get_offset_point(self): def get_offset_point(self):
offset_point = None offset_point = None
@@ -370,7 +369,7 @@ class IfcImporter:
if elements_checked > element_checking_threshold: if elements_checked > element_checking_threshold:
return return
for i, point in enumerate(point_list.CoordList): for i, point in enumerate(point_list.CoordList):
if len(point) == 3 and self.is_point_far_away(point): if len(point) == 3 and self.is_point_far_away(point, is_meters=False):
return point return point
for point in self.file.by_type("IfcCartesianPoint"): for point in self.file.by_type("IfcCartesianPoint"):
@@ -384,22 +383,26 @@ class IfcImporter:
elements_checked += 1 elements_checked += 1
if elements_checked > element_checking_threshold: if elements_checked > element_checking_threshold:
return return
if len(point.Coordinates) == 3 and self.is_point_far_away(point): if len(point.Coordinates) == 3 and self.is_point_far_away(point, is_meters=False):
return point.Coordinates return point.Coordinates
def apply_blender_offset_to_matrix(self, matrix): def apply_blender_offset_to_matrix_world(self, obj, matrix):
props = bpy.context.scene.BIMGeoreferenceProperties props = bpy.context.scene.BIMGeoreferenceProperties
if props.has_blender_offset and props.blender_offset_type == "OBJECT_PLACEMENT": if props.has_blender_offset:
return mathutils.Matrix( if self.is_point_far_away((matrix[0, 3], matrix[1, 3], matrix[2, 3])):
ifcopenshell.util.geolocation.global2local( obj.BIMObjectProperties.blender_offset_type = "OBJECT_PLACEMENT"
matrix, return mathutils.Matrix(
float(props.blender_eastings) * self.unit_scale, ifcopenshell.util.geolocation.global2local(
float(props.blender_northings) * self.unit_scale, matrix,
float(props.blender_orthogonal_height) * self.unit_scale, float(props.blender_eastings) * self.unit_scale,
float(props.blender_x_axis_abscissa), float(props.blender_northings) * self.unit_scale,
float(props.blender_x_axis_ordinate), float(props.blender_orthogonal_height) * self.unit_scale,
).tolist() float(props.blender_x_axis_abscissa),
) float(props.blender_x_axis_ordinate),
).tolist()
)
else:
obj.BIMObjectProperties.blender_offset_type = "CARTESIAN_POINT"
return mathutils.Matrix(matrix.tolist()) return mathutils.Matrix(matrix.tolist())
def find_decomposed_ifc_class(self, element, ifc_class): def find_decomposed_ifc_class(self, element, ifc_class):
@@ -426,29 +429,25 @@ class IfcImporter:
shape = ifcopenshell.geom.create_shape(self.settings_2d, grid) shape = ifcopenshell.geom.create_shape(self.settings_2d, grid)
grid_obj = self.create_product(grid, shape) grid_obj = self.create_product(grid, shape)
collection = bpy.data.collections.new(self.get_name(grid)) collection = bpy.data.collections.new(self.get_name(grid))
element_matrix = self.get_local_placement(grid.ObjectPlacement)
element_matrix[0][3] *= self.unit_scale
element_matrix[1][3] *= self.unit_scale
element_matrix[2][3] *= self.unit_scale
u_axes = bpy.data.collections.new("UAxes") u_axes = bpy.data.collections.new("UAxes")
collection.children.link(u_axes) collection.children.link(u_axes)
v_axes = bpy.data.collections.new("VAxes") v_axes = bpy.data.collections.new("VAxes")
collection.children.link(v_axes) collection.children.link(v_axes)
self.create_grid_axes(grid.UAxes, u_axes, element_matrix) self.create_grid_axes(grid.UAxes, u_axes, grid_obj)
self.create_grid_axes(grid.VAxes, v_axes, element_matrix) self.create_grid_axes(grid.VAxes, v_axes, grid_obj)
if grid.WAxes: if grid.WAxes:
w_axes = bpy.data.collections.new("WAxes") w_axes = bpy.data.collections.new("WAxes")
collection.children.link(w_axes) collection.children.link(w_axes)
self.create_grid_axes(grid.WAxes, w_axes, element_matrix) self.create_grid_axes(grid.WAxes, w_axes, grid_obj)
def create_grid_axes(self, axes, grid, matrix_world): def create_grid_axes(self, axes, grid_collection, grid_obj):
for axis in axes: for axis in axes:
shape = ifcopenshell.geom.create_shape(self.settings_2d, axis.AxisCurve) shape = ifcopenshell.geom.create_shape(self.settings_2d, axis.AxisCurve)
mesh = self.create_mesh(axis, shape) mesh = self.create_mesh(axis, shape)
obj = bpy.data.objects.new(f"IfcGridAxis/{axis.AxisTag}", mesh) obj = bpy.data.objects.new(f"IfcGridAxis/{axis.AxisTag}", mesh)
obj.BIMObjectProperties.ifc_definition_id = axis.id() obj.BIMObjectProperties.ifc_definition_id = axis.id()
obj.matrix_world = matrix_world obj.matrix_world = grid_obj.matrix_world
grid.objects.link(obj) grid_collection.objects.link(obj)
def create_type_products(self): def create_type_products(self):
type_products = self.file.by_type("IfcTypeProduct") type_products = self.file.by_type("IfcTypeProduct")
@@ -617,7 +616,7 @@ class IfcImporter:
mesh.from_pydata([mathutils.Vector(vertex) * self.unit_scale], [], []) mesh.from_pydata([mathutils.Vector(vertex) * self.unit_scale], [], [])
obj = bpy.data.objects.new("{}/{}".format(product.is_a(), product.Name), mesh) obj = bpy.data.objects.new("{}/{}".format(product.is_a(), product.Name), mesh)
obj.matrix_world = mathutils.Matrix(placement_matrix.tolist()) obj.matrix_world = self.apply_blender_offset_to_matrix_world(placement_matrix)
self.link_element(product, obj) self.link_element(product, obj)
def create_curve_products(self, products): def create_curve_products(self, products):
@@ -676,13 +675,13 @@ class IfcImporter:
mat = np.matrix( mat = np.matrix(
([m[0], m[3], m[6], m[9]], [m[1], m[4], m[7], m[10]], [m[2], m[5], m[8], m[11]], [0, 0, 0, 1]) ([m[0], m[3], m[6], m[9]], [m[1], m[4], m[7], m[10]], [m[2], m[5], m[8], m[11]], [0, 0, 0, 1])
) )
obj.matrix_world = self.apply_blender_offset_to_matrix(mat) obj.matrix_world = self.apply_blender_offset_to_matrix_world(obj, mat)
self.material_creator.create(element, obj, mesh) self.material_creator.create(element, obj, mesh)
elif mesh: elif mesh:
obj.matrix_world = self.apply_blender_offset_to_matrix(self.get_element_matrix(element)) obj.matrix_world = self.apply_blender_offset_to_matrix_world(obj, self.get_element_matrix(element))
self.material_creator.create(element, obj, mesh) self.material_creator.create(element, obj, mesh)
elif hasattr(element, "ObjectPlacement"): elif hasattr(element, "ObjectPlacement"):
obj.matrix_world = self.apply_blender_offset_to_matrix(self.get_element_matrix(element)) obj.matrix_world = self.apply_blender_offset_to_matrix_world(obj, self.get_element_matrix(element))
self.add_opening_relation(element, obj) self.add_opening_relation(element, obj)
@@ -982,6 +981,7 @@ class IfcImporter:
def create_aggregate(self, rel_aggregate): def create_aggregate(self, rel_aggregate):
element = rel_aggregate.RelatingObject element = rel_aggregate.RelatingObject
obj = bpy.data.objects.new("{}/{}".format(element.is_a(), element.Name), None) obj = bpy.data.objects.new("{}/{}".format(element.is_a(), element.Name), None)
obj.matrix_world = self.apply_blender_offset_to_matrix_world(obj, self.get_element_matrix(element))
self.link_element(element, obj) self.link_element(element, obj)
collection = bpy.data.collections.new(obj.name) collection = bpy.data.collections.new(obj.name)
collection.objects.link(obj) collection.objects.link(obj)
@@ -1131,7 +1131,7 @@ class IfcImporter:
self.ifc_import_settings.logger.warning("Warning: this object is outside the spatial hierarchy %s", element) self.ifc_import_settings.logger.warning("Warning: this object is outside the spatial hierarchy %s", element)
bpy.context.scene.collection.objects.link(obj) bpy.context.scene.collection.objects.link(obj)
def get_element_matrix(self, element, mesh_name=None): def get_element_matrix(self, element):
result = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement) result = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement)
result[0][3] *= self.unit_scale result[0][3] *= self.unit_scale
result[1][3] *= self.unit_scale result[1][3] *= self.unit_scale
@@ -1265,7 +1265,11 @@ class IfcImporter:
mesh = bpy.data.meshes.new(self.get_mesh_name(geometry)) mesh = bpy.data.meshes.new(self.get_mesh_name(geometry))
props = bpy.context.scene.BIMGeoreferenceProperties props = bpy.context.scene.BIMGeoreferenceProperties
if props.has_blender_offset and props.blender_offset_type == "CARTESIAN_POINT": if (
props.has_blender_offset
and geometry.verts
and self.is_point_far_away((geometry.verts[0], geometry.verts[1], geometry.verts[2]))
):
ordinate_index = 0 ordinate_index = 0
verts = [None] * len(geometry.verts) verts = [None] * len(geometry.verts)
offset_point = ( offset_point = (
src/blenderbim/blenderbim/bim/module/geometry/operator.py
+3 -3
View File
@@ -32,7 +32,7 @@ class EditObjectPlacement(bpy.types.Operator):
if not obj.BIMObjectProperties.ifc_definition_id: if not obj.BIMObjectProperties.ifc_definition_id:
continue continue
matrix = np.array(obj.matrix_world) matrix = np.array(obj.matrix_world)
if props.has_blender_offset and props.blender_offset_type == "OBJECT_PLACEMENT": if props.has_blender_offset and obj.BIMObjectProperties.blender_offset_type == "OBJECT_PLACEMENT":
unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file) unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
# TODO: np.array? Why not matrix? # TODO: np.array? Why not matrix?
matrix = np.array( matrix = np.array(
@@ -84,7 +84,7 @@ class AddRepresentation(bpy.types.Operator):
gprop = context.scene.BIMGeoreferenceProperties gprop = context.scene.BIMGeoreferenceProperties
coordinate_offset = None coordinate_offset = None
if gprop.has_blender_offset and gprop.blender_offset_type == "CARTESIAN_POINT": if gprop.has_blender_offset and obj.BIMObjectProperties.blender_offset_type == "CARTESIAN_POINT":
coordinate_offset = Vector( coordinate_offset = Vector(
( (
float(gprop.blender_eastings), float(gprop.blender_eastings),
@@ -302,7 +302,7 @@ class UpdateRepresentation(bpy.types.Operator):
gprop = context.scene.BIMGeoreferenceProperties gprop = context.scene.BIMGeoreferenceProperties
coordinate_offset = None coordinate_offset = None
if gprop.has_blender_offset and gprop.blender_offset_type == "CARTESIAN_POINT": if gprop.has_blender_offset and obj.BIMObjectProperties.blender_offset_type == "CARTESIAN_POINT":
coordinate_offset = Vector( coordinate_offset = Vector(
( (
float(gprop.blender_eastings), float(gprop.blender_eastings),
src/blenderbim/blenderbim/bim/module/geometry/ui.py
+4
View File
@@ -109,6 +109,10 @@ class BIM_PT_mesh(Panel):
def BIM_PT_transform(self, context): def BIM_PT_transform(self, context):
if context.active_object and context.active_object.BIMObjectProperties.ifc_definition_id: if context.active_object and context.active_object.BIMObjectProperties.ifc_definition_id:
row = self.layout.row(align=True)
row.label(text="Blender Offset")
row.label(text=context.active_object.BIMObjectProperties.blender_offset_type)
row = self.layout.row() row = self.layout.row()
row.operator("bim.edit_object_placement") row.operator("bim.edit_object_placement")
src/blenderbim/blenderbim/bim/module/georeference/operator.py
+2 -10
View File
@@ -244,11 +244,7 @@ class ConvertLocalToGlobal(bpy.types.Operator):
props = context.scene.BIMGeoreferenceProperties props = context.scene.BIMGeoreferenceProperties
x, y, z = [float(co) for co in props.coordinate_input.split(",")] x, y, z = [float(co) for co in props.coordinate_input.split(",")]
if props.has_blender_offset and props.blender_offset_type == "CARTESIAN_POINT": if props.has_blender_offset:
x -= float(props.blender_eastings)
y -= float(props.blender_northings)
z -= float(props.blender_orthogonal_height)
elif props.has_blender_offset and props.blender_offset_type == "OBJECT_PLACEMENT":
results = ifcopenshell.util.geolocation.xyz2enh( results = ifcopenshell.util.geolocation.xyz2enh(
x, x,
y, y,
@@ -310,11 +306,7 @@ class ConvertGlobalToLocal(bpy.types.Operator):
else: else:
results = (x, y, z) results = (x, y, z)
if props.has_blender_offset and props.blender_offset_type == "CARTESIAN_POINT": if props.has_blender_offset:
results[0] += float(props.blender_eastings)
results[1] += float(props.blender_northings)
results[2] += float(props.blender_orthogonal_height)
elif props.has_blender_offset and props.blender_offset_type == "OBJECT_PLACEMENT":
results = ifcopenshell.util.geolocation.enh2xyz( results = ifcopenshell.util.geolocation.enh2xyz(
results[0], results[0],
results[1], results[1],
src/blenderbim/blenderbim/bim/module/georeference/prop.py
-5
View File
@@ -36,11 +36,6 @@ class BIMGeoreferenceProperties(PropertyGroup):
coordinate_input: StringProperty(name="Coordinate Input") coordinate_input: StringProperty(name="Coordinate Input")
coordinate_output: StringProperty(name="Coordinate Output") coordinate_output: StringProperty(name="Coordinate Output")
has_blender_offset: BoolProperty(name="Has Blender Offset") has_blender_offset: BoolProperty(name="Has Blender Offset")
blender_offset_type: EnumProperty(
items=[(o, o, "") for o in ["OBJECT_PLACEMENT", "CARTESIAN_POINT"]],
name="Blender Offset",
default="OBJECT_PLACEMENT",
)
blender_eastings: StringProperty(name="Blender Eastings", default="0") blender_eastings: StringProperty(name="Blender Eastings", default="0")
blender_northings: StringProperty(name="Blender Northings", default="0") blender_northings: StringProperty(name="Blender Northings", default="0")
blender_orthogonal_height: StringProperty(name="Blender Orthogonal Height", default="0") blender_orthogonal_height: StringProperty(name="Blender Orthogonal Height", default="0")
src/blenderbim/blenderbim/bim/module/georeference/ui.py
+3 -5
View File
@@ -90,18 +90,16 @@ class BIM_PT_gis(Panel):
def draw_ui(self, context): def draw_ui(self, context):
props = context.scene.BIMGeoreferenceProperties props = context.scene.BIMGeoreferenceProperties
if not Data.projected_crs and IfcStore.get_file().schema != "IFC2X3": if not Data.projected_crs:
row = self.layout.row(align=True) row = self.layout.row(align=True)
row.label(text="Not Georeferenced") row.label(text="Not Georeferenced")
row.operator("bim.add_georeferencing", icon="ADD", text="") if IfcStore.get_file().schema != "IFC2X3":
row.operator("bim.add_georeferencing", icon="ADD", text="")
if props.has_blender_offset: if props.has_blender_offset:
row = self.layout.row() row = self.layout.row()
row.label(text="Blender Offset", icon="TRACKING_REFINE_FORWARDS") row.label(text="Blender Offset", icon="TRACKING_REFINE_FORWARDS")
row = self.layout.row(align=True)
row.label(text="Type")
row.label(text=props.blender_offset_type)
row = self.layout.row(align=True) row = self.layout.row(align=True)
row.label(text="Eastings") row.label(text="Eastings")
row.label(text=props.blender_eastings) row.label(text=props.blender_eastings)
src/blenderbim/blenderbim/bim/prop.py
+5 -6
View File
@@ -259,6 +259,11 @@ class GlobalId(PropertyGroup):
class BIMObjectProperties(PropertyGroup): class BIMObjectProperties(PropertyGroup):
ifc_definition_id: IntProperty(name="IFC Definition ID") ifc_definition_id: IntProperty(name="IFC Definition ID")
blender_offset_type: EnumProperty(
items=[(o, o, "") for o in ["NONE", "OBJECT_PLACEMENT", "CARTESIAN_POINT"]],
name="Blender Offset",
default="NONE",
)
is_reassigning_class: BoolProperty(name="Is Reassigning Class") is_reassigning_class: BoolProperty(name="Is Reassigning Class")
global_ids: CollectionProperty(name="GlobalIds", type=GlobalId) global_ids: CollectionProperty(name="GlobalIds", type=GlobalId)
relating_object: PointerProperty(name="Aggregate", type=bpy.types.Object) relating_object: PointerProperty(name="Aggregate", type=bpy.types.Object)
@@ -279,11 +284,6 @@ class BIMMaterialProperties(PropertyGroup):
ifc_style_id: IntProperty(name="IFC Style ID") ifc_style_id: IntProperty(name="IFC Style ID")
class ItemSlotMap(PropertyGroup):
name: StringProperty(name="Item Element ID")
slot_index: IntProperty(name="Material Slot Index")
class BIMMeshProperties(PropertyGroup): class BIMMeshProperties(PropertyGroup):
ifc_definition_id: IntProperty(name="IFC Definition ID") ifc_definition_id: IntProperty(name="IFC Definition ID")
is_native: BoolProperty(name="Is Native", default=False) is_native: BoolProperty(name="Is Native", default=False)
@@ -291,4 +291,3 @@ class BIMMeshProperties(PropertyGroup):
is_parametric: BoolProperty(name="Is Parametric", default=False) is_parametric: BoolProperty(name="Is Parametric", default=False)
ifc_definition: StringProperty(name="IFC Definition") ifc_definition: StringProperty(name="IFC Definition")
ifc_parameters: CollectionProperty(name="IFC Parameters", type=IfcParameter) ifc_parameters: CollectionProperty(name="IFC Parameters", type=IfcParameter)
ifc_item_ids: CollectionProperty(name="IFC Item IDs", type=ItemSlotMap)