프로젝트

일반

사용자정보

개정판 e534f39d

IDe534f39dbf396ce67be10b7f625ec73f3c8c4c5f
상위 a873b8aa
하위 4ca2299d

김연진이(가) 5년 이상 전에 추가함

issue #1053 : 생성한 장치의 데이터 입력 => 폼의 Unit 를 Drawing의 Attrs 에서 읽어 오도록 변경

Change-Id: Ie8edffc92576006b3da35c7a9ff7531f6831504a

차이점 보기:

HYTOS/HYTOS/AirFinCooler.py
43 43
        appDocData = AppDocData.instance()
44 44
        drawing = appDocData.activeDrawing    
45 45
        if drawing:
46
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
47
            if len(columnDisplayNameList) > 0:                
48
                for columnDisplayName in columnDisplayNameList:        
49
                    if columnDisplayName[0] == 'Pressure Drop':
50
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
51
                    elif columnDisplayName[0] == 'Elevation':
52
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
53
        
46
            for attr in drawing.attrs:
47
                if attr[0] == 'Units':
48
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
49
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
50
                    
54 51
    def accept(self):       
55 52
        QDialog.accept(self)
56 53

  
HYTOS/HYTOS/AirFinCooler_UI.py
135 135
        self.label_Img.setText(_translate("AirFinCoolerDialog", "<html><head/><body><p><img src=\":/images/AirFinCooler.png\"/></p></body></html>"))
136 136
        self.label.setText(_translate("AirFinCoolerDialog", "Tag No."))
137 137
        self.label_3.setText(_translate("AirFinCoolerDialog", "P. Drop"))
138
        self.label_PressureUnit.setText(_translate("AirFinCoolerDialog", "kg/cm2"))
138
        self.label_PressureUnit.setText(_translate("AirFinCoolerDialog", "-"))
139 139
        self.label_5.setText(_translate("AirFinCoolerDialog", "Elevation"))
140
        self.label_ElevationUnit.setText(_translate("AirFinCoolerDialog", "m"))
140
        self.label_ElevationUnit.setText(_translate("AirFinCoolerDialog", "-"))
141 141
import Resource_rc
HYTOS/HYTOS/Ball_UI.py
256 256
        self.groupBox_3.setTitle(_translate("BallDialog", "Equipment Data"))
257 257
        self.label_3.setText(_translate("BallDialog", "Pressure"))
258 258
        self.label_4.setText(_translate("BallDialog", "Elevation"))
259
        self.label_PressureUnit.setText(_translate("BallDialog", "kg/cm2(g)"))
260
        self.label_ElevationUnit.setText(_translate("BallDialog", "m"))
259
        self.label_PressureUnit.setText(_translate("BallDialog", "-"))
260
        self.label_ElevationUnit.setText(_translate("BallDialog", "-"))
261 261
        self.label_N1.setText(_translate("BallDialog", "<html><head/><body><p><img src=\":/images/N1.png\"/></p></body></html>"))
262 262
        self.label_N2.setText(_translate("BallDialog", "<html><head/><body><p><img src=\":/images/N2.png\"/></p></body></html>"))
263 263
        self.label_N3.setText(_translate("BallDialog", "<html><head/><body><p><img src=\":/images/N3.png\"/></p></body></html>"))
HYTOS/HYTOS/BatteryLimit.py
56 56
        appDocData = AppDocData.instance()
57 57
        drawing = appDocData.activeDrawing    
58 58
        if drawing:
59
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
60
            if len(columnDisplayNameList) > 0:                
61
                for columnDisplayName in columnDisplayNameList:        
62
                    if columnDisplayName[0] == 'Pressure':
63
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
64
                    elif columnDisplayName[0] == 'Elevation':
65
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
59
            for attr in drawing.attrs:
60
                if attr[0] == 'Units':
61
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
62
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
63
                
66 64
    
67 65
    def accept(self):
68 66
        
HYTOS/HYTOS/BatteryLimit_UI.py
130 130
        self.label_Img_Left.setText(_translate("BatteryLimitDialog", "<html><head/><body><p><img src=\":/images/Battery_Limit_Left.png\"/></p></body></html>"))
131 131
        self.label_Img_Right.setText(_translate("BatteryLimitDialog", "<html><head/><body><p><img src=\":/images/Battery_Limit_Right.png\"/></p></body></html>"))
132 132
        self.label_5.setText(_translate("BatteryLimitDialog", "Elevation"))
133
        self.label_ElevationUnit.setText(_translate("BatteryLimitDialog", "m"))
133
        self.label_ElevationUnit.setText(_translate("BatteryLimitDialog", "-"))
134 134
        self.label_3.setText(_translate("BatteryLimitDialog", "Pressure"))
135
        self.label_PressureUnit.setText(_translate("BatteryLimitDialog", "kg/cm2(g)"))
135
        self.label_PressureUnit.setText(_translate("BatteryLimitDialog", "-"))
136 136
        self.label.setText(_translate("BatteryLimitDialog", "Tag No."))
137 137
import Resource_rc
HYTOS/HYTOS/Coil.py
44 44
        appDocData = AppDocData.instance()
45 45
        drawing = appDocData.activeDrawing    
46 46
        if drawing:
47
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
48
            if len(columnDisplayNameList) > 0:                
49
                for columnDisplayName in columnDisplayNameList:        
50
                    if columnDisplayName[0] == 'Pressure Drop':
51
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
52
                    elif columnDisplayName[0] == 'Elevation':
53
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
54
                
47
            for attr in drawing.attrs:
48
                if attr[0] == 'Units':
49
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
50
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
51
                    
55 52
    def accept(self):
56 53
        QDialog.accept(self)
57 54

  
HYTOS/HYTOS/Coil_UI.py
119 119
        self.label.setText(_translate("CoilDialog", "Tag No."))
120 120
        self.label_Img.setText(_translate("CoilDialog", "<html><head/><body><p><img src=\":/images/Coil.png\"/></p></body></html>"))
121 121
        self.label_3.setText(_translate("CoilDialog", "P. Drop"))
122
        self.label_PressureUnit.setText(_translate("CoilDialog", "kg/cm2"))
122
        self.label_PressureUnit.setText(_translate("CoilDialog", "-"))
123 123
        self.label_5.setText(_translate("CoilDialog", "Elevation"))
124
        self.label_ElevationUnit.setText(_translate("CoilDialog", "m"))
124
        self.label_ElevationUnit.setText(_translate("CoilDialog", "-"))
125 125
import Resource_rc
HYTOS/HYTOS/Compressor.py
71 71
        appDocData = AppDocData.instance()
72 72
        drawing = appDocData.activeDrawing    
73 73
        if drawing:
74
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
75
            if len(columnDisplayNameList) > 0:                
76
                for columnDisplayName in columnDisplayNameList:        
77
                    if columnDisplayName[0] == 'Pressure':
78
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
79
                    elif columnDisplayName[0] == 'Elevation':
80
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
81
            
82

  
74
            for attr in drawing.attrs:
75
                if attr[0] == 'Units':
76
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
77
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
78
              
83 79
    def accept(self):
84 80

  
85 81
        QDialog.accept(self)
HYTOS/HYTOS/Compressor_UI.py
159 159
        self.label_Img_Out.setText(_translate("CompressorDialog", "<html><head/><body><p><img src=\":/images/Compressor_Out.png\"/></p></body></html>"))
160 160
        self.groupBox.setTitle(_translate("CompressorDialog", "Equipment Data"))
161 161
        self.label_11.setText(_translate("CompressorDialog", "Pressure"))
162
        self.label_ElevationUnit.setText(_translate("CompressorDialog", "Elevation"))
163
        self.label_PressureUnit.setText(_translate("CompressorDialog", "Pressure"))
162
        self.label_ElevationUnit.setText(_translate("CompressorDialog", "-"))
163
        self.label_PressureUnit.setText(_translate("CompressorDialog", "-"))
164 164
        self.label_12.setText(_translate("CompressorDialog", "Elevation"))
165 165
        self.label_Suc.setText(_translate("CompressorDialog", "<html><head/><body><p><img src=\":/images/Suction.png\"/></p></body></html>"))
166 166
        self.label_Dis.setText(_translate("CompressorDialog", "<html><head/><body><p><img src=\":/images/Discharge.png\"/></p></body></html>"))
HYTOS/HYTOS/ConeRoof.py
136 136
        appDocData = AppDocData.instance()
137 137
        drawing = appDocData.activeDrawing    
138 138
        if drawing:
139
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
140
            if len(columnDisplayNameList) > 0:                
141
                for columnDisplayName in columnDisplayNameList:        
142
                    if columnDisplayName[0] == 'Pressure':
143
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
144
                    elif columnDisplayName[0] == 'Elevation':
145
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
146
        
139
            for attr in drawing.attrs:
140
                if attr[0] == 'Units':
141
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
142
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
143
                
147 144
    def accept(self):
148 145
        
149 146
        QDialog.accept(self)
HYTOS/HYTOS/ConeRoof_UI.py
275 275
        self.groupBox_3.setTitle(_translate("ConeRoofDialog", "Equipment Data"))
