개정판 93015407
issue #538: add j function to insert and connect flange...
Change-Id: I47ce52951d118d8a13b470f5618bbfaff43275aa
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 1922 | 1922 |
|
| 1923 | 1923 |
if old_symbol: |
| 1924 | 1924 |
return |
| 1925 |
elif event.key() == Qt.Key_J: |
|
| 1926 |
# insert and connect symbol item that is selected symbol in tree to selected symbol |
|
| 1927 |
items = self.symbolTreeWidget.selectedItems() |
|
| 1928 |
if items and hasattr(items[0], 'svgFilePath'): |
|
| 1929 |
symData = items[0].data(0, self.symbolTreeWidget.TREE_DATA_ROLE) |
|
| 1930 |
symName = symData.getName() |
|
| 1931 |
else: |
|
| 1932 |
return |
|
| 1933 |
|
|
| 1934 |
symbolItems = [symbol for symbol in self.graphicsView.scene().selectedItems() if |
|
| 1935 |
issubclass(type(symbol), SymbolSvgItem)] |
|
| 1936 |
if symbolItems and len(symbolItems) is not 1: |
|
| 1937 |
return |
|
| 1938 |
|
|
| 1939 |
target_symbol = symbolItems[0] |
|
| 1940 |
for connector in [conn for conn in target_symbol.connectors if conn.connectedItem and type(conn.connectedItem) is QEngineeringLineItem]: |
|
| 1941 |
if connector.connectedItem.is_piping(True): |
|
| 1942 |
svg = self.graphicsView.createSymbolObject(symName) |
|
| 1943 |
self.graphicsView.matchSymbolToLine(svg, connector.sceneBoundingRect().center()) |
|
| 1944 |
|
|
| 1945 |
if target_symbol: |
|
| 1946 |
return |
|
| 1925 | 1947 |
elif event.key() == Qt.Key_X: |
| 1926 | 1948 |
app_doc_data = AppDocData.instance() |
| 1927 | 1949 |
configs = app_doc_data.getAppConfigs('app', 'mode')
|
| DTI_PID/DTI_PID/QtImageViewer.py | ||
|---|---|---|
| 704 | 704 |
type(item) is not QGraphicsPixmapItem and type(item) is not QGraphicsTextItem] |
| 705 | 705 |
items = [item for item in items if item.parentItem() is svg] |
| 706 | 706 |
if items and connectors[0].connectedItem and type(connectors[0].connectedItem) is QEngineeringLineItem: |
| 707 |
items[0].connectedItem = connectors[0].parentItem()
|
|
| 707 |
items[0].connect(connectors[0].parentItem())
|
|
| 708 | 708 |
anotherConns = [conn for conn in svg.connectors if conn is not items[0]] |
| 709 |
anotherConns[0].connectedItem = connectors[0].connectedItem
|
|
| 709 |
anotherConns[0].connect(connectors[0].connectedItem)
|
|
| 710 | 710 |
for lineConn in connectors[0].connectedItem.connectors: |
| 711 | 711 |
if lineConn.connectedItem is connectors[0].parentItem(): |
| 712 |
lineConn.connectedItem = svg
|
|
| 712 |
lineConn.connect(svg)
|
|
| 713 | 713 |
lineConn.setPos(anotherConns[0].center()) |
| 714 | 714 |
break |
| 715 |
connectors[0].connectedItem = svg
|
|
| 715 |
connectors[0].connect(svg)
|
|
| 716 | 716 |
lineConn.transfer.onPosChanged.emit(lineConn) |
| 717 | 717 |
elif items: |
| 718 |
items[0].connectedItem = connectors[0].parentItem()
|
|
| 719 |
items[0].highlight(False) |
|
| 718 |
items[0].connect(connectors[0].parentItem())
|
|
| 719 |
#items[0].highlight(False)
|
|
| 720 | 720 |
if connectors[0].connectedItem: |
| 721 | 721 |
for conn in connectors[0].connectedItem.connectors: |
| 722 | 722 |
if conn.connectedItem is connectors[0].parentItem(): |
| 723 |
conn.connectedItem = None
|
|
| 724 |
conn.highlight(False) |
|
| 723 |
conn.connect(None)
|
|
| 724 |
#conn.highlight(False)
|
|
| 725 | 725 |
break |
| 726 |
connectors[0].connectedItem = svg
|
|
| 727 |
connectors[0].highlight(False) |
|
| 726 |
connectors[0].connect(svg)
|
|
| 727 |
#connectors[0].highlight(False)
|
|
| 728 | 728 |
else: |
| 729 | 729 |
svg.angle = 0.0 |
| 730 | 730 |
svg.loc = [round(scenePos.x() - svg.symbolOrigin[0], 1), round(scenePos.y() - svg.symbolOrigin[1], 1)] |
| ... | ... | |
| 747 | 747 |
svg.angle = angle + rAngle if angle + rAngle < 2 * math.pi else angle + rAngle - 2 * math.pi |
| 748 | 748 |
''' |
| 749 | 749 |
|
| 750 |
svg.connectors[0].connectedItem = items[0].parentItem()
|
|
| 751 |
svg.connectors[0].highlight(False) |
|
| 752 |
items[0].connectedItem = svg
|
|
| 753 |
items[0].highlight(False) |
|
| 750 |
svg.connectors[0].connect(items[0].parentItem())
|
|
| 751 |
#svg.connectors[0].highlight(False)
|
|
| 752 |
items[0].connect(svg)
|
|
| 753 |
#items[0].highlight(False)
|
|
| 754 | 754 |
|
| 755 | 755 |
svg.addSvgItemToScene(self.scene()) |
| 756 | 756 |
|
| DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py | ||
|---|---|---|
| 1091 | 1091 |
self.loc[0] = self.loc[0] + delta |
| 1092 | 1092 |
self.origin[0] = self.origin[0] + delta |
| 1093 | 1093 |
self.rotate(self.getCurrentPoint(), self.angle) |
| 1094 |
elif event.key() == Qt.Key_I or event.key() == Qt.Key_X: |
|
| 1094 |
elif event.key() == Qt.Key_I or event.key() == Qt.Key_X or event.key() == Qt.Key_J:
|
|
| 1095 | 1095 |
from App import App |
| 1096 | 1096 |
App.mainWnd().keyPressEvent(event) |
| 1097 | 1097 |
|
내보내기 Unified diff
