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

common method for getting annotation symbol

Browse Source
This commit is contained in:
Andrej730
2024-03-14 16:20:33 +05:00
parent 858692f3f5
commit b72b23741e
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/drawing/data.py
+1 -1
View File
@@ -320,7 +320,7 @@ class DecoratorData:
font_size = FONT_SIZES[font_size_type] font_size = FONT_SIZES[font_size_type]
# get symbol # get symbol
symbol = pset_data.get("Symbol", None) symbol = tool.Drawing.get_annotation_symbol(element)
# other attributes # other attributes
props_literals = props.literals props_literals = props.literals
src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py
+2 -8
View File
@@ -864,10 +864,7 @@ class SvgWriter:
point = self.project_point_onto_camera(obj.matrix_world.translation) point = self.project_point_onto_camera(obj.matrix_world.translation)
element = tool.Ifc.get_entity(obj) element = tool.Ifc.get_entity(obj)
svg_id = ifcopenshell.util.element.get_pset(element, "EPset_Annotation", "Symbol") svg_id = tool.Drawing.get_annotation_symbol(element)
if not svg_id:
# EPset_AnnotationSurveyArea is not standard! See bSI-4.3 proposal #660.
svg_id = ifcopenshell.util.element.get_pset(element, "EPset_AnnotationSurveyArea", "PointType")
if not svg_id: if not svg_id:
svg_id = str(ifcopenshell.util.element.get_predefined_type(element)) svg_id = str(ifcopenshell.util.element.get_predefined_type(element))
if not svg_id: if not svg_id:
@@ -913,10 +910,7 @@ class SvgWriter:
projected_points = [self.project_point_onto_camera(matrix_world @ v.co) for v in obj.data.vertices] projected_points = [self.project_point_onto_camera(matrix_world @ v.co) for v in obj.data.vertices]
element = tool.Ifc.get_entity(obj) element = tool.Ifc.get_entity(obj)
svg_id = ifcopenshell.util.element.get_pset(element, "EPset_Annotation", "Symbol") svg_id = tool.Drawing.get_annotation_symbol(element)
if not svg_id:
# EPset_AnnotationSurveyArea is not standard! See bSI-4.3 proposal #660.
svg_id = ifcopenshell.util.element.get_pset(element, "EPset_AnnotationSurveyArea", "PointType")
if not svg_id: if not svg_id:
svg_id = str(ifcopenshell.util.element.get_predefined_type(element)) svg_id = str(ifcopenshell.util.element.get_predefined_type(element))
if not svg_id: if not svg_id:
src/blenderbim/blenderbim/tool/drawing.py
+6 -2
View File
@@ -1520,8 +1520,12 @@ class Drawing(blenderbim.core.tool.Drawing):
return ifcopenshell.util.element.get_pset(drawing, "EPset_Annotation", "ZIndex") or 0 return ifcopenshell.util.element.get_pset(drawing, "EPset_Annotation", "ZIndex") or 0
@classmethod @classmethod
def get_annotation_symbol(cls, drawing: ifcopenshell.entity_instance) -> Union[str, None]: def get_annotation_symbol(cls, element: ifcopenshell.entity_instance) -> Union[str, None]:
return ifcopenshell.util.element.get_pset(drawing, "EPset_Annotation", "Symbol") symbol = ifcopenshell.util.element.get_pset(element, "EPset_Annotation", "Symbol")
if not symbol:
# EPset_AnnotationSurveyArea is not standard! See bSI-4.3 proposal #660.
symbol = ifcopenshell.util.element.get_pset(element, "EPset_AnnotationSurveyArea", "PointType")
return symbol
@classmethod @classmethod
def has_linework(cls, drawing): def has_linework(cls, drawing):