276 276
        self.label_3.setText(_translate("ConeRoofDialog", "Pressure"))
277 277
        self.label_4.setText(_translate("ConeRoofDialog", "Elevation"))
278
        self.label_PressureUnit.setText(_translate("ConeRoofDialog", "kg/cm2(g)"))
279
        self.label_ElevationUnit.setText(_translate("ConeRoofDialog", "m"))
278
        self.label_PressureUnit.setText(_translate("ConeRoofDialog", "-"))
279
        self.label_ElevationUnit.setText(_translate("ConeRoofDialog", "-"))
280 280
        self.label_N1.setText(_translate("ConeRoofDialog", "<html><head/><body><p><img src=\":/images/N1.png\"/></p></body></html>"))
281 281
        self.label_N2.setText(_translate("ConeRoofDialog", "<html><head/><body><p><img src=\":/images/N2.png\"/></p></body></html>"))
282 282
        self.label_N3.setText(_translate("ConeRoofDialog", "<html><head/><body><p><img src=\":/images/N3.png\"/></p></body></html>"))
HYTOS/HYTOS/DP_Equipment.py
76 76
        appDocData = AppDocData.instance()
77 77
        drawing = appDocData.activeDrawing    
78 78
        if drawing:
79
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
80
            if len(columnDisplayNameList) > 0:                
81
                for columnDisplayName in columnDisplayNameList:        
82
                    if columnDisplayName[0] == 'Pressure Drop':
83
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
84
                    elif columnDisplayName[0] == 'Elevation':
85
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
86

  
87
                        
79
            for attr in drawing.attrs:
80
                if attr[0] == 'Units':
81
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
82
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
83
                
88 84
    def accept(self):
89 85

  
90 86
        QDialog.accept(self)
HYTOS/HYTOS/DP_Equipment_UI.py
148 148
        self.label_Img_Vertical_Out.setText(_translate("DP_EquipmentDialog", "<html><head/><body><p><img src=\":/images/Vertical_Out.png\"/></p></body></html>"))
149 149
        self.label_Img_Vertical_In.setText(_translate("DP_EquipmentDialog", "<html><head/><body><p><img src=\":/images/Vertical_In.png\"/></p></body></html>"))
150 150
        self.groupBox.setTitle(_translate("DP_EquipmentDialog", "Equipment Data"))
151
        self.label_PressureUnit.setText(_translate("DP_EquipmentDialog", "P. Drop"))
151
        self.label_PressureUnit.setText(_translate("DP_EquipmentDialog", "-"))
152 152
        self.label_11.setText(_translate("DP_EquipmentDialog", "P. Drop"))
153
        self.label_ElevationUnit.setText(_translate("DP_EquipmentDialog", "Elevation"))
153
        self.label_ElevationUnit.setText(_translate("DP_EquipmentDialog", "-"))
154 154
        self.label_12.setText(_translate("DP_EquipmentDialog", "Elevation"))
155 155
        self.label_Horizontal.setText(_translate("DP_EquipmentDialog", "<html><head/><body><p><img src=\":/images/Horizontal.png\"/></p></body></html>"))
156 156
        self.label_Vertical.setText(_translate("DP_EquipmentDialog", "<html><head/><body><p><img src=\":/images/Vertical.png\"/></p></body></html>"))
HYTOS/HYTOS/DomeRoof.py
136 136
        appDocData = AppDocData.instance()
137 137
        drawing = appDocData.activeDrawing    
138 138
        if drawing:
139
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
140
            if len(columnDisplayNameList) > 0:                
141
                for columnDisplayName in columnDisplayNameList:        
142
                    if columnDisplayName[0] == 'Pressure':
143
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
144
                    elif columnDisplayName[0] == 'Elevation':
145
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
146
        
139
            for attr in drawing.attrs:
140
                if attr[0] == 'Units':
141
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
142
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
143
                    
147 144
    def accept(self):
148 145
        
149 146
        QDialog.accept(self)
HYTOS/HYTOS/DomeRoof_UI.py
275 275
        self.groupBox_3.setTitle(_translate("DomeRoofDialog", "Equipment Data"))
276 276
        self.label_3.setText(_translate("DomeRoofDialog", "Pressure"))
277 277
        self.label_4.setText(_translate("DomeRoofDialog", "Elevation"))
278
        self.label_PressureUnit.setText(_translate("DomeRoofDialog", "kg/cm2(g)"))
279
        self.label_ElevationUnit.setText(_translate("DomeRoofDialog", "m"))
278
        self.label_PressureUnit.setText(_translate("DomeRoofDialog", "-"))
279
        self.label_ElevationUnit.setText(_translate("DomeRoofDialog", "-"))
280 280
        self.label_N1.setText(_translate("DomeRoofDialog", "<html><head/><body><p><img src=\":/images/N1.png\"/></p></body></html>"))
281 281
        self.label_N2.setText(_translate("DomeRoofDialog", "<html><head/><body><p><img src=\":/images/N2.png\"/></p></body></html>"))
282 282
        self.label_N3.setText(_translate("DomeRoofDialog", "<html><head/><body><p><img src=\":/images/N3.png\"/></p></body></html>"))
HYTOS/HYTOS/Drawing.py
68 68
        else:
69 69
            self._attrs.append([name, value])
70 70

  
71
        print('attribute({},{})'.format(name, value))
71
        #print('attribute({},{})'.format(name, value))
