papyru 2.11.1.dev133__tar.gz → 2.11.1.dev139__tar.gz

{papyru-2.11.1.dev133/papyru.egg-info → papyru-2.11.1.dev139}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papyru
-Version: 2.11.1.dev133
+Version: 2.11.1.dev139
 Summary: minimal REST library with OpenAPI-based validation for django
 Home-page: http://www.puzzleyou.net/
 Author: puzzleYOU GmbH

{papyru-2.11.1.dev133 → papyru-2.11.1.dev139}/papyru/create_variant/edit_template/xml.py

@@ -11,16 +11,13 @@ class PlaceholderInfo:
 
 
 @dataclass(frozen=True)
-class Placement:
+class CustomPlacement:
     container_width: float
     container_height: float
-    container_x: float
-    container_y: float
-    placement_x: float
-    placement_y: float
-    scale_x: float
-    scale_y: float
-    rotation: float
+    scaled_img_width: float
+    scaled_img_height: float
+    x_offset: float
+    y_offset: float
 
 
 @dataclass(frozen=True)
@@ -28,7 +25,7 @@ class ImageInfo:
     location: str
     width: int
     height: int
-    placement: Placement = None
+    placement: CustomPlacement = None
 
 
 def find_placeholder(doc: XMLHelper,
@@ -147,31 +144,37 @@ def _place_custom_image(doc: XMLHelper, ph: PlaceholderInfo,
                         image_info: ImageInfo):
     placement = image_info.placement
 
-    doc.set_attribute(ph.wrapper, 'viewBox',
-                      '0 0 %s %s' % (placement.container_width,
-                                     placement.container_height))
+    scale_x = placement.scaled_img_width / image_info.width
+    scale_y = placement.scaled_img_height / image_info.height
+
+    crop = {
+        'x': -placement.x_offset / scale_x,
+        'y': -placement.y_offset / scale_y,
+        'width': placement.container_width / scale_x,
+        'height': placement.container_height / scale_y,
+    }
 
-    img_width = image_info.width * placement.scale_x
-    img_height = image_info.height * placement.scale_y
-    x = placement.placement_x - placement.container_x
-    y = placement.placement_y - placement.container_y
+    doc.set_attribute(ph.wrapper, 'viewBox',
+                      '%s %s %s %s' % (crop['x'], crop['y'],
+                                       crop['width'], crop['height']))
 
     has_xlink = doc.namespace('xlink') is not None
     doc.set_attribute(ph.placeholder,
                       'href', image_info.location,
                       'xlink' if has_xlink else None)
 
-    doc.set_attribute(ph.placeholder, 'x', '%s' % x)
-    doc.set_attribute(ph.placeholder, 'y', '%s' % y)
-    doc.set_attribute(ph.placeholder, 'width', '%s' % img_width)
-    doc.set_attribute(ph.placeholder, 'height', '%s' % img_height)
-
-    if placement.rotation:
-        doc.set_attribute(ph.placeholder, 'transform',
-                          'rotate(%s %s %s)' % (
-                              placement.rotation,
-                              x + img_width / 2,
-                              y + img_height / 2))
+    doc.set_attribute(ph.placeholder, 'x', '0.0')
+    doc.set_attribute(ph.placeholder, 'y', '0.0')
+    doc.set_attribute(ph.placeholder, 'width', '%s' % image_info.width)
+    doc.set_attribute(ph.placeholder, 'height', '%s' % image_info.height)
+
+    doc.set_attribute(ph.placeholder, 'bbox',
+                      '{"x": %s, "y": %s, "width": %s, "height": %s}'
+                      % (crop['x'], crop['y'],
+                         crop['width'], crop['height']), 'pap')
+    doc.set_attribute(ph.placeholder, 'img-dimensions',
+                      '{"width": %s, "height": %s}'
+                      % (image_info.width, image_info.height), 'pap')
 
     _set_changed(doc, ph.placeholder)
 

{papyru-2.11.1.dev133 → papyru-2.11.1.dev139/papyru.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papyru
-Version: 2.11.1.dev133
+Version: 2.11.1.dev139
 Summary: minimal REST library with OpenAPI-based validation for django
 Home-page: http://www.puzzleyou.net/
 Author: puzzleYOU GmbH

{papyru-2.11.1.dev133 → papyru-2.11.1.dev139}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='papyru',
-    version='2.11.1.dev133',
+    version='2.11.1.dev139',
     description=(
         'minimal REST library with OpenAPI-based validation for django'),
     author='puzzleYOU GmbH',