Skip to content

Commit

Permalink
Flip sign of translation factor so it can be added rather...
Browse files Browse the repository at this point in the history 
...than subtracted from the original bounding rect. This seems to be
more conventional.
  • Loading branch information
@jams2 @zerolab
jams2 authored and zerolab committed Jul 6, 2023
1 parent 8d7990c commit 20453df
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 34 deletions.
48 changes: 24 additions & 24 deletions tests/test_svg_coordinate_transforms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ def test_portrait_view_box(self):
("xMinYMin meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 0)),
("xMinYMid meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 0)),
("xMinYMax meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 0)),
("xMidYMin meet", ViewportToUserSpaceTransform(1.25, 1.25, 18.75, 0)),
("xMidYMid meet", ViewportToUserSpaceTransform(1.25, 1.25, 18.75, 0)),
("xMidYMax meet", ViewportToUserSpaceTransform(1.25, 1.25, 18.75, 0)),
("xMaxYMin meet", ViewportToUserSpaceTransform(1.25, 1.25, 37.5, 0)),
("xMaxYMid meet", ViewportToUserSpaceTransform(1.25, 1.25, 37.5, 0)),
("xMaxYMax meet", ViewportToUserSpaceTransform(1.25, 1.25, 37.5, 0)),
("xMidYMin meet", ViewportToUserSpaceTransform(1.25, 1.25, -18.75, 0)),
("xMidYMid meet", ViewportToUserSpaceTransform(1.25, 1.25, -18.75, 0)),
("xMidYMax meet", ViewportToUserSpaceTransform(1.25, 1.25, -18.75, 0)),
("xMaxYMin meet", ViewportToUserSpaceTransform(1.25, 1.25, -37.5, 0)),
("xMaxYMid meet", ViewportToUserSpaceTransform(1.25, 1.25, -37.5, 0)),
("xMaxYMax meet", ViewportToUserSpaceTransform(1.25, 1.25, -37.5, 0)),
]
for preserve_aspect_ratio, expected_result in params:
with self.subTest(preserve_aspect_ratio=preserve_aspect_ratio):
Expand All @@ -78,12 +78,12 @@ def test_landscape_view_box(self):
("xMinYMin meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 0)),
("xMidYMin meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 0)),
("xMaxYMin meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 0)),
("xMinYMid meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 18.75)),
("xMidYMid meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 18.75)),
("xMaxYMid meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 18.75)),
("xMinYMax meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 37.5)),
("xMidYMax meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 37.5)),
("xMaxYMax meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, 37.5)),
("xMinYMid meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, -18.75)),
("xMidYMid meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, -18.75)),
("xMaxYMid meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, -18.75)),
("xMinYMax meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, -37.5)),
("xMidYMax meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, -37.5)),
("xMaxYMax meet", ViewportToUserSpaceTransform(1.25, 1.25, 0, -37.5)),
]
for preserve_aspect_ratio, expected_result in params:
with self.subTest(preserve_aspect_ratio=preserve_aspect_ratio):
Expand All @@ -105,12 +105,12 @@ def test_portrait_view_box(self):
("xMinYMin slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 0)),
("xMidYMin slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 0)),
("xMaxYMin slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 0)),
("xMinYMid slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, -50)),
("xMidYMid slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, -50)),
("xMaxYMid slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, -50)),
("xMinYMax slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, -100)),
("xMidYMax slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, -100)),
("xMaxYMax slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, -100)),
("xMinYMid slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 50)),
("xMidYMid slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 50)),
("xMaxYMid slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 50)),
("xMinYMax slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 100)),
("xMidYMax slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 100)),
("xMaxYMax slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 100)),
]
for preserve_aspect_ratio, expected_result in params:
with self.subTest(preserve_aspect_ratio=preserve_aspect_ratio):
Expand All @@ -129,12 +129,12 @@ def test_landscape_view_box(self):
("xMinYMin slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 0)),
("xMinYMid slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 0)),
("xMinYMax slice", ViewportToUserSpaceTransform(2.5, 2.5, 0, 0)),
("xMidYMin slice", ViewportToUserSpaceTransform(2.5, 2.5, -50, 0)),
("xMidYMid slice", ViewportToUserSpaceTransform(2.5, 2.5, -50, 0)),
("xMidYMax slice", ViewportToUserSpaceTransform(2.5, 2.5, -50, 0)),
("xMaxYMin slice", ViewportToUserSpaceTransform(2.5, 2.5, -100, 0)),
("xMaxYMid slice", ViewportToUserSpaceTransform(2.5, 2.5, -100, 0)),
("xMaxYMax slice", ViewportToUserSpaceTransform(2.5, 2.5, -100, 0)),
("xMidYMin slice", ViewportToUserSpaceTransform(2.5, 2.5, 50, 0)),
("xMidYMid slice", ViewportToUserSpaceTransform(2.5, 2.5, 50, 0)),
("xMidYMax slice", ViewportToUserSpaceTransform(2.5, 2.5, 50, 0)),
("xMaxYMin slice", ViewportToUserSpaceTransform(2.5, 2.5, 100, 0)),
("xMaxYMid slice", ViewportToUserSpaceTransform(2.5, 2.5, 100, 0)),
("xMaxYMax slice", ViewportToUserSpaceTransform(2.5, 2.5, 100, 0)),
]
for preserve_aspect_ratio, expected_result in params:
with self.subTest(preserve_aspect_ratio=preserve_aspect_ratio):
Expand Down
31 changes: 21 additions & 10 deletions willow/svg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ def __init__(self, scale_x, scale_y, translate_x, translate_y):
self.translate_x = translate_x
self.translate_y = translate_y

def __repr__(self):
return (
f"{self.__class__.__name__}(scale_x={self.scale_x}, scale_y="
f"{self.scale_y}, translate_x={self.translate_x}, "
f"translate_y={self.translate_y})"
)

def __eq__(self, other):
if not isinstance(other, self.__class__):
return False
Expand All @@ -49,10 +56,10 @@ def __eq__(self, other):
def __call__(self, rect):
left, top, right, bottom = rect
return (
(left - self.translate_x) / self.scale_x,
(top - self.translate_y) / self.scale_y,
(right - self.translate_x) / self.scale_x,
(bottom - self.translate_y) / self.scale_y,
(left + self.translate_x) / self.scale_x,
(top + self.translate_y) / self.scale_y,
(right + self.translate_x) / self.scale_x,
(bottom + self.translate_y) / self.scale_y,
)


Expand Down Expand Up @@ -86,17 +93,21 @@ def get_viewport_to_user_space_transform(
# coefficient and use it for scaling both axes
scale_x = scale_y = choose_coefficient(scale_x, scale_y)

translate_x = -view_box.min_x * scale_x
# initial offsets to account for non-zero viewBox min-x and min-y
translate_x = view_box.min_x * scale_x
translate_y = view_box.min_y * scale_y

# adjust the offsets by the amount the viewBox has been translated
# to fit into the viewport (if any)
if x_position == "mid":
translate_x += (svg.image.width - view_box.width * scale_x) / 2
translate_x -= (svg.image.width - view_box.width * scale_x) / 2
elif x_position == "max":
translate_x += svg.image.width - view_box.width * scale_x
translate_x -= svg.image.width - view_box.width * scale_x

translate_y = -view_box.min_y * scale_y
if y_position == "mid":
translate_y += (svg.image.height - view_box.height * scale_y) / 2
translate_y -= (svg.image.height - view_box.height * scale_y) / 2
elif y_position == "max":
translate_y += svg.image.height - view_box.height * scale_y
translate_y -= svg.image.height - view_box.height * scale_y

return ViewportToUserSpaceTransform(scale_x, scale_y, translate_x, translate_y)

Expand Down

0 comments on commit 20453df

Please sign in to comment.