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

Add view cut caching, equal dims, and RL tags

Browse Source
This commit is contained in:
Dion Moult
2019-12-17 17:05:03 +11:00
parent b500dab88a
commit f63161e40a
2 changed files with 127 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcblenderexport/blenderbim/cut_ifc.py
+117 -32
View File
@@ -725,39 +725,79 @@ class SvgWriter():
def draw_annotations(self): def draw_annotations(self):
x_offset = self.raw_width / 2 x_offset = self.raw_width / 2
y_offset = self.raw_height / 2 y_offset = self.raw_height / 2
if self.ifc_cutter.dimension_obj: if self.ifc_cutter.equal_obj:
for edge in self.ifc_cutter.dimension_obj.data.edges: for spline in self.ifc_cutter.equal_obj.data.splines:
classes = ['annotation', 'dimension'] for i, p in enumerate(spline.points):
v0 = self.ifc_cutter.dimension_obj.data.vertices[edge.vertices[0]].co if i+1 >= len(spline.points):
v1 = self.ifc_cutter.dimension_obj.data.vertices[edge.vertices[1]].co continue
start = Vector(((x_offset + v0.x), (y_offset - v0.y))) classes = ['annotation', 'dimension']
end = Vector(((x_offset + v1.x), (y_offset - v1.y))) v0 = spline.points[i].co
mid = ((end - start) / 2) + start v1 = spline.points[i+1].co
# TODO: hardcoded meters to mm conversion, until I properly do units start = Vector(((x_offset + v0.x), (y_offset - v0.y)))
vector = end - start end = Vector(((x_offset + v1.x), (y_offset - v1.y)))
if (end.y - start.y) * self.scale > 1: mid = ((end - start) / 2) + start
perpendicular = Vector((-vector.y, vector.x)).normalized() vector = end - start
else: if (end.y - start.y) * self.scale > 1:
perpendicular = Vector((-vector.y, vector.x)).normalized()
else:
perpendicular = Vector((vector.y, -vector.x)).normalized()
perpendicular = Vector((vector.y, -vector.x)).normalized() perpendicular = Vector((vector.y, -vector.x)).normalized()
text_position = (mid * self.scale) + perpendicular text_position = (mid * self.scale) + perpendicular
dimension = vector.length * 1000 rotation = degrees(vector.angle(Vector((1, 0))))
rotation = -degrees(vector.angle(Vector((1, 0)))) line = self.svg.add(self.svg.line(start=tuple(start * self.scale),
line = self.svg.add(self.svg.line(start=tuple(start * self.scale), end=tuple(end * self.scale), class_=' '.join(classes)))
end=tuple(end * self.scale), class_=' '.join(classes))) line['marker-start'] = 'url(#dimension-marker)'
line['marker-start'] = 'url(#dimension-marker)' line['marker-end'] = 'url(#dimension-marker)'
line['marker-end'] = 'url(#dimension-marker)' # Standard font sizes 1.8, 2.5, 3.5, 5, 7
# Standard font sizes 1.8, 2.5, 3.5, 5, 7 # Equivalent for OpenGost Type B: 2.97, 4.13, 5.78, 8.25, 11.55
# Equivalent for OpenGost Type B: 2.97, 4.13, 5.78, 8.25, 11.55 self.svg.add(self.svg.text('EQ', insert=tuple(text_position), **{
self.svg.add(self.svg.text(str(round(dimension)), insert=tuple(text_position), **{ 'transform': 'rotate({} {} {})'.format(
'transform': 'rotate({} {} {})'.format( rotation,
rotation, text_position.x,
text_position.x, text_position.y
text_position.y ),
), 'font-size': '4.13', # 2.5
'font-size': '4.13', # 2.5 'font-family': 'OpenGost Type B TT',
'font-family': 'OpenGost Type B TT', 'text-anchor': 'middle'
'text-anchor': 'middle' }))
}))
if self.ifc_cutter.dimension_obj:
for spline in self.ifc_cutter.dimension_obj.data.splines:
for i, p in enumerate(spline.points):
if i+1 >= len(spline.points):
continue
classes = ['annotation', 'dimension']
v0 = spline.points[i].co
v1 = spline.points[i+1].co
start = Vector(((x_offset + v0.x), (y_offset - v0.y)))
end = Vector(((x_offset + v1.x), (y_offset - v1.y)))
mid = ((end - start) / 2) + start
# TODO: hardcoded meters to mm conversion, until I properly do units
vector = end - start
if (end.y - start.y) * self.scale > 1:
perpendicular = Vector((-vector.y, vector.x)).normalized()
else:
perpendicular = Vector((vector.y, -vector.x)).normalized()
perpendicular = Vector((vector.y, -vector.x)).normalized()
text_position = (mid * self.scale) + perpendicular
dimension = vector.length * 1000
rotation = degrees(vector.angle(Vector((1, 0))))
line = self.svg.add(self.svg.line(start=tuple(start * self.scale),
end=tuple(end * self.scale), class_=' '.join(classes)))
line['marker-start'] = 'url(#dimension-marker)'
line['marker-end'] = 'url(#dimension-marker)'
# Standard font sizes 1.8, 2.5, 3.5, 5, 7
# Equivalent for OpenGost Type B: 2.97, 4.13, 5.78, 8.25, 11.55
self.svg.add(self.svg.text(str(round(dimension)), insert=tuple(text_position), **{
'transform': 'rotate({} {} {})'.format(
rotation,
text_position.x,
text_position.y
),
'font-size': '4.13', # 2.5
'font-family': 'OpenGost Type B TT',
'text-anchor': 'middle'
}))
for grid_obj in self.ifc_cutter.grid_objs: for grid_obj in self.ifc_cutter.grid_objs:
for edge in grid_obj.data.edges: for edge in grid_obj.data.edges:
@@ -807,6 +847,51 @@ class SvgWriter():
path = self.svg.add(self.svg.path(d=d, class_=' '.join(classes))) path = self.svg.add(self.svg.path(d=d, class_=' '.join(classes)))
path['marker-end'] = 'url(#leader-marker)' path['marker-end'] = 'url(#leader-marker)'
if self.ifc_cutter.plan_level_obj:
for spline in self.ifc_cutter.plan_level_obj.data.splines:
classes = ['annotation', 'plan-level']
d = ' '.join(['L {} {}'.format((x_offset + p.co.x) * self.scale, (y_offset - p.co.y) * self.scale) for p in spline.points])
d = 'M{}'.format(d[1:])
path = self.svg.add(self.svg.path(d=d, class_=' '.join(classes)))
path['marker-start'] = 'url(#plan-level-marker)'
text_position = Vector((
(x_offset + spline.points[0].co.x) * self.scale,
((y_offset - spline.points[0].co.y) * self.scale) - 5
))
# TODO: unhardcode mm unit
rl = round(((self.ifc_cutter.plan_level_obj.matrix_world @
spline.points[0].co).xyz + self.ifc_cutter.plan_level_obj.location).z * 1000)
self.svg.add(self.svg.text('RL +{}'.format(rl), insert=tuple(text_position), **{
'font-size': '4.13', # 2.5
'font-family': 'OpenGost Type B TT',
'text-anchor': 'middle',
'alignment-baseline': 'middle',
'dominant-baseline': 'middle'
}))
if self.ifc_cutter.section_level_obj:
for spline in self.ifc_cutter.section_level_obj.data.splines:
classes = ['annotation', 'section-level']
d = ' '.join(['L {} {}'.format((x_offset + p.co.x) * self.scale, (y_offset - p.co.y) * self.scale) for p in spline.points])
d = 'M{}'.format(d[1:])
path = self.svg.add(self.svg.path(d=d, class_=' '.join(classes)))
path['marker-start'] = 'url(#section-level-marker)'
path['stroke-dasharray'] = '12.5, 3, 3, 3'
text_position = Vector((
(x_offset + spline.points[0].co.x) * self.scale,
((y_offset - spline.points[0].co.y) * self.scale) - 7
))
# TODO: unhardcode mm unit
rl = round(((self.ifc_cutter.section_level_obj.matrix_world @
spline.points[0].co).xyz + self.ifc_cutter.section_level_obj.location).z * 1000)
self.svg.add(self.svg.text('RL +{}'.format(rl), insert=tuple(text_position), **{
'font-size': '4.13', # 2.5
'font-family': 'OpenGost Type B TT',
'text-anchor': 'middle',
'alignment-baseline': 'middle',
'dominant-baseline': 'middle'
}))
if self.ifc_cutter.stair_obj: if self.ifc_cutter.stair_obj:
for spline in self.ifc_cutter.stair_obj.data.splines: for spline in self.ifc_cutter.stair_obj.data.splines:
classes = ['annotation', 'stair'] classes = ['annotation', 'stair']
src/ifcblenderexport/blenderbim/operator.py
+10 -1
View File
@@ -791,7 +791,10 @@ class CutSection(bpy.types.Operator):
ifc_cutter.leader_obj = None ifc_cutter.leader_obj = None
ifc_cutter.stair_obj = None ifc_cutter.stair_obj = None
ifc_cutter.dimension_obj = None ifc_cutter.dimension_obj = None
ifc_cutter.equal_obj = None
ifc_cutter.hidden_obj = None ifc_cutter.hidden_obj = None
ifc_cutter.plan_level_obj = None
ifc_cutter.section_level_obj = None
ifc_cutter.grid_objs = [] ifc_cutter.grid_objs = []
ifc_cutter.text_objs = [] ifc_cutter.text_objs = []
for obj in bpy.context.selected_objects: for obj in bpy.context.selected_objects:
@@ -799,12 +802,18 @@ class CutSection(bpy.types.Operator):
ifc_cutter.leader_obj = obj ifc_cutter.leader_obj = obj
elif 'Stair' in obj.name: elif 'Stair' in obj.name:
ifc_cutter.stair_obj = obj ifc_cutter.stair_obj = obj
elif 'Equal' in obj.name:
ifc_cutter.equal_obj = obj
elif 'Dimension' in obj.name: elif 'Dimension' in obj.name:
ifc_cutter.dimension_obj = obj ifc_cutter.dimension_obj = obj
elif 'Hidden' in obj.name: elif 'Hidden' in obj.name:
ifc_cutter.hidden_obj = obj ifc_cutter.hidden_obj = obj
elif 'IfcGrid' in obj.name: elif 'IfcGrid' in obj.name:
ifc_cutter.grid_objs.append(obj) ifc_cutter.grid_objs.append(obj)
elif 'Plan Level' in obj.name:
ifc_cutter.plan_level_obj = obj
elif 'Section Level' in obj.name:
ifc_cutter.section_level_obj = obj
elif obj.type == 'CAMERA': elif obj.type == 'CAMERA':
ifc_cutter.camera_obj = obj ifc_cutter.camera_obj = obj
elif obj.type == 'FONT': elif obj.type == 'FONT':
@@ -821,7 +830,7 @@ class CutSection(bpy.types.Operator):
'face': None 'face': None
} }
ifc_cutter.shapes_pickle_file = os.path.join(ifc_cutter.data_dir, 'shapes.pickle') ifc_cutter.shapes_pickle_file = os.path.join(ifc_cutter.data_dir, 'shapes.pickle')
ifc_cutter.cut_pickle_file = os.path.join(ifc_cutter.data_dir, 'cut.pickle') ifc_cutter.cut_pickle_file = os.path.join(ifc_cutter.data_dir, '{}-cut.pickle'.format(self.diagram_name))
ifc_cutter.should_recut = bpy.context.scene.DocProperties.should_recut ifc_cutter.should_recut = bpy.context.scene.DocProperties.should_recut
svg_writer = cut_ifc.SvgWriter(ifc_cutter) svg_writer = cut_ifc.SvgWriter(ifc_cutter)
numerator, denominator = bpy.context.scene.DocProperties.diagram_scale.split(':') numerator, denominator = bpy.context.scene.DocProperties.diagram_scale.split(':')