diff --git a/src/arcaea_offline_ocr/masker/__init__.py b/src/arcaea_offline_ocr/masker/__init__.py index a21c811..fd4f408 100644 --- a/src/arcaea_offline_ocr/masker/__init__.py +++ b/src/arcaea_offline_ocr/masker/__init__.py @@ -1,2 +1,2 @@ -from .auto import AutoMasker, AutoMaskerT1, AutoMaskerT2 -from .common import Masker +from .auto import * +from .common import DeviceRoiMasker diff --git a/src/arcaea_offline_ocr/masker/auto/__init__.py b/src/arcaea_offline_ocr/masker/auto/__init__.py index edc1e5a..cc84af6 100644 --- a/src/arcaea_offline_ocr/masker/auto/__init__.py +++ b/src/arcaea_offline_ocr/masker/auto/__init__.py @@ -1,3 +1,3 @@ -from .common import AutoMasker -from .t1 import AutoMaskerT1 -from .t2 import AutoMaskerT2 +from .common import DeviceAutoRoiMasker +from .t1 import DeviceAutoRoiMaskerT1 +from .t2 import DeviceAutoRoiMaskerT2 diff --git a/src/arcaea_offline_ocr/masker/auto/common.py b/src/arcaea_offline_ocr/masker/auto/common.py index 8ead91f..ed725d2 100644 --- a/src/arcaea_offline_ocr/masker/auto/common.py +++ b/src/arcaea_offline_ocr/masker/auto/common.py @@ -1,5 +1,5 @@ -from ..common import Masker +from ..common import DeviceRoiMasker -class AutoMasker(Masker): +class DeviceAutoRoiMasker(DeviceRoiMasker): ... diff --git a/src/arcaea_offline_ocr/masker/auto/t1.py b/src/arcaea_offline_ocr/masker/auto/t1.py index ee26ecc..84ba4a8 100644 --- a/src/arcaea_offline_ocr/masker/auto/t1.py +++ b/src/arcaea_offline_ocr/masker/auto/t1.py @@ -1,7 +1,7 @@ import cv2 import numpy as np -from .common import AutoMasker +from .common import DeviceAutoRoiMasker GRAY_BGR_MIN = np.array([50] * 3, np.uint8) GRAY_BGR_MAX = np.array([160] * 3, np.uint8) @@ -34,7 +34,7 @@ PURE_MEMORY_HSV_MIN = np.array([90, 70, 80], np.uint8) PURE_MEMORY_HSV_MAX = np.array([110, 200, 175], np.uint8) -class AutoMaskerT1(AutoMasker): +class DeviceAutoRoiMaskerT1(DeviceAutoRoiMasker): @classmethod def gray(cls, roi_bgr: cv2.Mat) -> cv2.Mat: bgr_value_equal_mask = np.max(roi_bgr, axis=2) - np.min(roi_bgr, axis=2) <= 5 diff --git a/src/arcaea_offline_ocr/masker/auto/t2.py b/src/arcaea_offline_ocr/masker/auto/t2.py index 2c1981a..430a3fb 100644 --- a/src/arcaea_offline_ocr/masker/auto/t2.py +++ b/src/arcaea_offline_ocr/masker/auto/t2.py @@ -1,7 +1,7 @@ import cv2 import numpy as np -from .common import AutoMasker +from .common import DeviceAutoRoiMasker PFL_HSV_MIN = np.array([0, 0, 248], np.uint8) PFL_HSV_MAX = np.array([179, 10, 255], np.uint8) @@ -38,7 +38,7 @@ PURE_MEMORY_HSV_MIN = np.array([90, 70, 80], np.uint8) PURE_MEMORY_HSV_MAX = np.array([110, 200, 175], np.uint8) -class AutoMaskerT2(AutoMasker): +class DeviceAutoRoiMaskerT2(DeviceAutoRoiMasker): @classmethod def pfl(cls, roi_bgr: cv2.Mat) -> cv2.Mat: return cv2.inRange( diff --git a/src/arcaea_offline_ocr/masker/common.py b/src/arcaea_offline_ocr/masker/common.py index fabbd55..39bbaf6 100644 --- a/src/arcaea_offline_ocr/masker/common.py +++ b/src/arcaea_offline_ocr/masker/common.py @@ -1,7 +1,7 @@ import cv2 -class Masker: +class DeviceRoiMasker: @classmethod def pure(cls, roi_bgr: cv2.Mat) -> cv2.Mat: raise NotImplementedError() diff --git a/src/arcaea_offline_ocr/roi_extractor/__init__.py b/src/arcaea_offline_ocr/roi_extractor/__init__.py index c288e7f..050378c 100644 --- a/src/arcaea_offline_ocr/roi_extractor/__init__.py +++ b/src/arcaea_offline_ocr/roi_extractor/__init__.py @@ -1,2 +1,2 @@ -from .common import Extractor +from .common import DeviceRoiExtractor from .sizes import * diff --git a/src/arcaea_offline_ocr/roi_extractor/common.py b/src/arcaea_offline_ocr/roi_extractor/common.py index 01c7965..8bb106e 100644 --- a/src/arcaea_offline_ocr/roi_extractor/common.py +++ b/src/arcaea_offline_ocr/roi_extractor/common.py @@ -1,11 +1,11 @@ import cv2 from ..crop import crop_xywh -from .sizes.common import Sizes +from .sizes.common import DeviceRoiSizes -class Extractor: - def __init__(self, img: cv2.Mat, sizes: Sizes): +class DeviceRoiExtractor: + def __init__(self, img: cv2.Mat, sizes: DeviceRoiSizes): self.img = img self.sizes = sizes diff --git a/src/arcaea_offline_ocr/roi_extractor/sizes/auto/__init__.py b/src/arcaea_offline_ocr/roi_extractor/sizes/auto/__init__.py index 681ed11..270a1e0 100644 --- a/src/arcaea_offline_ocr/roi_extractor/sizes/auto/__init__.py +++ b/src/arcaea_offline_ocr/roi_extractor/sizes/auto/__init__.py @@ -1,3 +1,3 @@ -from .common import AutoSizes -from .t1 import AutoSizesT1 -from .t2 import AutoSizesT2 +from .common import DeviceAutoRoiSizes +from .t1 import DeviceAutoRoiSizesT1 +from .t2 import DeviceAutoRoiSizesT2 diff --git a/src/arcaea_offline_ocr/roi_extractor/sizes/auto/common.py b/src/arcaea_offline_ocr/roi_extractor/sizes/auto/common.py index 66d42e6..a6e9c11 100644 --- a/src/arcaea_offline_ocr/roi_extractor/sizes/auto/common.py +++ b/src/arcaea_offline_ocr/roi_extractor/sizes/auto/common.py @@ -1,7 +1,7 @@ -from ..common import Sizes +from ..common import DeviceRoiSizes -class AutoSizes(Sizes): +class DeviceAutoRoiSizes(DeviceRoiSizes): def __init__(self, w: int, h: int): self.w = w self.h = h diff --git a/src/arcaea_offline_ocr/roi_extractor/sizes/auto/t1.py b/src/arcaea_offline_ocr/roi_extractor/sizes/auto/t1.py index 415e065..291a29c 100644 --- a/src/arcaea_offline_ocr/roi_extractor/sizes/auto/t1.py +++ b/src/arcaea_offline_ocr/roi_extractor/sizes/auto/t1.py @@ -1,7 +1,7 @@ -from .common import AutoSizes +from .common import DeviceAutoRoiSizes -class AutoSizesT1(AutoSizes): +class DeviceAutoRoiSizesT1(DeviceAutoRoiSizes): @property def factor(self): return ( diff --git a/src/arcaea_offline_ocr/roi_extractor/sizes/auto/t2.py b/src/arcaea_offline_ocr/roi_extractor/sizes/auto/t2.py index a99107c..f214da0 100644 --- a/src/arcaea_offline_ocr/roi_extractor/sizes/auto/t2.py +++ b/src/arcaea_offline_ocr/roi_extractor/sizes/auto/t2.py @@ -1,7 +1,7 @@ -from .common import AutoSizes +from .common import DeviceAutoRoiSizes -class AutoSizesT2(AutoSizes): +class DeviceAutoRoiSizesT2(DeviceAutoRoiSizes): @property def factor(self): return ( diff --git a/src/arcaea_offline_ocr/roi_extractor/sizes/common.py b/src/arcaea_offline_ocr/roi_extractor/sizes/common.py index fa85a20..f4ef4a1 100644 --- a/src/arcaea_offline_ocr/roi_extractor/sizes/common.py +++ b/src/arcaea_offline_ocr/roi_extractor/sizes/common.py @@ -3,7 +3,7 @@ from typing import Tuple Rect = Tuple[int, int, int, int] -class Sizes: +class DeviceRoiSizes: pure: Rect far: Rect lost: Rect