changeset
Show final OG and FG if they are valid on the first tab.
Wed, 17 Aug 2022 15:23:17 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Wed, 17 Aug 2022 15:23:17 +0200
- changeset 396
- c9a1d85c1487
- parent 395
- 7212b980a527
- child 397
- 877420a13815
Show final OG and FG if they are valid on the first tab.
| src/EditProductTab3.cpp | file | annotate | diff | comparison | revisions |
--- a/src/EditProductTab3.cpp Wed Aug 17 14:30:33 2022 +0200 +++ b/src/EditProductTab3.cpp Wed Aug 17 15:23:17 2022 +0200 @@ -321,10 +321,16 @@ /* Estimate total recipe OG */ product->est_og = Utils::estimate_sg(sugarsf + addedS, product->batch_size); qDebug() << " OG" << ui->est_ogEdit->value() << product->est_og; - ui->est_ogEdit->setValue(product->est_og); + if (product->stage > PROD_STAGE_BREW) { + ui->est_ogLabel->setText(tr("Final OG")); + ui->est_ogEdit->setValue(product->og); + ui->est_ogShow->setValue(product->og); + } else { + ui->est_ogEdit->setValue(product->est_og); + ui->est_ogShow->setValue(product->est_og); + } ui->est_og2Edit->setValue(product->est_og); ui->est_og4Edit->setValue(product->est_og); - ui->est_ogShow->setValue(product->est_og); /* Estimate SG in kettle after boil */ product->est_og3 = Utils::estimate_sg(sugarsf, product->batch_size); @@ -452,16 +458,15 @@ else product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og); qDebug() << " FG" << ui->est_fgEdit->value() << product->est_fg; - ui->est_fgEdit->setValue(product->est_fg); + if (product->stage > PROD_STAGE_TERTIARY) { + ui->est_fgLabel->setText(tr("Final FG")); + ui->est_fgEdit->setValue(product->fg); + ui->est_fgShow->setValue(product->fg); + } else { + ui->est_fgEdit->setValue(product->est_fg); + ui->est_fgShow->setValue(product->est_fg); + } ui->est_fg3Edit->setValue(product->est_fg); - ui->est_fgShow->setValue(product->est_fg); - - /* - * Calculate the final values if available. - */ - if ((product->stage >= PROD_STAGE_PACKAGE) && (product->fg > 0.990) && (product->fg < product->brew_fermenter_sg)) { - - } product->est_abv = Utils::abvol(product->est_og, product->est_fg); qDebug() << " ABV" << ui->est_abvEdit->value() << product->est_abv;
