Mercurial > bmsapp / file diff

--- a/src/EditProductTab4.cpp	Thu Jul 07 14:17:53 2022 +0200
+++ b/src/EditProductTab4.cpp	Thu Jul 07 14:57:24 2022 +0200
@@ -106,7 +106,8 @@
 
 	double ibu = Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->batch_size,
 			   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_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
+			   product->brew_cooling_method, 0, 0);
 	item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0'));
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->hopsTable->setItem(i, 7, item);
@@ -258,11 +259,13 @@
 	ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg,
 			   product->batch_size, 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_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
+			   product->brew_cooling_method, 0, 0);
 	ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_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_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
+			   product->brew_cooling_method, 0, 0);
 
 	hop_flavour += Utils::hopFlavourContribution(product->hops.at(i).time, product->batch_size, product->hops.at(i).useat, product->hops.at(i).amount);
         hop_aroma += Utils::hopAromaContribution(product->hops.at(i).time, product->batch_size, product->hops.at(i).useat, product->hops.at(i).amount);
@@ -360,7 +363,8 @@
     double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg,
                               product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
                               product->hops.at(product->hops_row).alpha, product->ibu_method,
-			      product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time);
+			      product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
+			      product->brew_cooling_method, 0, 0);
 
     ibuEdit->setValue(ibu);
     item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0'));
@@ -394,7 +398,8 @@
     double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg,
                               product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
  			      product->hops.at(product->hops_row).alpha, product->ibu_method,
-			      product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time);
+			      product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
+			      product->brew_cooling_method, 0, 0);
 
     ibuEdit->setValue(ibu);
     item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0'));
@@ -459,7 +464,8 @@
     double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg,
 		              product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
 			      product->hops.at(product->hops_row).alpha, product->ibu_method,
-			      product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time);
+			      product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
+			      product->brew_cooling_method, 0, 0);
     ibuEdit->setValue(ibu);
 
     ui->hopsTable->setItem(product->hops_row, 0, new QTableWidgetItem(product->hops.at(product->hops_row).origin));
@@ -683,7 +689,8 @@
     double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg,
                               product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
                               product->hops.at(product->hops_row).alpha, product->ibu_method,
-			      product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time);
+			      product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
+			      product->brew_cooling_method, 0, 0);
     ibuEdit->setValue(ibu);
 
     hop_instock_changed(true);