프로젝트

일반

사용자정보

개정판 a4163690

IDa41636901b0127fb9a5c520654e50b20fdfacd8c
상위 8eee15b4
하위 9f6515a1, 11045d18

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

vendor item fix

Change-Id: I082301a1a6a8781e110c7a88b5508f5ee62eb1ea

차이점 보기:

DTI_PID/DTI_PID/Shapes/EngineeringVendorItem.py
41 41
        self.setColor(self._color if pack_type == 'Vendor Package' else QEngineeringVendorItem.EQUIPMENT_PACKAGE_COLOR)
42 42
        self._savedColor = None
43 43

  
44
        self._properties = { SymbolProp(None, 'Image', 'String', Expression='self.EvaluatedImage'): None }
44
        self._properties = { }
45
        #self._properties = { SymbolProp(None, 'Image', 'String', Expression='self.EvaluatedImage'): None }
45 46
        self._pack_type = pack_type
46 47

  
47 48
        self.setFlags(QGraphicsItem.ItemIsSelectable | QGraphicsItem.ItemIsFocusable)
......
224 225
            item = QEngineeringVendorItem(polygon, pack_type=component['Value'], uid=uid)
225 226
            item.area = component['Area']
226 227

  
227
            for key in item._properties.keys():
228
                item._properties[key] = key.parse_value(component[key.Attribute])
228
            #for key in item._properties.keys():
229
            #    item._properties[key] = key.parse_value(component[key.Attribute])
229 230

  
230 231
            # get associations 
231 232
            associations = app_doc_data.get_component_associations(uid)
......
334 335
            item = QEngineeringVendorItem(polygon, pack_type=_type, uid=uid)
335 336
            item.area = node.find('AREA').text
336 337

  
338
            '''
337 339
            for prop_node in node.iter('PROPERTY'):
338 340
                matches = [prop for prop in item._properties.keys() if
339 341
                           prop.Attribute == prop_node.attrib['Attribute']]
340 342
                if matches:
341 343
                    item._properties[matches[0]] = matches[0].parse_value(
342 344
                        prop_node.text) if prop_node.text else ''
345
            '''
343 346

  
344 347
            attributeValue = node.find('ASSOCIATIONS')
345 348
            if attributeValue is not None:
DTI_PID/DTI_PID/SymbolRegiDataListDialog.py
158 158
    def pushButtonEditClicked(self, row=None, col=None):
159 159
        try:
160 160
            col = 1
161
            #if not self.ui.tableWidget.cellWidget(row, col + 2).isEnabled():
162
            #    return
161
            if not self.ui.tableWidget.cellWidget(row, col + 2).isEnabled():
162
                return
163 163
        
164 164
            symbolItem = self.ui.tableWidget.item(row, col).tag
165 165

  

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)