YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2026-10-18 03:32:18 +00:00
Code Releases Wiki Activity

feat: add cached_property for OCR initialization in draggable_list

Browse Source
This commit is contained in:
YoursFunny
2026-07-06 22:40:52 +08:00
parent dcd4b8f0f4
commit 2f4afcd5e8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ui/draggable_list.py
+6 -2
View File
@@ -4,6 +4,7 @@ import numpy as np
from module.base.base import ModuleBase from module.base.base import ModuleBase
from module.base.button import ButtonWrapper from module.base.button import ButtonWrapper
from module.base.decorator import cached_property
from module.base.timer import Timer from module.base.timer import Timer
from module.base.utils import area_size, random_rectangle_vector_opted from module.base.utils import area_size, random_rectangle_vector_opted
from module.logger import logger from module.logger import logger
@@ -67,6 +68,10 @@ class DraggableList:
def __hash__(self): def __hash__(self):
return hash(self.name) return hash(self.name)
@cached_property
def ocr(self):
return self.ocr_class(self.search_button)
def keyword2index(self, row: Keyword) -> int: def keyword2index(self, row: Keyword) -> int:
try: try:
return self.known_rows.index(row) + 1 return self.known_rows.index(row) + 1
@@ -88,8 +93,7 @@ class DraggableList:
""" """
Parse current rows to get list position. Parse current rows to get list position.
""" """
self.cur_buttons = self.ocr_class(self.search_button) \ self.cur_buttons = self.ocr.matched_ocr(main.device.image, self.keyword_class)
.matched_ocr(main.device.image, self.keyword_class)
# Get indexes # Get indexes
indexes = [self.keyword2index(row.matched_keyword) indexes = [self.keyword2index(row.matched_keyword)
for row in self.cur_buttons] for row in self.cur_buttons]