comparison: src/EditProductTab3.cpp
src/EditProductTab3.cpp
- changeset 396
- c9a1d85c1487
- parent 390
- 2a69be28a925
- child 397
- 877420a13815
equal
deleted
inserted
replaced
| 395:7212b980a527 | 396:c9a1d85c1487 |
|---|---|
| 319 ui->brew_mashsgShow->setValue(product->est_mash_sg); | 319 ui->brew_mashsgShow->setValue(product->est_mash_sg); |
| 320 | 320 |
| 321 /* Estimate total recipe OG */ | 321 /* Estimate total recipe OG */ |
| 322 product->est_og = Utils::estimate_sg(sugarsf + addedS, product->batch_size); | 322 product->est_og = Utils::estimate_sg(sugarsf + addedS, product->batch_size); |
| 323 qDebug() << " OG" << ui->est_ogEdit->value() << product->est_og; | 323 qDebug() << " OG" << ui->est_ogEdit->value() << product->est_og; |
| 324 ui->est_ogEdit->setValue(product->est_og); | 324 if (product->stage > PROD_STAGE_BREW) { |
| 325 ui->est_ogLabel->setText(tr("Final OG")); | |
| 326 ui->est_ogEdit->setValue(product->og); | |
| 327 ui->est_ogShow->setValue(product->og); | |
| 328 } else { | |
| 329 ui->est_ogEdit->setValue(product->est_og); | |
| 330 ui->est_ogShow->setValue(product->est_og); | |
| 331 } | |
| 325 ui->est_og2Edit->setValue(product->est_og); | 332 ui->est_og2Edit->setValue(product->est_og); |
| 326 ui->est_og4Edit->setValue(product->est_og); | 333 ui->est_og4Edit->setValue(product->est_og); |
| 327 ui->est_ogShow->setValue(product->est_og); | |
| 328 | 334 |
| 329 /* Estimate SG in kettle after boil */ | 335 /* Estimate SG in kettle after boil */ |
| 330 product->est_og3 = Utils::estimate_sg(sugarsf, product->batch_size); | 336 product->est_og3 = Utils::estimate_sg(sugarsf, product->batch_size); |
| 331 ui->brew_aboilsgShow->setValue(product->est_og3); | 337 ui->brew_aboilsgShow->setValue(product->est_og3); |
| 332 | 338 |
| 450 if (product->mashs_kg > 0 && mashinfuse > 0 && mashtime > 0 && mashtemp > 0) | 456 if (product->mashs_kg > 0 && mashinfuse > 0 && mashtime > 0 && mashtemp > 0) |
| 451 product->est_fg = Utils::estimate_fg(psugar, pcara, mashinfuse / product->mashs_kg, mashtime, mashtemp, svg, product->est_og); | 457 product->est_fg = Utils::estimate_fg(psugar, pcara, mashinfuse / product->mashs_kg, mashtime, mashtemp, svg, product->est_og); |
| 452 else | 458 else |
| 453 product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og); | 459 product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og); |
| 454 qDebug() << " FG" << ui->est_fgEdit->value() << product->est_fg; | 460 qDebug() << " FG" << ui->est_fgEdit->value() << product->est_fg; |
| 455 ui->est_fgEdit->setValue(product->est_fg); | 461 if (product->stage > PROD_STAGE_TERTIARY) { |
| 462 ui->est_fgLabel->setText(tr("Final FG")); | |
| 463 ui->est_fgEdit->setValue(product->fg); | |
| 464 ui->est_fgShow->setValue(product->fg); | |
| 465 } else { | |
| 466 ui->est_fgEdit->setValue(product->est_fg); | |
| 467 ui->est_fgShow->setValue(product->est_fg); | |
| 468 } | |
| 456 ui->est_fg3Edit->setValue(product->est_fg); | 469 ui->est_fg3Edit->setValue(product->est_fg); |
| 457 ui->est_fgShow->setValue(product->est_fg); | |
| 458 | |
| 459 /* | |
| 460 * Calculate the final values if available. | |
| 461 */ | |
| 462 if ((product->stage >= PROD_STAGE_PACKAGE) && (product->fg > 0.990) && (product->fg < product->brew_fermenter_sg)) { | |
| 463 | |
| 464 } | |
| 465 | 470 |
| 466 product->est_abv = Utils::abvol(product->est_og, product->est_fg); | 471 product->est_abv = Utils::abvol(product->est_og, product->est_fg); |
| 467 qDebug() << " ABV" << ui->est_abvEdit->value() << product->est_abv; | 472 qDebug() << " ABV" << ui->est_abvEdit->value() << product->est_abv; |
| 468 ui->est_abvEdit->setValue(product->est_abv); | 473 ui->est_abvEdit->setValue(product->est_abv); |
| 469 ui->est_abv2Edit->setValue(product->est_abv); | 474 ui->est_abv2Edit->setValue(product->est_abv); |
