Mercurial > bmsapp / file diff

--- a/src/PrinterDialog.cpp	Tue Jul 26 19:46:44 2022 +0200
+++ b/src/PrinterDialog.cpp	Fri Jul 29 13:12:26 2022 +0200
@@ -435,9 +435,10 @@
 
 	    double cost = recipe->hops.at(i).amount * recipe->hops.at(i).cost;
 	    cost_hops += cost;
-	    double ibu = Utils::toIBU(recipe->hops.at(i).useat, recipe->hops.at(i).form, recipe->preboil_sg, recipe->batch_size,
+	    double ibu = Utils::toIBU(recipe->hops.at(i).useat, recipe->hops.at(i).form, recipe->preboil_sg, recipe->est_og, recipe->batch_size,
 			    	      recipe->hops.at(i).amount, recipe->hops.at(i).time, recipe->hops.at(i).alpha,
-				      recipe->ibu_method, 0, recipe->hops.at(i).time, 0, recipe->boil_time, 0, 0, 0);
+				      recipe->ibu_method, 0, recipe->hops.at(i).time, 0, recipe->boil_time, 0, 0, 0,
+				      recipe->hops.at(i).utilisation, recipe->hops.at(i).bu_factor);
 
 	    if (recipe->hops.at(i).useat == 2 || recipe->hops.at(i).useat == 4)	// Boil or Whirlpool
 		use = QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]) + QString(" %1 min").arg(recipe->hops.at(i).time);
@@ -846,10 +847,10 @@
 
             double cost = product->hops.at(i).amount * product->hops.at(i).cost;
             cost_hops += cost;
-            double ibu = Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->batch_size,
+            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->boil_time, product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
 
             if (product->hops.at(i).useat == 2 || product->hops.at(i).useat == 4)     // Boil or Whirlpool
                 use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 min").arg(product->hops.at(i).time);