72 72

  
73 73
    '''
74 74
        @brief      getter of hmb table
HYTOS/HYTOS/Drum_Horizontal.py
146 146
        appDocData = AppDocData.instance()
147 147
        drawing = appDocData.activeDrawing    
148 148
        if drawing:
149
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
150
            if len(columnDisplayNameList) > 0:                
151
                for columnDisplayName in columnDisplayNameList:        
152
                    if columnDisplayName[0] == 'Pressure':
153
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
154
                    elif columnDisplayName[0] == 'Elevation':
155
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
156
                            
149
            for attr in drawing.attrs:
150
                if attr[0] == 'Units':
151
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
152
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
153
                
157 154
    def accept(self):   
158 155
        QDialog.accept(self)
159 156

  
HYTOS/HYTOS/Drum_Horizontal_UI.py
292 292
        self.label_Img_N7.setText(_translate("Drum_HorizontalDialog", "<html><head/><body><p><img src=\":/images/N7.png\"/></p></body></html>"))
293 293
        self.label_Img_N5.setText(_translate("Drum_HorizontalDialog", "<html><head/><body><p><img src=\":/images/N5.png\"/></p></body></html>"))
294 294
        self.groupBox_3.setTitle(_translate("Drum_HorizontalDialog", "Equipment Data"))
295
        self.label_ElevationUnit.setText(_translate("Drum_HorizontalDialog", "m"))
296
        self.label_PressureUnit.setText(_translate("Drum_HorizontalDialog", "kg/cm2(g)"))
295
        self.label_ElevationUnit.setText(_translate("Drum_HorizontalDialog", "-"))
296
        self.label_PressureUnit.setText(_translate("Drum_HorizontalDialog", "-"))
297 297
        self.label_3.setText(_translate("Drum_HorizontalDialog", "Pressure"))
298 298
        self.label_4.setText(_translate("Drum_HorizontalDialog", "Elevation"))
299 299
        self.label_N9.setText(_translate("Drum_HorizontalDialog", "<html><head/><body><p><img src=\":/images/N9.png\"/></p></body></html>"))
HYTOS/HYTOS/Drum_Vertical.py
167 167
        appDocData = AppDocData.instance()
168 168
        drawing = appDocData.activeDrawing    
169 169
        if drawing:
170
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
171
            if len(columnDisplayNameList) > 0:                
172
                for columnDisplayName in columnDisplayNameList:        
173
                    if columnDisplayName[0] == 'Pressure':
174
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
175
                    elif columnDisplayName[0] == 'Elevation':
176
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
177

  
170
            for attr in drawing.attrs:
171
                if attr[0] == 'Units':
172
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
173
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
174
                
178 175
                        
179 176
    def accept(self):
180 177

  
HYTOS/HYTOS/Drum_Vertical_UI.py
332 332
        self.groupBox_3.setTitle(_translate("Drum_VerticalDialog", "Equipment Data"))
333 333
        self.label_3.setText(_translate("Drum_VerticalDialog", "Pressure"))
334 334
        self.label_4.setText(_translate("Drum_VerticalDialog", "Elevation"))
335
        self.label_PressureUnit.setText(_translate("Drum_VerticalDialog", "kg/cm2(g)"))
336
        self.label_ElevationUnit.setText(_translate("Drum_VerticalDialog", "m"))
335
        self.label_PressureUnit.setText(_translate("Drum_VerticalDialog", "-"))
336
        self.label_ElevationUnit.setText(_translate("Drum_VerticalDialog", "-"))
337 337
        self.label_N1.setText(_translate("Drum_VerticalDialog", "<html><head/><body><p><img src=\":/images/N1.png\"/></p></body></html>"))
338 338
        self.label_N2.setText(_translate("Drum_VerticalDialog", "<html><head/><body><p><img src=\":/images/N2.png\"/></p></body></html>"))
339 339
        self.label_N3.setText(_translate("Drum_VerticalDialog", "<html><head/><body><p><img src=\":/images/N3.png\"/></p></body></html>"))
HYTOS/HYTOS/DualPacked.py
167 167
        appDocData = AppDocData.instance()
168 168
        drawing = appDocData.activeDrawing    
169 169
        if drawing:
170
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
171
            if len(columnDisplayNameList) > 0:                
172
                for columnDisplayName in columnDisplayNameList:        
173
                    if columnDisplayName[0] == 'Pressure':
174
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
175
                    elif columnDisplayName[0] == 'Elevation':
176
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
177
    
170
            for attr in drawing.attrs:
171
                if attr[0] == 'Units':
172
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
173
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
174
                
178 175
    def accept(self):
179 176
        
180 177
        QDialog.accept(self)
HYTOS/HYTOS/DualPacked_UI.py
308 308
        self.groupBox_3.setTitle(_translate("DualPackedDialog", "Equipment Data"))
309 309
        self.label_3.setText(_translate("DualPackedDialog", "Pressure"))
310 310
        self.label_4.setText(_translate("DualPackedDialog", "Elevation"))
311
        self.label_PressureUnit.setText(_translate("DualPackedDialog", "kg/cm2(g)"))
312
        self.label_ElevationUnit.setText(_translate("DualPackedDialog", "m"))
311
        self.label_PressureUnit.setText(_translate("DualPackedDialog", "-"))
312
        self.label_ElevationUnit.setText(_translate("DualPackedDialog", "-"))
313 313
        self.label_N1.setText(_translate("DualPackedDialog", "<html><head/><body><p><img src=\":/images/N1.png\"/></p></body></html>"))
314 314
        self.label_N2.setText(_translate("DualPackedDialog", "<html><head/><body><p><img src=\":/images/N2.png\"/></p></body></html>"))
315 315
        self.label_N3.setText(_translate("DualPackedDialog", "<html><head/><body><p><img src=\":/images/N3.png\"/></p></body></html>"))
HYTOS/HYTOS/Equipment.py
166 166
        appDocData = AppDocData.instance()
167 167
        drawing = appDocData.activeDrawing    
168 168
        if drawing:
169
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
170
            if len(columnDisplayNameList) > 0:                
171
                for columnDisplayName in columnDisplayNameList:        
172
                    if columnDisplayName[0] == 'Pressure':
173
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
174
                    elif columnDisplayName[0] == 'Elevation':
175
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
176
    
169
            for attr in drawing.attrs:
170
                if attr[0] == 'Units':
171
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
172
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
173
                
177 174
    def accept(self):
178 175

  
179 176
        QDialog.accept(self)
HYTOS/HYTOS/Equipment_UI.py
332 332
        self.groupBox_3.setTitle(_translate("EquipmentDialog", "Equipment Data"))
333 333
        self.label_3.setText(_translate("EquipmentDialog", "Pressure"))
334 334
        self.label_4.setText(_translate("EquipmentDialog", "Elevation"))
335
        self.label_PressureUnit.setText(_translate("EquipmentDialog", "kg/cm2(g)"))
336
        self.label_ElevationUnit.setText(_translate("EquipmentDialog", "m"))
335
        self.label_PressureUnit.setText(_translate("EquipmentDialog", "-"))
336
        self.label_ElevationUnit.setText(_translate("EquipmentDialog", "-"))
337 337
        self.label_N1.setText(_translate("EquipmentDialog", "<html><head/><body><p><img src=\":/images/N1.png\"/></p></body></html>"))
338 338
        self.label_N2.setText(_translate("EquipmentDialog", "<html><head/><body><p><img src=\":/images/N2.png\"/></p></body></html>"))
339 339
        self.label_N3.setText(_translate("EquipmentDialog", "<html><head/><body><p><img src=\":/images/N3.png\"/></p></body></html>"))
HYTOS/HYTOS/Filter.py
43 43
        appDocData = AppDocData.instance()
44 44
        drawing = appDocData.activeDrawing    
45 45
        if drawing:
46
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
47
            if len(columnDisplayNameList) > 0:                
48
                for columnDisplayName in columnDisplayNameList:        
49
                    if columnDisplayName[0] == 'Pressure Drop':
50
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
51
                    elif columnDisplayName[0] == 'Elevation':
52
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
53
                
46
            for attr in drawing.attrs:
47
                if attr[0] == 'Units':
48
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
49
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
50
                    
51
                    
54 52
    def accept(self):        
55 53
        QDialog.accept(self)
56 54

  
HYTOS/HYTOS/Filter_UI.py
118 118
        self.groupBox.setTitle(_translate("FilterDialog", "Equipment Figure"))
119 119
        self.label_Img.setText(_translate("FilterDialog", "<html><head/><body><p><img src=\":/images/Filter.png\"/></p></body></html>"))
120 120
        self.label_3.setText(_translate("FilterDialog", "P. Drop"))
121
        self.label_PressureUnit.setText(_translate("FilterDialog", "kg/cm2"))
121
        self.label_PressureUnit.setText(_translate("FilterDialog", "-"))
122 122
        self.label_5.setText(_translate("FilterDialog", "Elevation"))
123
        self.label_ElevationUnit.setText(_translate("FilterDialog", "m"))
123
        self.label_ElevationUnit.setText(_translate("FilterDialog", "-"))
124 124
        self.label.setText(_translate("FilterDialog", "Tag No."))
125 125
import Resource_rc
HYTOS/HYTOS/Fitting_2KDialog.py
299 299
    def add_fitting_data(self, row, category, type, name):
300 300
        self.ui.tableWidget_SelectedFitting.setRowCount(row+1)
301 301

  
302
        self.ui.tableWidget_SelectedFitting.setItem(row, 0, QTableWidgetItem(category))
303
        self.ui.tableWidget_SelectedFitting.setItem(row, 1, QTableWidgetItem(type))
304
        self.ui.tableWidget_SelectedFitting.setItem(row, 2, QTableWidgetItem(name))
305
        self.ui.tableWidget_SelectedFitting.setItem(row, 3, QTableWidgetItem('1'))
302
        self.ui.tableWidget_SelectedFitting.setItem(row, 0, self.setTableWidgetItemProperties(category, Qt.AlignLeft | Qt.AlignVCenter))
303
        self.ui.tableWidget_SelectedFitting.setItem(row, 1, self.setTableWidgetItemProperties(type, Qt.AlignLeft | Qt.AlignVCenter))
304
        self.ui.tableWidget_SelectedFitting.setItem(row, 2, self.setTableWidgetItemProperties(name, Qt.AlignLeft | Qt.AlignVCenter))
305
        self.ui.tableWidget_SelectedFitting.setItem(row, 3, self.setTableWidgetItemProperties(1, Qt.AlignHCenter | Qt.AlignVCenter))
306 306

  
307 307

  
308 308
    def showDialog(self, item):
309 309
        self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
310 310
        self.exec_()
311 311

  
312
    def setTableWidgetItemProperties(self, name, alignment, color = None):
313

  
314
        item = QTableWidgetItem(str(name))
315
        item.setTextAlignment(alignment)
316
        if color:
317
            item.setBackground(color)  
318

  
319
        return item
320

  
312 321
    def accept(self):
313 322
        
314 323
        QDialog.accept(self)
......
317 326
        QDialog.reject(self)
318 327

  
319 328

  
329
    
320 330

  
321 331
    if __name__ == '__main__':
322 332
        from Fitting_2KDialog import QFitting_2KDialog
HYTOS/HYTOS/Fitting_2K_UI.py
540 540
        self.gridLayout.addLayout(self.verticalLayout, 0, 0, 1, 1)
541 541

  
542 542
        self.retranslateUi(Dialog)
543
        self.tabWidget.setCurrentIndex(6)
543
        self.tabWidget.setCurrentIndex(0)
544 544
        self.buttonBox.accepted.connect(Dialog.accept)
545 545
        self.buttonBox.rejected.connect(Dialog.reject)
546 546
        QtCore.QMetaObject.connectSlotsByName(Dialog)
HYTOS/HYTOS/Fitting_CraneKDialog.py
578 578
    def add_fitting_data(self, row, category, type, name):
579 579
        self.ui.tableWidget_SelectedFitting.setRowCount(row+1)
580 580

  
581
        self.ui.tableWidget_SelectedFitting.setItem(row, 0, QTableWidgetItem(category))
582
        self.ui.tableWidget_SelectedFitting.setItem(row, 1, QTableWidgetItem(type))
583
        self.ui.tableWidget_SelectedFitting.setItem(row, 2, QTableWidgetItem(name))
584
        self.ui.tableWidget_SelectedFitting.setItem(row, 3, QTableWidgetItem('1'))
581
        self.ui.tableWidget_SelectedFitting.setItem(row, 0, self.setTableWidgetItemProperties(category, Qt.AlignLeft | Qt.AlignVCenter))
582
        self.ui.tableWidget_SelectedFitting.setItem(row, 1, self.setTableWidgetItemProperties(type, Qt.AlignLeft | Qt.AlignVCenter))
583
        self.ui.tableWidget_SelectedFitting.setItem(row, 2, self.setTableWidgetItemProperties(name, Qt.AlignLeft | Qt.AlignVCenter))
584
        self.ui.tableWidget_SelectedFitting.setItem(row, 3, self.setTableWidgetItemProperties(1, Qt.AlignHCenter | Qt.AlignVCenter))
585 585

  
586 586

  
587 587
    def showDialog(self, item):
588 588
        self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
589 589
        self.exec_()
590 590
        
591
    def setTableWidgetItemProperties(self, name, alignment, color = None):
592

  
593
        item = QTableWidgetItem(str(name))
594
        item.setTextAlignment(alignment)
595
        if color:
596
            item.setBackground(color)  
597

  
598
        return item        
599
        
591 600
    def accept(self):
592 601
        
593 602
        QDialog.accept(self)
HYTOS/HYTOS/Fitting_CraneK_UI.py
997 997
        self.gridLayout.addWidget(self.buttonBox, 1, 0, 1, 1)
998 998

  
999 999
        self.retranslateUi(Dialog)
1000
        self.tabWidget.setCurrentIndex(8)
1000
        self.tabWidget.setCurrentIndex(0)
1001 1001
        self.buttonBox.accepted.connect(Dialog.accept)
1002 1002
        self.buttonBox.rejected.connect(Dialog.reject)
1003 1003
        QtCore.QMetaObject.connectSlotsByName(Dialog)
HYTOS/HYTOS/Flowmeter.py
43 43
        appDocData = AppDocData.instance()
44 44
        drawing = appDocData.activeDrawing    
45 45
        if drawing:
46
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
47
            if len(columnDisplayNameList) > 0:                
48
                for columnDisplayName in columnDisplayNameList:        
49
                    if columnDisplayName[0] == 'Pressure Drop':
50
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
51
                    elif columnDisplayName[0] == 'Elevation':
52
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
46
            for attr in drawing.attrs:
47
                if attr[0] == 'Units':
48
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
49
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
53 50
                
54

  
55 51
    def accept(self):
56 52
        QDialog.accept(self)
57 53

  
HYTOS/HYTOS/Flowmeter_UI.py
119 119
        _translate = QtCore.QCoreApplication.translate
120 120
        FlowmeterDialog.setWindowTitle(_translate("FlowmeterDialog", "HYTOS Instrument Data - Flowmeter"))
121 121
        self.groupBox.setTitle(_translate("FlowmeterDialog", "Equipment Figure"))
122
        self.label_ElevationUnit.setText(_translate("FlowmeterDialog", "m"))
122
        self.label_ElevationUnit.setText(_translate("FlowmeterDialog", "-"))
123 123
        self.label.setText(_translate("FlowmeterDialog", "Tag No."))
124
        self.label_PressureUnit.setText(_translate("FlowmeterDialog", "kg/cm2"))
124
        self.label_PressureUnit.setText(_translate("FlowmeterDialog", "-"))
125 125
        self.label_3.setText(_translate("FlowmeterDialog", "P. Drop"))
126 126
        self.label_5.setText(_translate("FlowmeterDialog", "Elevation"))
127 127
        self.label_Img.setText(_translate("FlowmeterDialog", "<html><head/><body><p><img src=\":/images/Flowmeter.png\"/></p></body></html>"))
HYTOS/HYTOS/LineSplitter.py
56 56
        appDocData = AppDocData.instance()
57 57
        drawing = appDocData.activeDrawing    
58 58
        if drawing:
59
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
60
            if len(columnDisplayNameList) > 0:                
61
                for columnDisplayName in columnDisplayNameList:        
62
                    if columnDisplayName[0] == 'Pressure Drop':
63
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
64
                    elif columnDisplayName[0] == 'Elevation':
65
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
66
            
59
            for attr in drawing.attrs:
60
                if attr[0] == 'Units':
61
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
62
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
63
                
67 64
    def accept(self):
68 65

  
69 66
        QDialog.accept(self)
HYTOS/HYTOS/LineSplitter_UI.py
142 142
        self.label_Img_Down.setText(_translate("LineSplitterDialog", "<html><head/><body><p><img src=\":/images/Vertical_In.png\"/></p></body></html>"))
143 143
        self.label_Img.setText(_translate("LineSplitterDialog", "<html><head/><body><p><img src=\":/images/LineSplitter.png\"/></p></body></html>"))
144 144
        self.label_3.setText(_translate("LineSplitterDialog", "P. Drop"))
145
        self.label_PressureUnit.setText(_translate("LineSplitterDialog", "kg/cm2"))
145
        self.label_PressureUnit.setText(_translate("LineSplitterDialog", "-"))
146 146
        self.label_5.setText(_translate("LineSplitterDialog", "Elevation"))
147
        self.label_ElevationUnit.setText(_translate("LineSplitterDialog", "m"))
147
        self.label_ElevationUnit.setText(_translate("LineSplitterDialog", "-"))
148 148
        self.label.setText(_translate("LineSplitterDialog", "Tag No."))
149 149
import Resource_rc
HYTOS/HYTOS/MainWindow.py
310 310
        self.tableWidgetHMB.setRowCount(count)
311 311
        self.tableWidgetHMB.setColumnCount(2)
312 312
        self.tableWidgetHMB.hideRow(0)
313
        self.tableWidgetHMB.hideRow(1)
314

  
315
        rowIndex = 0
316
        for columnInfo in columnInfos:      
317
            displayName = columnInfo[0]
318
            unitsExpres = columnInfo[1]
319

  
320
            name = QTableWidgetItem(displayName)
321
            name.setTextAlignment(Qt.AlignLeft | Qt.AlignVCenter)
322
            name.setBackground(QColor(230, 230, 230))                                     
323
            self.tableWidgetHMB.setItem(rowIndex, 0, name)
324
               
325
            if docData.activeDrawing:                
326
                if unitsExpres:
327
                    units = self.convertToUnits(unitsExpres)
328
                else:
329
                    units = None    
330
            else:
331
                units = None
332

  
333
            unit = QTableWidgetItem(units)
334
            unit.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
335
            unit.setBackground(QColor(230, 230, 230))
336
            self.tableWidgetHMB.setItem(rowIndex, 1, unit)
337

  
338
            rowIndex += 1
339

  
313
        self.tableWidgetHMB.hideRow(1)        
340 314
        self.tableWidgetHMB.setEditTriggers(QAbstractItemView.NoEditTriggers)
341
        self.tableWidgetHMB.resizeColumnsToContents()
342
        self.tableWidgetHMB.resizeRowsToContents()        
343

  
344 315
        self.tableWidgetHMB.horizontalHeader().setVisible(False)
345 316
        self.tableWidgetHMB.verticalHeader().setVisible(False)
346 317

  
347

  
348
        return
349

  
350

  
351

  
352
        docData = AppDocData.instance()    
353
        if docData.activeDrawing is None:
354
            
355
            drawingUid = '00000000-0000-0000-0000-000000000000'
356
        else:
357
            drawingUid = docData.activeDrawing.UID
358

  
359
        columnDisplayNameList = docData.getColumnDisplayNames(drawingUid, 'HMB')
360
        count = len(columnDisplayNameList)
361
        self.tableWidgetHMB.setRowCount(count)
362
        self.tableWidgetHMB.setColumnCount(2)
363
        self.tableWidgetHMB.hideRow(0)
364
        self.tableWidgetHMB.hideRow(1)
365

  
366 318
        rowIndex = 0
367
        for columnDisplayName in columnDisplayNameList:        
368
            name = QTableWidgetItem(columnDisplayName[0])
369
            name.setTextAlignment(Qt.AlignLeft | Qt.AlignVCenter)
370
            name.setBackground(QColor(230, 230, 230))                                     
371
            self.tableWidgetHMB.setItem(rowIndex, 0, name)
372

  
373
            unit = QTableWidgetItem(columnDisplayName[1])
374
            unit.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
375
            unit.setBackground(QColor(230, 230, 230))
376
            self.tableWidgetHMB.setItem(rowIndex, 1, unit)
319
        for columnInfo in columnInfos:      
320
            name = columnInfo[0]
321
            unit = self.convertToUnits(columnInfo[1])
322
            
323
            self.tableWidgetHMB.setItem(rowIndex, 0, self.setTableWidgetItemProperties(name, Qt.AlignLeft | Qt.AlignVCenter, QColor(230, 230, 230)))
324
            self.tableWidgetHMB.setItem(rowIndex, 1, self.setTableWidgetItemProperties(unit, Qt.AlignHCenter | Qt.AlignVCenter, QColor(230, 230, 230)))
377 325

  
378 326
            rowIndex += 1
379 327

  
380
        self.tableWidgetHMB.setEditTriggers(QAbstractItemView.NoEditTriggers)
381 328
        self.tableWidgetHMB.resizeColumnsToContents()
382 329
        self.tableWidgetHMB.resizeRowsToContents()        
383

  
384
        self.tableWidgetHMB.horizontalHeader().setVisible(False)
385
        self.tableWidgetHMB.verticalHeader().setVisible(False)
386 330
        
387

  
388

  
389 331
    '''
