comparison: src/EditProductTab3.cpp
src/EditProductTab3.cpp
- changeset 369
- 09d3d8d18f97
- parent 363
- 313cdeb309d2
- child 390
- 2a69be28a925
equal
deleted
inserted
replaced
| 368:0757a3758540 | 369:09d3d8d18f97 |
|---|---|
| 289 addedS += product->fermentables.at(i).amount * x; | 289 addedS += product->fermentables.at(i).amount * x; |
| 290 addedmass += product->fermentables.at(i).amount; | 290 addedmass += product->fermentables.at(i).amount; |
| 291 vol += (x * sugardensity + (1 - x) * 1) * product->fermentables.at(i).amount; | 291 vol += (x * sugardensity + (1 - x) * 1) * product->fermentables.at(i).amount; |
| 292 } | 292 } |
| 293 if (product->fermentables.at(i).added == FERMENTABLE_ADDED_MASH && | 293 if (product->fermentables.at(i).added == FERMENTABLE_ADDED_MASH && |
| 294 (product->fermentables.at(i).type == FERMENTABLE_TYPE_GRAIN || product->fermentables.at(i).type == FERMENTABLE_TYPE_ADJUCT) && | 294 (product->fermentables.at(i).type == FERMENTABLE_TYPE_GRAIN || product->fermentables.at(i).type == FERMENTABLE_TYPE_ADJUCT)) { |
| 295 product->fermentables.at(i).color < 50) { | |
| 296 lintner += product->fermentables.at(i).diastatic_power * product->fermentables.at(i).amount; | 295 lintner += product->fermentables.at(i).diastatic_power * product->fermentables.at(i).amount; |
| 297 } | 296 } |
| 298 if (product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) { | 297 if (product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) { |
| 299 colort += product->fermentables.at(i).amount * Utils::ebc_to_srm(product->fermentables.at(i).color); | 298 colort += product->fermentables.at(i).amount * Utils::ebc_to_srm(product->fermentables.at(i).color); |
| 300 colorh += product->fermentables.at(i).amount * product->fermentables.at(i).color * Utils::get_kt(product->fermentables.at(i).color); | 299 colorh += product->fermentables.at(i).amount * product->fermentables.at(i).color * Utils::get_kt(product->fermentables.at(i).color); |
