comparison: src/EditRecipeTab7.cpp
src/EditRecipeTab7.cpp
- changeset 150
- fd568cc1dd0e
- parent 149
- d73719fa2ebb
- child 152
- 58e4ce7dd217
equal
deleted
inserted
replaced
| 149:d73719fa2ebb | 150:fd568cc1dd0e |
|---|---|
| 626 } | 626 } |
| 627 calcWater(); | 627 calcWater(); |
| 628 } | 628 } |
| 629 | 629 |
| 630 | 630 |
| 631 void EditRecipe::adjustWaters(double factor) | |
| 632 { | |
| 633 int i; | |
| 634 double amount; | |
| 635 | |
| 636 if (recipe->mashs.size() == 0) | |
| 637 return; | |
| 638 | |
| 639 double mash_infuse = 0; | |
| 640 for (i = 0; i < recipe->mashs.size(); i++) { | |
| 641 if (recipe->mashs.at(i).step_type == 0) { // Infusion | |
| 642 amount = round(recipe->mashs.at(i).step_infuse_amount * factor * 1000000.0) / 1000000.0; | |
| 643 recipe->mashs[i].step_infuse_amount = amount; | |
| 644 mash_infuse += amount; | |
| 645 recipe->mashs[i].step_volume = mash_infuse; | |
| 646 } | |
| 647 } | |
| 648 | |
| 649 this->ignoreChanges = true; | |
| 650 if (recipe->w2_amount == 0) { | |
| 651 recipe->w1_amount = mash_infuse; | |
| 652 ui->w1_volEdit->setValue(mash_infuse); | |
| 653 } else { | |
| 654 double w1 = (recipe->w1_amount / (recipe->w1_amount + recipe->w2_amount)) * mash_infuse; | |
| 655 double w2 = (recipe->w2_amount / (recipe->w1_amount + recipe->w2_amount)) * mash_infuse; | |
| 656 recipe->w1_amount = w1; | |
| 657 recipe->w2_amount = w2; | |
| 658 ui->w1_volEdit->setValue(recipe->w1_amount); | |
| 659 ui->w2_volEdit->setValue(recipe->w2_amount); | |
| 660 } | |
| 661 recipe->wg_amount = mash_infuse; | |
| 662 ui->wg_volEdit->setValue(mash_infuse); | |
| 663 this->ignoreChanges = false; | |
| 664 } | |
| 665 | |
| 666 | |
| 631 void EditRecipe::wb_cacl2_changed(double val) { set_brewing_salt("CaCl2", val); } | 667 void EditRecipe::wb_cacl2_changed(double val) { set_brewing_salt("CaCl2", val); } |
| 632 void EditRecipe::wb_caso4_changed(double val) { set_brewing_salt("CaSO4", val); } | 668 void EditRecipe::wb_caso4_changed(double val) { set_brewing_salt("CaSO4", val); } |
| 633 void EditRecipe::wb_mgso4_changed(double val) { set_brewing_salt("MgSO4", val); } | 669 void EditRecipe::wb_mgso4_changed(double val) { set_brewing_salt("MgSO4", val); } |
| 634 void EditRecipe::wb_nacl_changed(double val) { set_brewing_salt("NaCl", val); } | 670 void EditRecipe::wb_nacl_changed(double val) { set_brewing_salt("NaCl", val); } |
| 635 void EditRecipe::wb_mgcl2_changed(double val) { set_brewing_salt("MgCl2", val); } | 671 void EditRecipe::wb_mgcl2_changed(double val) { set_brewing_salt("MgCl2", val); } |
