프로젝트

일반

사용자정보

개정판 3e73b053

ID3e73b05333b9d8f1541420e3199b079fb8d43384
상위 13165df6
하위 8021ed7b

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

issue #000: fix line display color

Change-Id: I8c6e4ed26c3be0a4103f2ddbdd13fbf28f2419f8

차이점 보기:

DTI_PID/DTI_PID/MainWindow_UI.py
448 448
        self.menu.addAction(self.actionClose)
449 449
        self.menu_2.addAction(self.actionHMB_DATA)
450 450
        self.menu_2.addAction(self.actionItem_Data_List)
451
        self.menu_2.addAction(self.actionText_Data_List)
452 451
        self.menu_2.addSeparator()
453 452
        self.menu_2.addAction(self.actionCodeTable)
454 453
        self.menu_2.addAction(self.actionOCR_Training)
......
464 463
        self.menu_3.addAction(self.actionDrawing_Only)
465 464
        self.menu_4.addAction(self.actionpdf_to_image)
466 465
        self.menu_5.addAction(self.actionFindReplaceText)
466
        self.menu_5.addAction(self.actionText_Data_List)
467 467
        self.menubar.addAction(self.menu.menuAction())
468 468
        self.menubar.addAction(self.menu_5.menuAction())
469 469
        self.menubar.addAction(self.menu_2.menuAction())
DTI_PID/DTI_PID/Shapes/EngineeringLineItem.py
1275 1275
                    else:
1276 1276
                        return QEngineeringAbstractItem.DEFAULT_COLOR
1277 1277
        else:
1278
            return QEngineeringAbstractItem.getColor(self)
1278
            if self.owner is None:
1279
                return QEngineeringAbstractItem.getColor(self)
1280
            else:
1281
                return self.owner.getColor()
1282

  
1279 1283

  
1280 1284
    '''
1281 1285
        @brief      Set Color. Override QEngineeringAbstractItem's
DTI_PID/DTI_PID/SymbolAttr.py
123 123
        import uuid
124 124

  
125 125
        attr = SymbolAttr()
126
        attr.UID = uuid.UUID(node.attrib['UID'], version=4) if 'UID' in node.attrib else  uuid.uuid4()
126
        attr.UID = uuid.UUID(node.attrib['UID'], version=4) if 'UID' in node.attrib else uuid.uuid4()
127 127
        attr.Freeze = node.attrib['Freeze'] == 'True' if 'Freeze' in node.attrib else False
128 128
        attr.Attribute = node.attrib['Attribute']
129 129
        attr.DisplayAttribute = node.attrib['DisplayAttribute']
DTI_PID/DTI_PID/TextItemFactory.py
91 91
                    if colorCount:
92 92
                        colorIdx = random.randrange(0, colorCount)
93 93
                        rgb = docData.colors[colorIdx]
94
                        item.setColor(QColor(rgb.red, rgb.green, rgb.blue).name())
94
                        item.change_color(QColor(rgb.red, rgb.green, rgb.blue).name())
95
                        #item.setColor(QColor(rgb.red, rgb.green, rgb.blue).name())
95 96
                else:
96 97
                    configs = docData.getConfigs('Line No', 'Configuration')
97 98
                    configs = configs[0].value.split(self.delimiter)
DTI_PID/DTI_PID/UI/MainWindow.ui
79 79
    </property>
80 80
    <addaction name="actionHMB_DATA"/>
81 81
    <addaction name="actionItem_Data_List"/>
82
    <addaction name="actionText_Data_List"/>
83 82
    <addaction name="separator"/>
84 83
    <addaction name="actionCodeTable"/>
85 84
    <addaction name="actionOCR_Training"/>
......
110 109
     <string>Edit</string>
111 110
    </property>
112 111
    <addaction name="actionFindReplaceText"/>
112
    <addaction name="actionText_Data_List"/>
113 113
   </widget>
114 114
   <addaction name="menu"/>
115 115
   <addaction name="menu_5"/>

내보내기 Unified diff

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