Commit 5629eff5 authored by dmMaze's avatar dmMaze
Browse files

fix img reading racing, close #900

parent 82994d8c

modules/ocr/ocr_stariver.py

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import base64 
from typing import List



from .base import register_OCR, OCRBase, TextBlock

from utils import create_error_dialog, create_info_dialog

from utils.message import create_error_dialog, create_info_dialog





@register_OCR('stariver_ocr')

modules/textdetector/detector_stariver.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import requests 
import base64



from .base import register_textdetectors, TextDetectorBase, TextBlock, ProjImgTrans

from utils import create_error_dialog, create_info_dialog

from utils.message import create_error_dialog, create_info_dialog



import json

import time

ui/io_thread.py

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ from qtpy.QtWidgets import QDialog, QMessageBox, QFileDialog 


from utils.logger import logger as LOGGER

from utils.io_utils import imread, imwrite

from utils import create_error_dialog

from utils.message import create_error_dialog

from utils.proj_imgtrans import ProjImgTrans

from .custom_widget import ProgressMessageBox

from .misc import pixmap2ndarray

ui/mainwindow.py

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ from utils.logger import logger as LOGGER 
from utils.text_processing import is_cjk, full_len, half_len

from utils.textblock import TextBlock, TextAlignment

from utils import shared

from utils import create_error_dialog, create_info_dialog

from utils.message import create_error_dialog, create_info_dialog

from modules.translators.trans_chatgpt import GPTTranslator

from modules import GET_VALID_TEXTDETECTORS, GET_VALID_INPAINTERS, GET_VALID_TRANSLATORS, GET_VALID_OCR

from .misc import parse_stylesheet, set_html_family, QKEY

ui/module_manager.py

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import modules 
modules.translators.SYSTEM_LANG = QLocale.system().name()

from utils.textblock import TextBlock, sort_regions

from utils import shared

from utils import create_error_dialog, create_info_dialog, connect_once

from utils.message import create_error_dialog, create_info_dialog

from .custom_widget import ImgtransProgressMessageBox, ParamComboBox

from .configpanel import ConfigPanel

from utils.proj_imgtrans import ProjImgTrans
@@ -376,7 +376,6 @@ class ImgtransThread(QThread): 
                    existed_mask = self.imgtrans_proj.load_mask_by_imgname(imgname)

                    if existed_mask is not None:

                        mask = np.bitwise_or(mask, existed_mask)

                    print(len(blk_list), len(self.imgtrans_proj.pages[imgname]))

                self.imgtrans_proj.pages[imgname] = blk_list



            if blk_list is None: