papyru 2.11.1.dev114__tar.gz → 2.11.1.dev133__tar.gz

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

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

{papyru-2.11.1.dev114 → papyru-2.11.1.dev133}/papyru/create_variant/edit_template/ean.py

@@ -17,8 +17,6 @@ def insert_ean(doc: XMLHelper,
                resi_instance: Optional[resi.Instance] = None,
                resi_url: Optional[str] = None,
                ) -> XMLHelper:
-    if ean is None:
-        return doc
 
     ph = find_placeholder(doc, 'image', EAN_PLACEHOLDER_ID)
 

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

@@ -10,11 +10,25 @@ class PlaceholderInfo:
     placeholder: Element
 
 
+@dataclass(frozen=True)
+class Placement:
+    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
+
+
 @dataclass(frozen=True)
 class ImageInfo:
     location: str
     width: int
     height: int
+    placement: Placement = None
 
 
 def find_placeholder(doc: XMLHelper,
@@ -77,31 +91,34 @@ def fit_image(doc: XMLHelper,
     if ph is None:
         return doc
 
-    wrapper_dims = (float(doc.get_attribute(ph.wrapper, 'width')),
-                    float(doc.get_attribute(ph.wrapper, 'height')))
+    if image_info.placement is not None:
+        return _place_custom_image(doc, ph, image_info)
+    else:
+        wrapper_dims = (float(doc.get_attribute(ph.wrapper, 'width')),
+                        float(doc.get_attribute(ph.wrapper, 'height')))
 
-    image_dims = (float(image_info.width),
-                  float(image_info.height))
+        image_dims = (float(image_info.width),
+                      float(image_info.height))
 
-    viewbox = _fit_dimensions(wrapper_dims, image_dims)
+        viewbox = _fit_dimensions(wrapper_dims, image_dims)
 
-    doc.set_attribute(ph.wrapper,
-                      'viewBox',
-                      '%s %s %s %s' % viewbox)
+        doc.set_attribute(ph.wrapper,
+                          'viewBox',
+                          '%s %s %s %s' % viewbox)
 
-    has_xlink = doc.namespace('xlink') is not None
-    doc.set_attribute(ph.placeholder,
-                      'href', image_info.location,
-                      'xlink' if has_xlink else None)
+        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', '0.0')
-    doc.set_attribute(ph.placeholder, 'y', '0.0')
-    doc.set_attribute(ph.placeholder, 'width', '%s' % image_dims[0])
-    doc.set_attribute(ph.placeholder, 'height', '%s' % image_dims[1])
+        doc.set_attribute(ph.placeholder, 'x', '0.0')
+        doc.set_attribute(ph.placeholder, 'y', '0.0')
+        doc.set_attribute(ph.placeholder, 'width', '%s' % image_dims[0])
+        doc.set_attribute(ph.placeholder, 'height', '%s' % image_dims[1])
 
-    _set_changed(doc, ph.placeholder)
+        _set_changed(doc, ph.placeholder)
 
-    return doc
+        return doc
 
 
 def _set_changed(document: XMLHelper, element: Element):
@@ -124,3 +141,38 @@ def _fit_dimensions(container_dims: (float, float),
     else:
         w = element_dims[1] * aspect_container
         return ((e_w - w) / 2, 0.0, w, e_h)
+
+
+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))
+
+    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))
+
+    _set_changed(doc, ph.placeholder)
+
+    return doc

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

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

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

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