프로젝트

일반

사용자정보

개정판 75060f7c

ID75060f7c5a29c5e0e1cb281697f072cee54af4f8
상위 39d5c40a
하위 f14662e1

함의성이(가) 약 6년 전에 추가함

issue #637: specbreak

차이점 보기:

DTI_PID/DTI_PID/ItemPropertyTableWidget.py
219 219
                self.setItem(3, 0, QTableWidgetItem("각도"))
220 220
                self.setItem(4, 0, QTableWidgetItem("원점"))
221 221
                self.setItem(5, 0, QTableWidgetItem("OWNER"))
222
                if type(item) is QEngineeringSpecBreakItem:
223
                    self.setRowCount(7)
224
                    self.setItem(6, 0, QTableWidgetItem("Set Specs"))
222 225
            elif type(item) is QEngineeringNoteItem:
223 226
                self.setRowCount(1)
224 227
                self.setItem(0, 0, QTableWidgetItem("노트번호"))
......
290 293
                self.setItem(3, 1, QTableWidgetItem(str(round(math.degrees(self.symData.angle)))))
291 294
                self.setItem(4, 1, QTableWidgetItem(str(self.symData.origin)))
292 295
                self.setItem(5, 1, QTableWidgetItem('{}'.format(self.symData.owner)))
296
                if type(self.symData) is QEngineeringSpecBreakItem:
297
                    setSpecsItem = QTableWidgetItem('Open')
298
                    icon = QtGui.QIcon()
299
                    icon.addPixmap(QtGui.QPixmap(":/newPrefix/doubleclick.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
300
                    setSpecsItem.setIcon(icon)
301
                    setSpecsItem.setFlags(Qt.ItemIsEnabled|Qt.ItemIsSelectable)
302
                    self.setItem(6, 1, setSpecsItem)
293 303

  
294 304
                row = self.rowCount()
295 305
                attrs = self.symData.getAttributes()
......
349 359
                                UpDownItem.setIcon(icon)
350 360
                                self.setItem(row, 1, UpDownItem)
351 361

  
352
                            elif key.Attribute == 'SetSpecs':
353
                                setSpecsItem = QTableWidgetItem('Open')
354
                                icon = QtGui.QIcon()
355
                                icon.addPixmap(QtGui.QPixmap(":/newPrefix/doubleclick.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
356
                                setSpecsItem.setIcon(icon)
357
                                setSpecsItem.setFlags(Qt.ItemIsEnabled|Qt.ItemIsSelectable)
358
                                self.setItem(row, 1, setSpecsItem)
359
                            elif key.Attribute == 'Spec':
360
                                self.setItem(row, 1, QTableWidgetItem(key.AttributeType))
362
                            elif key.AttributeType == 'Spec':
363
                                self.setItem(row, 1, QTableWidgetItem(key.Attribute))
361 364

  
362 365
                        else:
363 366
                            self.setItem(row, 1, valueItem)
......
691 694
                    cmd.onSuccess.connect(self.onSuccessSelectAttribute)
692 695
                    self.mainWindow.graphicsView.command = cmd
693 696

  
694
                elif keyCell.text() == 'SetSpecs':
697
                elif keyCell.text() == 'Set Specs':
695 698
                    from SpecBreakDialog import QSpecBreakDialog
696 699

  
697 700
                    try:
DTI_PID/DTI_PID/Shapes/EngineeringSpecBreakItem.py
35 35
        attr.Attribute = 'DownStream'
36 36
        attr.AttributeType = 'Comp Item'
37 37
        self.attrs[attr] = None
38
        attr = SymbolAttr()
39
        attr.Attribute = 'SetSpecs'
40
        attr.AttributeType = 'Link Dialog'
41
        self.attrs[attr] = 'Double Click'
38
        #attr = SymbolAttr()
39
        #attr.Attribute = 'SetSpecs'
40
        #attr.AttributeType = 'Link Dialog'
41
        #self.attrs[attr] = 'Double Click'
42 42
        '''
43 43
        attr = SymbolAttr()
44 44
        attr.Attribute = 'Spec'
......
158 158
            for attr in _attrs:
159 159
                if type(attr) is SymbolAttr:
160 160
                    _node = attr.toXml()
161
                    if attr.Attribute != 'Spec':
161
                    if attr.AttributeType != 'Spec':
162 162
                        _node.text = self.attrs[attr]
163 163
                    else:
164
                        _node.text = str(self.attrs[attr])
164
                        _node.text = str(self.attrs[attr][0]) + ',' + str(self.attrs[attr][1])
165 165
                    attributesNode.append(_node)
166 166
               
167 167
            node.append(attributesNode)
DTI_PID/DTI_PID/SpecBreakDialog.py
166 166
            row = 0
167 167
            for rowIndex in range(self.ui.tableWidgetSpec.rowCount()):
168 168
                attr = SymbolAttr()
169
                attr.Attribute = 'Spec'
170
                attr.AttributeType = self.ui.tableWidgetSpec.cellWidget(row, 0).currentText()
169
                attr.Attribute = self.ui.tableWidgetSpec.cellWidget(row, 0).currentText()
170
                attr.AttributeType = 'Spec'
171 171
                attr.DisplayAttribute = 'Spec'
172 172
                self.attrs[attr] = [self.ui.tableWidgetSpec.cellWidget(row, 1).currentText(), self.ui.tableWidgetSpec.cellWidget(row, 2).currentText()]
173 173
                row += 1

내보내기 Unified diff