xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-22 08:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Assignment duration and name OCR

Browse Source
This commit is contained in:
LmeSzinc 2023-09-17 08:09:00 +08:00
parent 59b3c59f99
commit 1f47d63af8
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
module/ocr/ocr.py
View File

@ -145,6 +145,12 @@ class Ocr:
text=str([result for result, _ in result_list])) text=str([result for result, _ in result_list]))
return result_list return result_list
def filter_detected(self, result: BoxedResult) -> bool:
"""
Return False to drop result.
"""
return True
def detect_and_ocr(self, image, direct_ocr=False) -> list[BoxedResult]: def detect_and_ocr(self, image, direct_ocr=False) -> list[BoxedResult]:
""" """
Args: Args:
@ -160,13 +166,14 @@ class Ocr:
image = crop(image, self.button.area) image = crop(image, self.button.area)
image = self.pre_process(image) image = self.pre_process(image)
# ocr # ocr
# image = enlarge_canvas(image)
results: list[BoxedResult] = self.model.detect_and_ocr(image) results: list[BoxedResult] = self.model.detect_and_ocr(image)
# after proces # after proces
for result in results: for result in results:
if not direct_ocr: if not direct_ocr:
result.box += self.button.area[:2] result.box += self.button.area[:2]
result.box = tuple(corner2area(result.box)) result.box = tuple(corner2area(result.box))
results = [result for result in results if self.filter_detected(result)]
results = merge_buttons(results, thres_x=self.merge_thres_x, thres_y=self.merge_thres_y) results = merge_buttons(results, thres_x=self.merge_thres_x, thres_y=self.merge_thres_y)
for result in results: for result in results:
result.ocr_text = self.after_process(result.ocr_text) result.ocr_text = self.after_process(result.ocr_text)
@ -366,14 +373,18 @@ class Duration(Ocr):
@classmethod @classmethod
def timedelta_regex(cls, lang): def timedelta_regex(cls, lang):
regex_str = { regex_str = {
'cn': r'((?P<days>\d{1,2})天)?' 'cn': r'^(?P<prefix>.*?)'
r'((?P<days>\d{1,2})天)?'
r'((?P<hours>\d{1,2})小时)?' r'((?P<hours>\d{1,2})小时)?'
r'((?P<minutes>\d{1,2})分钟)?' r'((?P<minutes>\d{1,2})分钟)?'
r'((?P<seconds>\d{1,2})秒)', r'((?P<seconds>\d{1,2})秒)?'
'en': r'((?P<days>\d{1,2})\s*d\s*)?' r'$',
'en': r'^(?P<prefix>.*?)'
r'((?P<days>\d{1,2})\s*d\s*)?'
r'((?P<hours>\d{1,2})\s*h\s*)?' r'((?P<hours>\d{1,2})\s*h\s*)?'
r'((?P<minutes>\d{1,2})\s*m\s*)?' r'((?P<minutes>\d{1,2})\s*m\s*)?'
r'((?P<seconds>\d{1,2})\s*s)' r'((?P<seconds>\d{1,2})\s*s)?'
r'$'
}[lang] }[lang]
return re.compile(regex_str) return re.compile(regex_str)

13
tasks/assignment/ui.py
View File

@ -60,16 +60,13 @@ class AssignmentOcr(Ocr):
return None return None
return re.compile('|'.join('(?P<%s>%s)' % pair for pair in rules)) return re.compile('|'.join('(?P<%s>%s)' % pair for pair in rules))
def filter_detected(self, result) -> bool:
# Drop duration rows
res = Duration.timedelta_regex(self.lang).search(result.ocr_text)
return not bool(res.group('seconds'))
def after_process(self, result: str): def after_process(self, result: str):
result = super().after_process(result) result = super().after_process(result)
# Drop duration
result = Duration.timedelta_regex(self.lang).sub('', result)
result = result.strip()
if self.lang == 'cn':
# Hourglass icon may be detected as "豆"
result = result.replace('豆', '')
result = re.sub(r'\d$', '', result)
if self.ocr_regex is None: if self.ocr_regex is None:
return result return result