개정판 4aa060ea
issue #1202: calculate press drop
Change-Id: I70e77a77f03ea80410da0f9b838b5b29c0be95d9
| 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 |
|
내보내기 Unified diff
