From 3a2f29aefcf24b50f6e633c85734dba14a0e1f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?= Date: Thu, 10 Oct 2024 20:18:03 -0300 Subject: [PATCH] =?UTF-8?q?Fix=20bug=20in=20measurement=20area=20decorator?= =?UTF-8?q?.=20Make=20input=20validation=20accept=20"m=C2=B2"=20and=20"mm?= =?UTF-8?q?=C2=B2"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bonsai/bonsai/bim/module/model/decorator.py | 1 + src/bonsai/bonsai/tool/polyline.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bonsai/bonsai/bim/module/model/decorator.py b/src/bonsai/bonsai/bim/module/model/decorator.py index 3fa274c90e..4628b1d4f5 100644 --- a/src/bonsai/bonsai/bim/module/model/decorator.py +++ b/src/bonsai/bonsai/bim/module/model/decorator.py @@ -749,6 +749,7 @@ class PolylineDecorator: # Area highlight if polyline_data: + print("A", polyline_data.area) _, area = tool.Polyline.validate_input(polyline_data.area, "AREA") if area: if float(area) > 0: diff --git a/src/bonsai/bonsai/tool/polyline.py b/src/bonsai/bonsai/tool/polyline.py index dbbb48ea1d..d5e8733849 100644 --- a/src/bonsai/bonsai/tool/polyline.py +++ b/src/bonsai/bonsai/tool/polyline.py @@ -419,7 +419,7 @@ class Polyline(bonsai.core.tool.Polyline): FORMULA: "=" - metric: NUMBER "mm"? "m"? "°"? + metric: NUMBER "mm²"? "m²"? "mm"? "m"? "°"? expr: (ADD | SUB | MUL | DIV) dim