papyru 2.11.1.dev133__tar.gz → 2.11.1.dev134__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papyru
-Version: 2.11.1.dev133
+Version: 2.11.1.dev134
 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.dev134}/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,
@@ -151,27 +148,17 @@ def _place_custom_image(doc: XMLHelper, ph: PlaceholderInfo,
                       '0 0 %s %s' % (placement.container_width,
                                      placement.container_height))
 
-    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
-
     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', '%s' % placement.x_offset)
+    doc.set_attribute(ph.placeholder, 'y', '%s' % placement.y_offset)
+    doc.set_attribute(ph.placeholder, 'width', '%s' %
+                      placement.scaled_img_width)
+    doc.set_attribute(ph.placeholder, 'height', '%s' %
+                      placement.scaled_img_height)
 
     _set_changed(doc, ph.placeholder)
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papyru
-Version: 2.11.1.dev133
+Version: 2.11.1.dev134
 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.dev134}/setup.py

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