sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-05 22:40:09 +08:00
Code Activity

Fix: Button.image_binary is used before assignment

Browse Source
This commit is contained in:
LmeSzinc
2022-04-23 22:31:52 +08:00
parent 49a2ec6519
commit 09577297c8
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
module/base/button.py
View File

@@ -36,7 +36,9 @@ class Button(Resource):
self._button_offset = None self._button_offset = None
self._match_init = False self._match_init = False
self._match_binary_init = False
self.image = None self.image = None
self.image_binary = None
if self.file: if self.file:
self.resource_add(key=self.file) self.resource_add(key=self.file)
@@ -152,24 +154,33 @@ class Button(Resource):
image = image[:, :, :3].copy() if len(image.shape) == 3 else image image = image[:, :, :3].copy() if len(image.shape) == 3 else image
image = crop(image, self.area) image = crop(image, self.area)
self.image.append(image) self.image.append(image)
# graying else:
self.image = load_image(self.file, self.area)
self._match_init = True
def ensure_binary_template(self):
"""
Load asset image.
If needs to call self.match, call this first.
"""
if not self._match_binary_init:
if self.is_gif:
self.image_binary = []
for image in self.image:
image_gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY) image_gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
self.image_gray.append(image_gray)
# binarization
_, image_binary = cv2.threshold(image_gray, 0, 255, cv2.THRESH_BINARY | cv2.THRESH_OTSU) _, image_binary = cv2.threshold(image_gray, 0, 255, cv2.THRESH_BINARY | cv2.THRESH_OTSU)
self.image_binary.append(image_binary) self.image_binary.append(image_binary)
else: else:
self.image = load_image(self.file, self.area) image_gray = cv2.cvtColor(self.image, cv2.COLOR_BGR2GRAY)
# graying _, self.image_binary = cv2.threshold(image_gray, 0, 255, cv2.THRESH_BINARY | cv2.THRESH_OTSU)
self.image_gray = cv2.cvtColor(self.image, cv2.COLOR_BGR2GRAY) self._match_binary_init = True
# binarization
_, self.image_binary = cv2.threshold(self.image_gray, 0, 255, cv2.THRESH_BINARY | cv2.THRESH_OTSU)
self._match_init = True
def resource_release(self): def resource_release(self):
super().resource_release() super().resource_release()
self.image = None self.image = None
self.image_binary = None
self._match_init = False self._match_init = False
self._match_binary_init = False
def match(self, image, offset=30, threshold=0.85): def match(self, image, offset=30, threshold=0.85):
"""Detects button by template matching. To Some button, its location may not be static. """Detects button by template matching. To Some button, its location may not be static.
@@ -220,6 +231,7 @@ class Button(Resource):
bool. bool.
""" """
self.ensure_template() self.ensure_template()
self.ensure_binary_template()
if isinstance(offset, tuple): if isinstance(offset, tuple):
if len(offset) == 2: if len(offset) == 2: