comparison: src/EditProductTab4.cpp
src/EditProductTab4.cpp
- changeset 398
- 49cf387e9070
- parent 380
- 8f5c03ed4321
- child 399
- 4b9aaf86094e
equal
deleted
inserted
replaced
| 397:877420a13815 | 398:49cf387e9070 |
|---|---|
| 259 ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3, | 259 ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3, |
| 260 product->batch_size, product->hops.at(i).amount, | 260 product->batch_size, product->hops.at(i).amount, |
| 261 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method, | 261 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method, |
| 262 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, | 262 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, |
| 263 product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor); | 263 product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor); |
| 264 ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3, | 264 if (product->stage > PROD_STAGE_BREW) |
| 265 ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->brew_preboil_sg, product->brew_fermenter_sg, | |
| 266 product->brew_fermenter_volume + product->brew_fermenter_tcloss, product->hops.at(i).amount, | |
| 267 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method, | |
| 268 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, | |
| 269 product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor); | |
| 270 else | |
| 271 ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3, | |
| 265 product->brew_fermenter_volume + product->brew_fermenter_tcloss, product->hops.at(i).amount, | 272 product->brew_fermenter_volume + product->brew_fermenter_tcloss, product->hops.at(i).amount, |
| 266 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method, | 273 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method, |
| 267 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, | 274 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, |
| 268 product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor); | 275 product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor); |
| 269 | 276 |
| 286 qDebug() << "ibu" << product->est_ibu << ibus << "flavour" << hop_flavour << "aroma" << hop_aroma << "method" << product->ibu_method | 293 qDebug() << "ibu" << product->est_ibu << ibus << "flavour" << hop_flavour << "aroma" << hop_aroma << "method" << product->ibu_method |
| 287 << "fermenter" << ferm_ibus << "supplies" << product->hops_ok; | 294 << "fermenter" << ferm_ibus << "supplies" << product->hops_ok; |
| 288 | 295 |
| 289 product->est_ibu = ibus; | 296 product->est_ibu = ibus; |
| 290 product->brew_fermenter_ibu = ferm_ibus; | 297 product->brew_fermenter_ibu = ferm_ibus; |
| 291 ui->est_ibuEdit->setValue(product->est_ibu); | 298 if (product->stage > PROD_STAGE_BREW) { |
| 299 ui->est_ibuLabel->setText(tr("Final IBU")); | |
| 300 ui->est_ibuEdit->setValue(product->brew_fermenter_ibu); | |
| 301 ui->est_ibuShow->setValue(product->brew_fermenter_ibu); | |
| 302 } else { | |
| 303 ui->est_ibuEdit->setValue(product->est_ibu); | |
| 304 ui->est_ibuShow->setValue(product->est_ibu); | |
| 305 } | |
| 292 ui->est_ibu2Edit->setValue(product->est_ibu); | 306 ui->est_ibu2Edit->setValue(product->est_ibu); |
| 293 ui->est_ibuShow->setValue(product->est_ibu); | |
| 294 ui->brew_fermentibuShow->setValue(product->brew_fermenter_ibu); | 307 ui->brew_fermentibuShow->setValue(product->brew_fermenter_ibu); |
| 295 ui->hop_tasteShow->setValue(hop_flavour); | 308 ui->hop_tasteShow->setValue(hop_flavour); |
| 296 ui->hop_aromaShow->setValue(hop_aroma); | 309 ui->hop_aromaShow->setValue(hop_aroma); |
| 297 } | 310 } |
| 298 | 311 |
