프로젝트

일반

사용자정보

개정판 f68e5171

IDf68e5171bfd85158371b20773ada7cac99b2fe99
상위 7c2fa913
하위 c3986d21

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

issue #000: change EvaluatedDrawing

Change-Id: Ib870d0ce7e57f441b74eacb3ca8852dcb15c727b

차이점 보기:

DTI_PID/DTI_PID/Shapes/EngineeringAbstractItem.py
384 384
                        prev = item
385 385

  
386 386
                    if 'Drain' == matches[0].Type:
387
                        return None
387
                        return ''
388 388
                        #return AppDocData.instance().drain_size
389 389

  
390 390
                return self.owner.Size
391 391

  
392
            return None
392
            return ''
393 393
        except Exception as ex:
394 394
            from App import App
395 395
            from AppDocData import MessageType
......
399 399
            #App.mainWnd().addMessage.emit(MessageType.Error, str(self.uid) + self.name + message)
400 400
            App.mainWnd().addMessage.emit(MessageType.Error, message)
401 401

  
402
            return ''
403

  
402 404
    def EvaluatedTable(self, old_code, table_name):
403 405
        """ return new attribute code """
404 406
        from AppDocData import AppDocData
......
428 430

  
429 431
        return None
430 432

  
431
    def EvaluatedDrawing(self, prop):
433
    def EvaluatedDrawing(self, prop=None):
432 434
        """ return text item that is in prop"""
433 435
        from EngineeringTextItem import QEngineeringTextItem
436
        from AppDocData import AppDocData
434 437

  
435
        scene = self.scene()
436
        if scene:
437
            items = [item for item in scene.items() if issubclass(type(item), QEngineeringTextItem) and item.area == prop]
438
            if items:
439
                return items[0]
440
        
441
        return QEngineeringTextItem()
438
        if prop is not None:
439
            scene = self.scene()
440
            if scene:
441
                items = [item for item in scene.items() if issubclass(type(item), QEngineeringTextItem) and item.area == prop]
442
                if items:
443
                    return items[0]
444
            return QEngineeringTextItem()
445
        else:
446
            app_doc_data = AppDocData.instance()
447
            drawing_name = app_doc_data.activeDrawing.name
448
            drawing_text_item = QEngineeringTextItem()
449
            drawing_text_item.setPlainText(drawing_name)
450
            return drawing_text_item
442 451

  
443 452
    def EvaluatedAttribute(self, prop, cache=False):
444 453
        """ return item's attribute """

내보내기 Unified diff

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