개정판 824f1a2b
issue #700: process check off
Change-Id: I4d139411680d48f1bf1c2fceb14442ca6b7a3cb6
| DTI_PID/DTI_PID/License.py | ||
|---|---|---|
| 42 | 42 |
import socket |
| 43 | 43 |
import ipaddress |
| 44 | 44 |
|
| 45 |
return True |
|
| 46 |
|
|
| 45 | 47 |
n = 0 # number of instances of the program running |
| 46 | 48 |
CREATE_NO_WINDOW = 0x08000000 |
| 47 | 49 |
prog = [line.split() for line in |
| DTI_PID/DTI_PID/RecognitionDialog.py | ||
|---|---|---|
| 81 | 81 |
displayLog = pyqtSignal(MessageType, str) |
| 82 | 82 |
add_detected_items_to_scene = pyqtSignal(QGraphicsScene) |
| 83 | 83 |
add_predata_to_scene = pyqtSignal(Drawing, QGraphicsScene, bool, bool, bool, bool, bool) |
| 84 |
clear_scene = pyqtSignal(list)
|
|
| 84 |
clear_scene = pyqtSignal(QGraphicsScene, QGraphicsScene, QGraphicsScene)
|
|
| 85 | 85 |
|
| 86 | 86 |
def __init__(self, mutex, cond): |
| 87 | 87 |
super(Worker, self).__init__() |
| ... | ... | |
| 803 | 803 |
#worker.scene.clear() |
| 804 | 804 |
#worker.text_scene.clear() |
| 805 | 805 |
#worker.line_scene.clear() |
| 806 |
worker.clear_scene.emit([worker.scene, worker.text_scene, worker.line_scene])
|
|
| 806 |
worker.clear_scene.emit(worker.scene, worker.text_scene, worker.line_scene)
|
|
| 807 | 807 |
worker.cond.wait(worker.mutex) |
| 808 | 808 |
|
| 809 | 809 |
app_doc_data.clearItemList(True) |
| ... | ... | |
| 2778 | 2778 |
finally: |
| 2779 | 2779 |
self.cond.wakeAll() |
| 2780 | 2780 |
|
| 2781 |
def clear_scene(self, scenes) -> None:
|
|
| 2781 |
def clear_scene(self, scene1, scene2, scene3) -> None:
|
|
| 2782 | 2782 |
""" clear scenes """ |
| 2783 | 2783 |
|
| 2784 | 2784 |
try: |
| 2785 |
for scene in scenes: |
|
| 2786 |
scene.clear() |
|
| 2785 |
scene1.clear() |
|
| 2786 |
scene2.clear() |
|
| 2787 |
scene3.clear() |
|
| 2787 | 2788 |
|
| 2788 | 2789 |
except Exception as ex: |
| 2789 | 2790 |
from App import App |
| DTI_PID/DTI_PID/TextDetector.py | ||
|---|---|---|
| 47 | 47 |
return self.getTextAreaInfo(img, offset[0], offset[1]) |
| 48 | 48 |
else: |
| 49 | 49 |
# using craft |
| 50 |
return self.get_text_box_using_craft(img, offset[0], offset[1], web=True) |
|
| 50 |
local_info, _ = [], []#self.getTextAreaInfo(img, offset[0], offset[1]) |
|
| 51 |
server_info, img = self.get_text_box_using_craft(img, offset[0], offset[1], web=True) |
|
| 52 |
|
|
| 53 |
min_area = sys.maxsize |
|
| 54 |
for info in server_info: |
|
| 55 |
if info.area < min_area: |
|
| 56 |
min_area = info.area |
|
| 57 |
min_area = min_area * 1.3 |
|
| 58 |
|
|
| 59 |
for index in reversed(range(len(local_info))): |
|
| 60 |
if local_info[index].area > min_area: |
|
| 61 |
local_info.pop(index) |
|
| 62 |
|
|
| 63 |
return local_info + server_info, img |
|
| 51 | 64 |
|
| 52 | 65 |
except Exception as ex: |
| 53 | 66 |
from App import App |
| ... | ... | |
| 185 | 198 |
abs(x[1].height() - rect[1].height()) < (x[1].height() + rect[1].height())*0.5 and |
| 186 | 199 |
abs(x[1].center().y() - rect[1].center().y()) < rect[1].height()*0.25 and |
| 187 | 200 |
rectExpand.intersects(x[1])] |
| 188 |
else: # y -direction text
|
|
| 201 |
else: # y-direction text |
|
| 189 | 202 |
rectExpand = rect[1].adjusted(0, -mergeSize, 0, mergeSize) |
| 190 | 203 |
matches = [x for x in rects if (x[0] == rect[0]) and |
| 191 | 204 |
abs(x[1].width() - rect[1].width()) < (x[1].width() + rect[1].width())*0.5 and |
| ... | ... | |
| 644 | 657 |
app_doc_data = AppDocData.instance() |
| 645 | 658 |
project = app_doc_data.getCurrentProject() |
| 646 | 659 |
|
| 647 |
text_info_array = np.array_split(tInfoList, App.THREAD_MAX_WORKER |
|
| 648 |
if len(tInfoList) > App.THREAD_MAX_WORKER else len(tInfoList)) |
|
| 649 |
with futures.ThreadPoolExecutor(max_workers=App.THREAD_MAX_WORKER) as pool: |
|
| 650 |
future_text = {pool.submit(TextDetector.recognizeTextFromImage, tInfo, imgSrc, offset,
|
|
| 651 |
searchedSymbolList, worker, listWidget, maxProgressValue): |
|
| 652 |
tInfo for tInfo in text_info_array} |
|
| 653 |
|
|
| 654 |
for future in futures.as_completed(future_text): |
|
| 655 |
try: |
|
| 656 |
data = future.result() |
|
| 657 |
if data: |
|
| 658 |
self.textInfoList.extend(data) |
|
| 659 |
except Exception as ex: |
|
| 660 |
message = 'error occurred({}) in {}:{}'.format(repr(ex), sys.exc_info()[-1].tb_frame.f_code.co_filename,
|
|
| 660 |
if len(tInfoList): |
|
| 661 |
text_info_array = np.array_split(tInfoList, App.THREAD_MAX_WORKER |
|
| 662 |
if len(tInfoList) > App.THREAD_MAX_WORKER else len(tInfoList)) |
|
| 663 |
with futures.ThreadPoolExecutor(max_workers=App.THREAD_MAX_WORKER) as pool: |
|
| 664 |
future_text = {pool.submit(TextDetector.recognizeTextFromImage, tInfo, imgSrc, offset,
|
|
| 665 |
searchedSymbolList, worker, listWidget, maxProgressValue): |
|
| 666 |
tInfo for tInfo in text_info_array} |
|
| 667 |
|
|
| 668 |
for future in futures.as_completed(future_text): |
|
| 669 |
try: |
|
| 670 |
data = future.result() |
|
| 671 |
if data: |
|
| 672 |
self.textInfoList.extend(data) |
|
| 673 |
except Exception as ex: |
|
| 674 |
message = 'error occurred({}) in {}:{}'.format(repr(ex), sys.exc_info()[-1].tb_frame.f_code.co_filename,
|
|
| 661 | 675 |
sys.exc_info()[-1].tb_lineno) |
| 662 |
if worker: |
|
| 663 |
worker.displayLog.emit(MessageType.Error, message) |
|
| 676 |
if worker:
|
|
| 677 |
worker.displayLog.emit(MessageType.Error, message)
|
|
| 664 | 678 |
|
| 665 | 679 |
if onlyTextArea: |
| 666 | 680 |
return |
내보내기 Unified diff
