개정판 e51b485b
issue #567: signal unify
Change-Id: I4cab13d12a619d5b380377f35f7fa4788a719cf2
DTI_PID/DTI_PID/App.py | ||
---|---|---|
127 | 127 |
#AppDocData.instance().ex = exceptionHandler |
128 | 128 |
app._mainWnd = MainWindow.instance() |
129 | 129 |
app._mainWnd.show() |
130 |
sys.exit(app.exec_()) |
|
130 |
sys.exit(app.exec_()) |
DTI_PID/DTI_PID/ItemPropertyTableWidget.py | ||
---|---|---|
107 | 107 |
try: |
108 | 108 |
from PyQt5 import QtGui |
109 | 109 |
from SymbolAttr import SymbolAttr |
110 |
from EngineeringRunItem import QEngineeringRunItem |
|
110 | 111 |
|
111 | 112 |
self._item = item |
112 | 113 |
|
... | ... | |
117 | 118 |
self.initContentsCell() |
118 | 119 |
elif issubclass(type(item), SymbolSvgItem): |
119 | 120 |
self.onSymbolClicked(item) |
120 |
elif type(item) is QEngineeringLineNoTextItem: |
|
121 |
elif type(item) is QEngineeringLineNoTextItem or type(item) is QEngineeringRunItem:
|
|
121 | 122 |
self.onLineNoClicked(item) |
122 | 123 |
elif type(item) is QEngineeringNoteItem: |
123 | 124 |
noteContentsList = item.findNoteContents(item.text()) |
... | ... | |
168 | 169 |
elif type(symbol) is QEngineeringLineNoTextItem: |
169 | 170 |
self.lineNoChanged(symbol) |
170 | 171 |
finally: |
171 |
self.blockSignals(True)
|
|
172 |
self.blockSignals(False)
|
|
172 | 173 |
|
173 | 174 |
''' |
174 | 175 |
@brief show drawing' attributes |
DTI_PID/DTI_PID/ItemTreeWidget.py | ||
---|---|---|
52 | 52 |
TREE_DATA_ROLE = Qt.UserRole |
53 | 53 |
|
54 | 54 |
# Add Signal |
55 |
singleClicked = pyqtSignal(SymbolSvgItem)
|
|
55 |
singleClicked = pyqtSignal(QEngineeringAbstractItem)
|
|
56 | 56 |
noteNoSingleClicked = pyqtSignal(str, dict) |
57 |
lineNoSingleClicked = pyqtSignal(QEngineeringAbstractItem) |
|
57 |
#lineNoSingleClicked = pyqtSignal(QEngineeringAbstractItem)
|
|
58 | 58 |
drawingClicked = pyqtSignal(Drawing) |
59 | 59 |
checkBoxToggled = pyqtSignal(QTreeWidgetItem, Qt.CheckState) |
60 | 60 |
|
... | ... | |
614 | 614 |
# self.singleClicked.emit(itemData) |
615 | 615 |
elif type(itemData) is QEngineeringRunItem: |
616 | 616 |
HighlightCommand(self.imageViewer).execute(itemData) |
617 |
self.lineNoSingleClicked.emit(itemData)
|
|
617 |
self.singleClicked.emit(itemData)
|
|
618 | 618 |
for child in range(item.childCount()): |
619 | 619 |
item.child(child).setSelected(True) |
620 | 620 |
elif type(itemData) is QEngineeringLineNoTextItem: |
DTI_PID/DTI_PID/MainWindow.py | ||
---|---|---|
189 | 189 |
# Add Empty Widget |
190 | 190 |
self.resultPropertyTableWidget = ItemPropertyTableWidget.QItemPropertyTableWidget(self) |
191 | 191 |
self.symbolExplorerVerticalLayout.addWidget(self.resultPropertyTableWidget) |
192 |
self.itemTreeWidget.singleClicked.connect(self.resultPropertyTableWidget.onSymbolClicked)
|
|
192 |
#self.itemTreeWidget.singleClicked.connect(self.resultPropertyTableWidget.show_item_property)
|
|
193 | 193 |
self.itemTreeWidget.noteNoSingleClicked.connect(self.resultPropertyTableWidget.onNoteClicked) |
194 |
self.itemTreeWidget.lineNoSingleClicked.connect(self.resultPropertyTableWidget.onLineNoClicked) |
|
194 |
#self.itemTreeWidget.lineNoSingleClicked.connect(self.resultPropertyTableWidget.onLineNoClicked)
|
|
195 | 195 |
self.itemTreeWidget.drawingClicked.connect(self.resultPropertyTableWidget.onDrawingClicked) |
196 | 196 |
# add splitter widget |
197 | 197 |
splitter = QSplitter(Qt.Vertical) |
DTI_PID/DTI_PID/Shapes/QEngineeringOPCItem.py | ||
---|---|---|
24 | 24 |
|
25 | 25 |
self._properties = \ |
26 | 26 |
{\ |
27 |
SymbolProp(None, 'Logical', 'String', Expression=None):'Process'#, |
|
27 |
#SymbolProp(None, 'Logical', 'String', Expression=None):'Process'#,
|
|
28 | 28 |
#SymbolProp(None, 'From', 'Text Item', Expression='self.From'):None, |
29 | 29 |
#SymbolProp(None, 'To', 'Text Item', Expression='self.To'):None |
30 | 30 |
} |
내보내기 Unified diff