comparison: src/EditProductTab3.cpp
src/EditProductTab3.cpp
- changeset 184
- da148d6b4c95
- parent 182
- 545d31130844
- child 187
- 91af2c697345
equal
deleted
inserted
replaced
| 183:bce87b8b604b | 184:da148d6b4c95 |
|---|---|
| 233 if (product->fermentables.at(i).f_added == 0) { // Mash | 233 if (product->fermentables.at(i).f_added == 0) { // Mash |
| 234 if (mvol > 0) { // If mash volume is known | 234 if (mvol > 0) { // If mash volume is known |
| 235 mvol += product->fermentables.at(i).f_amount * product->fermentables.at(i).f_moisture / 100; | 235 mvol += product->fermentables.at(i).f_amount * product->fermentables.at(i).f_moisture / 100; |
| 236 s += d; | 236 s += d; |
| 237 } | 237 } |
| 238 d = ui->efficiencyEdit->value() / 100 * d; | 238 d = product->efficiency / 100 * d; |
| 239 sugarsm += d; | 239 sugarsm += d; |
| 240 product->mashs_kg += product->fermentables.at(i).f_amount; | 240 product->mashs_kg += product->fermentables.at(i).f_amount; |
| 241 } | 241 } |
| 242 if (product->fermentables.at(i).f_added == 0 || product->fermentables.at(i).f_added == 1) // Mash or boil | 242 if (product->fermentables.at(i).f_added == 0 || product->fermentables.at(i).f_added == 1) // Mash or boil |
| 243 sugarsf += d; | 243 sugarsf += d; |
| 273 ui->est_ogEdit->setValue(og); | 273 ui->est_ogEdit->setValue(og); |
| 274 ui->est_og2Edit->setValue(og); | 274 ui->est_og2Edit->setValue(og); |
| 275 ui->est_og4Edit->setValue(og); | 275 ui->est_og4Edit->setValue(og); |
| 276 ui->est_ogShow->setValue(og); | 276 ui->est_ogShow->setValue(og); |
| 277 | 277 |
| 278 product->est_og3 = Utils::estimate_sg(sugarsf, product->batch_size); | |
| 279 ui->brew_aboilsgShow->setValue(product->est_og3); | |
| 280 | |
| 278 product->preboil_sg = Utils::estimate_sg(sugarsm, product->boil_size); | 281 product->preboil_sg = Utils::estimate_sg(sugarsm, product->boil_size); |
| 282 ui->brew_preboilsgShow->setValue(product->preboil_sg); | |
| 279 qDebug() << " preboil SG" << product->preboil_sg; | 283 qDebug() << " preboil SG" << product->preboil_sg; |
| 280 | 284 |
| 281 /* | 285 /* |
| 282 * Color of the wort | 286 * Color of the wort |
| 283 */ | 287 */ |
