Mercurial > bmsapp / changeset

--- a/src/EditProductTab4.cpp	Thu Aug 18 16:11:20 2022 +0200
+++ b/src/EditProductTab4.cpp	Thu Aug 18 17:07:47 2022 +0200
@@ -261,7 +261,14 @@
                            product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method,
 			   product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
 			   product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
-	ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3,
+	if (product->stage > PROD_STAGE_BREW)
+	    ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->brew_preboil_sg, product->brew_fermenter_sg,
+                           product->brew_fermenter_volume + product->brew_fermenter_tcloss, product->hops.at(i).amount,
+                           product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method,
+                           product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
+                           product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
+	else
+	    ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3,
 			   product->brew_fermenter_volume + product->brew_fermenter_tcloss, product->hops.at(i).amount,
                            product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method,
 			   product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
@@ -288,9 +295,15 @@
 
     product->est_ibu = ibus;
     product->brew_fermenter_ibu = ferm_ibus;
-    ui->est_ibuEdit->setValue(product->est_ibu);
+    if (product->stage > PROD_STAGE_BREW) {
+	ui->est_ibuLabel->setText(tr("Final IBU"));
+	ui->est_ibuEdit->setValue(product->brew_fermenter_ibu);
+	ui->est_ibuShow->setValue(product->brew_fermenter_ibu);
+    } else {
+	ui->est_ibuEdit->setValue(product->est_ibu);
+	ui->est_ibuShow->setValue(product->est_ibu);
+    }
     ui->est_ibu2Edit->setValue(product->est_ibu);
-    ui->est_ibuShow->setValue(product->est_ibu);
     ui->brew_fermentibuShow->setValue(product->brew_fermenter_ibu);
     ui->hop_tasteShow->setValue(hop_flavour);
     ui->hop_aromaShow->setValue(hop_aroma);

--- a/ui/EditProduct.ui	Thu Aug 18 16:11:20 2022 +0200
+++ b/ui/EditProduct.ui	Thu Aug 18 17:07:47 2022 +0200
@@ -2711,7 +2711,7 @@
          </rect>
         </property>
         <property name="text">
-         <string>Bitterness IBU:</string>
+         <string>Estimated IBU:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>