From 050c10020470c20b531c965f0196c65c8b12a9c4 Mon Sep 17 00:00:00 2001 From: MrTeferi Date: Thu, 6 Jul 2023 22:17:42 -0500 Subject: [PATCH] fix(test): Fix test rendering not using the correct fullart image, fixed image testing for Split template --- src/templates/_core.py | 10 +++------- src/templates/split.py | 16 +++++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/templates/_core.py b/src/templates/_core.py index 9b44d9a2..2a6f8459 100644 --- a/src/templates/_core.py +++ b/src/templates/_core.py @@ -511,13 +511,9 @@ def load_artwork(self) -> None: """ Loads the specified art file into the specified layer. """ - # Choose image for dev_mode - if cfg.test_mode: - # Check for Fullart test image - dims = psd.get_layer_dimensions(self.art_reference) - if (dims['width'] * 1.2) < dims['height']: - # Use fullart test image - self.layout.filename = osp.join(con.path_img, "test-fa.png") + # Check for fullart test image + if cfg.test_mode and self.is_fullart: + self.layout.filename = osp.join(con.path_img, "test-fa.png") # Paste the file into the art self.active_layer = self.art_layer diff --git a/src/templates/split.py b/src/templates/split.py index 907258d9..d9389465 100644 --- a/src/templates/split.py +++ b/src/templates/split.py @@ -260,6 +260,12 @@ def create_blended_layer( def load_artwork(self) -> None: + # Check for fullart test image + if cfg.test_mode and self.is_fullart: + self.layout.filename = [osp.join(con.path_img, "test-fa.png")] * 2 + else: + self.layout.filename = [self.layout.filename] * 2 + # Manually select a second artwork if not provided self.layout: SplitLayout = self.layout if len(self.layout.filename) == 1: @@ -279,13 +285,9 @@ def load_artwork(self) -> None: # Load art for each side for i, ref in enumerate(self.art_reference): - # Choose image for dev_mode - if cfg.test_mode: - # Check for Fullart test image - dims = psd.get_layer_dimensions(ref) - if (dims['width'] * 1.2) < dims['height']: - # Use fullart test image - self.layout.filename = osp.join(con.path_img, "test-fa.png") + # Check for fullart test image + if cfg.test_mode and self.is_fullart: + self.layout.filename = [osp.join(con.path_img, "test-fa.png")] * 2 # Paste the file into the art self.active_layer = self.art_layer[i]