개정판 80696a97
Azure Api Key, Region 변경 / SymbolBase.getPath() 내용 변경 및 관련사항 수정
| DTI_PID/DTI_PID/DTI_PID.py | ||
|---|---|---|
| 295 | 295 |
symId = targetSymbol.getId() |
| 296 | 296 |
symbolName = targetSymbol.getName() |
| 297 | 297 |
symbolType = targetSymbol.getType() |
| 298 |
symbolPath = AppDocData.instance().getCurrentProject().getPath() + "/image/" + symbolName + ".png" |
|
| 298 |
symbolPath = targetSymbol.getPath() |
|
| 299 |
#symbolPath = AppDocData.instance().getCurrentProject().getPath() + "/image/" + symbolName + ".png" |
|
| 299 | 300 |
#symbolPath = os.path.dirname(os.path.realpath(__file__)) + "/image/" + symbolName |
| 300 | 301 |
symbolThreshold = targetSymbol.getThreshold() |
| 301 | 302 |
symbolMinMatchCount = targetSymbol.getMinMatchCount() |
| ... | ... | |
| 490 | 491 |
global srcGray |
| 491 | 492 |
global ocrCompletedSrc |
| 492 | 493 |
global threadLock |
| 493 |
|
|
| 494 |
path = AppDocData.instance().getCurrentProject().getPath() + "/image/" + sym.getName() + ".png" |
|
| 494 |
|
|
| 495 |
path = sym.getPath() |
|
| 496 |
#path = AppDocData.instance().getCurrentProject().getPath() + "/image/" + sym.getName() + ".png" |
|
| 495 | 497 |
sp = sym.getSp() |
| 496 | 498 |
sw = sym.getWidth() |
| 497 | 499 |
sh = sym.getHeight() |
| ... | ... | |
| 515 | 517 |
global src |
| 516 | 518 |
global srcGray |
| 517 | 519 |
global ocrCompletedSrc |
| 518 |
|
|
| 519 |
path = AppDocData.instance().getCurrentProject().getPath() + "/image/" + sym.getName() + ".png" |
|
| 520 |
|
|
| 521 |
path = sym.getPath() |
|
| 522 |
#path = AppDocData.instance().getCurrentProject().getPath() + "/image/" + sym.getName() + ".png" |
|
| 520 | 523 |
sp = sym.getSp() |
| 521 | 524 |
sw = sym.getWidth() |
| 522 | 525 |
sh = sym.getHeight() |
| ... | ... | |
| 533 | 536 |
global searchedSymbolList |
| 534 | 537 |
|
| 535 | 538 |
symbolId = symbol.getId() |
| 536 |
symbolPath = AppDocData.instance().getCurrentProject().getPath() + "/image/" + symbol.getName() + ".png" |
|
| 539 |
symbolPath = symbol.getPath() |
|
| 540 |
#symbolPath = AppDocData.instance().getCurrentProject().getPath() + "/image/" + symbol.getName() + ".png" |
|
| 537 | 541 |
symbolSp = symbol.getSp() |
| 538 | 542 |
symbolWidth = symbol.getWidth() |
| 539 | 543 |
symbolHeight = symbol.getHeight() |
| ... | ... | |
| 685 | 689 |
|
| 686 | 690 |
def drawTempLine(sym): |
| 687 | 691 |
ADJUST = 8 |
| 688 |
symPath = AppDocData.instance().getCurrentProject().getPath() + "/image/" + sym.getName() + ".png" |
|
| 692 |
symPath = sym.getPath() |
|
| 693 |
#symPath = AppDocData.instance().getCurrentProject().getPath() + "/image/" + sym.getName() + ".png" |
|
| 689 | 694 |
symSp = sym.getSp() |
| 690 | 695 |
symWidth = sym.getWidth() |
| 691 | 696 |
symHeight = sym.getHeight() |
| DTI_PID/DTI_PID/QDirTreeWidget.py | ||
|---|---|---|
| 57 | 57 |
|
| 58 | 58 |
def displaySymbolActionClickEvent(self, itemName): |
| 59 | 59 |
project = AppDocData.instance().getCurrentProject() |
| 60 |
image = QImage(project.getPath()+"/image/"+itemName, "PNG") |
|
| 60 |
image = QImage(project.getPath()+"/image/"+itemName, "PNG") #itemName includes ".png"
|
|
| 61 | 61 |
dialog = QSymbolDisplayDialog.QSymbolDisplayDialog(image) |
| 62 | 62 |
dialog.showDialog() |
| 63 | 63 |
|
| ... | ... | |
| 75 | 75 |
print("handle")
|
| 76 | 76 |
if result == QMessageBox.Ok: |
| 77 | 77 |
project = AppDocData.instance().getCurrentProject() |
| 78 |
imagePath = project.getPath() + "/image/" + itemName + ".png"
|
|
| 78 |
imagePath = project.getPath() + "/image/" + itemName # itemName includes ".png"
|
|
| 79 | 79 |
if os.path.exists(imagePath): |
| 80 | 80 |
os.remove(imagePath) |
| 81 | 81 |
|
| ... | ... | |
| 118 | 118 |
def showSymbolEditorDialog(self, item, columnNo): |
| 119 | 119 |
sym = self.getSymbolByItemName(item, columnNo) |
| 120 | 120 |
if sym is not None: |
| 121 |
path = AppDocData.instance().getCurrentProject().getPath() + "/image/" + sym.getName() + ".png" |
|
| 121 |
path = sym.getPath() |
|
| 122 |
#path = AppDocData.instance().getCurrentProject().getPath() + "/image/" + sym.getName() + ".png" |
|
| 122 | 123 |
image = QImage(path, "PNG") |
| 123 | 124 |
print("after image")
|
| 124 | 125 |
symbolEditorDialog = QSymbolEditorDialog.QSymbolEditorDialog(self, image, AppDocData.instance().getCurrentProject(), sym) |
| ... | ... | |
| 152 | 153 |
while tmpItem.parent() is not None: |
| 153 | 154 |
path = tmpItem.parent().text(columnNo) + "/" + path |
| 154 | 155 |
tmpItem = tmpItem.parent() |
| 155 |
fullPath = AppDocData.instance().getCurrentProject().getPath() + "/image/" + path + ".png"
|
|
| 156 |
fullPath = AppDocData.instance().getCurrentProject().getPath() + "/image/" + path # path includes ".png"
|
|
| 156 | 157 |
|
| 157 | 158 |
name = itemName.replace(".png", "")
|
| 158 | 159 |
sym = AppDocData.instance().getSymbolByQuery("name", name)
|
| DTI_PID/DTI_PID/QPropertyTableWidget.py | ||
|---|---|---|
| 95 | 95 |
if self.symData is not None: |
| 96 | 96 |
self.setItem(0, 1, QTableWidgetItem(str(self.symData.getId()))) |
| 97 | 97 |
self.setItem(1, 1, QTableWidgetItem(self.symData.getName())) |
| 98 |
self.setItem(2, 1, QTableWidgetItem(AppDocData.instance().getCurrentProject().getPath() + "/image/" + self.symData.getName() + ".png")) |
|
| 98 |
self.setItem(2, 1, QTableWidgetItem(self.symData.getPath())) |
|
| 99 |
#self.setItem(2, 1, QTableWidgetItem(AppDocData.instance().getCurrentProject().getPath() + "/image/" + self.symData.getName() + ".png")) |
|
| 99 | 100 |
self.setItem(3, 1, QTableWidgetItem(str(int(self.symData.getThreshold() * 100)))) |
| 100 | 101 |
self.setItem(4, 1, QTableWidgetItem(str(self.symData.getMinMatchCount()))) |
| 101 | 102 |
|
| DTI_PID/DTI_PID/QSymbolEditorDialog.py | ||
|---|---|---|
| 325 | 325 |
if os.path.exists(imagePath): |
| 326 | 326 |
os.remove(imagePath) |
| 327 | 327 |
|
| 328 |
svgPath = self.project.getPath()+"/svg/" + fileName + ".svg"
|
|
| 328 |
svgPath = self.project.getPath() + "/svg/" + fileName + ".svg"
|
|
| 329 | 329 |
if os.path.exists(svgPath): |
| 330 | 330 |
os.remove(svgPath) |
| 331 | 331 |
|
| DTI_PID/DTI_PID/SymbolBase.py | ||
|---|---|---|
| 53 | 53 |
#def setPath(self, path): |
| 54 | 54 |
# self.path = path |
| 55 | 55 |
|
| 56 |
#def getPath(self): |
|
| 57 |
# return self.path |
|
| 56 |
def getPath(self): |
|
| 57 |
from AppDocData import AppDocData |
|
| 58 |
#return self.path |
|
| 59 |
return AppDocData.instance().getCurrentProject().getPath() + "/image/" + self.sName + ".png" |
|
| 58 | 60 |
|
| 59 | 61 |
def setThreshold(self, threshold): |
| 60 | 62 |
self.threshold = threshold |
| DTI_PID/DTI_PID/azure_ocr_module.py | ||
|---|---|---|
| 43 | 43 |
############################################### |
| 44 | 44 |
|
| 45 | 45 |
# Replace the subscription_key string value with your valid subscription key. |
| 46 |
subscription_key = '828669ef78ae40959882ff4a897fb1a4' # master |
|
| 46 |
subscription_key = '0c331f82837b4adeb5cbdb80a6c03d68' # master |
|
| 47 |
''' |
|
| 48 |
[NAME] |
|
| 49 |
CognitiveService_ImagePnID |
|
| 50 |
[KEY 1] |
|
| 51 |
0c331f82837b4adeb5cbdb80a6c03d68 |
|
| 52 |
[KEY 2] |
|
| 53 |
642218f51d364b00bb6d750d2575ca3f |
|
| 54 |
''' |
|
| 47 | 55 |
|
| 48 | 56 |
# Replace or verify the region. |
| 49 | 57 |
# |
| ... | ... | |
| 56 | 64 |
# NOTE: Free trial subscription keys are generated in the westcentralus region, |
| 57 | 65 |
# so if you are using |
| 58 | 66 |
# a free trial subscription key, you should not need to change this region. |
| 59 |
uri_base = 'southeastasia.api.cognitive.microsoft.com' # southeast asia for master
|
|
| 67 |
uri_base = 'eastasia.api.cognitive.microsoft.com' # southeast asia for master |
|
| 60 | 68 |
|
| 61 | 69 |
headers = {
|
| 62 | 70 |
# Request headers. |
내보내기 Unified diff
