프로젝트

일반

사용자정보

개정판 d763560c

IDd763560cf2ca56e115b875b9a2342041f5c4383f
상위 f973b84d
하위 7e2402d4, 7de563ee

humkyung 이(가) 6년 이상 전에 추가함

...

차이점 보기:

DTI_PID/DTI_PID/DTI_PID.py
464 464
                                                                                        , originalPoint, connectionPoint, baseSymbol, additionalSymbol,isExceptDetect)
465 465
                                        threadLock.release()
466 466
                            else:
467
                                '''
467 468
                                if searchedSymbol.getIsContainChild() == 1:
468 469
                                    ##TODO: 특정 카테고리 심볼을 걸러냄 (ex - 9900 대 Drum)
469 470
                                    if (searchedSymbol.getId() // 100) == (symId // 100):
470 471
                                        continue
471 472
                                    else:
472
                                        threadLock.acquire()
473
                                        foundSymbolCount = foundSymbolCount + 1
474
                                        addSearchedSymbol(symId, symbolName, symbolType
475
                                                            , searchedItemSp, sw, sh, symbolThreshold, hitRate, hitRate, symbolRotatedAngle
476
                                                            , isDetectOnOrigin, symbolRotateCount, symbolOcrOption, isContainChild
477
                                                            , originalPoint, connectionPoint, baseSymbol, additionalSymbol,isExceptDetect)
478
                                        threadLock.release()
473
                                '''
474
                                threadLock.acquire()
475
                                foundSymbolCount = foundSymbolCount + 1
476
                                addSearchedSymbol(symId, symbolName, symbolType
477
                                                    , searchedItemSp, sw, sh, symbolThreshold, hitRate, hitRate, symbolRotatedAngle
478
                                                    , isDetectOnOrigin, symbolRotateCount, symbolOcrOption, isContainChild
479
                                                    , originalPoint, connectionPoint, baseSymbol, additionalSymbol,isExceptDetect)
480
                                threadLock.release()
479 481
                                    
480 482
            ## Rotate Symbol
481 483
            symGray = cv2.rotate(symGray, cv2.ROTATE_90_COUNTERCLOCKWISE)
......
608 610
def initTargetSymbolDataList():
609 611
    ############ region SQLite
610 612
    global targetSymbolList
613

  
611 614
    targetSymbolList.clear()
612 615
    dict = {}
613
    tempTargetList = AppDocData.instance().getTargetSymbolList()
616
    symbolList = AppDocData.instance().getTargetSymbolList()
617
    targetSymbolList.extend(symbolList)
614 618

  
615 619
    ## Init Symbol Data from SQLite
620
    '''
616 621
    for target in tempTargetList:
617 622
        symId = target.getId() // 100 # symId
618 623
        if symId in dict:
......
630 635
    for sym in list(dict.values()):
631 636
        targetSymbolList.append(sym)
632 637
    ############ endregion SQLite
638
    '''
633 639

  
634 640
    return targetSymbolList
635 641

  

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)