mirror
/
inkstitch
kopia lustrzana https://github.com/inkstitch/inkstitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

lettering along path: fix transform issues (#2246)

pull/2259/head
Kaalleen 2023-04-30 11:20:51 +02:00 zatwierdzone przez GitHub
rodzic 377bbfb3b4
commit eeb4c46cf2
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 10 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
lib/extensions/lettering_along_path.py
Wyświetl plik

@ -8,7 +8,7 @@ import sys
from math import atan2, degrees from math import atan2, degrees
from inkex import Boolean, Transform, errormsg from inkex import Boolean, Transform, errormsg
from shapely.ops import substring from inkex.units import convert_unit
from ..elements import Stroke from ..elements import Stroke
from ..i18n import _ from ..i18n import _
@ -49,7 +49,8 @@ class LetteringAlongPath(InkstitchExtension):
if self.options.stretch_spaces: if self.options.stretch_spaces:
text_content = self.settings["text"] text_content = self.settings["text"]
space_indices = [i for i, t in enumerate(text_content) if t == " "] space_indices = [i for i, t in enumerate(text_content) if t == " "]
text_width = text_bbox.width text_bbox = text.bounding_box()
text_width = convert_unit(text_bbox.width, 'px', self.svg.unit)
if len(text_content) - 1 != 0: if len(text_content) - 1 != 0:
stretch_space = (path_length - text_width) / (len(text_content) - 1) stretch_space = (path_length - text_width) / (len(text_content) - 1)
@ -70,13 +71,14 @@ class LetteringAlongPath(InkstitchExtension):
for glyph in glyphs: for glyph in glyphs:
# dimensions # dimensions
bbox = glyph.bounding_box() bbox = glyph.bounding_box()
transformed_bbox = glyph.bounding_box(glyph.getparent().composed_transform())
left = bbox.left left = bbox.left
width = bbox.width transformed_left = transformed_bbox.left
width = convert_unit(transformed_bbox.width, 'px', self.svg.unit)
# adjust position # adjust position
if old_bbox: if old_bbox:
right = old_bbox.right distance += convert_unit(transformed_left - old_bbox.right, 'px', self.svg.unit) + stretch_space
distance += left - right + stretch_space
if self.options.stretch_spaces and i in space_indices: if self.options.stretch_spaces and i in space_indices:
distance += stretch_space distance += stretch_space
@ -85,8 +87,8 @@ class LetteringAlongPath(InkstitchExtension):
new_distance = distance + width new_distance = distance + width
# calculate and apply transform # calculate and apply transform
first = substring(path, distance, distance) first = path.interpolate(distance)
last = substring(path, new_distance, new_distance) last = path.interpolate(new_distance)
angle = degrees(atan2(last.y - first.y, last.x - first.x)) % 360 angle = degrees(atan2(last.y - first.y, last.x - first.x)) % 360
translate = InkstitchPoint(first.x, first.y) - InkstitchPoint(left, text_y) translate = InkstitchPoint(first.x, first.y) - InkstitchPoint(left, text_y)
@ -97,7 +99,7 @@ class LetteringAlongPath(InkstitchExtension):
# set values for next iteration # set values for next iteration
distance = new_distance distance = new_distance
old_bbox = bbox old_bbox = transformed_bbox
i += 1 i += 1
def load_settings(self, text): def load_settings(self, text):