390
        @brief      Convert UnitsExpression To Units Value
332
        @brief      Drawing 속성의 Units 에서 Key값을 이용하여 Value를 찾음
391 333
        @author     yeonjin
392
        @date       19.08.29
334
        @date       19.08.30
393 335
    '''
394
    def convertToUnits(self, unitsExpression):
395
        value = unitsExpression
336
    def findValue(self, key):
337
        value = None
396 338

  
339
        key = key.replace("{","").replace("}","") 
397 340
        for attr in AppDocData.instance().activeDrawing.attrs:
398 341
            if attr[0] == 'Units':
399
                key = unitsExpression.replace("{","").replace("}","")                
400 342
                if key in attr[1]:
401 343
                    value = attr[1][key]
402 344
                    break
403 345
                
404 346
        return value
405 347

  
348
    '''
349
        @brief      Convert UnitsExpression To Units Value
350
        @author     yeonjin
351
        @date       19.08.29
352
    '''
353
    def convertToUnits(self, unitsExpression):
354
        import re
355

  
356
        if unitsExpression is None or AppDocData.instance().activeDrawing is None:
357
            return ''
358
        
359
        found = re.findall('{.*?}', unitsExpression)
360
        for f in found:
361
            key = f
362
            val = self.findValue(key)
363
            if val:
364
                unitsExpression = unitsExpression.replace(key, val)
365

  
366
        return unitsExpression
406 367

  
407 368
    '''
