phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix cropper

Browse Source
This commit is contained in:
Kuroshini 2020-01-20 19:00:36 +03:00
parent 6ad1849835
commit e517d87d7e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/gallery/serializers.py
View File

@ -94,13 +94,13 @@ class CropImageSerializer(ImageSerializer):
"""Overridden create method.""" """Overridden create method."""
width = validated_data.pop('width', None) width = validated_data.pop('width', None)
height = validated_data.pop('height', None) height = validated_data.pop('height', None)
quality = validated_data.pop('quality')
crop = validated_data.pop('crop') crop = validated_data.pop('crop')
x1, y1 = int(crop.split(' ')[0][:-2]), int(crop.split(' ')[1][:-2])
x2, y2 = x1 + width, y1 + height
crop_params = { crop_params = {
'geometry': f'{width}x{height}', 'geometry': f'{self._image.image.width}x{self._image.image.width}',
'quality': 95, 'quality': 100,
'crop': crop, 'cropbox': f'{x1},{y1},{x2},{y2}'
} }
cropped_image = self._image.get_cropped_image(**crop_params) cropped_image = self._image.get_cropped_image(**crop_params)
image = self._image image = self._image

8
apps/utils/models.py
View File

@ -230,17 +230,19 @@ class SORLImageMixin(models.Model):
else: else:
return None return None
def get_cropped_image(self, geometry: str, quality: int, crop: str) -> dict: def get_cropped_image(self, geometry: str, quality: int, cropbox:str) -> dict:
cropped_image = get_thumbnail(self.image, cropped_image = get_thumbnail(self.image,
geometry_string=geometry, geometry_string=geometry,
crop=crop, # crop=crop,
# upscale=False, # upscale=False,
cropbox=cropbox,
quality=quality) quality=quality)
return { return {
'geometry_string': geometry, 'geometry_string': geometry,
'crop_url': cropped_image.url, 'crop_url': cropped_image.url,
'quality': quality, 'quality': quality,
'crop': crop # 'crop': crop,
'cropbox': cropbox,
} }
image_tag.short_description = _('Image') image_tag.short_description = _('Image')