diff --git a/projet/codes/block.py b/projet/codes/block.py index 8112131ef56435ee6e54bd2626c1452154515ce7..46b9b9526b6a9653e40d578530107351b324bbef 100644 --- a/projet/codes/block.py +++ b/projet/codes/block.py @@ -85,22 +85,19 @@ class Block: # Si le bloc est uniforme, une nouvelle image est cree im = Image.new('RGB', size, self.color) else: - # Calculer les tailles - upper_left_size = (size[0] // 2, size[1] // 2) - upper_right_size = (size[0] // 2, size[1] // 2) - lower_left_size = (size[0] // 2, size[1] // 2) - lower_right_size = (size[0] // 2, size[1] // 2) + # Calculer la taille + sub_block_size = (size[0] // 2, size[1] // 2) # transformer chaque sous-bloc en image - upper_left_im = self.upper_left_block.block_to_image(upper_left_size) - upper_right_im = self.upper_right_block.block_to_image(upper_right_size) - lower_left_im = self.lower_left_block.block_to_image(lower_left_size) - lower_right_im = self.lower_right_block.block_to_image(lower_right_size) + upper_left_im = self.upper_left_block.block_to_image(sub_block_size) + upper_right_im = self.upper_right_block.block_to_image(sub_block_size) + lower_left_im = self.lower_left_block.block_to_image(sub_block_size) + lower_right_im = self.lower_right_block.block_to_image(sub_block_size) # Creer une nouvelle image et coller les sous-blocs im = Image.new('RGB', size) im.paste(upper_left_im, (0, 0)) - im.paste(upper_right_im, (upper_left_size[0], 0)) - im.paste(lower_left_im, (0, upper_left_size[1])) - im.paste(lower_right_im, (upper_left_size[0], upper_left_size[1])) + im.paste(upper_right_im, (sub_block_size[0], 0)) + im.paste(lower_left_im, (0, sub_block_size[1])) + im.paste(lower_right_im, (sub_block_size[0], sub_block_size[1])) return im