sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-19 23:33:33 +08:00
Code Activity

Fix: Ocr.buttons should be lazy loaded (#2278)

Browse Source
This commit is contained in:
LmeSzinc
2023-02-26 20:35:15 +08:00
parent cca3de7e77
commit f4dc328697
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/ocr/ocr.py
View File

@@ -33,8 +33,7 @@ class Ocr:
name (str): name (str):
""" """
self.name = str(buttons) if isinstance(buttons, Button) else name self.name = str(buttons) if isinstance(buttons, Button) else name
self.buttons = buttons if isinstance(buttons, list) else [buttons] self._buttons = buttons
self.buttons = [button.area if isinstance(button, Button) else button for button in self.buttons]
self.letter = letter self.letter = letter
self.threshold = threshold self.threshold = threshold
self.alphabet = alphabet self.alphabet = alphabet
@@ -44,6 +43,13 @@ class Ocr:
def cnocr(self) -> "AlOcr": def cnocr(self) -> "AlOcr":
return OCR_MODEL.__getattribute__(self.lang) return OCR_MODEL.__getattribute__(self.lang)
@cached_property
def buttons(self):
buttons = self._buttons
buttons = buttons if isinstance(buttons, list) else [buttons]
buttons = [button.area if isinstance(button, Button) else button for button in buttons]
return buttons
def pre_process(self, image): def pre_process(self, image):
""" """
Args: Args: