From 28d959ff1be1efe6185bdc2315ddbe24f6e81e7f Mon Sep 17 00:00:00 2001
From: mmattmcw <matt@sixteenmillimeter.com>
Date: Thu, 9 Feb 2023 22:17:18 -0500
Subject: [PATCH] Tried more approaches

---
 fourcell/apply_image.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/fourcell/apply_image.py b/fourcell/apply_image.py
index d9a4e1b..3c389bc 100644
--- a/fourcell/apply_image.py
+++ b/fourcell/apply_image.py
@@ -23,15 +23,16 @@ def apply_image_to_points (original, target, points) :
 
 	original[0:rows, 0:cols] = dst
 
-	return original
+	#return original
+	return cv2.cvtColor(original, cv2.COLOR_BGR2BGRA)
 
 def create_blank(width, height):
 	rgb_color=(255,255,255)
 	image = np.zeros((height, width, 3), np.uint8)
 	color = tuple(reversed(rgb_color))
 	image[:] = color
-	return image
-	#return cv2.cvtColor(image, cv2.COLOR_RGB2RGBA)
+	#return image
+	return cv2.cvtColor(image, cv2.COLOR_BGR2BGRA)
 
 # get points 0, 1 and 3 = top left, top right and bottom left
 def to_points (d) :
@@ -79,8 +80,8 @@ print(f"Image size {tmpl['width']}x{tmpl['height']}")
 
 hole = round(tmpl['width'] * holeConstant)
 blank = create_blank(tmpl['width'], tmpl['height'])
-#output = blank.copy() #
-output = cv2.imread(templateFile.replace('.calibration.json', ''))
+output = blank.copy() #
+#output = cv2.imread(templateFile.replace('.calibration.json', ''))
 
 hp = tmpl['holePunches']
 for i in hp:
@@ -97,6 +98,7 @@ for i in hp:
 #	print(f'Applied {basename(images[i])}')
 
 target = cv2.imread(images[0])
+target = cv2.cvtColor(target, cv2.COLOR_BGR2BGRA)
 points = to_points(tmpl['0'])
 
 rows, cols, ch = output.shape
@@ -109,9 +111,13 @@ atPts = np.float32(points)
 targetPts = np.float32([[0, 0], [ic, 0], [0, ir]])
 
 M = cv2.getAffineTransform(targetPts, atPts)
-dst = cv2.warpAffine(target, M, (cols, rows), borderMode=cv2.BORDER_TRANSPARENT)
+dst = cv2.warpAffine(target, M, (cols, rows), 
+	flags = cv2.INTER_CUBIC, 
+	borderMode = cv2.BORDER_CONSTANT, 
+	borderValue = [0, 0, 0, 0])
 
 output[0:rows, 0:cols] = dst
 
-cv2.imwrite(outputFile, output)
-print(f'Wrote {outputFile}')
+display(output)
+#cv2.imwrite(outputFile, output)
+##print(f'Wrote {outputFile}')