개정판 afee1544
issue #663: 인식 - drawing,database 코드 수정으로 인한 인식 부분 오류 수정
Change-Id: Iffb7a93e54f51993dce6d7512fbfdf3e4f0090b2
| DTI_PID/DTI_PID/AppDocData.py | ||
|---|---|---|
| 521 | 521 |
def getTargetSymbolList(self): |
| 522 | 522 |
targetSymbolList = [] |
| 523 | 523 |
|
| 524 |
conn = self.database.connect() |
|
| 524 |
conn = self.project.database.connect()
|
|
| 525 | 525 |
with conn: |
| 526 | 526 |
cursor = conn.cursor() |
| 527 | 527 |
sql = """SELECT a.UID,a.Name,b.Type,a.Threshold,a.MinMatchPoint,a.IsDetectOrigin,a.RotationCount,a.OCROption,a.IsContainChild,a.OriginalPoint,a.ConnectionPoint, |
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 1604 | 1604 |
return |
| 1605 | 1605 |
|
| 1606 | 1606 |
try: |
| 1607 |
''' |
|
| 1608 |
self.removedItems['LINE'] = [] |
|
| 1609 |
self.removedItems['EQUIP'] = [] |
|
| 1610 |
self.removedItems['INST'] = [] |
|
| 1611 |
self.removedItems['NOTE'] = [] |
|
| 1612 |
''' |
|
| 1613 |
|
|
| 1614 | 1607 |
appDocData = AppDocData.instance() |
| 1615 | 1608 |
|
| 1616 | 1609 |
self.onClearLog() |
| ... | ... | |
| 1626 | 1619 |
|
| 1627 | 1620 |
# save working date-time |
| 1628 | 1621 |
drawings = appDocData.getDrawings() |
| 1629 |
drawing = [drawing for drawing in drawings if appDocData.imgName == os.path.splitext(drawing[1])[0]]
|
|
| 1622 |
drawing = [drawing for drawing in drawings if appDocData.imgName == os.path.splitext(drawing.name)[0]]
|
|
| 1630 | 1623 |
if drawing[0]: |
| 1631 |
drawing[0][2] = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
|
|
| 1624 |
drawing[0].datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
|
|
| 1632 | 1625 |
appDocData.saveDrawings(drawing) |
| 1633 | 1626 |
|
| 1634 | 1627 |
currentPid = appDocData.activeDrawing.name |
| DTI_PID/DTI_PID/RecognitionDialog.py | ||
|---|---|---|
| 220 | 220 |
|
| 221 | 221 |
try: |
| 222 | 222 |
appDocData = AppDocData.instance() |
| 223 |
drawings = appDocData.getDrawings() |
|
| 223 | 224 |
project = appDocData.getCurrentProject() |
| 224 | 225 |
textDetector = TextDetector() |
| 225 | 226 |
|
| ... | ... | |
| 257 | 258 |
|
| 258 | 259 |
appDocData.setImgFilePath(mainRes) |
| 259 | 260 |
appDocData.imgSrc = None |
| 260 |
appDocData.activeDrawing = Drawing(appDocData.imgName) |
|
| 261 |
matches = [drawing for drawing in drawings if appDocData.imgName == os.path.splitext(drawing.name)[0]] |
|
| 262 |
appDocData.activeDrawing = matches[0] if matches else Drawing(None, appDocData.imgName, None) |
|
| 261 | 263 |
appDocData.setCurrentPidSource(Image.open(mainRes)) |
| 262 | 264 |
|
| 263 | 265 |
# remove not drawing area |
| ... | ... | |
| 1534 | 1536 |
# remove not drawing area |
| 1535 | 1537 |
configs = appDocData.getConfigs('{} Equipment Desc Area'.format(appDocData.imgName))
|
| 1536 | 1538 |
for config in configs: |
| 1537 |
found = re.findall('\d+', config.value)
|
|
| 1539 |
found = re.findall('\\d+', config.value)
|
|
| 1538 | 1540 |
if len(found) == 4: |
| 1539 | 1541 |
cv2.rectangle(imgOriginal, (int(found[0]), int(found[1])), (int(found[0])+int(found[2]), int(found[1])+int(found[3])), 255, -1) |
| 1540 | 1542 |
|
내보내기 Unified diff
