/ - Diff - HYTOS - 일정관리

개정판 61f271c0

ID	61f271c025b023f83f4f260c62d19a0ee672df4a
상위	cd915509
하위	fe30e6d6

함의성이(가) 약 3년 전에 추가함

thread fix test

Change-Id: Ie0bba3bded76e4c3ac9faf80923b58000d665d5b

     import numpy as np
     import math
     import threading
     import multiprocessing
     from multiprocessing import Process, Queue
     #import multiprocessing
     #from multiprocessing import Process, Queue
     import concurrent.futures as futures
     from shapely.geometry import Point
     from xml.etree.ElementTree import Element, SubElement, dump, ElementTree, parse
-...
     from AppDocData import AppDocData
     import DetectSymbol_UI
     THREAD_MAX_WORKER = os.cpu_count()
     PercentGage = 0
     threadLock = threading.Lock()
     VerticalLineList = []
     HorizontalLineList = []
     class QDetectSymbolDialog(QDialog):
-...
         '''
         def detectSymbol(self):
             global VerticalLineList
             global HorizontalLineList
             if not self.ui.listWidgetDrawings.count():
                 return
-...
             areaImg = cv2.bitwise_not(areaImg)
             # find lines
             verticalLineList = []
             horizontalLineList = []
             self.findLines(areaImg, verticalLineList, horizontalLineList)
             VerticalLineList = []
             HorizontalLineList = []
             self.findLines(areaImg)#, verticalLineList, horizontalLineList)
             # chage color
             for vLine in verticalLineList:
             for vLine in VerticalLineList:
                 p1 = vLine[0]
                 p2 = vLine[1]
                 x = p1[0]
                 areaImg[p1[1]:p2[1], x] = 255
             # chage color
             for vLine in horizontalLineList:
             for vLine in HorizontalLineList:
                 p1 = vLine[0]
                 p2 = vLine[1]
                 y = p1[1]
-...
             @date   2018.10.01
         '''
         def findLines(self, areaImg, verticalLineList, horizontalLineList):
         def findLines(self, areaImg):#, verticalLineList, horizontalLineList):
             global PercentGage
             vJumpValue = int(areaImg.shape[1] / THREAD_MAX_WORKER)
             hJumpValue = int(areaImg.shape[0] / THREAD_MAX_WORKER)
             PercentGage = int(100 / vJumpValue + hJumpValue)
             value = 0
             values = []
             ranges = []
             for cpuIndex in range(THREAD_MAX_WORKER):
                 values.append(value)
                 ranges.append(value + vJumpValue) if os.cpu_count() - 1 != cpuIndex else ranges.append(areaImg.shape[1])
             with futures.ThreadPoolExecutor(max_workers=THREAD_MAX_WORKER) as pool:
                 verticalList = {pool.submit(QDetectSymbolDialog.isVerticalLineThread, values[index], ranges[index], areaImg, self.progress):
                                     index for index in range(THREAD_MAX_WORKER)}
                 futures.wait(verticalList)
             value = 0
             values = []
             ranges = []
             for cpuIndex in range(THREAD_MAX_WORKER):
                 values.append(value)
                 ranges.append(value + hJumpValue) if os.cpu_count() - 1 != cpuIndex else ranges.append(areaImg.shape[0])
             with futures.ThreadPoolExecutor(max_workers=THREAD_MAX_WORKER) as pool:
                 horizontalList = {pool.submit(QDetectSymbolDialog.isHorizontalLineThread, values[index], ranges[index], areaImg, self.progress):
                                     index for index in range(THREAD_MAX_WORKER)}
                 futures.wait(horizontalList)
             '''
             # for multiprocessing
             verticalProcessList = []
             horizontalProcessList = []
             # Find VerticalLine using multiprocessing
             # Set Vertical Line
             jumpValue = int(areaImg.shape[1] / os.cpu_count())
             jumpValue = int(areaImg.shape[1] / THREAD_MAX_WORKER)
             value = 0
             for cpuIndex in range(os.cpu_count()):
             for cpuIndex in range(THREAD_MAX_WORKER):
                 _queue = Queue()
                 _range = value + jumpValue
                 if os.cpu_count() - 1 == cpuIndex:
-...
                 _process.daemon = True
                 horizontalProcessList.append((_process, _queue))
                 value = value + jumpValue
             '''
             '''
             # set percent
             progressCount = len(verticalProcessList) + len(horizontalProcessList) + 1
             percentGage = int(100 / progressCount)
-...
                 percent = percent + percentGage
                 self.progress.setValue(percent)
                 QApplication.processEvents()
             '''
         '''
             @brief  get contours
-...
             QDialog.accept(self)
         @staticmethod
         def isVerticalLineThread(start, end, img, progress):
             global VerticalLineList
             global threadLock
             global PercentGage
             minLineSize = 40
             ## Vertical
             find = False
             startY = 0
             lineList = []
             for x in range(start, end):
                 for y in range(0, img.shape[0]):
                     if img[y, x] == 0:
                         if find:
                             continue
                         else:
                             find = True
                             startY = y
                     else:
                         if find:
                             if y - startY > minLineSize:
                                 lineList.append(((x, startY), (x, y)))
                             find = False
             threadLock.acquire()
             VerticalLineList.extend(lineList)
             progress.setValue(progress.value() + PercentGage)
             QApplication.processEvents()
             threadLock.release()
         @staticmethod
         def isHorizontalLineThread(start, end, img, progress):
             global HorizontalLineList
             global threadLock
             global PercentGage
             minLineSize = 40
             ## Horizontal
             find = False
             startX = 0
             lineList = []
             for y in range(start, end):
                 for x in range(0, img.shape[1]):
                     if img[y, x] == 0:
                         if find:
                             continue
                         else:
                             find = True
                             startX = x
                     else:
                         if find:
                             if x - startX > minLineSize:
                                 lineList.append(((startX, y), (x, y)))
                             find = False
             threadLock.acquire()
             HorizontalLineList.extend(lineList)
             progress.setValue(progress.value() + PercentGage)
             QApplication.processEvents()
             threadLock.release()
     '''
         @brief  Check Vertical Line using Multiprocessing
         @author kyouho
         @date   2018.09.27
     '''
     '''
     def isVerticalLineThread(start, end, img, _queue):
         minLineSize = 40
-...
                             lineList.append(((x, startY), (x, y)))
                         find = False
         _queue.put(lineList)
     '''
     '''
         @brief  Check Horizontal Line using Multiprocessing
         @author kyouho
         @date   2018.09.27
     '''
     '''
     def isHorizontalLineThread(start, end, img, _queue):
         minLineSize = 40
-...
                         find = False
         _queue.put(lineList)
     '''

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 61f271c0