개정판 018ee240
issue #000: fix text recog and opc type and segment break
Change-Id: I4efde08a10ded90140f131d4f443be8c86d69f88
| DTI_PID/DTI_PID/ConnectAttrDialog.py | ||
|---|---|---|
| 17 | 17 |
from EngineeringTextItem import QEngineeringTextItem |
| 18 | 18 |
from GraphicsBoundingBoxItem import QGraphicsBoundingBoxItem |
| 19 | 19 |
|
| 20 |
''' |
|
| 21 |
''' |
|
| 22 |
|
|
| 23 |
|
|
| 24 | 20 |
class WorkerSignals(QObject): |
| 25 | 21 |
"""Defines the signals available from a running worker thread.""" |
| 26 | 22 |
finished = pyqtSignal() |
| ... | ... | |
| 91 | 87 |
self.isRunned = False |
| 92 | 88 |
|
| 93 | 89 |
self.ui.pushButtonStart.clicked.connect(self.start_job) |
| 90 |
self.ui.checkBoxUpdateSpec.setChecked(True) |
|
| 94 | 91 |
|
| 95 | 92 |
@property |
| 96 | 93 |
def validation_checked(self): |
| DTI_PID/DTI_PID/RecognitionDialog.py | ||
|---|---|---|
| 457 | 457 |
# get text area by using symbol setting |
| 458 | 458 |
text_area_symbols = [] |
| 459 | 459 |
for symbol in [symbol for symbol in searchedSymbolList if symbol.text_area]: |
| 460 |
symbol_angle = symbol.getRotatedAngle() |
|
| 460 | 461 |
for text_area in symbol.text_area: |
| 461 |
so = [symbol.getWidth(), symbol.getHeight()] if symbol.getRotatedAngle() is 0 or symbol.getRotatedAngle() is 180\
|
|
| 462 |
so = [symbol.getWidth(), symbol.getHeight()] if symbol_angle is 0 or symbol_angle is 180\
|
|
| 462 | 463 |
else [symbol.getHeight(), symbol.getWidth()] |
| 463 | 464 |
text_area_origin = Worker.getCalculatedOriginalPoint(None, str(text_area.center()[0]) + ',' + str(text_area.center()[1]),\ |
| 464 |
symbol.getRotatedAngle(), None, None, so[0], so[1], symbol.getDetectFlip())
|
|
| 465 |
x = text_area_origin[0] - round(text_area.width / 2) if symbol.getRotatedAngle() is 0 or symbol.getRotatedAngle() is 180\
|
|
| 465 |
symbol_angle, None, None, so[0], so[1], symbol.getDetectFlip())
|
|
| 466 |
x = text_area_origin[0] - round(text_area.width / 2) if symbol_angle is 0 or symbol_angle is 180\
|
|
| 466 | 467 |
else text_area_origin[0] - round(text_area.height / 2) |
| 467 | 468 |
x = x + symbol.sp[0] |
| 468 |
y = text_area_origin[1] - round(text_area.height / 2) if symbol.getRotatedAngle() is 0 or symbol.getRotatedAngle() is 180\
|
|
| 469 |
y = text_area_origin[1] - round(text_area.height / 2) if symbol_angle is 0 or symbol_angle is 180\
|
|
| 469 | 470 |
else text_area_origin[1] - round(text_area.width / 2) |
| 470 | 471 |
y = y + symbol.sp[1] |
| 471 |
w = text_area.width if symbol.getRotatedAngle() is 0 or symbol.getRotatedAngle() is 180 else text_area.height |
|
| 472 |
h = text_area.height if symbol.getRotatedAngle() is 0 or symbol.getRotatedAngle() is 180 else text_area.width |
|
| 473 |
text_area_symbols.append(TextInfo('', x, y, w, h, symbol.getRotatedAngle()))
|
|
| 472 |
w = text_area.width if symbol_angle is 0 or symbol_angle is 180 else text_area.height |
|
| 473 |
h = text_area.height if symbol_angle is 0 or symbol_angle is 180 else text_area.width |
|
| 474 |
|
|
| 475 |
if symbol_angle is 180 or symbol_angle is 0: |
|
| 476 |
text_angle = 0 |
|
| 477 |
else: |
|
| 478 |
text_angle90 |
|
| 479 |
text_area_symbols.append(TextInfo('', x, y, w, h, text_angle))
|
|
| 474 | 480 |
|
| 475 | 481 |
for textArea_index in reversed(range(len(textAreas))): |
| 476 | 482 |
for text_area_index in reversed(range(len(text_area_symbols))): |
| DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py | ||
|---|---|---|
| 1715 | 1715 |
item = None |
| 1716 | 1716 |
try: |
| 1717 | 1717 |
cateogry = app_doc_data.getSymbolCategoryByType(type) |
| 1718 |
if type == "Piping OPC's": |
|
| 1718 |
if type == "Piping OPC's" or type == "Instrument OPC's":
|
|
| 1719 | 1719 |
item = QEngineeringOPCItem(path, uid, flip=flip) |
| 1720 | 1720 |
elif type == 'Nozzles': |
| 1721 | 1721 |
item = QEngineeringNozzleItem(path, uid, flip=flip) |
내보내기 Unified diff
