From ce78fdc65a4814043dca5a40dbe55a179c9e354d Mon Sep 17 00:00:00 2001 From: PommeDroid Date: Sat, 27 Jul 2019 22:37:33 +0200 Subject: [PATCH] Minor correction overlay code --- main.py | 2 +- src/cli/utils.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index f7e21d5..d6f9d0d 100644 --- a/main.py +++ b/main.py @@ -79,7 +79,7 @@ scale_mod.add_argument( def check_crops_coord(): def type_func(a): - if not re.match(r"^\d*,\d*:\d*,\d*$", a): + if not re.match(r"^\d+,\d+:\d+,\d+$", a): raise argparse.ArgumentTypeError("Incorrect coordinates format. Valid format is ,:,") return tuple(int(x) for x in re.findall('\d+', a)) return type_func diff --git a/src/cli/utils.py b/src/cli/utils.py index 1f9d99b..2436a0f 100644 --- a/src/cli/utils.py +++ b/src/cli/utils.py @@ -1,16 +1,20 @@ import cv2 -import math + +from opencv_transform.dress_to_correct import correct_color desired_size = 512 def crop_input(img,x1,y1,x2,y2): crop = img[y1:y2,x1:x2] - return resize_crop_input(crop) + return resize_input(crop) def overlay_original_img(original_img,img,x1,y1,x2,y2): img = cv2.resize(img, (abs(x1-x2), abs(y1-y2))) + original_img = original_img[:,:,:3] + img = img[:, :, :3] + original_img = correct_color(original_img,5) original_img[y1:y2,x1:x2] = img[:,:,:3] return original_img