/ - Diff - HYTOS - 일정관리

개정판 32735cac

ID	32735cac9fb0dc2e1b951bed482ca3c2853b1313
상위	7ac6b06b
하위	698ae50c, 34f2b549

김정우 이(가) 약 7년 전에 추가함

심볼 검출 시 정확한 위치 조정할 때 사용하던 기준을 Feature Point Count(mpCount) 에서 Template Matching HitRate로 변경

         @brief  Add symbols
         @author jwkim
         @date
         @history    Change parameter (mpCount → hitRate)
     '''
     def addSearchedSymbol(id, sName, sType
                           , sp, w, h, threshold, minMatchCount, mpCount, rotatedAngle
                           , sp, w, h, threshold, minMatchCount, hitRate, rotatedAngle
                           , isDetectOnOrigin, rotateCount, ocrOption, isContainChild
                           , originalPoint, connectionPoint, baseSymbol, additionalSymbol, isExceptDetect):
         global searchedSymbolList
         newSym = symbol.Symbol(id, sName, sType
                                , sp, w, h, threshold, minMatchCount, mpCount, rotatedAngle
                                , sp, w, h, threshold, minMatchCount, hitRate, rotatedAngle
                                , isDetectOnOrigin, rotateCount, ocrOption, isContainChild
                                , originalPoint, connectionPoint, baseSymbol, additionalSymbol, isExceptDetect)
     ##Add symbols
-...
         @author     jwkim
         @date
         @history    humkyung 2018.04.06 check if symbol file exists
                     Jeongwoo 2018.05.29 Change method to adjust detail symbol location with hit-rate. Not feature point count
                                         Change parameter on add symbol part (mpCount → hitRate)
                                         Remove unusing calculation (avg)
     '''
     def detectSymbolOnPid(mainRes, targetSymbol, listWidget):
         global src
-...
                         roi = roiItem[pt[1]:pt[1]+sh, pt[0]:pt[0]+sw]
                         mpCount = getMatchPointCount(roi, symGray)
                         if not (mpCount >= symbolMinMatchCount):
                             continue
                         currentHitRate = tmRes[pt[1], pt[0]]
                         ## 겹치는 영역이 기준값보다 작을 경우
                         if overlapArea <= ACCEPT_OVERLAY_AREA:
                             if mpCount >= symbolMinMatchCount:
                                 threadLock.acquire()
                                 foundSymbolCount = foundSymbolCount + 1
                                 totalMpCount = totalMpCount + mpCount
                                 addSearchedSymbol(symId, symbolName, symbolType
                                                   , searchedItemSp, sw, sh, symbolThreshold, symbolMinMatchCount, mpCount, symbolRotatedAngle
                                                   , isDetectOnOrigin, symbolRotateCount, symbolOcrOption, isContainChild
                                                   , originalPoint, connectionPoint, baseSymbol, additionalSymbol,isExceptDetect)
                                 threadLock.release()
                             #if mpCount >= symbolMinMatchCount:
                             threadLock.acquire()
                             foundSymbolCount = foundSymbolCount + 1
                             addSearchedSymbol(symId, symbolName, symbolType
                                                 , searchedItemSp, sw, sh, symbolThreshold, symbolMinMatchCount, currentHitRate, symbolRotatedAngle
                                                 , isDetectOnOrigin, symbolRotateCount, symbolOcrOption, isContainChild
                                                 , originalPoint, connectionPoint, baseSymbol, additionalSymbol,isExceptDetect)
                             threadLock.release()
                         ## 겹치는 영역이 기준값보다 클 경우
                         else:
                             if symbolIndex != -1 and symbolIndex < len(searchedSymbolList):
                                 searchedSymbol = searchedSymbolList[symbolIndex]
                                 ## 현재 심볼과 검출된 심볼이 같을 경우 Match Point가 더 높은 정보로 교체
                                 if symbolName == searchedSymbol.getName():
                                     symbolMpCount = searchedSymbol.getMpCount()
                                     if symbolMpCount < mpCount:
                                     symbolHitRate = searchedSymbol.getHitRate()
                                     if symbolHitRate < currentHitRate:
                                         threadLock.acquire()
                                         totalMpCount = totalMpCount - symbolMpCount + mpCount
                                         searchedSymbolList[symbolIndex] = symbol.Symbol(symId, symbolName, symbolType
                                                                                         , searchedItemSp, sw, sh, symbolThreshold, symbolMinMatchCount, mpCount, symbolRotatedAngle
                                                                                         , searchedItemSp, sw, sh, symbolThreshold, symbolMinMatchCount, currentHitRate, symbolRotatedAngle
                                                                                         , isDetectOnOrigin, symbolRotateCount, symbolOcrOption, isContainChild
                                                                                         , originalPoint, connectionPoint, baseSymbol, additionalSymbol,isExceptDetect)
                                         threadLock.release()