408 369
        @brief      Clear TreeWidget and Set Current PID
......
907 868
        self.tableWidgetHMB.setColumnCount(0)
908 869

  
909 870
    def load_HMB(self):        
910

  
911 871
        drawing = AppDocData.instance().activeDrawing
912 872
        if drawing is None:
913 873
            return
......
920 880
                columnCount = self.tableWidgetHMB.columnCount()                      
921 881
                self.tableWidgetHMB.setColumnCount(columnCount + 1)
922 882

  
923
                uid = QTableWidgetItem(str(hmb.uid))
924
                uid.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
925

  
926
                components_uid = QTableWidgetItem(str(hmb.components_uid))
927
                components_uid.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
928

  
929
                stream_no = QTableWidgetItem(str(hmb.stream_no))
930
                stream_no.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
931

  
932
                phase_type = QTableWidgetItem(str(hmb.phase_type))
933
                phase_type.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
934

  
935
                if hmb.isDeleted == True:
936
                    stream_no.setForeground(Qt.darkGray)       
937
                else:
938
                    stream_no.setForeground(Qt.black)       
939

  
940

  
941

  
942

  
943
                self.tableWidgetHMB.setItem(0, columnCount, uid)
944
                self.tableWidgetHMB.setItem(1, columnCount, components_uid)
945
                self.tableWidgetHMB.setItem(2, columnCount, stream_no)
946
                self.tableWidgetHMB.setItem(3, columnCount, phase_type)
883
                self.tableWidgetHMB.setItem(0, columnCount, self.setTableWidgetItemProperties(hmb.uid, Qt.AlignHCenter | Qt.AlignVCenter))
884
                self.tableWidgetHMB.setItem(1, columnCount, self.setTableWidgetItemProperties(hmb.components_uid, Qt.AlignHCenter | Qt.AlignVCenter))
885
                self.tableWidgetHMB.setItem(2, columnCount, self.setTableWidgetItemProperties(hmb.stream_no, Qt.AlignHCenter | Qt.AlignVCenter))
886
                self.tableWidgetHMB.setItem(3, columnCount, self.setTableWidgetItemProperties(hmb.phase_type, Qt.AlignHCenter | Qt.AlignVCenter))
