comparison: src/EditProductTab3.cpp
src/EditProductTab3.cpp
- changeset 448
- 9e0da3824cf9
- parent 432
- f189af715073
- child 449
- 00757c056ca6
equal
deleted
inserted
replaced
| 447:9b5acb1f5776 | 448:9e0da3824cf9 |
|---|---|
| 462 if (product->stage > PROD_STAGE_BREW) { | 462 if (product->stage > PROD_STAGE_BREW) { |
| 463 ui->est_colorLabel->setText(tr("Final EBC:")); | 463 ui->est_colorLabel->setText(tr("Final EBC:")); |
| 464 ui->est_colorEdit->setValue(product->brew_fermenter_color); | 464 ui->est_colorEdit->setValue(product->brew_fermenter_color); |
| 465 ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(product->brew_fermenter_color)); | 465 ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(product->brew_fermenter_color)); |
| 466 ui->est_colorShow->setValue(product->brew_fermenter_color); | 466 ui->est_colorShow->setValue(product->brew_fermenter_color); |
| 467 ui->pack_finalcolorLabel->setText(tr("Final EBC:")); | |
| 467 } else { | 468 } else { |
| 468 ui->est_colorEdit->setValue(color); | 469 ui->est_colorEdit->setValue(color); |
| 469 ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(color)); | 470 ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(color)); |
| 470 ui->est_colorShow->setValue(color); | 471 ui->est_colorShow->setValue(color); |
| 471 } | 472 } |
| 518 | 519 |
| 519 if (product->mashs_kg > 0 && mashinfuse > 0 && mashtime > 0 && mashtemp > 0) | 520 if (product->mashs_kg > 0 && mashinfuse > 0 && mashtime > 0 && mashtemp > 0) |
| 520 product->est_fg = Utils::estimate_fg(psugar, pcara, mashinfuse / product->mashs_kg, mashtime, mashtemp, svg, product->est_og); | 521 product->est_fg = Utils::estimate_fg(psugar, pcara, mashinfuse / product->mashs_kg, mashtime, mashtemp, svg, product->est_og); |
| 521 else | 522 else |
| 522 product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og); | 523 product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og); |
| 523 // qDebug() << " est FG" << ui->est_fgEdit->value() << product->est_fg; | 524 qDebug() << " est FG" << ui->est_fgEdit->value() << product->est_fg; |
| 524 product->est_abv = Utils::abvol(product->est_og, product->est_fg); | 525 product->est_abv = Utils::abvol(product->est_og, product->est_fg); |
| 525 // qDebug() << " est ABV" << ui->est_abvEdit->value() << product->est_abv; | 526 // qDebug() << " est ABV" << ui->est_abvEdit->value() << product->est_abv; |
| 526 | 527 |
| 527 if (product->stage > PROD_STAGE_TERTIARY) { | 528 if (product->stage > PROD_STAGE_TERTIARY) { |
| 528 ui->est_fgLabel->setText(tr("Final FG:")); | 529 ui->est_fgLabel->setText(tr("Final FG:")); |
