개정판 aea5052a
fix line merge
Change-Id: Id9897b68dc107fd124e88122a13fec0700c5d2ff
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 2823 | 2823 |
selected = [item for item in self.graphicsView.scene().items(QPointF(pt[0], pt[1])) if |
| 2824 | 2824 |
type(item) is QEngineeringConnectorItem or type(item) is QEngineeringLineItem] |
| 2825 | 2825 |
if selected: |
| 2826 |
if type(selected[0]) is QEngineeringConnectorItem and selected[0].parent in connectedItems:
|
|
| 2826 |
if type(selected[0]) is QEngineeringConnectorItem: |
|
| 2827 | 2827 |
lineItem.connect_if_possible(selected[0].parent, 5) |
| 2828 |
elif selected[0] in connectedItems: |
|
| 2829 |
lineItem.connect_if_possible(selected[0], 5) |
|
| 2828 | 2830 |
else: |
| 2829 | 2831 |
detector.connectLineToLine(selected[0].parent, lineItem, 5) |
| 2830 | 2832 |
|
내보내기 Unified diff
