프로젝트

일반

사용자정보

개정판 4aa060ea

ID4aa060eabce40361f60f06a82a6ce3082d4b2282
상위 d6c9d55b
하위 96c9d53a, c6ffbb05

백흠경이(가) 5년 이상 전에 추가함

issue #1202: calculate press drop

Change-Id: I70e77a77f03ea80410da0f9b838b5b29c0be95d9

차이점 보기:

HYTOS/HYTOS/AirFinCooler.py
51 51
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
52 52
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
53 53

  
54
        matches = [connector.nozzle_data for connector in self._item.connectors if connector.nozzle_data]
54
        matches = [connector.data for connector in self._item.connectors if connector.data]
55 55
        if matches:
56 56
            pressure_drop = matches[0].pressure_drop
57 57
            if pressure_drop:                
......
66 66
        from EngineeringConnectorItem import NozzleData
67 67

  
68 68
        for connector in self._item.connectors:
69
            if not connector.nozzle_data: 
70
                connector.nozzle_data = NozzleData()
69
            if not connector.data: 
70
                connector.data = NozzleData()
71 71

  
72 72
            pressure_drop = self.ui.lineEdit_Pressure_Drop.text()
73 73
            if pressure_drop:
74
                connector.nozzle_data.pressure_drop = float(pressure_drop)    
74
                connector.data.pressure_drop = float(pressure_drop)    
75 75
            else: 
76
                connector.nozzle_data.pressure_drop = None
76
                connector.data.pressure_drop = None
77 77

  
78 78
            elevation = self.ui.lineEdit_Elevation.text()
79 79
            if elevation:
80
                connector.nozzle_data.elevation = float(elevation)  
80
                connector.data.elevation = float(elevation)  
81 81
            else:
82
                connector.nozzle_data.elevation = None
82
                connector.data.elevation = None
83 83

  
84 84
        QDialog.accept(self)
85 85

  
HYTOS/HYTOS/AppDocData.py
876 876
            rows = cursor.fetchall()
877 877
            if rows:
878 878
                res = NozzleData()
879
                if rows[0]['Pressure']:
880
                    res.pressure = float(rows[0]['Pressure'])
881
                if rows[0]['Pressure_Drop']:
882
                    res.pressure_drop = float(rows[0]['Pressure_Drop'])
883
                if rows[0]['Elevation']:
884
                    res.elevation = float(rows[0]['Elevation'])
885
                if rows[0]['Over_Design_CV']:
886
                    res.over_design_cv = float(rows[0]['Over_Design_CV'])
887
        return res
879
                res.parse(rows[0])
888 880

  
881
        return res
889 882
    
890 883
    '''
891 884
        @brief      Return Components By DrawingUID
HYTOS/HYTOS/Ball.py
178 178

  
179 179
        for connector in self._item.connectors:
180 180
            index = connector._conn_index
181
            if connector.nozzle_data:
182
                pressure = connector.nozzle_data.pressure                                
181
            if connector.data:
182
                pressure = connector.data.pressure                                
183 183
                if pressure:
184 184
                    if index == 1:
185 185
                        self.ui.lineEdit_N1_Pressure.setText(str(pressure))
......
198 198
                    elif index == 8:
199 199
                        self.ui.lineEdit_N8_Pressure.setText(str(pressure))
200 200

  
201
                elevation = connector.nozzle_data.elevation
201
                elevation = connector.data.elevation
202 202
                if elevation:
203 203
                    if index == 1:
204 204
                        self.ui.lineEdit_N1_Elevation.setText(str(elevation))
......
223 223

  
224 224
        for connector in self._item.connectors:
225 225
            index = connector._conn_index
226
            if not connector.nozzle_data: 
227
                connector.nozzle_data = NozzleData()
226
            if not connector.data: 
227
                connector.data = NozzleData()
228 228

  
229 229
            if index == 1:
230 230
                pressure = self.ui.lineEdit_N1_Pressure.text()
231 231
                if pressure:
232
                    connector.nozzle_data.pressure = float(pressure)    
232
                    connector.data.pressure = float(pressure)    
233 233
                else: 
234
                    connector.nozzle_data.pressure = None
234
                    connector.data.pressure = None
235 235

  
236 236
                elevation = self.ui.lineEdit_N1_Elevation.text()
237 237
                if elevation:
238
                    connector.nozzle_data.elevation = float(elevation)  
238
                    connector.data.elevation = float(elevation)  
239 239
                else:
240
                    connector.nozzle_data.elevation = None
240
                    connector.data.elevation = None
241 241
            elif index == 2:
242 242
                pressure = self.ui.lineEdit_N2_Pressure.text()
243 243
                if pressure:
244
                    connector.nozzle_data.pressure = float(pressure)    
244
                    connector.data.pressure = float(pressure)    
245 245
                else: 
246
                    connector.nozzle_data.pressure = None
246
                    connector.data.pressure = None
247 247

  
248 248
                elevation = self.ui.lineEdit_N2_Elevation.text()
249 249
                if elevation:
250
                    connector.nozzle_data.elevation = float(elevation)  
250
                    connector.data.elevation = float(elevation)  
251 251
                else:
252
                    connector.nozzle_data.elevation = None
252
                    connector.data.elevation = None
253 253
            elif index == 3:
254 254
                pressure = self.ui.lineEdit_N3_Pressure.text()
255 255
                if pressure:
256
                    connector.nozzle_data.pressure = float(pressure)    
256
                    connector.data.pressure = float(pressure)    
257 257
                else: 
258
                    connector.nozzle_data.pressure = None
258
                    connector.data.pressure = None
259 259

  
260 260
                elevation = self.ui.lineEdit_N3_Elevation.text()
261 261
                if elevation:
262
                    connector.nozzle_data.elevation = float(elevation)  
262
                    connector.data.elevation = float(elevation)  
263 263
                else:
264
                    connector.nozzle_data.elevation = None
264
                    connector.data.elevation = None
265 265
            elif index == 4:
266 266
                pressure = self.ui.lineEdit_N4_Pressure.text()
267 267
                if pressure:
268
                    connector.nozzle_data.pressure = float(pressure)    
268
                    connector.data.pressure = float(pressure)    
269 269
                else: 
270
                    connector.nozzle_data.pressure = None
270
                    connector.data.pressure = None
271 271

  
272 272
                elevation = self.ui.lineEdit_N4_Elevation.text()
273 273
                if elevation:
274
                    connector.nozzle_data.elevation = float(elevation)  
274
                    connector.data.elevation = float(elevation)  
275 275
                else:
276
                    connector.nozzle_data.elevation = None
276
                    connector.data.elevation = None
277 277
            elif index == 5:
278 278
                pressure = self.ui.lineEdit_N5_Pressure.text()
279 279
                if pressure:
280
                    connector.nozzle_data.pressure = float(pressure)    
280
                    connector.data.pressure = float(pressure)    
281 281
                else: 
282
                    connector.nozzle_data.pressure = None
282
                    connector.data.pressure = None
283 283

  
284 284
                elevation = self.ui.lineEdit_N5_Elevation.text()
285 285
                if elevation:
286
                    connector.nozzle_data.elevation = float(elevation)  
286
                    connector.data.elevation = float(elevation)  
287 287
                else:
288
                    connector.nozzle_data.elevation = None
288
                    connector.data.elevation = None
289 289
            elif index == 6:
290 290
                pressure = self.ui.lineEdit_N6_Pressure.text()
291 291
                if pressure:
292
                    connector.nozzle_data.pressure = float(pressure)    
292
                    connector.data.pressure = float(pressure)    
293 293
                else: 
294
                    connector.nozzle_data.pressure = None
294
                    connector.data.pressure = None
295 295

  
296 296
                elevation = self.ui.lineEdit_N6_Elevation.text()
297 297
                if elevation:
298
                    connector.nozzle_data.elevation = float(elevation)  
298
                    connector.data.elevation = float(elevation)  
299 299
                else:
300
                    connector.nozzle_data.elevation = None
300
                    connector.data.elevation = None
301 301
            elif index == 7:
302 302
                pressure = self.ui.lineEdit_N7_Pressure.text()
303 303
                if pressure:
304
                    connector.nozzle_data.pressure = float(pressure)    
304
                    connector.data.pressure = float(pressure)    
305 305
                else: 
306
                    connector.nozzle_data.pressure = None
306
                    connector.data.pressure = None
307 307

  
308 308
                elevation = self.ui.lineEdit_N7_Elevation.text()
309 309
                if elevation:
310
                    connector.nozzle_data.elevation = float(elevation)  
310
                    connector.data.elevation = float(elevation)  
311 311
                else:
312
                    connector.nozzle_data.elevation = None
312
                    connector.data.elevation = None
313 313
            elif index == 8:
314 314
                pressure = self.ui.lineEdit_N8_Pressure.text()
315 315
                if pressure:
316
                    connector.nozzle_data.pressure = float(pressure)    
316
                    connector.data.pressure = float(pressure)    
317 317
                else: 
318
                    connector.nozzle_data.pressure = None
318
                    connector.data.pressure = None
319 319

  
320 320
                elevation = self.ui.lineEdit_N8_Elevation.text()
321 321
                if elevation:
322
                    connector.nozzle_data.elevation = float(elevation)  
322
                    connector.data.elevation = float(elevation)  
323 323
                else:
324
                    connector.nozzle_data.elevation = None
324
                    connector.data.elevation = None
325 325

  
326 326
        QDialog.accept(self)
327 327

  
HYTOS/HYTOS/BatteryLimit.py
64 64
                    self.ui.label_PressureUnit.setText('{}(g)'.format(attr[1]['Pressure']))
65 65
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
66 66

  
67
        matches = [connector.nozzle_data for connector in self._item.connectors if connector.nozzle_data]
67
        matches = [connector.data for connector in self._item.connectors if connector.data]
68 68
        if matches:
69 69
            pressure = matches[0].pressure
70 70
            if pressure:                
......
80 80
        from EngineeringConnectorItem import NozzleData
81 81

  
82 82
        for connector in self._item.connectors:
83
            if not connector.nozzle_data: 
84
                connector.nozzle_data = NozzleData()
83
            if not connector.data: 
84
                connector.data = NozzleData()
85 85

  
86 86
            pressure = self.ui.lineEdit_Pressure.text()
87 87
            if pressure:
88
                connector.nozzle_data.pressure = float(pressure)    
88
                connector.data.pressure = float(pressure)    
89 89
            else: 
90
                connector.nozzle_data.pressure = None
90
                connector.data.pressure = None
91 91

  
92 92
            elevation = self.ui.lineEdit_Elevation.text()
93 93
            if elevation:
94
                connector.nozzle_data.elevation = float(elevation)  
94
                connector.data.elevation = float(elevation)  
95 95
            else:
96
                connector.nozzle_data.elevation = None
96
                connector.data.elevation = None
97 97

  
98 98
        QDialog.accept(self)
99 99

  
HYTOS/HYTOS/Coil.py
52 52
                    self.ui.label_PressureUnit.setText(attr[1]['Pressure'])
53 53
                    self.ui.label_ElevationUnit.setText(attr[1]['Length'])
54 54

  
55
        matches = [connector.nozzle_data for connector in self._item.connectors if connector.nozzle_data]
55
        matches = [connector.data for connector in self._item.connectors if connector.data]
56 56
        if matches:
57 57
            pressure_drop = matches[0].pressure_drop
58 58
            if pressure_drop:                
......
67 67
        from EngineeringConnectorItem import NozzleData
68 68

  
69 69
        for connector in self._item.connectors:
70
            if not connector.nozzle_data: 
71
                connector.nozzle_data = NozzleData()
70
            if not connector.data: 
71
                connector.data = NozzleData()
72 72

  
73 73
            pressure_drop = self.ui.lineEdit_Pressure_Drop.text()
74 74
            if pressure_drop:
75
                connector.nozzle_data.pressure_drop = float(pressure_drop)    
75
                connector.data.pressure_drop = float(pressure_drop)    
76 76
            else: 
77
                connector.nozzle_data.pressure_drop = None
77
                connector.data.pressure_drop = None
78 78

  
79 79
            elevation = self.ui.lineEdit_Elevation.text()
80 80
            if elevation:
81
                connector.nozzle_data.elevation = float(elevation)  
81
                connector.data.elevation = float(elevation)  
82 82
            else:
83
                connector.nozzle_data.elevation = None
83
                connector.data.elevation = None
84 84
                
85 85
        QDialog.accept(self)
86 86

  
HYTOS/HYTOS/Compressor.py
85 85

  
86 86
        for connector in self._item.connectors:
87 87
            index = connector._conn_index
88
            if connector.nozzle_data:
89
                pressure = connector.nozzle_data.pressure                                
88
            if connector.data:
89
                pressure = connector.data.pressure                                
90 90
                if pressure:
91 91
                    if index == 1:
92 92
                        self.ui.lineEdit_Suc_Pressure.setText(str(pressure))
93 93
                    elif index == 2:
94 94
                        self.ui.lineEdit_Dis_Pressure.setText(str(pressure))
95 95
                    
96
                elevation = connector.nozzle_data.elevation
96
                elevation = connector.data.elevation
97 97
                if elevation:
98 98
                    if index == 1:
99 99
                        self.ui.lineEdit_Suc_Elevation.setText(str(elevation))
......
106 106

  
107 107
        for connector in self._item.connectors:
108 108
            index = connector._conn_index
109
            if not connector.nozzle_data: 
110
                connector.nozzle_data = NozzleData()
109
            if not connector.data: 
110
                connector.data = NozzleData()
111 111

  
112 112
            if index == 1:
113 113
                pressure = self.ui.lineEdit_Suc_Pressure.text()
114 114
                if pressure:
115
                    connector.nozzle_data.pressure = float(pressure)    
115
                    connector.data.pressure = float(pressure)    
116 116
                else: 
117
                    connector.nozzle_data.pressure = None
117
                    connector.data.pressure = None
118 118

  
119 119
                elevation = self.ui.lineEdit_Suc_Elevation.text()
120 120
                if elevation:
121
                    connector.nozzle_data.elevation = float(elevation)  
121
                    connector.data.elevation = float(elevation)  
122 122
                else:
123
                    connector.nozzle_data.elevation = None
123
                    connector.data.elevation = None
124 124
            elif index == 2:
125 125
                pressure = self.ui.lineEdit_Dis_Pressure.text()
126 126
                if pressure:
127
                    connector.nozzle_data.pressure = float(pressure)    
127
                    connector.data.pressure = float(pressure)    
128 128
                else: 
129
                    connector.nozzle_data.pressure = None
129
                    connector.data.pressure = None
130 130

  
131 131
                elevation = self.ui.lineEdit_Dis_Elevation.text()
132 132
                if elevation:
133
                    connector.nozzle_data.elevation = float(elevation)  
133
                    connector.data.elevation = float(elevation)  
134 134
                else:
135
                    connector.nozzle_data.elevation = None
135
                    connector.data.elevation = None
136 136

  
137 137
        QDialog.accept(self)
138 138

  
HYTOS/HYTOS/ConeRoof.py
166 166
                
167 167
        for connector in self._item.connectors:
168 168
            index = connector._conn_index
169
            if connector.nozzle_data:
170
                pressure = connector.nozzle_data.pressure                                
169
            if connector.data:
170
                pressure = connector.data.pressure                                
171 171
                if pressure:
172 172
                    if index == 1:
173 173
                        self.ui.lineEdit_N1_Pressure.setText(str(pressure))
......
188 188
                    elif index == 9:
189 189
                        self.ui.lineEdit_N9_Pressure.setText(str(pressure))
190 190

  
191
                elevation = connector.nozzle_data.elevation
191
                elevation = connector.data.elevation
192 192
                if elevation:
193 193
                    if index == 1:
194 194
                        self.ui.lineEdit_N1_Elevation.setText(str(elevation))
......
216 216

  
217 217
        for connector in self._item.connectors:
218 218
            index = connector._conn_index
219
            if not connector.nozzle_data: 
220
                connector.nozzle_data = NozzleData()
219
            if not connector.data: 
220
                connector.data = NozzleData()
221 221

  
222 222
            if index == 1:
223 223
                pressure = self.ui.lineEdit_N1_Pressure.text()
224 224
                if pressure:
225
                    connector.nozzle_data.pressure = float(pressure)    
225
                    connector.data.pressure = float(pressure)    
226 226
                else: 
227
                    connector.nozzle_data.pressure = None
227
                    connector.data.pressure = None
228 228

  
229 229
                elevation = self.ui.lineEdit_N1_Elevation.text()
230 230
                if elevation:
231
                    connector.nozzle_data.elevation = float(elevation)  
231
                    connector.data.elevation = float(elevation)  
232 232
                else:
233
                    connector.nozzle_data.elevation = None
233
                    connector.data.elevation = None
234 234
            elif index == 2:
235 235
                pressure = self.ui.lineEdit_N2_Pressure.text()
236 236
                if pressure:
237
                    connector.nozzle_data.pressure = float(pressure)    
237
                    connector.data.pressure = float(pressure)    
238 238
                else: 
239
                    connector.nozzle_data.pressure = None
239
                    connector.data.pressure = None
240 240

  
241 241
                elevation = self.ui.lineEdit_N2_Elevation.text()
242 242
                if elevation:
243
                    connector.nozzle_data.elevation = float(elevation)  
243
                    connector.data.elevation = float(elevation)  
244 244
                else:
245
                    connector.nozzle_data.elevation = None
245
                    connector.data.elevation = None
246 246
            elif index == 3:
247 247
                pressure = self.ui.lineEdit_N3_Pressure.text()
248 248
                if pressure:
249
                    connector.nozzle_data.pressure = float(pressure)    
249
                    connector.data.pressure = float(pressure)    
250 250
                else: 
251
                    connector.nozzle_data.pressure = None
251
                    connector.data.pressure = None
252 252

  
253 253
                elevation = self.ui.lineEdit_N3_Elevation.text()
254 254
                if elevation:
255
                    connector.nozzle_data.elevation = float(elevation)  
255
                    connector.data.elevation = float(elevation)  
256 256
                else:
257
                    connector.nozzle_data.elevation = None
257
                    connector.data.elevation = None
258 258
            elif index == 4:
259 259
                pressure = self.ui.lineEdit_N4_Pressure.text()
260 260
                if pressure:
261
                    connector.nozzle_data.pressure = float(pressure)    
261
                    connector.data.pressure = float(pressure)    
262 262
                else: 
263
                    connector.nozzle_data.pressure = None
263
                    connector.data.pressure = None
264 264

  
265 265
                elevation = self.ui.lineEdit_N4_Elevation.text()
266 266
                if elevation:
267
                    connector.nozzle_data.elevation = float(elevation)  
267
                    connector.data.elevation = float(elevation)  
268 268
                else:
269
                    connector.nozzle_data.elevation = None
269
                    connector.data.elevation = None
270 270
            elif index == 5:
271 271
                pressure = self.ui.lineEdit_N5_Pressure.text()
272 272
                if pressure:
273
                    connector.nozzle_data.pressure = float(pressure)    
273
                    connector.data.pressure = float(pressure)    
274 274
                else: 
275
                    connector.nozzle_data.pressure = None
275
                    connector.data.pressure = None
276 276

  
277 277
                elevation = self.ui.lineEdit_N5_Elevation.text()
278 278
                if elevation:
279
                    connector.nozzle_data.elevation = float(elevation)  
279
                    connector.data.elevation = float(elevation)  
280 280
                else:
281
                    connector.nozzle_data.elevation = None
281
                    connector.data.elevation = None
282 282
            elif index == 6:
283 283
                pressure = self.ui.lineEdit_N6_Pressure.text()
284 284
                if pressure:
285
                    connector.nozzle_data.pressure = float(pressure)    
285
                    connector.data.pressure = float(pressure)    
286 286
                else: 
287
                    connector.nozzle_data.pressure = None
287
                    connector.data.pressure = None
288 288

  
289 289
                elevation = self.ui.lineEdit_N6_Elevation.text()
290 290
                if elevation:
291
                    connector.nozzle_data.elevation = float(elevation)  
291
                    connector.data.elevation = float(elevation)  
292 292
                else:
293
                    connector.nozzle_data.elevation = None
293
                    connector.data.elevation = None
294 294
            elif index == 7:
295 295
                pressure = self.ui.lineEdit_N7_Pressure.text()
296 296
                if pressure:
297
                    connector.nozzle_data.pressure = float(pressure)    
297
                    connector.data.pressure = float(pressure)    
298 298
                else: 
299
                    connector.nozzle_data.pressure = None
299
                    connector.data.pressure = None
300 300

  
301 301
                elevation = self.ui.lineEdit_N7_Elevation.text()
302 302
                if elevation:
303
                    connector.nozzle_data.elevation = float(elevation)  
303
                    connector.data.elevation = float(elevation)  
304 304
                else:
305
                    connector.nozzle_data.elevation = None
305
                    connector.data.elevation = None
306 306
            elif index == 8:
307 307
                pressure = self.ui.lineEdit_N8_Pressure.text()
308 308
                if pressure:
309
                    connector.nozzle_data.pressure = float(pressure)    
309
                    connector.data.pressure = float(pressure)    
310 310
                else: 
311
                    connector.nozzle_data.pressure = None
311
                    connector.data.pressure = None
312 312

  
313 313
                elevation = self.ui.lineEdit_N8_Elevation.text()
314 314
                if elevation:
315
                    connector.nozzle_data.elevation = float(elevation)  
315
                    connector.data.elevation = float(elevation)  
316 316
                else:
317
                    connector.nozzle_data.elevation = None
317
                    connector.data.elevation = None
318 318
            elif index == 9:
319 319
                pressure = self.ui.lineEdit_N9_Pressure.text()
320 320
                if pressure:
321
                    connector.nozzle_data.pressure = float(pressure)    
321
                    connector.data.pressure = float(pressure)    
322 322
                else: 
323
                    connector.nozzle_data.pressure = None
323
                    connector.data.pressure = None
324 324

  
325 325
                elevation = self.ui.lineEdit_N9_Elevation.text()
326 326
                if elevation:
327
                    connector.nozzle_data.elevation = float(elevation)  
327
                    connector.data.elevation = float(elevation)  
328 328
                else:
329
                    connector.nozzle_data.elevation = None
329
                    connector.data.elevation = None
330 330

  
331 331
        QDialog.accept(self)
332 332

  
HYTOS/HYTOS/DP_Equipment.py
90 90
        
91 91
        for connector in self._item.connectors:
92 92
            index = connector._conn_index
93
            if connector.nozzle_data:
94
                pressure_drop = connector.nozzle_data.pressure_drop                                
93
            if connector.data:
94
                pressure_drop = connector.data.pressure_drop                                
95 95
                if pressure_drop:
96 96
                    if index == 1:
97 97
                        self.ui.lineEdit_Vertical_Pressure_Drop.setText(str(pressure_drop))
......
102 102
                    elif index == 4:
103 103
                        self.ui.lineEdit_Horizontal_Pressure_Drop.setText(str(pressure_drop))
104 104
                   
105
                elevation = connector.nozzle_data.elevation
105
                elevation = connector.data.elevation
106 106
                if elevation:
107 107
                    if index == 1:
108 108
                        self.ui.lineEdit_Vertical_Elevation.setText(str(elevation))
......
120 120

  
121 121
        for connector in self._item.connectors:
122 122
            index = connector._conn_index
123
            if not connector.nozzle_data: 
124
                connector.nozzle_data = NozzleData()
123
            if not connector.data: 
124
                connector.data = NozzleData()
125 125

  
126 126
            if index == 1:
127 127
                pressure_drop = self.ui.lineEdit_Vertical_Pressure_Drop.text()
128 128
                if pressure_drop:
129
                    connector.nozzle_data.pressure_drop = float(pressure_drop)    
129
                    connector.data.pressure_drop = float(pressure_drop)    
130 130
                else: 
131
                    connector.nozzle_data.pressure_drop = None
131
                    connector.data.pressure_drop = None
132 132

  
133 133
                elevation = self.ui.lineEdit_Vertical_Elevation.text()
134 134
                if elevation:
135
                    connector.nozzle_data.elevation = float(elevation)  
135
                    connector.data.elevation = float(elevation)  
136 136
                else:
137
                    connector.nozzle_data.elevation = None
137
                    connector.data.elevation = None
138 138
            elif index == 2:
139 139
                pressure_drop = self.ui.lineEdit_Horizontal_Pressure_Drop.text()
140 140
                if pressure_drop:
141
                    connector.nozzle_data.pressure_drop = float(pressure_drop)    
141
                    connector.data.pressure_drop = float(pressure_drop)    
142 142
                else: 
143
                    connector.nozzle_data.pressure_drop = None
143
                    connector.data.pressure_drop = None
144 144

  
145 145
                elevation = self.ui.lineEdit_Horizontal_Elevation.text()
146 146
                if elevation:
147
                    connector.nozzle_data.elevation = float(elevation)  
147
                    connector.data.elevation = float(elevation)  
148 148
                else:
149
                    connector.nozzle_data.elevation = None
149
                    connector.data.elevation = None
150 150
            elif index == 3:
151 151
                pressure_drop = self.ui.lineEdit_Vertical_Pressure_Drop.text()
152 152
                if pressure_drop:
153
                    connector.nozzle_data.pressure_drop = float(pressure_drop)    
153
                    connector.data.pressure_drop = float(pressure_drop)    
154 154
                else: 
155
                    connector.nozzle_data.pressure_drop = None
155
                    connector.data.pressure_drop = None
156 156

  
157 157
                elevation = self.ui.lineEdit_Vertical_Elevation.text()
158 158
                if elevation:
159
                    connector.nozzle_data.elevation = float(elevation)  
159
                    connector.data.elevation = float(elevation)  
160 160
                else:
161
                    connector.nozzle_data.elevation = None
161
                    connector.data.elevation = None
162 162
            elif index == 4:
163 163
                pressure_drop = self.ui.lineEdit_Horizontal_Pressure_Drop.text()
164 164
                if pressure_drop:
165
                    connector.nozzle_data.pressure_drop = float(pressure_drop)    
165
                    connector.data.pressure_drop = float(pressure_drop)    
166 166
                else: 
167
                    connector.nozzle_data.pressure_drop = None
167
                    connector.data.pressure_drop = None
168 168

  
169 169
                elevation = self.ui.lineEdit_Horizontal_Elevation.text()
170 170
                if elevation:
171
                    connector.nozzle_data.elevation = float(elevation)  
171
                    connector.data.elevation = float(elevation)  
172 172
                else:
173
                    connector.nozzle_data.elevation = None
173
                    connector.data.elevation = None
174 174

  
175 175
        QDialog.accept(self)
176 176

  
HYTOS/HYTOS/DomeRoof.py
165 165

  
166 166
        for connector in self._item.connectors:
167 167
            index = connector._conn_index
168
            if connector.nozzle_data:
169
                pressure = connector.nozzle_data.pressure                                
168
            if connector.data:
169
                pressure = connector.data.pressure                                
170 170
                if pressure:
171 171
                    if index == 1:
172 172
                        self.ui.lineEdit_N1_Pressure.setText(str(pressure))
......
187 187
                    elif index == 9:
188 188
                        self.ui.lineEdit_N9_Pressure.setText(str(pressure))
189 189

  
190
                elevation = connector.nozzle_data.elevation
190
                elevation = connector.data.elevation
191 191
                if elevation:
192 192
                    if index == 1:
193 193
                        self.ui.lineEdit_N1_Elevation.setText(str(elevation))
......
214 214

  
215 215
        for connector in self._item.connectors:
216 216
            index = connector._conn_index
217
            if not connector.nozzle_data: 
218
                connector.nozzle_data = NozzleData()
217
            if not connector.data: 
218
                connector.data = NozzleData()
219 219

  
220 220
            if index == 1:
221 221
                pressure = self.ui.lineEdit_N1_Pressure.text()
222 222
                if pressure:
223
                    connector.nozzle_data.pressure = float(pressure)    
223
                    connector.data.pressure = float(pressure)    
224 224
                else: 
225
                    connector.nozzle_data.pressure = None
225
                    connector.data.pressure = None
226 226

  
227 227
                elevation = self.ui.lineEdit_N1_Elevation.text()
228 228
                if elevation:
229
                    connector.nozzle_data.elevation = float(elevation)  
229
                    connector.data.elevation = float(elevation)  
230 230
                else:
231
                    connector.nozzle_data.elevation = None
231
                    connector.data.elevation = None
232 232
            elif index == 2:
233 233
                pressure = self.ui.lineEdit_N2_Pressure.text()
234 234
                if pressure:
235
                    connector.nozzle_data.pressure = float(pressure)    
235
                    connector.data.pressure = float(pressure)    
236 236
                else: 
237
                    connector.nozzle_data.pressure = None
237
                    connector.data.pressure = None
238 238

  
239 239
                elevation = self.ui.lineEdit_N2_Elevation.text()
240 240
                if elevation:
241
                    connector.nozzle_data.elevation = float(elevation)  
241
                    connector.data.elevation = float(elevation)  
242 242
                else:
243
                    connector.nozzle_data.elevation = None
243
                    connector.data.elevation = None
244 244
            elif index == 3:
245 245
                pressure = self.ui.lineEdit_N3_Pressure.text()
246 246
                if pressure:
247
                    connector.nozzle_data.pressure = float(pressure)    
247
                    connector.data.pressure = float(pressure)    
248 248
                else: 
249
                    connector.nozzle_data.pressure = None
249
                    connector.data.pressure = None
250 250

  
251 251
                elevation = self.ui.lineEdit_N3_Elevation.text()
252 252
                if elevation:
253
                    connector.nozzle_data.elevation = float(elevation)  
253
                    connector.data.elevation = float(elevation)  
254 254
                else:
255
                    connector.nozzle_data.elevation = None
255
                    connector.data.elevation = None
256 256
            elif index == 4:
257 257
                pressure = self.ui.lineEdit_N4_Pressure.text()
258 258
                if pressure:
259
                    connector.nozzle_data.pressure = float(pressure)    
259
                    connector.data.pressure = float(pressure)    
260 260
                else: 
261
                    connector.nozzle_data.pressure = None
261
                    connector.data.pressure = None
262 262

  
263 263
                elevation = self.ui.lineEdit_N4_Elevation.text()
264 264
                if elevation:
265
                    connector.nozzle_data.elevation = float(elevation)  
265
                    connector.data.elevation = float(elevation)  
266 266
                else:
267
                    connector.nozzle_data.elevation = None
267
                    connector.data.elevation = None
268 268
            elif index == 5:
269 269
                pressure = self.ui.lineEdit_N5_Pressure.text()
270 270
                if pressure:
271
                    connector.nozzle_data.pressure = float(pressure)    
271
                    connector.data.pressure = float(pressure)    
272 272
                else: 
273
                    connector.nozzle_data.pressure = None
273
                    connector.data.pressure = None
274 274

  
275 275
                elevation = self.ui.lineEdit_N5_Elevation.text()
276 276
                if elevation:
277
                    connector.nozzle_data.elevation = float(elevation)  
277
                    connector.data.elevation = float(elevation)  
278 278
                else:
279
                    connector.nozzle_data.elevation = None
279
                    connector.data.elevation = None
280 280
            elif index == 6:
281 281
                pressure = self.ui.lineEdit_N6_Pressure.text()
282 282
                if pressure:
283
                    connector.nozzle_data.pressure = float(pressure)    
283
                    connector.data.pressure = float(pressure)    
284 284
                else: 
285
                    connector.nozzle_data.pressure = None
285
                    connector.data.pressure = None
286 286

  
287 287
                elevation = self.ui.lineEdit_N6_Elevation.text()
288 288
                if elevation:
289
                    connector.nozzle_data.elevation = float(elevation)  
289
                    connector.data.elevation = float(elevation)  
290 290
                else:
291
                    connector.nozzle_data.elevation = None
291
                    connector.data.elevation = None
292 292
            elif index == 7:
293 293
                pressure = self.ui.lineEdit_N7_Pressure.text()
294 294
                if pressure:
295
                    connector.nozzle_data.pressure = float(pressure)    
295
                    connector.data.pressure = float(pressure)    
296 296
                else: 
297
                    connector.nozzle_data.pressure = None
297
                    connector.data.pressure = None
298 298

  
299 299
                elevation = self.ui.lineEdit_N7_Elevation.text()
300 300
                if elevation:
301
                    connector.nozzle_data.elevation = float(elevation)  
301
                    connector.data.elevation = float(elevation)  
302 302
                else:
303
                    connector.nozzle_data.elevation = None
303
                    connector.data.elevation = None
304 304
            elif index == 8:
305 305
                pressure = self.ui.lineEdit_N8_Pressure.text()
306 306
                if pressure:
307
                    connector.nozzle_data.pressure = float(pressure)    
307
                    connector.data.pressure = float(pressure)    
308 308
                else: 
309
                    connector.nozzle_data.pressure = None
309
                    connector.data.pressure = None
310 310

  
311 311
                elevation = self.ui.lineEdit_N8_Elevation.text()
312 312
                if elevation:
313
                    connector.nozzle_data.elevation = float(elevation)  
313
                    connector.data.elevation = float(elevation)  
314 314
                else:
315
                    connector.nozzle_data.elevation = None
315
                    connector.data.elevation = None
316 316
            elif index == 9:
317 317
                pressure = self.ui.lineEdit_N9_Pressure.text()
318 318
                if pressure:
319
                    connector.nozzle_data.pressure = float(pressure)    
319
                    connector.data.pressure = float(pressure)    
320 320
                else: 
321
                    connector.nozzle_data.pressure = None
321
                    connector.data.pressure = None
322 322

  
323 323
                elevation = self.ui.lineEdit_N9_Elevation.text()
324 324
                if elevation:
325
                    connector.nozzle_data.elevation = float(elevation)  
325
                    connector.data.elevation = float(elevation)  
326 326
                else:
327
                    connector.nozzle_data.elevation = None
327
                    connector.data.elevation = None
328 328

  
329 329
        QDialog.accept(self)
330 330

  
HYTOS/HYTOS/Drum_Horizontal.py
177 177

  
178 178
        for connector in self._item.connectors:
179 179
            index = connector._conn_index
180
            if connector.nozzle_data:
181
                pressure = connector.nozzle_data.pressure                                
180
            if connector.data:
181
                pressure = connector.data.pressure                                
182 182
                if pressure:
183 183
                    if index == 1:
184 184
                        self.ui.lineEdit_N1_Pressure.setText(str(pressure))
......
201 201
                    elif index == 10:
202 202
                        self.ui.lineEdit_N10_Pressure.setText(str(pressure))
203 203

  
204
                elevation = connector.nozzle_data.elevation
204
                elevation = connector.data.elevation
205 205
                if elevation:
206 206
                    if index == 1:
207 207
                        self.ui.lineEdit_N1_Elevation.setText(str(elevation))
......
231 231

  
232 232
        for connector in self._item.connectors:
233 233
            index = connector._conn_index
234
            if not connector.nozzle_data: 
235
                connector.nozzle_data = NozzleData()
234
            if not connector.data: 
235
                connector.data = NozzleData()
236 236

  
237 237
            if index == 1:
238 238
                pressure = self.ui.lineEdit_N1_Pressure.text()
239 239
                if pressure:
240
                    connector.nozzle_data.pressure = float(pressure)    
240
                    connector.data.pressure = float(pressure)    
241 241
                else: 
242
                    connector.nozzle_data.pressure = None
242
                    connector.data.pressure = None
243 243

  
244 244
                elevation = self.ui.lineEdit_N1_Elevation.text()
245 245
                if elevation:
246
                    connector.nozzle_data.elevation = float(elevation)  
246
                    connector.data.elevation = float(elevation)  
247 247
                else:
248
                    connector.nozzle_data.elevation = None
248
                    connector.data.elevation = None
249 249
            elif index == 2:
250 250
                pressure = self.ui.lineEdit_N2_Pressure.text()
251 251
                if pressure:
252
                    connector.nozzle_data.pressure = float(pressure)    
252
                    connector.data.pressure = float(pressure)    
253 253
                else: 
254
                    connector.nozzle_data.pressure = None
254
                    connector.data.pressure = None
255 255

  
256 256
                elevation = self.ui.lineEdit_N2_Elevation.text()
257 257
                if elevation:
258
                    connector.nozzle_data.elevation = float(elevation)  
258
                    connector.data.elevation = float(elevation)  
259 259
                else:
260
                    connector.nozzle_data.elevation = None
260
                    connector.data.elevation = None
261 261
            elif index == 3:
262 262
                pressure = self.ui.lineEdit_N3_Pressure.text()
263 263
                if pressure:
264
                    connector.nozzle_data.pressure = float(pressure)    
264
                    connector.data.pressure = float(pressure)    
265 265
                else: 
266
                    connector.nozzle_data.pressure = None
266
                    connector.data.pressure = None
267 267

  
268 268
                elevation = self.ui.lineEdit_N3_Elevation.text()
269 269
                if elevation:
270
                    connector.nozzle_data.elevation = float(elevation)  
270
                    connector.data.elevation = float(elevation)  
271 271
                else:
272
                    connector.nozzle_data.elevation = None
272
                    connector.data.elevation = None
273 273
            elif index == 4:
274 274
                pressure = self.ui.lineEdit_N4_Pressure.text()
275 275
                if pressure:
276
                    connector.nozzle_data.pressure = float(pressure)    
276
                    connector.data.pressure = float(pressure)    
277 277
                else: 
278
                    connector.nozzle_data.pressure = None
278
                    connector.data.pressure = None
279 279

  
280 280
                elevation = self.ui.lineEdit_N4_Elevation.text()
281 281
                if elevation:
282
                    connector.nozzle_data.elevation = float(elevation)  
282
                    connector.data.elevation = float(elevation)  
283 283
                else:
284
                    connector.nozzle_data.elevation = None
284
                    connector.data.elevation = None
285 285
            elif index == 5:
286 286
                pressure = self.ui.lineEdit_N5_Pressure.text()
287 287
                if pressure:
288
                    connector.nozzle_data.pressure = float(pressure)    
288
                    connector.data.pressure = float(pressure)    
289 289
                else: 
290
                    connector.nozzle_data.pressure = None
290
                    connector.data.pressure = None
291 291

  
292 292
                elevation = self.ui.lineEdit_N5_Elevation.text()
293 293
                if elevation:
294
                    connector.nozzle_data.elevation = float(elevation)  
294
                    connector.data.elevation = float(elevation)  
295 295
                else:
296
                    connector.nozzle_data.elevation = None
296
                    connector.data.elevation = None
297 297
            elif index == 6:
298 298
                pressure = self.ui.lineEdit_N6_Pressure.text()
299 299
                if pressure:
300
                    connector.nozzle_data.pressure = float(pressure)    
300
                    connector.data.pressure = float(pressure)    
301 301
                else: 
302
                    connector.nozzle_data.pressure = None
302
                    connector.data.pressure = None
303 303

  
304 304
                elevation = self.ui.lineEdit_N6_Elevation.text()
305 305
                if elevation:
306
                    connector.nozzle_data.elevation = float(elevation)  
306
                    connector.data.elevation = float(elevation)  
307 307
                else:
308
                    connector.nozzle_data.elevation = None
308
                    connector.data.elevation = None
309 309
            elif index == 7:
310 310
                pressure = self.ui.lineEdit_N7_Pressure.text()
311 311
                if pressure:
312
                    connector.nozzle_data.pressure = float(pressure)    
312
                    connector.data.pressure = float(pressure)    
313 313
                else: 
314
                    connector.nozzle_data.pressure = None
314
                    connector.data.pressure = None
315 315

  
316 316
                elevation = self.ui.lineEdit_N7_Elevation.text()
317 317
                if elevation:
318
                    connector.nozzle_data.elevation = float(elevation)  
318
                    connector.data.elevation = float(elevation)  
319 319
                else:
320
                    connector.nozzle_data.elevation = None
320
                    connector.data.elevation = None
321 321
            elif index == 8:
322 322
                pressure = self.ui.lineEdit_N8_Pressure.text()
323 323
                if pressure:
324
                    connector.nozzle_data.pressure = float(pressure)    
324
                    connector.data.pressure = float(pressure)    
325 325
                else: 
326
                    connector.nozzle_data.pressure = None
326
                    connector.data.pressure = None
327 327

  
328 328
                elevation = self.ui.lineEdit_N8_Elevation.text()
329 329
                if elevation:
330
                    connector.nozzle_data.elevation = float(elevation)  
330
                    connector.data.elevation = float(elevation)  
331 331
                else:
332
                    connector.nozzle_data.elevation = None
332
                    connector.data.elevation = None
333 333
            elif index == 9:
334 334
                pressure = self.ui.lineEdit_N9_Pressure.text()
335 335
                if pressure:
336
                    connector.nozzle_data.pressure = float(pressure)    
336
                    connector.data.pressure = float(pressure)    
337 337
                else: 
338
                    connector.nozzle_data.pressure = None
338
                    connector.data.pressure = None
339 339

  
340 340
                elevation = self.ui.lineEdit_N9_Elevation.text()
341 341
                if elevation:
342
                    connector.nozzle_data.elevation = float(elevation)  
342
                    connector.data.elevation = float(elevation)  
343 343
                else:
344
                    connector.nozzle_data.elevation = None
344
                    connector.data.elevation = None
345 345
            elif index == 10:
346 346
                pressure = self.ui.lineEdit_N10_Pressure.text()
347 347
                if pressure:
348
                    connector.nozzle_data.pressure = float(pressure)    
348
                    connector.data.pressure = float(pressure)    
349 349
                else: 
350
                    connector.nozzle_data.pressure = None
350
                    connector.data.pressure = None
351 351

  
352 352
                elevation = self.ui.lineEdit_N10_Elevation.text()
353 353
                if elevation:
354
                    connector.nozzle_data.elevation = float(elevation)  
354
                    connector.data.elevation = float(elevation)  
355 355
                else:
356
                    connector.nozzle_data.elevation = None
356
                    connector.data.elevation = None
357 357

  
358 358
        QDialog.accept(self)
359 359

  
HYTOS/HYTOS/Drum_Vertical.py
202 202
                
203 203
        for connector in self._item.connectors:
204 204
            index = connector._conn_index
205
            if connector.nozzle_data:
206
                pressure = connector.nozzle_data.pressure                                
205
            if connector.data:
206
                pressure = connector.data.pressure                                
207 207
                if pressure:
208 208
                    if index == 1:
209 209
                        self.ui.lineEdit_N1_Pressure.setText(str(pressure))
......
230 230
                    elif index == 12:
231 231
                        self.ui.lineEdit_N12_Pressure.setText(str(pressure))
232 232

  
233
                elevation = connector.nozzle_data.elevation
233
                elevation = connector.data.elevation
234 234
                if elevation:
235 235
                    if index == 1:
236 236
                        self.ui.lineEdit_N1_Elevation.setText(str(elevation))
......
263 263

  
264 264
        for connector in self._item.connectors:
265 265
            index = connector._conn_index
266
            if not connector.nozzle_data: 
267
                connector.nozzle_data = NozzleData()
266
            if not connector.data: 
267
                connector.data = NozzleData()
268 268

  
269 269
            if index == 1:
270 270
                pressure = self.ui.lineEdit_N1_Pressure.text()
271 271
                if pressure:
272
                    connector.nozzle_data.pressure = float(pressure)    
272
                    connector.data.pressure = float(pressure)    
273 273
                else: 
274
                    connector.nozzle_data.pressure = None
274
                    connector.data.pressure = None
275 275

  
276 276
                elevation = self.ui.lineEdit_N1_Elevation.text()
277 277
                if elevation:
278
                    connector.nozzle_data.elevation = float(elevation)  
278
                    connector.data.elevation = float(elevation)  
279 279
                else:
280
                    connector.nozzle_data.elevation = None
280
                    connector.data.elevation = None
281 281
            elif index == 2:
282 282
                pressure = self.ui.lineEdit_N2_Pressure.text()
283 283
                if pressure:
284
                    connector.nozzle_data.pressure = float(pressure)    
284
                    connector.data.pressure = float(pressure)    
285 285
                else: 
286
                    connector.nozzle_data.pressure = None
286
                    connector.data.pressure = None
287 287

  
288 288
                elevation = self.ui.lineEdit_N2_Elevation.text()
289 289
                if elevation:
290
                    connector.nozzle_data.elevation = float(elevation)  
290
                    connector.data.elevation = float(elevation)  
291 291
                else:
292
                    connector.nozzle_data.elevation = None
292
                    connector.data.elevation = None
293 293
            elif index == 3:
294 294
                pressure = self.ui.lineEdit_N3_Pressure.text()
295 295
                if pressure:
296
                    connector.nozzle_data.pressure = float(pressure)    
296
                    connector.data.pressure = float(pressure)    
297 297
                else: 
298
                    connector.nozzle_data.pressure = None
298
                    connector.data.pressure = None
299 299

  
300 300
                elevation = self.ui.lineEdit_N3_Elevation.text()
301 301
                if elevation:
302
                    connector.nozzle_data.elevation = float(elevation)  
302
                    connector.data.elevation = float(elevation)  
303 303
                else:
304
                    connector.nozzle_data.elevation = None
304
                    connector.data.elevation = None
305 305
            elif index == 4:
306 306
                pressure = self.ui.lineEdit_N4_Pressure.text()
307 307
                if pressure:
308
                    connector.nozzle_data.pressure = float(pressure)    
308
                    connector.data.pressure = float(pressure)    
309 309
                else: 
310
                    connector.nozzle_data.pressure = None
310
                    connector.data.pressure = None
311 311

  
312 312
                elevation = self.ui.lineEdit_N4_Elevation.text()
313 313
                if elevation:
314
                    connector.nozzle_data.elevation = float(elevation)  
314
                    connector.data.elevation = float(elevation)  
315 315
                else:
316
                    connector.nozzle_data.elevation = None
316
                    connector.data.elevation = None
317 317
            elif index == 5:
318 318
                pressure = self.ui.lineEdit_N5_Pressure.text()
319 319
                if pressure:
320
                    connector.nozzle_data.pressure = float(pressure)    
320
                    connector.data.pressure = float(pressure)    
321 321
                else: 
322
                    connector.nozzle_data.pressure = None
322
                    connector.data.pressure = None
323 323

  
324 324
                elevation = self.ui.lineEdit_N5_Elevation.text()
325 325
                if elevation:
326
                    connector.nozzle_data.elevation = float(elevation)  
326
                    connector.data.elevation = float(elevation)  
327 327
                else:
328
                    connector.nozzle_data.elevation = None
328
                    connector.data.elevation = None
329 329
            elif index == 6:
330 330
                pressure = self.ui.lineEdit_N6_Pressure.text()
331 331
                if pressure:
332
                    connector.nozzle_data.pressure = float(pressure)    
332
                    connector.data.pressure = float(pressure)    
333 333
                else: 
334
                    connector.nozzle_data.pressure = None
334
                    connector.data.pressure = None
335 335

  
336 336
                elevation = self.ui.lineEdit_N6_Elevation.text()
337 337
                if elevation:
338
                    connector.nozzle_data.elevation = float(elevation)  
338
                    connector.data.elevation = float(elevation)  
339 339
                else:
340
                    connector.nozzle_data.elevation = None
340
                    connector.data.elevation = None
341 341
            elif index == 7:
342 342
                pressure = self.ui.lineEdit_N7_Pressure.text()
343 343
                if pressure:
344
                    connector.nozzle_data.pressure = float(pressure)    
344
                    connector.data.pressure = float(pressure)    
345 345
                else: 
346
                    connector.nozzle_data.pressure = None
346
                    connector.data.pressure = None
347 347

  
348 348
                elevation = self.ui.lineEdit_N7_Elevation.text()
349 349
                if elevation:
350
                    connector.nozzle_data.elevation = float(elevation)  
350
                    connector.data.elevation = float(elevation)  
351 351
                else:
352
                    connector.nozzle_data.elevation = None
352
                    connector.data.elevation = None
353 353
            elif index == 8:
354 354
                pressure = self.ui.lineEdit_N8_Pressure.text()
355 355
                if pressure:
356
                    connector.nozzle_data.pressure = float(pressure)    
356
                    connector.data.pressure = float(pressure)    
357 357
                else: 
358
                    connector.nozzle_data.pressure = None
358
                    connector.data.pressure = None
359 359

  
360 360
                elevation = self.ui.lineEdit_N8_Elevation.text()
361 361
                if elevation:
362
                    connector.nozzle_data.elevation = float(elevation)  
362
                    connector.data.elevation = float(elevation)  
363 363
                else:
364
                    connector.nozzle_data.elevation = None
364
                    connector.data.elevation = None
365 365
            elif index == 9:
366 366
                pressure = self.ui.lineEdit_N9_Pressure.text()
367 367
                if pressure:
368
                    connector.nozzle_data.pressure = float(pressure)    
368
                    connector.data.pressure = float(pressure)    
369 369
                else: 
370
                    connector.nozzle_data.pressure = None
370
                    connector.data.pressure = None
371 371

  
372 372
                elevation = self.ui.lineEdit_N9_Elevation.text()
373 373
                if elevation:
374
                    connector.nozzle_data.elevation = float(elevation)  
374
                    connector.data.elevation = float(elevation)  
375 375
                else:
376
                    connector.nozzle_data.elevation = None
376
                    connector.data.elevation = None
377 377
            elif index == 10:
378 378
                pressure = self.ui.lineEdit_N10_Pressure.text()
379 379
                if pressure:
380
                    connector.nozzle_data.pressure = float(pressure)    
380
                    connector.data.pressure = float(pressure)    
381 381
                else: 
382
                    connector.nozzle_data.pressure = None
382
                    connector.data.pressure = None
383 383

  
384 384
                elevation = self.ui.lineEdit_N10_Elevation.text()
385 385
                if elevation:
386
                    connector.nozzle_data.elevation = float(elevation)  
386
                    connector.data.elevation = float(elevation)  
387 387
                else:
388
                    connector.nozzle_data.elevation = None
388
                    connector.data.elevation = None
389 389
            elif index == 11:
390 390
                pressure = self.ui.lineEdit_N11_Pressure.text()
391 391
                if pressure:
392
                    connector.nozzle_data.pressure = float(pressure)    
392
                    connector.data.pressure = float(pressure)    
393 393
                else: 
394
                    connector.nozzle_data.pressure = None
394
                    connector.data.pressure = None
395 395

  
396 396
                elevation = self.ui.lineEdit_N11_Elevation.text()
397 397
                if elevation:
398
                    connector.nozzle_data.elevation = float(elevation)  
398
                    connector.data.elevation = float(elevation)  
399 399
                else:
400
                    connector.nozzle_data.elevation = None
400
                    connector.data.elevation = None
401 401
            elif index == 12:
402 402
                pressure = self.ui.lineEdit_N12_Pressure.text()
403 403
                if pressure:
404
                    connector.nozzle_data.pressure = float(pressure)    
404
                    connector.data.pressure = float(pressure)    
405 405
                else: 
406
                    connector.nozzle_data.pressure = None
406
                    connector.data.pressure = None
407 407

  
408 408
                elevation = self.ui.lineEdit_N12_Elevation.text()
409 409
                if elevation:
410
                    connector.nozzle_data.elevation = float(elevation)  
410
                    connector.data.elevation = float(elevation)  
411 411
                else:
412
                    connector.nozzle_data.elevation = None
412
                    connector.data.elevation = None
413 413

  
414 414
        QDialog.accept(self)
415 415

  
HYTOS/HYTOS/DualPacked.py
202 202
                
203 203
        for connector in self._item.connectors:
204 204
            index = connector._conn_index
205
            if connector.nozzle_data:
206
                pressure = connector.nozzle_data.pressure                                
205
            if connector.data:
206
                pressure = connector.data.pressure                                
207 207
                if pressure:
208 208
                    if index == 1:
209 209
                        self.ui.lineEdit_N1_Pressure.setText(str(pressure))
......
230 230
                    elif index == 12:
231 231
                        self.ui.lineEdit_N12_Pressure.setText(str(pressure))
232 232

  
233
                elevation = connector.nozzle_data.elevation
233
                elevation = connector.data.elevation
234 234
                if elevation:
235 235
                    if index == 1:
236 236
                        self.ui.lineEdit_N1_Elevation.setText(str(elevation))
......
265 265

  
266 266
        for connector in self._item.connectors:
267 267
            index = connector._conn_index
268
            if not connector.nozzle_data: 
269
                connector.nozzle_data = NozzleData()
268
            if not connector.data: 
269
                connector.data = NozzleData()
270 270

  
271 271
            if index == 1:
272 272
                pressure = self.ui.lineEdit_N1_Pressure.text()
273 273
                if pressure:
274
                    connector.nozzle_data.pressure = float(pressure)    
274
                    connector.data.pressure = float(pressure)    
275 275
                else: 
276
                    connector.nozzle_data.pressure = None
276
                    connector.data.pressure = None
277 277

  
278 278
                elevation = self.ui.lineEdit_N1_Elevation.text()
279 279
                if elevation:
280
                    connector.nozzle_data.elevation = float(elevation)  
280
                    connector.data.elevation = float(elevation)  
281 281
                else:
282
                    connector.nozzle_data.elevation = None
282
                    connector.data.elevation = None
283 283
            elif index == 2:
284 284
                pressure = self.ui.lineEdit_N2_Pressure.text()
285 285
                if pressure:
286
                    connector.nozzle_data.pressure = float(pressure)    
286
                    connector.data.pressure = float(pressure)    
287 287
                else: 
288
                    connector.nozzle_data.pressure = None
288
                    connector.data.pressure = None
289 289

  
290 290
                elevation = self.ui.lineEdit_N2_Elevation.text()
291 291
                if elevation:
292
                    connector.nozzle_data.elevation = float(elevation)  
292
                    connector.data.elevation = float(elevation)  
293 293
                else:
294
                    connector.nozzle_data.elevation = None
294
                    connector.data.elevation = None
295 295
            elif index == 3:
296 296
                pressure = self.ui.lineEdit_N3_Pressure.text()
297 297
                if pressure:
298
                    connector.nozzle_data.pressure = float(pressure)    
298
                    connector.data.pressure = float(pressure)    
299 299
                else: 
300
                    connector.nozzle_data.pressure = None
300
                    connector.data.pressure = None
301 301

  
302 302
                elevation = self.ui.lineEdit_N3_Elevation.text()
303 303
                if elevation:
304
                    connector.nozzle_data.elevation = float(elevation)  
304
                    connector.data.elevation = float(elevation)  
305 305
                else:
306
                    connector.nozzle_data.elevation = None
306
                    connector.data.elevation = None
307 307
            elif index == 4:
308 308
                pressure = self.ui.lineEdit_N4_Pressure.text()
309 309
                if pressure:
310
                    connector.nozzle_data.pressure = float(pressure)    
310
                    connector.data.pressure = float(pressure)    
311 311
                else: 
312
                    connector.nozzle_data.pressure = None
312
                    connector.data.pressure = None
313 313

  
314 314
                elevation = self.ui.lineEdit_N4_Elevation.text()
315 315
                if elevation:
316
                    connector.nozzle_data.elevation = float(elevation)  
316
                    connector.data.elevation = float(elevation)  
317 317
                else:
318
                    connector.nozzle_data.elevation = None
318
                    connector.data.elevation = None
319 319
            elif index == 5:
320 320
                pressure = self.ui.lineEdit_N5_Pressure.text()
321 321
                if pressure:
322
                    connector.nozzle_data.pressure = float(pressure)    
322
                    connector.data.pressure = float(pressure)    
323 323
                else: 
324
                    connector.nozzle_data.pressure = None
324
                    connector.data.pressure = None
325 325

  
326 326
                elevation = self.ui.lineEdit_N5_Elevation.text()
327 327
                if elevation:
328
                    connector.nozzle_data.elevation = float(elevation)  
328
                    connector.data.elevation = float(elevation)  
329 329
                else:
330
                    connector.nozzle_data.elevation = None
330
                    connector.data.elevation = None
331 331
            elif index == 6:
332 332
                pressure = self.ui.lineEdit_N6_Pressure.text()
333 333
                if pressure:
334
                    connector.nozzle_data.pressure = float(pressure)    
334
                    connector.data.pressure = float(pressure)    
335 335
                else: 
336
                    connector.nozzle_data.pressure = None
336
                    connector.data.pressure = None
337 337

  
338 338
                elevation = self.ui.lineEdit_N6_Elevation.text()
339 339
                if elevation:
340
                    connector.nozzle_data.elevation = float(elevation)  
340
                    connector.data.elevation = float(elevation)  
341 341
                else:
342
                    connector.nozzle_data.elevation = None
342
                    connector.data.elevation = None
343 343
            elif index == 7:
344 344
                pressure = self.ui.lineEdit_N7_Pressure.text()
345 345
                if pressure:
346
                    connector.nozzle_data.pressure = float(pressure)    
346
                    connector.data.pressure = float(pressure)    
347 347
                else: 
348
                    connector.nozzle_data.pressure = None
348
                    connector.data.pressure = None
349 349

  
350 350
                elevation = self.ui.lineEdit_N7_Elevation.text()
351 351
                if elevation:
352
                    connector.nozzle_data.elevation = float(elevation)  
352
                    connector.data.elevation = float(elevation)  
353 353
                else:
354
                    connector.nozzle_data.elevation = None
354
                    connector.data.elevation = None
355 355
            elif index == 8:
356 356
                pressure = self.ui.lineEdit_N8_Pressure.text()
357 357
                if pressure:
358
                    connector.nozzle_data.pressure = float(pressure)    
358
                    connector.data.pressure = float(pressure)    
359 359
                else: 
360
                    connector.nozzle_data.pressure = None
360
                    connector.data.pressure = None
361 361

  
362 362
                elevation = self.ui.lineEdit_N8_Elevation.text()
363 363
                if elevation:
364
                    connector.nozzle_data.elevation = float(elevation)  
364
                    connector.data.elevation = float(elevation)  
365 365
                else:
366
                    connector.nozzle_data.elevation = None
366
                    connector.data.elevation = None
367 367
            elif index == 9:
368 368
                pressure = self.ui.lineEdit_N9_Pressure.text()
369 369
                if pressure:
370
                    connector.nozzle_data.pressure = float(pressure)    
370
                    connector.data.pressure = float(pressure)    
371 371
                else: 
372
                    connector.nozzle_data.pressure = None
372
                    connector.data.pressure = None
373 373

  
374 374
                elevation = self.ui.lineEdit_N9_Elevation.text()
375 375
                if elevation:
376
                    connector.nozzle_data.elevation = float(elevation)  
376
                    connector.data.elevation = float(elevation)  
377 377
                else:
378
                    connector.nozzle_data.elevation = None
378
                    connector.data.elevation = None
379 379
            elif index == 10:
380 380
                pressure = self.ui.lineEdit_N10_Pressure.text()
381 381
                if pressure:
382
                    connector.nozzle_data.pressure = float(pressure)    
382
                    connector.data.pressure = float(pressure)    
383 383
                else: 
384
                    connector.nozzle_data.pressure = None
384
                    connector.data.pressure = None
385 385

  
386 386
                elevation = self.ui.lineEdit_N10_Elevation.text()
387 387
                if elevation:
388
                    connector.nozzle_data.elevation = float(elevation)  
388
                    connector.data.elevation = float(elevation)  
389 389
                else:
390
                    connector.nozzle_data.elevation = None
390
                    connector.data.elevation = None
391 391
            elif index == 11:
392 392
                pressure = self.ui.lineEdit_N11_Pressure.text()
393 393
                if pressure:
394
                    connector.nozzle_data.pressure = float(pressure)    
394
                    connector.data.pressure = float(pressure)    
395 395
                else: 
396
                    connector.nozzle_data.pressure = None
396
                    connector.data.pressure = None
397 397

  
398 398
                elevation = self.ui.lineEdit_N11_Elevation.text()
399 399
                if elevation:
400
                    connector.nozzle_data.elevation = float(elevation)  
400
                    connector.data.elevation = float(elevation)  
401 401
                else:
402
                    connector.nozzle_data.elevation = None
402
                    connector.data.elevation = None
403 403
            elif index == 12:
404 404
                pressure = self.ui.lineEdit_N12_Pressure.text()
405 405
                if pressure:
406
                    connector.nozzle_data.pressure = float(pressure)    
406
                    connector.data.pressure = float(pressure)    
407 407
                else: 
408
                    connector.nozzle_data.pressure = None
408
                    connector.data.pressure = None
409 409

  
410 410
                elevation = self.ui.lineEdit_N12_Elevation.text()
411 411
                if elevation:
412
                    connector.nozzle_data.elevation = float(elevation)  
412
                    connector.data.elevation = float(elevation)  
413 413
                else:
414
                    connector.nozzle_data.elevation = None
414
                    connector.data.elevation = None
415 415

  
416 416
        QDialog.accept(self)
417 417

  
HYTOS/HYTOS/Equipment.py
201 201
                
202 202
        for connector in self._item.connectors:
... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

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