papyru 2.11.1.dev139__tar.gz → 2.11.1.dev140__tar.gz

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

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

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

@@ -11,13 +11,11 @@ class PlaceholderInfo:
 
 
 @dataclass(frozen=True)
-class CustomPlacement:
-    container_width: float
-    container_height: float
-    scaled_img_width: float
-    scaled_img_height: float
-    x_offset: float
-    y_offset: float
+class ImageCrop:
+    x: float
+    y: float
+    width: float
+    height: float
 
 
 @dataclass(frozen=True)
@@ -25,7 +23,7 @@ class ImageInfo:
     location: str
     width: int
     height: int
-    placement: CustomPlacement = None
+    crop: ImageCrop = None
 
 
 def find_placeholder(doc: XMLHelper,
@@ -88,8 +86,8 @@ def fit_image(doc: XMLHelper,
     if ph is None:
         return doc
 
-    if image_info.placement is not None:
-        return _place_custom_image(doc, ph, image_info)
+    if image_info.crop is not None:
+        return _crop_image(doc, ph, image_info)
     else:
         wrapper_dims = (float(doc.get_attribute(ph.wrapper, 'width')),
                         float(doc.get_attribute(ph.wrapper, 'height')))
@@ -140,23 +138,13 @@ def _fit_dimensions(container_dims: (float, float),
         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
-
-    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,
-    }
+def _crop_image(doc: XMLHelper, ph: PlaceholderInfo,
+                image_info: ImageInfo) -> XMLHelper:
+    crop = image_info.crop
 
     doc.set_attribute(ph.wrapper, 'viewBox',
-                      '%s %s %s %s' % (crop['x'], crop['y'],
-                                       crop['width'], crop['height']))
+                      '%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,
@@ -170,8 +158,8 @@ def _place_custom_image(doc: XMLHelper, ph: PlaceholderInfo,
 
     doc.set_attribute(ph.placeholder, 'bbox',
                       '{"x": %s, "y": %s, "width": %s, "height": %s}'
-                      % (crop['x'], crop['y'],
-                         crop['width'], crop['height']), 'pap')
+                      % (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')

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

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

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

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