tamil_ocr 밖으로 빼옴

Moment-Capture · May 30, 2024 · d250e2b · d250e2b
1 parent 363004c
commit d250e2b
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,5 +1,5 @@
-[submodule "models/tamil_ocr"]
-	path = models/tamil_ocr
+[submodule "tamil_ocr"]
+	path = tamil_ocr
 	url = https://github.com/gnana70/tamil_ocr.git
 [submodule "ultralytics"]
 	path = ultralytics

diff --git a/POINT-CHECKER.spec b/POINT-CHECKER.spec
@@ -1,12 +1,19 @@
 # -*- mode: python ; coding: utf-8 -*-
+from PyInstaller.utils.hooks import collect_all
+
+datas = [('D:\\venvs\\pyinstaller_venv\\Lib\\site-packages\\ultralytics\\cfg\\default.yaml', './ultralytics/cfg')]
+binaries = []
+hiddenimports = ['gdown']
+tmp_ret = collect_all('easyocr')
+datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 
 
 a = Analysis(
     ['main.py'],
     pathex=[],
-    binaries=[],
-    datas=[('D:\\venvs\\pyinstaller_venv\\Lib\\site-packages\\ultralytics\\cfg\\default.yaml', './ultralytics/cfg')],
-    hiddenimports=['gdown'],
+    binaries=binaries,
+    datas=datas,
+    hiddenimports=hiddenimports,
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],

diff --git a/mul.py b/mul.py
@@ -8,7 +8,7 @@
 from path import *
 from utils import cropBox, labelToInt, deleteDuplicateFiles, getNumEasy, getNumTamil
 
-sys.path.append(os.path.dirname(os.getcwd() + "/ultralytics/ultralytics"))
+sys.path.append(os.path.dirname(os.getcwd() + "\\" + "ultralytics" + "\\" + "ultralytics"))
 from ultralytics import YOLO
 
 

diff --git a/qna.py b/qna.py
@@ -7,7 +7,7 @@
 from path import *
 from utils import cropBox, concatImage
 
-sys.path.append(os.path.dirname(os.getcwd() + "/ultralytics/ultralytics"))
+sys.path.append(os.path.dirname(os.getcwd() + "\\" + "ultralytics" + "\\" + "ultralytics"))
 from ultralytics import YOLO
 
 

diff --git a/recognize.py b/recognize.py
@@ -8,10 +8,10 @@
 from utils import getNumText
 from utils import *
 
-sys.path.append(os.path.dirname(os.getcwd() + "/models/tamil_ocr/ocr_tamil"))
+sys.path.append(os.path.dirname(os.getcwd() + "\\" + "tamil_ocr" + "\\" + "ocr_tamil"))
 from ocr_tamil.ocr import OCR
 
-sys.path.append(os.path.dirname(os.getcwd() + "/EasyOCR"))
+sys.path.append(os.path.dirname(os.getcwd() + "\\" + "EasyOCR"))
 from EasyOCR.easyocr import easyocr
 
 
@@ -65,7 +65,8 @@ def testeeIdJpgDf(df, testee_jpg_df, id_match):
 ### 텍스트 부분 잘라내기 함수 (메인) ###
 def testeeCodeRecognition(jpg_file_path_list, testee_jpg_df):
     # easyOCR 사용
-    reader = easyocr.Reader(['ko', 'en'])
+    # reader = easyocr.Reader(['ko', 'en'])
+    reader = easyocr.Reader(['en'])
 
     # id_match 딕셔너리 초기화
     id_match = pd.DataFrame(columns=["testee_id", "testee_name"])

diff --git a/sub.py b/sub.py
@@ -8,7 +8,7 @@
 from path import *
 from utils import cropBox, deleteDuplicateFiles, getNumEasy, getNumTamil, getAnswerTamil
 
-sys.path.append(os.path.dirname(os.getcwd() + "/ultralytics/ultralytics"))
+sys.path.append(os.path.dirname(os.getcwd() + "\\" + "ultralytics" + "\\" + "ultralytics"))
 from ultralytics import YOLO
 
 

diff --git a/models/tamil_ocr → tamil_ocr b/models/tamil_ocr → tamil_ocr
diff --git a/utils.py b/utils.py
@@ -12,10 +12,10 @@
 from pdf2image import convert_from_path
 from PIL import Image
 
-sys.path.append(os.path.dirname(os.getcwd() + "/models/tamil_ocr/ocr_tamil"))
+sys.path.append(os.path.dirname(os.getcwd() + "\\" + "tamil_ocr" + "\\" + "ocr_tamil"))
 from ocr_tamil.ocr import OCR
 
-sys.path.append(os.path.dirname(os.getcwd() + "/EasyOCR"))
+sys.path.append(os.path.dirname(os.getcwd() + "\\" + "EasyOCR"))
 from EasyOCR.easyocr import easyocr