comparison: src/EditProductTab11.cpp
src/EditProductTab11.cpp
- changeset 404
- 47f1259378fe
- parent 397
- 877420a13815
- child 427
- 1466eab37f53
equal
deleted
inserted
replaced
| 403:2ed66e586a52 | 404:47f1259378fe |
|---|---|
| 359 void EditProduct::bottle_volume_changed(double val) | 359 void EditProduct::bottle_volume_changed(double val) |
| 360 { | 360 { |
| 361 /* | 361 /* |
| 362 * Check if kegs volume plus this new volume fits in the package volume. | 362 * Check if kegs volume plus this new volume fits in the package volume. |
| 363 */ | 363 */ |
| 364 const QSignalBlocker blocker1(ui->keg_volumeEdit); | |
| 365 if (product->keg_amount < 0) | |
| 366 product->keg_amount = 0; /* Failsafe - bugfix */ | |
| 367 if (val > product->package_volume) { | |
| 368 val = product->package_volume; | |
| 369 const QSignalBlocker blocker2(ui->bottle_volumeEdit); | |
| 370 ui->bottle_volumeEdit->setValue(val); | |
| 371 } | |
| 372 | |
| 364 if ((val + product->keg_amount) > product->package_volume) { | 373 if ((val + product->keg_amount) > product->package_volume) { |
| 365 double kegs = product->package_volume - val; | 374 double kegs = product->package_volume - val; |
| 366 const QSignalBlocker blocker1(ui->keg_volumeEdit); | |
| 367 product->keg_amount = kegs; | 375 product->keg_amount = kegs; |
| 368 ui->keg_volumeEdit->setValue(kegs); | 376 ui->keg_volumeEdit->setValue(kegs); |
| 369 } | 377 } |
| 370 product->bottle_amount = val; | 378 product->bottle_amount = val; |
| 371 calcPack(); | 379 calcPack(); |
| 457 void EditProduct::kegs_volume_changed(double val) | 465 void EditProduct::kegs_volume_changed(double val) |
| 458 { | 466 { |
| 459 /* | 467 /* |
| 460 * Check if bottle volume plus this new volume fits in the package volume. | 468 * Check if bottle volume plus this new volume fits in the package volume. |
| 461 */ | 469 */ |
| 470 const QSignalBlocker blocker1(ui->bottle_volumeEdit); | |
| 471 if (product->bottle_amount < 0) | |
| 472 product->bottle_amount = 0; /* Failsafe - bugfix */ | |
| 473 if (val > product->package_volume) { | |
| 474 val = product->package_volume; | |
| 475 const QSignalBlocker blocker2(ui->keg_volumeEdit); | |
| 476 ui->keg_volumeEdit->setValue(val); | |
| 477 } | |
| 478 | |
| 462 if ((val + product->bottle_amount) > product->package_volume) { | 479 if ((val + product->bottle_amount) > product->package_volume) { |
| 463 double bottle = product->package_volume - val; | 480 double bottle = product->package_volume - val; |
| 464 const QSignalBlocker blocker1(ui->bottle_volumeEdit); | |
| 465 product->bottle_amount = bottle; | 481 product->bottle_amount = bottle; |
| 466 ui->bottle_volumeEdit->setValue(bottle); | 482 ui->bottle_volumeEdit->setValue(bottle); |
| 467 } | 483 } |
| 468 product->keg_amount = val; | 484 product->keg_amount = val; |
| 469 calcPack(); | 485 calcPack(); |
