From 60b6582f1b8a4f88f17e599230a98770012c80ed Mon Sep 17 00:00:00 2001 From: erjemin Date: Fri, 13 Jan 2023 22:23:24 +0300 Subject: [PATCH] =?UTF-8?q?minor=20(=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B8=D0=BF=D1=8B=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D0=BE=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20=D1=81=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B4=D0=B0=D0=BA=D1=88=D0=BD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oknardia/web/add_func.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/oknardia/web/add_func.py b/oknardia/web/add_func.py index 1d8703d..a86249a 100644 --- a/oknardia/web/add_func.py +++ b/oknardia/web/add_func.py @@ -118,7 +118,7 @@ def get_flaps_for_big_pictures(query_set) -> dict: for i in query_set: # найдём максимальную высоту проёма окна и двери if i.iWinHight >= mount_max_h: mount_max_h = i.iWinHight - if i.bIsDoor >= door_h: + if i.bIsDoor and i.iWinHight >= door_h: door_h = i.iWinHight # Проверяем есть ли папка для хранения картинки конфигурации проема и схемы открывания для данной серии. if not os.path.exists(f"{STATIC_BASE_PATH}/{PATH_FOR_IMG}/{PATH_FOR_BIGIMGFLAPCONFIG}"): @@ -176,8 +176,8 @@ def get_flaps_for_big_pictures(query_set) -> dict: return result -def make_big_img_win_flap(img_file_name_with_path: str, width: int, height: int, is_door: bool, - flap_config: str, height_max: int, height_mount_bulk: int, height_door: int) -> None: +def make_big_img_win_flap(img_file_name_with_path: str, width: float, height: float, is_door: bool, + flap_config: str, height_max: float, height_mount_bulk: float, height_door: int) -> None: """ Функция создает png-картинку схемы открывания окна или двери :param img_file_name_with_path: str -- полное имя файла картинки @@ -191,7 +191,7 @@ def make_big_img_win_flap(img_file_name_with_path: str, width: int, height: int, :return: None """ # создаем картинку с нужными размерами - img = Image.new("RGBA", (width * PICT_H / height_max, PICT_H), (255, 255, 255, 0)) + img = Image.new("RGBA", (int(width * PICT_H / height_max), PICT_H), (255, 255, 255, 0)) # print(img_file_name_with_path) # находим крайние точки периметра (если окно -- выравнено вверх; если дверь -- вниз) top = 0