From 3cf7a9e925e73e824c4cd2f59a78bdc479334db3 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Tue, 28 Feb 2023 11:08:17 +0500 Subject: [PATCH] Renamed batting pset --- .../blenderbim/bim/data/pset/Psets_BBIM_Annotation.ifc | 4 ++-- src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/data/pset/Psets_BBIM_Annotation.ifc b/src/blenderbim/blenderbim/bim/data/pset/Psets_BBIM_Annotation.ifc index 1cb611443f..85fda525db 100644 --- a/src/blenderbim/blenderbim/bim/data/pset/Psets_BBIM_Annotation.ifc +++ b/src/blenderbim/blenderbim/bim/data/pset/Psets_BBIM_Annotation.ifc @@ -9,8 +9,8 @@ DATA; #2=IFCSIMPLEPROPERTYTEMPLATE('2P7JN79n96Q9pElZ83LKe4',$,'ZIndex','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.); #3=IFCSIMPLEPROPERTYTEMPLATE('1Wpx_r2xj1_9w5JpI0QRJy',$,'Symbol','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.); #4=IFCSIMPLEPROPERTYTEMPLATE('3q0oxMUKP47vZ4jnyG$dDb',$,'Classes','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.); -#5=IFCPROPERTYSETTEMPLATE('0iKwujnQL9IevVQato8f7Z',$,'Pset_BBIM_Batting','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#6,#7)); -#6=IFCSIMPLEPROPERTYTEMPLATE('0t2LEesGT1QRQtrIZUAR8L',$,'Thickness','Batting thickness',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.); +#5=IFCPROPERTYSETTEMPLATE('0iKwujnQL9IevVQato8f7Z',$,'BBIM_Batting','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#6,#7)); +#6=IFCSIMPLEPROPERTYTEMPLATE('0t2LEesGT1QRQtrIZUAR8L',$,'Thickness','Batting thickness',.P_SINGLEVALUE.,'IfcPositiveLengthMeasure',$,$,$,$,$,.READWRITE.); #7=IFCSIMPLEPROPERTYTEMPLATE('082PndS6v2kBOiJoSboMnh',$,'Reverse pattern direction','Reverse batting pattern (swap starting and ending points)',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.); ENDSEC; END-ISO-10303-21; diff --git a/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py b/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py index 16781303ed..98dd520eca 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py @@ -98,6 +98,8 @@ class SvgWriter: return self def calculate_scale(self): + # svg_scale is for conversion from m to paper units + # paper units = mm x drawing scale self.svg_scale = self.scale * 1000 # IFC is in meters, SVG is in mm self.raw_width = self.camera_width self.raw_height = self.camera_height @@ -378,9 +380,10 @@ class SvgWriter: end_svg = Vector(((x_offset + v1.x), (y_offset - v1.y))) * self.svg_scale element = tool.Ifc.get_entity(obj) - pset_data = ifcopenshell.util.element.get_pset(element, "Pset_BBIM_Batting") or {} + pset_data = ifcopenshell.util.element.get_pset(element, "BBIM_Batting") or {} unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get()) + # default thickness set to 15 mm in paper space to keep the insulation visible thickness = pset_data["Thickness"] * unit_scale * self.svg_scale if "Thickness" in pset_data else 15.0 reverse_x = pset_data.get("Reverse pattern direction", False)