개정판 092db086
issue #578: add eqp to eqp tree and fix symbol count
Change-Id: I6a5f8923ac774e368f32438ca2dec1629562a40a
| DTI_PID/DTI_PID/ItemTreeWidget.py | ||
|---|---|---|
| 286 | 286 |
try: |
| 287 | 287 |
if (not hasattr(child, 'treeItem')) or (child.treeItem is None): |
| 288 | 288 |
if issubclass(type(child), SymbolSvgItem): |
| 289 |
if appDocData.isEquipmentType(child.type): |
|
| 290 |
item = QTreeWidgetItem(self.SymbolsTreeItem, [child.name]) |
|
| 289 |
isEquipmentType = appDocData.isEquipmentType(child.type) |
|
| 290 |
if isEquipmentType: |
|
| 291 |
item = QTreeWidgetItem(self.EqpTreeItem, [child.name]) |
|
| 291 | 292 |
item.setData(0, self.TREE_DATA_ROLE, child) |
| 292 | 293 |
elif child.type == 'Nozzles': |
| 293 | 294 |
for i in range(self.EqpTreeItem.childCount()): |
| ... | ... | |
| 315 | 316 |
item.setForeground(0, brush) |
| 316 | 317 |
item.setFont(0, item.font(0)) |
| 317 | 318 |
child.treeItem = item |
| 318 |
self.SymbolsTreeItem.addChild(item) |
|
| 319 |
self.SymbolsTreeItem.sortChildren(0, Qt.AscendingOrder) # sort childrens |
|
| 319 |
if isEquipmentType: |
|
| 320 |
self.EqpTreeItem.addChild(item) |
|
| 321 |
self.EqpTreeItem.sortChildren(0, Qt.AscendingOrder) # sort childrens |
|
| 322 |
else: |
|
| 323 |
self.SymbolsTreeItem.addChild(item) |
|
| 324 |
self.SymbolsTreeItem.sortChildren(0, Qt.AscendingOrder) # sort childrens |
|
| 320 | 325 |
elif type(child) is QEngineeringLineNoTextItem: |
| 321 | 326 |
item = CustomTreeWidgetItem([child.text()]) |
| 322 | 327 |
item.setFlags(item.flags() | Qt.ItemIsUserCheckable) |
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 535 | 535 |
else: |
| 536 | 536 |
self.labelStatus.setText("<font color='black'>" + self.tr('Unrecognition') + " : {}</font>".format(len(items)))
|
| 537 | 537 |
|
| 538 |
items = [item for item in self.graphicsView.scene.items() if issubclass(type(item), SymbolSvgItem)] |
|
| 538 |
items = [item for item in self.graphicsView.scene.items() if issubclass(type(item), SymbolSvgItem) and type(item) is not QEngineeringErrorItem]
|
|
| 539 | 539 |
self.labelSymbolStatus.setText("<font color='blue'>" + self.tr('Symbol') + " : {}</font>".format(len(items)))
|
| 540 | 540 |
|
| 541 | 541 |
items = [item for item in self.graphicsView.scene.items() if type(item) is QEngineeringLineItem] |
| DTI_PID/DTI_PID/Shapes/EngineeringVendorItem.py | ||
|---|---|---|
| 36 | 36 |
self.setColor(self._color) |
| 37 | 37 |
self._savedColor = None |
| 38 | 38 |
|
| 39 |
#self.setFlags(QGraphicsItem.ItemIsSelectable|QGraphicsItem.ItemIsFocusable)
|
|
| 39 |
self.setFlags(QGraphicsItem.ItemIsSelectable|QGraphicsItem.ItemIsFocusable) |
|
| 40 | 40 |
|
| 41 | 41 |
self.transfer = Transfer() |
| 42 | 42 |
|
내보내기 Unified diff