947 887

  
948 888

  
949 889
    '''
......
1158 1098

  
1159 1099
        return itemList
1160 1100

  
1101
    def setTableWidgetItemProperties(self, name, alignment, color = None):
1102

  
1103
        item = QTableWidgetItem(str(name))
1104
        item.setTextAlignment(alignment)
1105
        if color:
1106
            item.setBackground(color)  
1107

  
1108
        return item
1109

  
1110

  
1161 1111
if __name__ == '__main__':
1162 1112
    import locale
1163 1113
    from PyQt5.QtCore import QTranslator
HYTOS/HYTOS/Phase_LiquidDialog.py
24 24

  
25 25
        self.ui.pushButton_Fitting.clicked.connect(self.show_FittingMethodDialog)
26 26
    
27
        self.initUnits()
27 28
        self.initNominalDiameter()
28 29
        self.initSchedule()
29 30

  
......
71 72
        dialog = QPhase_MixedDialog()
72 73
        dialog.showDialog(self)
73 74

  
75
    def initUnits(self):
76
        activeDrawing = AppDocData.instance().activeDrawing
77

  
78
        for attr in activeDrawing.attrs:
79
            if attr[0] == 'Units':
80
                self.ui.label_Flowrate_Mass_Unit.setText(attr[1]['Flowrate_Mass'])
81
                self.ui.label_Flowrate_Volume_Unit.setText(attr[1]['Flowrate_Volume'])
82
                self.ui.label_Density_Unit.setText(attr[1]['Density'])
83
                self.ui.label_Viscosity_Unit.setText(attr[1]['Viscosity'])
84
                self.ui.label_Velocity_Unit.setText(attr[1]['Velocity'])
85
                self.ui.label_DropPressure_Unit.setText('{}/100{}'.format(attr[1]['Pressure'], attr[1]['Length']))
86
                self.ui.label_Nominal_Pipe_Size_Unit.setText(attr[1]['Pipe_Diameter'])
87
                self.ui.label_Inside_Pipe_Size_Unit.setText(attr[1]['Pipe_Diameter'])
88
                self.ui.label_Roughness_Unit.setText(attr[1]['Roughness'])
89
                self.ui.label_Straight_Lengh_Unit.setText(attr[1]['Length'])
90
                self.ui.label_Equivalent_Lenght_Input_Unit.setText(attr[1]['Length'])
91
                self.ui.label_Fitting_Length_Unit.setText(attr[1]['Length'])
92
                self.ui.label_Equivalent_Lenght_Cal_Unit.setText(attr[1]['Length'])
93

  
94

  
74 95
    def initNominalDiameter(self):
75 96
        from AppDocData import AppDocData
76 97

  
......
78 99

  
79 100
        nominalDiameterList = AppDocData.instance().getNominalDiameter()
80 101
        for nominalDiameter in nominalDiameterList:
81
            self.ui.comboBox_NominalDiameter.addItem(str(nominalDiameter[1]), nominalDiameter[0])    
82

  
102
            if self.ui.label_Nominal_Pipe_Size_Unit.text() == 'mm':
103
                self.ui.comboBox_NominalDiameter.addItem(str(nominalDiameter[1]), nominalDiameter[0])    
104
            else:
105
                self.ui.comboBox_NominalDiameter.addItem(str(nominalDiameter[2]), nominalDiameter[0])    
83 106
        self.ui.comboBox_NominalDiameter.setCurrentIndex(-1)
107
        
84 108
    def initSchedule(self):
85 109
        self.ui.comboBox_Schedule.clear()
86 110

  
HYTOS/HYTOS/Phase_Liquid_UI.py
322 322
        self.verticalLayout_4.addLayout(self.horizontalLayout_5)
323 323
        self.horizontalLayout_19 = QtWidgets.QHBoxLayout()
324 324
        self.horizontalLayout_19.setObjectName("horizontalLayout_19")
325
        spacerItem3 = QtWidgets.QSpacerItem(49, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
325
        spacerItem3 = QtWidgets.QSpacerItem(50, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
326 326
        self.horizontalLayout_19.addItem(spacerItem3)
327 327
        self.pushButton = QtWidgets.QPushButton(self.groupBox)
328 328
        font = QtGui.QFont()
......
406 406
        self.verticalLayout_4.addLayout(self.horizontalLayout_18)
407 407
        self.horizontalLayout_16 = QtWidgets.QHBoxLayout()
408 408
        self.horizontalLayout_16.setObjectName("horizontalLayout_16")
409
        spacerItem4 = QtWidgets.QSpacerItem(49, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
409
        spacerItem4 = QtWidgets.QSpacerItem(50, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
410 410
        self.horizontalLayout_16.addItem(spacerItem4)
411 411
        self.pushButton_Fitting = QtWidgets.QPushButton(self.groupBox)
412 412
        font = QtGui.QFont()
......
577 577
        self.pushButton_4.setText(_translate("LiquidDialog", "Detail Loop Information"))
578 578
        self.groupBox_3.setTitle(_translate("LiquidDialog", "Process Data"))
579 579
        self.label_14.setText(_translate("LiquidDialog", "Flowrate (Mass) :"))
580
        self.label_Flowrate_Mass_Unit.setText(_translate("LiquidDialog", "kg/h"))
580
        self.label_Flowrate_Mass_Unit.setText(_translate("LiquidDialog", "-"))
581 581
        self.label_16.setText(_translate("LiquidDialog", "Flowrate (Volume) :"))
582
        self.label_Flowrate_Volume_Unit.setText(_translate("LiquidDialog", "m3/h"))
582
        self.label_Flowrate_Volume_Unit.setText(_translate("LiquidDialog", "-"))
583 583
        self.label_18.setText(_translate("LiquidDialog", "Density :"))
584
        self.label_Density_Unit.setText(_translate("LiquidDialog", "kg/m3"))
584
        self.label_Density_Unit.setText(_translate("LiquidDialog", "-"))
585 585
        self.label_20.setText(_translate("LiquidDialog", "Viscosity :"))
586
        self.label_Viscosity_Unit.setText(_translate("LiquidDialog", "cP"))
586
        self.label_Viscosity_Unit.setText(_translate("LiquidDialog", "-"))
587 587
        self.groupBox_2.setTitle(_translate("LiquidDialog", "Line Sizing Data"))
588 588
        self.label_4.setText(_translate("LiquidDialog", "Velocity :"))
589
        self.label_Velocity_Unit.setText(_translate("LiquidDialog", "m/s"))
589
        self.label_Velocity_Unit.setText(_translate("LiquidDialog", "-"))
590 590
        self.label_6.setText(_translate("LiquidDialog", "△P :"))
591
        self.label_DropPressure_Unit.setText(_translate("LiquidDialog", "kg/cm2/100m"))
591
        self.label_DropPressure_Unit.setText(_translate("LiquidDialog", "-"))
592 592
        self.groupBox.setTitle(_translate("LiquidDialog", "Geometry Data"))
593 593
        self.label_8.setText(_translate("LiquidDialog", "ND :"))
594
        self.label_Nominal_Pipe_Size_Unit.setText(_translate("LiquidDialog", "in"))
594
        self.label_Nominal_Pipe_Size_Unit.setText(_translate("LiquidDialog", "-"))
595 595
        self.label_10.setText(_translate("LiquidDialog", "Sch. No. :"))
596 596
        self.label_12.setText(_translate("LiquidDialog", "ID :"))
597
        self.label_Inside_Pipe_Size_Unit.setText(_translate("LiquidDialog", "in"))
597
        self.label_Inside_Pipe_Size_Unit.setText(_translate("LiquidDialog", "-"))
598 598
        self.pushButton.setText(_translate("LiquidDialog", "Roughness"))
599
        self.label_Roughness_Unit.setText(_translate("LiquidDialog", "mm"))
599
        self.label_Roughness_Unit.setText(_translate("LiquidDialog", "-"))
600 600
        self.label_27.setText(_translate("LiquidDialog", "Str. Length :"))
601
        self.label_Straight_Lengh_Unit.setText(_translate("LiquidDialog", "m"))
601
        self.label_Straight_Lengh_Unit.setText(_translate("LiquidDialog", "-"))
602 602
        self.label_29.setText(_translate("LiquidDialog", "Equiv. Length (Input) :"))
603
        self.label_Equivalent_Lenght_Input_Unit.setText(_translate("LiquidDialog", "m"))
603
        self.label_Equivalent_Lenght_Input_Unit.setText(_translate("LiquidDialog", "-"))
604 604
        self.pushButton_Fitting.setText(_translate("LiquidDialog", "Fitting Input"))
605
        self.label_Fitting_Length_Unit.setText(_translate("LiquidDialog", "m"))
605
        self.label_Fitting_Length_Unit.setText(_translate("LiquidDialog", "-"))
606 606
        self.label.setText(_translate("LiquidDialog", "Equiv. Length (Cal\'d) :"))
607
        self.label_Equivalent_Lenght_Cal_Unit.setText(_translate("LiquidDialog", "m"))
607
        self.label_Equivalent_Lenght_Cal_Unit.setText(_translate("LiquidDialog", "-"))
608 608
        self.groupBox_4.setTitle(_translate("LiquidDialog", "Data Basis"))
609 609
        self.groupBox_StreamNo.setTitle(_translate("LiquidDialog", "Stream Information"))
610 610
        self.label_5.setText(_translate("LiquidDialog", "Stream No. "))
HYTOS/HYTOS/PlateHeatExchanger_UI.py
146 146
        self.label_Img_4.setText(_translate("PlateHeatExchangerDialog", "<html><head/><body><p><img src=\":/images/Plate_Arrow.png\"/></p></body></html>"))
147 147
        self.groupBox.setTitle(_translate("PlateHeatExchangerDialog", "Equipment Data"))
148 148
        self.label_11.setText(_translate("PlateHeatExchangerDialog", "P. Drop"))
149
        self.label_ElevationUnit.setText(_translate("PlateHeatExchangerDialog", "Elevation"))
150
        self.label_PressureUnit.setText(_translate("PlateHeatExchangerDialog", "P. Drop"))
149
        self.label_ElevationUnit.setText(_translate("PlateHeatExchangerDialog", "-"))
150
        self.label_PressureUnit.setText(_translate("PlateHeatExchangerDialog", "-"))
151 151
        self.label_12.setText(_translate("PlateHeatExchangerDialog", "Elevation"))
152 152
        self.label_UpDown.setText(_translate("PlateHeatExchangerDialog", "<html><head/><body><p><img src=\":/images/UpDown.png\"/></p></body></html>"))
153 153
        self.label_DownUp.setText(_translate("PlateHeatExchangerDialog", "<html><head/><body><p><img src=\":/images/DownUp.png\"/></p></body></html>"))
HYTOS/HYTOS/Pump.py
43 43
        appDocData = AppDocData.instance()
44 44
        drawing = appDocData.activeDrawing    
45 45
        if drawing:
46
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
47
            if len(columnDisplayNameList) > 0:                
48
                for columnDisplayName in columnDisplayNameList:        
49
                    if columnDisplayName[0] == 'Pressure':
50
                        self.ui.label_Diff_PressureUnit.setText(columnDisplayName[1])
51
                        self.ui.label_Vapor_PressureUnit.setText(columnDisplayName[1])
52
                    elif columnDisplayName[0] == 'Elevation':
53
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
46
            for attr in drawing.attrs:
47
                if attr[0] == 'Units':
48
                    self.ui.label_Diff_PressureUnit.setText(attr[1]['Pressure'])
49
                    self.ui.label_Vapor_PressureUnit.setText('{}(a)'.format(attr[1]['Pressure']))
50
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
54 51
                
55 52

  
56 53
    def accept(self):
HYTOS/HYTOS/Pump_UI.py
71 71
        self.lineEdit_Vapor_Pressure.setAlignment(QtCore.Qt.AlignCenter)
72 72
        self.lineEdit_Vapor_Pressure.setObjectName("lineEdit_Vapor_Pressure")
73 73
        self.label_Vapor_PressureUnit = QtWidgets.QLabel(self.groupBox)
74
        self.label_Vapor_PressureUnit.setGeometry(QtCore.QRect(338, 117, 56, 16))
74
        self.label_Vapor_PressureUnit.setGeometry(QtCore.QRect(338, 117, 61, 16))
75 75
        font = QtGui.QFont()
76 76
        font.setBold(False)
77 77
        font.setWeight(50)
......
140 140
        self.groupBox.setTitle(_translate("PumpDialog", "Equipment Figure"))
141 141
        self.label_Img.setText(_translate("PumpDialog", "<html><head/><body><p><img src=\":/images/Pump.png\"/></p></body></html>"))
142 142
        self.label_5.setText(_translate("PumpDialog", "Elevation"))
143
        self.label_ElevationUnit.setText(_translate("PumpDialog", "m"))
143
        self.label_ElevationUnit.setText(_translate("PumpDialog", "-"))
144 144
        self.label_9.setText(_translate("PumpDialog", "Vapor Press.(a)"))
145
        self.label_Vapor_PressureUnit.setText(_translate("PumpDialog", "kg/cm2(a)"))
145
        self.label_Vapor_PressureUnit.setText(_translate("PumpDialog", "-"))
146 146
        self.label_3.setText(_translate("PumpDialog", "Diff. P"))
147
        self.label_Diff_PressureUnit.setText(_translate("PumpDialog", "kg/cm2"))
147
        self.label_Diff_PressureUnit.setText(_translate("PumpDialog", "-"))
148 148
        self.label_2.setText(_translate("PumpDialog", "Tag No."))
149 149
import Resource_rc
HYTOS/HYTOS/Reactor.py
95 95
        appDocData = AppDocData.instance()
96 96
        drawing = appDocData.activeDrawing    
97 97
        if drawing:
98
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
99
            if len(columnDisplayNameList) > 0:                
100
                for columnDisplayName in columnDisplayNameList:        
101
                    if columnDisplayName[0] == 'Pressure Drop':
102
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
103
                    elif columnDisplayName[0] == 'Elevation':
104
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
105
                        
98
            for attr in drawing.attrs:
99
                if attr[0] == 'Units':
100
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
101
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
102
                       
106 103
    def accept(self):
107 104
       
108 105
        QDialog.accept(self)
HYTOS/HYTOS/Reactor_UI.py
235 235
        self.label_Img_N1.setText(_translate("ReactorDialog", "<html><head/><body><p><img src=\":/images/N1.png\"/></p></body></html>"))
236 236
        self.label_Img_N4.setText(_translate("ReactorDialog", "<html><head/><body><p><img src=\":/images/N4.png\"/></p></body></html>"))
237 237
        self.groupBox_2.setTitle(_translate("ReactorDialog", "Pressure Drop"))
238
        self.label_PressureUnit.setText(_translate("ReactorDialog", "kg/cm2"))
238
        self.label_PressureUnit.setText(_translate("ReactorDialog", "-"))
239 239
        self.groupBox.setTitle(_translate("ReactorDialog", "Equipment Data"))
240 240
        self.label_4.setText(_translate("ReactorDialog", "Elevation"))
241
        self.label_ElevationUnit.setText(_translate("ReactorDialog", "m"))
241
        self.label_ElevationUnit.setText(_translate("ReactorDialog", "-"))
242 242
        self.label_N1.setText(_translate("ReactorDialog", "<html><head/><body><p><img src=\":/images/N1.png\"/></p></body></html>"))
243 243
        self.label_N2.setText(_translate("ReactorDialog", "<html><head/><body><p><img src=\":/images/N2.png\"/></p></body></html>"))
244 244
        self.label_N3.setText(_translate("ReactorDialog", "<html><head/><body><p><img src=\":/images/N3.png\"/></p></body></html>"))
HYTOS/HYTOS/Reducer.py
44 44
        appDocData = AppDocData.instance()
45 45
        drawing = appDocData.activeDrawing    
46 46
        if drawing:
47
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
48
            if len(columnDisplayNameList) > 0:                
49
                for columnDisplayName in columnDisplayNameList:        
50
                    if columnDisplayName[0] == 'Pressure Drop':
51
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
52
                    elif columnDisplayName[0] == 'Elevation':
53
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
47
            for attr in drawing.attrs:
48
                if attr[0] == 'Units':
49
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
50
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
54 51
                
55 52
    def accept(self):
56 53
       
HYTOS/HYTOS/Reducer_UI.py
119 119
        _translate = QtCore.QCoreApplication.translate
120 120
        ReducerDialog.setWindowTitle(_translate("ReducerDialog", "HYTOS Instrument Data - Reducer / Expander"))
121 121
        self.groupBox.setTitle(_translate("ReducerDialog", "Equipment Figure"))
122
        self.label_ElevationUnit.setText(_translate("ReducerDialog", "m"))
122
        self.label_ElevationUnit.setText(_translate("ReducerDialog", "-"))
123 123
        self.label.setText(_translate("ReducerDialog", "Tag No."))
124
        self.label_PressureUnit.setText(_translate("ReducerDialog", "kg/cm2"))
124
        self.label_PressureUnit.setText(_translate("ReducerDialog", "-"))
125 125
        self.label_3.setText(_translate("ReducerDialog", "P. Drop"))
126 126
        self.label_5.setText(_translate("ReducerDialog", "Elevation"))
127 127
        self.label_Img.setText(_translate("ReducerDialog", "<html><head/><body><p><img src=\":/images/Reducer.png\"/></p></body></html>"))
HYTOS/HYTOS/Shapes/EngineeringStreamlineItem.py
395 395

  
396 396
        drawing = AppDocData.instance().activeDrawing
397 397
        if drawing:        
398
            drawing.hmbTable.updateByUID(self.uid, 'Vapor')
398
            drawing.hmbTable.updateByUID(self.uid, 'Liquid')
399 399

  
400 400
    def load_HMB(self):        
401 401
        from App import App 
HYTOS/HYTOS/ShlTubHeatExchanger.py
81 81
        appDocData = AppDocData.instance()
82 82
        drawing = appDocData.activeDrawing    
83 83
        if drawing:
84
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
85
            if len(columnDisplayNameList) > 0:                
86
                for columnDisplayName in columnDisplayNameList:        
87
                    if columnDisplayName[0] == 'Pressure Drop':
88
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
89
                    elif columnDisplayName[0] == 'Elevation':
90
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
91

  
84
            for attr in drawing.attrs:
85
                if attr[0] == 'Units':
86
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
87
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
88
                
92 89
    def accept(self):
93 90
        
94 91
        QDialog.accept(self)
HYTOS/HYTOS/ShlTubHeatExchanger_UI.py
167 167
        self.groupBox.setTitle(_translate("ShlTubHeatExchangerDialog", "Equipment Data"))
168 168
        self.label_11.setText(_translate("ShlTubHeatExchangerDialog", "P. Drop"))
169 169
        self.label_12.setText(_translate("ShlTubHeatExchangerDialog", "Elevation"))
170
        self.label_ElevationUnit.setText(_translate("ShlTubHeatExchangerDialog", "Elevation"))
171
        self.label_PressureUnit.setText(_translate("ShlTubHeatExchangerDialog", "P. Drop"))
170
        self.label_ElevationUnit.setText(_translate("ShlTubHeatExchangerDialog", "-"))
171
        self.label_PressureUnit.setText(_translate("ShlTubHeatExchangerDialog", "-"))
172 172
        self.label_Tub.setText(_translate("ShlTubHeatExchangerDialog", "<html><head/><body><p><img src=\":/images/Tube.png\"/></p></body></html>"))
173 173
        self.label_Shl.setText(_translate("ShlTubHeatExchangerDialog", "<html><head/><body><p><img src=\":/images/Shell.png\"/></p></body></html>"))
174 174
import Resource_rc
HYTOS/HYTOS/SinglePacked.py
147 147
        appDocData = AppDocData.instance()
148 148
        drawing = appDocData.activeDrawing    
149 149
        if drawing:
150
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
151
            if len(columnDisplayNameList) > 0:                
152
                for columnDisplayName in columnDisplayNameList:        
153
                    if columnDisplayName[0] == 'Pressure':
154
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
155
                    elif columnDisplayName[0] == 'Elevation':
156
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
157
                        
150
            for attr in drawing.attrs:
151
                if attr[0] == 'Units':
152
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
153
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
154
                    
158 155
    def accept(self):
159 156
        
160 157
        QDialog.accept(self)
HYTOS/HYTOS/SinglePacked_UI.py
272 272
        self.label_Img_N10.setText(_translate("SinglePackedDialog", "<html><head/><body><p><img src=\":/images/N10.png\"/></p></body></html>"))
273 273
        self.label_Img_N1.setText(_translate("SinglePackedDialog", "<html><head/><body><p><img src=\":/images/N1.png\"/></p></body></html>"))
274 274
        self.groupBox_3.setTitle(_translate("SinglePackedDialog", "Equipment Data"))
275
        self.label_ElevationUnit.setText(_translate("SinglePackedDialog", "m"))
276
        self.label_PressureUnit.setText(_translate("SinglePackedDialog", "kg/cm2(g)"))
275
        self.label_ElevationUnit.setText(_translate("SinglePackedDialog", "-"))
276
        self.label_PressureUnit.setText(_translate("SinglePackedDialog", "-"))
277 277
        self.label_3.setText(_translate("SinglePackedDialog", "Pressure"))
278 278
        self.label_4.setText(_translate("SinglePackedDialog", "Elevation"))
279 279
        self.label_N9.setText(_translate("SinglePackedDialog", "<html><head/><body><p><img src=\":/images/N9.png\"/></p></body></html>"))
HYTOS/HYTOS/Strainer_T.py
44 44
        appDocData = AppDocData.instance()
45 45
        drawing = appDocData.activeDrawing    
46 46
        if drawing:
47
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
48
            if len(columnDisplayNameList) > 0:                
49
                for columnDisplayName in columnDisplayNameList:        
50
                    if columnDisplayName[0] == 'Pressure Drop':
51
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
52
                    elif columnDisplayName[0] == 'Elevation':
53
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
54
        
47
            for attr in drawing.attrs:
48
                if attr[0] == 'Units':
49
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
50
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
51
                
55 52
    def accept(self):
56 53
        QDialog.accept(self)
57 54

  
HYTOS/HYTOS/Strainer_T_UI.py
118 118
        self.groupBox.setTitle(_translate("Strainer_T_Dialog", "Equipment Figure"))
119 119
        self.label_Img.setText(_translate("Strainer_T_Dialog", "<html><head/><body><p><img src=\":/images/Strainer_T.png\"/></p></body></html>"))
120 120
        self.label.setText(_translate("Strainer_T_Dialog", "Tag No."))
121
        self.label_ElevationUnit.setText(_translate("Strainer_T_Dialog", "m"))
121
        self.label_ElevationUnit.setText(_translate("Strainer_T_Dialog", "-"))
122 122
        self.label_5.setText(_translate("Strainer_T_Dialog", "Elevation"))
123
        self.label_PressureUnit.setText(_translate("Strainer_T_Dialog", "kg/cm2"))
123
        self.label_PressureUnit.setText(_translate("Strainer_T_Dialog", "-"))
124 124
        self.label_3.setText(_translate("Strainer_T_Dialog", "P. Drop"))
125 125
import Resource_rc
HYTOS/HYTOS/Strainer_Y.py
43 43
        appDocData = AppDocData.instance()
44 44
        drawing = appDocData.activeDrawing    
45 45
        if drawing:
46
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
47
            if len(columnDisplayNameList) > 0:                
48
                for columnDisplayName in columnDisplayNameList:        
49
                    if columnDisplayName[0] == 'Pressure Drop':
50
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
51
                    elif columnDisplayName[0] == 'Elevation':
52
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
53
        
46
            for attr in drawing.attrs:
47
                if attr[0] == 'Units':
48
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
49
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
50
                
54 51
    def accept(self):
55 52
        QDialog.accept(self)
56 53

  
HYTOS/HYTOS/Strainer_Y_UI.py
115 115
        Strainer_Y_Dialog.setWindowTitle(_translate("Strainer_Y_Dialog", "HYTOS Equipment Data - Y Type Strainer"))
116 116
        self.groupBox.setTitle(_translate("Strainer_Y_Dialog", "Equipment Figure"))
117 117
        self.label_5.setText(_translate("Strainer_Y_Dialog", "Elevation"))
118
        self.label_PressureUnit.setText(_translate("Strainer_Y_Dialog", "kg/cm2"))
119
        self.label_ElevationUnit.setText(_translate("Strainer_Y_Dialog", "m"))
118
        self.label_PressureUnit.setText(_translate("Strainer_Y_Dialog", "-"))
119
        self.label_ElevationUnit.setText(_translate("Strainer_Y_Dialog", "-"))
120 120
        self.label.setText(_translate("Strainer_Y_Dialog", "Tag No."))
121 121
        self.label_3.setText(_translate("Strainer_Y_Dialog", "P. Drop"))
122 122
        self.label_Img.setText(_translate("Strainer_Y_Dialog", "<html><head/><body><p><img src=\":/images/Strainer_Y.png\"/></p></body></html>"))
HYTOS/HYTOS/SymbolEditor_UI.py
130 130
        self.rotateLeftButton.setMinimumSize(QtCore.QSize(32, 32))
131 131
        self.rotateLeftButton.setMaximumSize(QtCore.QSize(32, 32))
132 132
        self.rotateLeftButton.setText("")
133
        icon3 = QtGui.QIcon()
134
        icon3.addPixmap(QtGui.QPixmap(":/newPrefix/Rotate_Minus.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
135
        self.rotateLeftButton.setIcon(icon3)
136 133
        self.rotateLeftButton.setIconSize(QtCore.QSize(20, 20))
137 134
        self.rotateLeftButton.setObjectName("rotateLeftButton")
138 135
        self.gridLayout_5.addWidget(self.rotateLeftButton, 1, 0, 1, 1)
......
145 142
        self.rotateRightButton.setMinimumSize(QtCore.QSize(32, 32))
146 143
        self.rotateRightButton.setMaximumSize(QtCore.QSize(32, 32))
147 144
        self.rotateRightButton.setText("")
148
        icon4 = QtGui.QIcon()
149
        icon4.addPixmap(QtGui.QPixmap(":/newPrefix/Rotate_Plus.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
150
        self.rotateRightButton.setIcon(icon4)
151 145
        self.rotateRightButton.setIconSize(QtCore.QSize(20, 20))
152 146
        self.rotateRightButton.setObjectName("rotateRightButton")
153 147
        self.gridLayout_5.addWidget(self.rotateRightButton, 1, 1, 1, 1)
......
231 225
        self.areaEraserButton.setMinimumSize(QtCore.QSize(32, 32))
232 226
        self.areaEraserButton.setMaximumSize(QtCore.QSize(32, 32))
233 227
        self.areaEraserButton.setText("")
234
        icon5 = QtGui.QIcon()
235
        icon5.addPixmap(QtGui.QPixmap(":/newPrefix/eraser_area.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
236
        self.areaEraserButton.setIcon(icon5)
237 228
        self.areaEraserButton.setIconSize(QtCore.QSize(20, 20))
238 229
        self.areaEraserButton.setObjectName("areaEraserButton")
239 230
        self.gridLayout_5.addWidget(self.areaEraserButton, 0, 7, 1, 1)
HYTOS/HYTOS/Tray.py
167 167
        appDocData = AppDocData.instance()
168 168
        drawing = appDocData.activeDrawing    
169 169
        if drawing:
170
            columnDisplayNameList = appDocData.getColumnDisplayNames(drawing.UID, 'Nozzles')
171
            if len(columnDisplayNameList) > 0:                
172
                for columnDisplayName in columnDisplayNameList:        
173
                    if columnDisplayName[0] == 'Pressure':
174
                        self.ui.label_PressureUnit.setText(columnDisplayName[1])
175
                    elif columnDisplayName[0] == 'Elevation':
176
                        self.ui.label_ElevationUnit.setText(columnDisplayName[1])
177
    
170
            for attr in drawing.attrs:
171
                if attr[0] == 'Units':
172
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
173
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
174
                
178 175
    def accept(self):
179 176
        
180 177
        QDialog.accept(self)
HYTOS/HYTOS/Tray_UI.py
313 313
        self.groupBox_3.setTitle(_translate("TrayDialog", "Equipment Data"))
314 314
        self.label_3.setText(_translate("TrayDialog", "Pressure"))
315 315
        self.label_4.setText(_translate("TrayDialog", "Elevation"))
316
        self.label_PressureUnit.setText(_translate("TrayDialog", "kg/cm2(g)"))
317
        self.label_ElevationUnit.setText(_translate("TrayDialog", "m"))
316
        self.label_PressureUnit.setText(_translate("TrayDialog", "-"))
317
        self.label_ElevationUnit.setText(_translate("TrayDialog", "-"))
318 318
        self.label_N1.setText(_translate("TrayDialog", "<html><head/><body><p><img src=\":/images/N1.png\"/></p></body></html>"))
319 319
        self.label_N2.setText(_translate("TrayDialog", "<html><head/><body><p><img src=\":/images/N2.png\"/></p></body></html>"))
320 320
        self.label_N3.setText(_translate("TrayDialog", "<html><head/><body><p><img src=\":/images/N3.png\"/></p></body></html>"))
HYTOS/HYTOS/UI/AirFinCooler.ui
206 206
     </font>
207 207
    </property>
208 208
    <property name="text">
209
     <string>kg/cm2</string>
209
     <string>-</string>
210 210
    </property>
211 211
   </widget>
212 212
   <widget class="QLabel" name="label_5">
......
278 278
     </font>
279 279
    </property>
280 280
    <property name="text">
281
     <string>m</string>
281
     <string>-</string>
282 282
    </property>
283 283
   </widget>
284 284
  </widget>
HYTOS/HYTOS/UI/Ball.ui
290 290
     </font>
291 291
    </property>
292 292
    <property name="text">
293
     <string>kg/cm2(g)</string>
293
     <string>-</string>
294 294
    </property>
295 295
    <property name="alignment">
296 296
     <set>Qt::AlignCenter</set>
......
312 312
     </font>
313 313
    </property>
314 314
    <property name="text">
315
     <string>m</string>
315
     <string>-</string>
316 316
    </property>
317 317
    <property name="alignment">
318 318
     <set>Qt::AlignCenter</set>
HYTOS/HYTOS/UI/BatteryLimit.ui
153 153
     </font>
154 154
    </property>
155 155
    <property name="text">
156
     <string>m</string>
156
     <string>-</string>
157 157
    </property>
158 158
   </widget>
159 159
   <widget class="QLineEdit" name="lineEdit_Elevation">
......
250 250
     </font>
251 251
    </property>
252 252
    <property name="text">
253
     <string>kg/cm2(g)</string>
253
     <string>-</string>
254 254
    </property>
255 255
   </widget>
256 256
   <widget class="QLabel" name="label">
HYTOS/HYTOS/UI/Coil.ui
176 176
     </font>
177 177
    </property>
178 178
    <property name="text">
179
     <string>kg/cm2</string>
179
     <string>-</string>
180 180
    </property>
181 181
   </widget>
182 182
   <widget class="QLabel" name="label_5">
......
223 223
     </font>
224 224
    </property>
225 225
    <property name="text">
226
     <string>m</string>
226
     <string>-</string>
227 227
    </property>
228 228
   </widget>
229 229
   <widget class="QLineEdit" name="lineEdit_Elevation">
HYTOS/HYTOS/UI/Compressor.ui
186 186
     </font>
187 187
    </property>
188 188
    <property name="text">
189
     <string>Elevation</string>
189
     <string>-</string>
190 190
    </property>
191 191
    <property name="alignment">
192 192
     <set>Qt::AlignCenter</set>
......
208 208
     </font>
209 209
    </property>
210 210
    <property name="text">
211
     <string>Pressure</string>
211
     <string>-</string>
212 212
    </property>
213 213
    <property name="alignment">
... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

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