From 06d947f8694dc7d3124e9724c5009427890780ee Mon Sep 17 00:00:00 2001 From: Ryan Schultz Date: Mon, 18 Nov 2024 22:55:31 -0600 Subject: [PATCH] Some fixes for 812e3dc6df32e08fbe85051ccf752ac1d1b5f93c --- src/bonsai/bonsai/bim/module/drawing/data.py | 5 ++++- src/bonsai/bonsai/bim/module/drawing/decoration.py | 3 +-- src/bonsai/bonsai/bim/module/drawing/prop.py | 1 + src/bonsai/bonsai/bim/module/drawing/ui.py | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bonsai/bonsai/bim/module/drawing/data.py b/src/bonsai/bonsai/bim/module/drawing/data.py index 37628451d9..96f2305707 100644 --- a/src/bonsai/bonsai/bim/module/drawing/data.py +++ b/src/bonsai/bonsai/bim/module/drawing/data.py @@ -321,6 +321,9 @@ class DecoratorData: # get symbol symbol = tool.Drawing.get_annotation_symbol(element) + # get newline_at + newline_at = pset_data['Newline_At'] + # other attributes props_literals = props.literals props_literals_n = len(props.literals) @@ -338,7 +341,7 @@ class DecoratorData: literals_data.append(literal_data) - text_data = {"Literals": literals_data, "FontSize": font_size, "Symbol": symbol} + text_data = {"Literals": literals_data, "FontSize": font_size, "Symbol": symbol, "Newline_At": newline_at} cls.data[obj.name] = text_data return text_data diff --git a/src/bonsai/bonsai/bim/module/drawing/decoration.py b/src/bonsai/bonsai/bim/module/drawing/decoration.py index a953e76513..d0d4c7e4f1 100644 --- a/src/bonsai/bonsai/bim/module/drawing/decoration.py +++ b/src/bonsai/bonsai/bim/module/drawing/decoration.py @@ -594,6 +594,7 @@ class BaseDecorator: text_data = text_data | props.get_text_edited_data() literals_data = text_data["Literals"] symbol = text_data["Symbol"] + newline_at = text_data["Newline_At"] text_scale = 1.0 # draw asterisk symbol to indicate that there is some symbol that's not shown in viewport @@ -607,8 +608,6 @@ class BaseDecorator: box_alignment = literal_data["BoxAlignment"] text = literal_data["CurrentValue"] - newline_at = props.newline_at - if newline_at != 0: text = helper.add_newline_between_words (text, newline_at) diff --git a/src/bonsai/bonsai/bim/module/drawing/prop.py b/src/bonsai/bonsai/bim/module/drawing/prop.py index 98ea4c99d7..d078cf91e8 100644 --- a/src/bonsai/bonsai/bim/module/drawing/prop.py +++ b/src/bonsai/bonsai/bim/module/drawing/prop.py @@ -536,6 +536,7 @@ class BIMTextProperties(PropertyGroup): text_data = { "Literals": literals_data, "FontSize": float(self.font_size), + "Newline_At": int(self.newline_at), } return text_data diff --git a/src/bonsai/bonsai/bim/module/drawing/ui.py b/src/bonsai/bonsai/bim/module/drawing/ui.py index 9f72c1da82..2d75bcb927 100644 --- a/src/bonsai/bonsai/bim/module/drawing/ui.py +++ b/src/bonsai/bonsai/bim/module/drawing/ui.py @@ -578,7 +578,7 @@ class BIM_PT_text(Panel): row.label(text=str(text_data["FontSize"])) row = self.layout.row(align=True) row.label(text="Newline_At") - row.label(text=str(props.newline_at)) + row.label(text=str(text_data["Newline_At"])) for literal_data in text_data["Literals"]: box = self.layout.box()