개정판 2193e1b2
issue #563: diagonal ongoing and nozzle type change need check
Change-Id: I6ea5e330b797478dc295242726e8b7288dd71374
| DTI_PID/DTI_PID/RecognitionDialog.py | ||
|---|---|---|
| 696 | 696 |
from EngineeringTextItem import QEngineeringTextItem |
| 697 | 697 |
from EngineeringLineItem import QEngineeringLineItem |
| 698 | 698 |
from LineDetector import LineDetector |
| 699 |
from HoughBundler import HoughBundler |
|
| 699 | 700 |
|
| 700 | 701 |
try: |
| 701 | 702 |
listWidget.addItem('Starting line recognition')
|
| ... | ... | |
| 731 | 732 |
remainLines = detector.detectLineWithoutSymbol() |
| 732 | 733 |
windowSize = app_doc_data.getSlidingWindowSize() |
| 733 | 734 |
thickness = int(windowSize[1]) |
| 735 |
|
|
| 736 |
diagonal = HoughBundler() |
|
| 737 |
for index in reversed(range(len(remainLines))): |
|
| 738 |
angle = diagonal.get_orientation([remainLines[index][0][0], remainLines[index][0][1], remainLines[index][1][0], remainLines[index][1][1]]) |
|
| 739 |
if not (angle < 3 or angle > 87): |
|
| 740 |
remainLines.pop(index) |
|
| 741 |
|
|
| 734 | 742 |
for line in remainLines: |
| 735 | 743 |
line.append(thickness) |
| 736 | 744 |
connectedLines.extend(remainLines) |
| DTI_PID/DTI_PID/Scripts/MSSQL/ID2.sql | ||
|---|---|---|
| 53 | 53 |
VALUES(11, 'Equipment Components', 'Mechanical Components'); |
| 54 | 54 |
INSERT INTO SymbolType |
| 55 | 55 |
(UID, Category, "Type") |
| 56 |
VALUES(12, 'Piping', 'Nozzles');
|
|
| 56 |
VALUES(12, 'Equipment Components', 'Nozzles');
|
|
| 57 | 57 |
INSERT INTO SymbolType |
| 58 | 58 |
(UID, Category, "Type") |
| 59 | 59 |
VALUES(13, 'Equipment Components', 'Trays'); |
| DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py | ||
|---|---|---|
| 1672 | 1672 |
cateogry = app_doc_data.getSymbolCategoryByType(type) |
| 1673 | 1673 |
if type == "Piping OPC's": |
| 1674 | 1674 |
item = QEngineeringOPCItem(path, uid, flip=flip) |
| 1675 |
elif type == 'Nozzles': |
|
| 1676 |
item = QEngineeringNozzleItem(path, uid, flip=flip) |
|
| 1675 | 1677 |
elif cateogry == 'Equipment' or cateogry == 'Equipment Components': |
| 1676 | 1678 |
item = QEngineeringEquipmentItem(path, uid, flip=flip) |
| 1677 | 1679 |
elif cateogry == 'Instrumentation': |
| 1678 | 1680 |
item = QEngineeringInstrumentItem(path, uid, flip=flip) |
| 1679 |
elif type == 'Nozzles': |
|
| 1680 |
item = QEngineeringNozzleItem(path, uid, flip=flip) |
|
| 1681 | 1681 |
elif type == 'Segment Breaks': |
| 1682 | 1682 |
item = QEngineeringSpecBreakItem(path, uid, flip=flip) |
| 1683 | 1683 |
elif type == 'Reducers': |
내보내기 Unified diff