-...
                                     ## 현재 심볼과 검출된 심볼이 같을 경우 Match Point가 더 높은 정보로 교체
                                     if len(matches) != 0:
                                         for s in matches:
                                             symbolMpCount = s.getMpCount()
                                             if symbolMpCount < mpCount:
                                             symbolHitRate = s.getHitRate()
                                             if symbolHitRate < currentHitRate:
                                                 threadLock.acquire()
                                                 totalMpCount = totalMpCount - symbolMpCount + mpCount
                                                 searchedSymbolList[searchedSymbolList.index(s)] = symbol.Symbol(symId, symbolName, symbolType
                                                                                                 , searchedItemSp, sw, sh, symbolThreshold, symbolMinMatchCount, mpCount, symbolRotatedAngle
                                                                                                 , searchedItemSp, sw, sh, symbolThreshold, symbolMinMatchCount, currentHitRate, symbolRotatedAngle
                                                                                                 , isDetectOnOrigin, symbolRotateCount, symbolOcrOption, isContainChild
                                                                                                 , originalPoint, connectionPoint, baseSymbol, additionalSymbol,isExceptDetect)
                                                 threadLock.release()
                                     else:
                                         if mpCount >= symbolMinMatchCount:
                                             if searchedSymbol.getIsContainChild() == 1:
                                                 ## 특정 카테고리 심볼을 걸러냄 (ex - 9900 대 Drum)
                                                 if (searchedSymbol.getId() // 100) == (symId // 100):
                                                     continue
                                                 else:
                                                     threadLock.acquire()
                                                     foundSymbolCount = foundSymbolCount + 1
                                                     totalMpCount = totalMpCount + mpCount
                                                     addSearchedSymbol(symId, symbolName, symbolType
                                                                       , searchedItemSp, sw, sh, symbolThreshold, symbolMinMatchCount, mpCount, symbolRotatedAngle
                                                                       , isDetectOnOrigin, symbolRotateCount, symbolOcrOption, isContainChild
                                                                       , originalPoint, connectionPoint, baseSymbol, additionalSymbol,isExceptDetect)
                                                     threadLock.release()
                                         #if mpCount >= symbolMinMatchCount:
                                         if searchedSymbol.getIsContainChild() == 1:
                                             ## 특정 카테고리 심볼을 걸러냄 (ex - 9900 대 Drum)
                                             if (searchedSymbol.getId() // 100) == (symId // 100):
                                                 continue
                                             else:
                                                 threadLock.acquire()
                                                 foundSymbolCount = foundSymbolCount + 1
                                                 addSearchedSymbol(symId, symbolName, symbolType
                                                                     , searchedItemSp, sw, sh, symbolThreshold, currentHitRate, currentHitRate, symbolRotatedAngle
                                                                     , isDetectOnOrigin, symbolRotateCount, symbolOcrOption, isContainChild
                                                                     , originalPoint, connectionPoint, baseSymbol, additionalSymbol,isExceptDetect)
                                                 threadLock.release()
                     ## Rotate Symbol
                     symGray = cv2.rotate(symGray, cv2.ROTATE_90_COUNTERCLOCKWISE)
-...
             splitCount = splitCount // 2
         avgMpCount = 0
         if foundSymbolCount != 0:
             avgMpCount = totalMpCount / foundSymbolCount
         threadLock.acquire()
         srcName = os.path.splitext(os.path.basename(mainRes))[0]

             @brief  get angle between given two vectors
             @author humkyung
             @date   2018.04.14
             @history    2018.05.29  Jeongwoo    Add try-exception
             @TODO : Need to modify case - Exception
         '''
         def getAngle(self, lhs, rhs):
             return math.acos(self.dotProduct(lhs, rhs) / (self.getLength(lhs) * self.getLength(rhs)))
             try:
                 return math.acos(self.dotProduct(lhs, rhs) / (self.getLength(lhs) * self.getLength(rhs)))
             except Exception as ex:
                 return sys.float_info.max
         """
             @brief  get distance between given two points

     # coding: utf-8
     import sys
     import os.path
     import copy
     try:
-...
             @brief      Delete Line Item from scene
             @author     Jeongwoo
             @date       2018.05.29
             @history    2018.05.29  Add parameter 'self' / Make comments emit()
         '''
         def deleteLineItemFromScene():
             self.removed.emit(self)
         def deleteLineItemFromScene(self):
             #self.removed.emit(self)
             self.scene().removeItem(self)
         '''

     from SymbolBase import SymbolBase
     '''
         @history    2018.05.29  Jeongwoo    Change parameter and getter/setter (mpCount → hitRate)
     '''
     class Symbol(SymbolBase):
         def __init__(self, id, sName, sType, sp, width, height, threshold, minMatchCount, mpCount, rotatedAngle
         def __init__(self, id, sName, sType, sp, width, height, threshold, minMatchCount, hitRate, rotatedAngle
                      , isDetectOnOrigin, rotationCount, ocrOption, isContainChild = 0
                      , originalPoint = None, connectionPoint = None, baseSymbol = None, additionalSymbol = None, isExceptDetect = 0, uid = None):
             SymbolBase.__init__(self, id, sName, sType, threshold, minMatchCount
-...
             self.sp = sp
             self.width = width
             self.height = height
             self.mpCount = mpCount
             self.hitRate = hitRate
             self.rotatedAngle = rotatedAngle
             self.text = ''
-...
         def getHeight(self):
             return self.height
         def setMpCount(self, mpCount):
             self.mpCount = mpCount
         def setHitRate(self, hitRate):
             self.hitRate = hitRate
         def getMpCount(self):
             return self.mpCount
         def getHitRate(self):
             return self.hitRate
         def setRotatedAngle(self, rotatedAngle):
             self.rotatedAngle = rotatedAngle

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 32735cac