diff options
| author | Kaalleen <36401965+kaalleen@users.noreply.github.com> | 2024-12-26 05:39:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-26 05:39:49 +0100 |
| commit | 1253544ea06af0b70bc5df557c3f7351c8200b25 (patch) | |
| tree | b58a9793f428b7a30d270e1d01fe470f27d3fc97 /lib | |
| parent | 9bae24a79a8e6ff5741cdb3d1926f87c80d000ee (diff) | |
lettering: add scale info in mm (#3366)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gui/lettering/main_panel.py | 4 | ||||
| -rw-r--r-- | lib/gui/lettering/option_panel.py | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/gui/lettering/main_panel.py b/lib/gui/lettering/main_panel.py index 05510d12..f8f1636b 100644 --- a/lib/gui/lettering/main_panel.py +++ b/lib/gui/lettering/main_panel.py @@ -224,8 +224,8 @@ class LetteringPanel(wx.Panel): self.options_panel.font_description.SetForegroundColour(color) self.options_panel.font_description.Wrap(self.options_panel.GetSize().width - 50) self.options_panel.size_info.SetLabel(str(font.size)) - self.options_panel.min_scale_info.SetLabel(str(int(font.min_scale * 100))) - self.options_panel.max_scale_info.SetLabel(str(int(font.max_scale * 100))) + self.options_panel.scale_info_percent.SetLabel(f'{int(font.min_scale * 100)}% - {int(font.max_scale * 100)}%') + self.options_panel.scale_info_mm.SetLabel(f' ({round(font.size * font.min_scale, 2)}mm - {round(font.size * font.max_scale, 2)}mm)') if font.reversible: self.options_panel.back_and_forth_checkbox.Enable() diff --git a/lib/gui/lettering/option_panel.py b/lib/gui/lettering/option_panel.py index f7424554..d972b4a3 100644 --- a/lib/gui/lettering/option_panel.py +++ b/lib/gui/lettering/option_panel.py @@ -27,18 +27,14 @@ class LetteringOptionsPanel(wx.Panel): size_info_unit = wx.StaticText(self, wx.ID_ANY, "mm") scale_info_label = wx.StaticText(self, wx.ID_ANY, _("Scale:")) scale_info_label.SetFont(bold_font) - self.min_scale_info = wx.StaticText(self, wx.ID_ANY, '0') - middle_scale = wx.StaticText(self, wx.ID_ANY, '% - ') - self.max_scale_info = wx.StaticText(self, wx.ID_ANY, '200') - end_scale = wx.StaticText(self, wx.ID_ANY, '%') + self.scale_info_percent = wx.StaticText(self, wx.ID_ANY, '0% - 200%') + self.scale_info_mm = wx.StaticText(self, wx.ID_ANY, ' (10mm - 100mm)') size_info_sizer.Add(size_info_label, 0, wx.LEFT, 0) size_info_sizer.Add(self.size_info, 0, wx.LEFT, 0) size_info_sizer.Add(size_info_unit, 0, wx.LEFT, 0) size_info_sizer.Add(scale_info_label, 0, wx.LEFT, 10) - size_info_sizer.Add(self.min_scale_info, 0, wx.LEFT, 5) - size_info_sizer.Add(middle_scale, 0, wx.LEFT, 0) - size_info_sizer.Add(self.max_scale_info, 0, wx.LEFT, 0) - size_info_sizer.Add(end_scale, 0, wx.LEFT, 0) + size_info_sizer.Add(self.scale_info_percent, 0, wx.LEFT, 5) + size_info_sizer.Add(self.scale_info_mm, 0, wx.LEFT, 0) font_description_sizer.Add(size_info_sizer, 0, wx.ALL, 0) self.font_selector_box = wx.StaticBox(self, wx.ID_ANY, label=_("Font")) |