diff options
| author | Kaalleen <36401965+kaalleen@users.noreply.github.com> | 2023-04-23 07:02:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-23 07:02:54 +0200 |
| commit | 16f52ca5dad2a7571cd46e4901c3a66637ad8b2c (patch) | |
| tree | 567722c1560d88737ebada152714d1b9b453ec0a /lib | |
| parent | df94082cefa05c98ae6da43ecf4a25437ae16b30 (diff) | |
lettering: preserve scale (#2230)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/elements/satin_column.py | 10 | ||||
| -rw-r--r-- | lib/extensions/lettering.py | 2 | ||||
| -rw-r--r-- | lib/stitch_plan/lock_stitch.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py index 8330d67a..3a0b0f8e 100644 --- a/lib/elements/satin_column.py +++ b/lib/elements/satin_column.py @@ -1094,11 +1094,11 @@ class SatinColumn(EmbroideryElement): points, _ = self.get_split_points(last_point, left, last_point, left, max_stitch_length) patch.add_stitches(points) - patch.add_stitch(a_short, ("edge")) - patch.add_stitches(split_points, ("split_stitch")) - patch.add_stitch(b_short, ("edge")) - patch.add_stitches(split_points[::-1], ("split_stitch")) - patch.add_stitch(a_short, ("edge")) + patch.add_stitch(a_short, ("edge", "left")) + patch.add_stitches(split_points, ("split_stitch",)) + patch.add_stitch(b_short, ("edge",)) + patch.add_stitches(split_points[::-1], ("split_stitch",)) + patch.add_stitch(a_short, ("edge",)) last_point = a_short diff --git a/lib/extensions/lettering.py b/lib/extensions/lettering.py index b304a6f9..8a8445bf 100644 --- a/lib/extensions/lettering.py +++ b/lib/extensions/lettering.py @@ -135,9 +135,9 @@ class LetteringFrame(wx.Frame): self.back_and_forth_checkbox.SetValue(bool(self.settings.back_and_forth)) self.trim_option_choice.SetSelection(self.settings.trim_option) self.use_trim_symbols.SetValue(bool(self.settings.use_trim_symbols)) - self.set_initial_font(self.settings.font) self.text_editor.SetValue(self.settings.text) self.scale_spinner.SetValue(self.settings.scale) + self.set_initial_font(self.settings.font) def save_settings(self): """Save the settings into the SVG group element.""" diff --git a/lib/stitch_plan/lock_stitch.py b/lib/stitch_plan/lock_stitch.py index bf760923..788e6377 100644 --- a/lib/stitch_plan/lock_stitch.py +++ b/lib/stitch_plan/lock_stitch.py @@ -98,7 +98,7 @@ class RelativeLock(LockStitchDefinition): direction = to_previous.unit() for delta in path: - lock_stitches.append(Stitch(stitches[0] + delta * length * direction, tags=('lock_stitch'))) + lock_stitches.append(Stitch(stitches[0] + delta * length * direction, tags=('lock_stitch',))) else: # Too short to travel part of the way to the previous stitch; just go # back and forth to it a couple times. |