Mercurial > bmsapp / file diff

--- a/src/EditProductTab4.cpp	Wed Nov 16 17:26:27 2022 +0100
+++ b/src/EditProductTab4.cpp	Thu Nov 17 17:23:54 2022 +0100
@@ -107,7 +107,8 @@
 	double ibu = Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3, 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_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
+			   product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
+			   product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
 	item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0'));
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->hopsTable->setItem(i, 7, item);
@@ -260,19 +261,22 @@
 			   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_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
+			   product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
+			   product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
 	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->boil_absorb, 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);
+                           product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
+			   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->boil_absorb, 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);
+			   product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
+			   product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
 
 	hop_flavour += Utils::hopFlavourContribution(product->hops.at(i).time, product->batch_size, product->hops.at(i).useat,
 				product->hops.at(i).amount, product->hops.at(i).form);
@@ -381,7 +385,7 @@
                               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_cooling_method, 0, 0,
+			      product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
 			      product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor);
 
     ibuEdit->setValue(ibu);
@@ -417,7 +421,7 @@
                               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_cooling_method, 0, 0,
+			      product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
 			      product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor);
 
     ibuEdit->setValue(ibu);
@@ -486,7 +490,7 @@
 		              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_cooling_method, 0, 0,
+			      product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
 			      product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor);
     ibuEdit->setValue(ibu);
 
@@ -710,7 +714,7 @@
                               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_cooling_method, 0, 0,
+			      product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
 			      product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor);
     ibuEdit->setValue(ibu);