sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-17 11:05:25 +08:00
Code Activity

Opt: Remove redundant converts from pillow to numpy

Browse Source
This commit is contained in:
LmeSzinc
2022-01-24 23:43:53 +08:00
parent c5ed59ab26
commit e92579b5f9
28 changed files with 62 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/base/template.py
View File

@@ -72,7 +72,6 @@ class Template(Resource):
bool: If matches.
"""
if self.is_gif:
image = np.array(image)
for template in self.image:
res = cv2.matchTemplate(image, template, cv2.TM_CCOEFF_NORMED)
_, sim, _, _ = cv2.minMaxLoc(res)
@@ -83,7 +82,7 @@ class Template(Resource):
return False
else:
res = cv2.matchTemplate(np.array(image), self.image, cv2.TM_CCOEFF_NORMED)
res = cv2.matchTemplate(image, self.image, cv2.TM_CCOEFF_NORMED)
_, sim, _, _ = cv2.minMaxLoc(res)
# print(self.file, sim)
return sim > similarity
@@ -92,7 +91,7 @@ class Template(Resource):
"""
Args:
point:
image: Pillow image. If provided, load color and image from it.
image (np.ndarray): Screenshot. If provided, load color and image from it.
name (str):
Returns:
@@ -116,7 +115,7 @@ class Template(Resource):
float: Similarity
Button:
"""
res = cv2.matchTemplate(np.array(image), self.image, cv2.TM_CCOEFF_NORMED)
res = cv2.matchTemplate(image, self.image, cv2.TM_CCOEFF_NORMED)
_, sim, _, point = cv2.minMaxLoc(res)
# print(self.file, sim)
@@ -137,13 +136,12 @@ class Template(Resource):
raw = image
if self.is_gif:
result = []
image = np.array(image)
for template in self.image:
res = cv2.matchTemplate(image, template, cv2.TM_CCOEFF_NORMED)
res = np.array(np.where(res > similarity)).T[:, ::-1].tolist()
result += res
else:
result = cv2.matchTemplate(np.array(image), self.image, cv2.TM_CCOEFF_NORMED)
result = cv2.matchTemplate(image, self.image, cv2.TM_CCOEFF_NORMED)
result = np.array(np.where(result > similarity)).T[:, ::-1]
# result: np.array([[x0, y0], [x1, y1], ...)