Mercurial > bmsapp / file diff

--- a/src/EditProductTab7.cpp	Fri Apr 29 17:07:35 2022 +0200
+++ b/src/EditProductTab7.cpp	Fri Apr 29 20:29:26 2022 +0200
@@ -154,8 +154,8 @@
 
 double EditProduct::infusionVol(double step_infused, double step_mashkg, double infuse_temp, double step_temp, double last_temp)
 {
-    double a = last_temp * (equip_tun_weight * equip_tun_specific_heat + step_infused * SpecificHeatWater + step_mashkg * SpecificHeatMalt);
-    double b = step_temp * (equip_tun_weight * equip_tun_specific_heat + step_infused * SpecificHeatWater + step_mashkg * SpecificHeatMalt);
+    double a = last_temp * (product->eq_tun_weight * product->eq_tun_specific_heat + step_infused * SpecificHeatWater + step_mashkg * SpecificHeatMalt);
+    double b = step_temp * (product->eq_tun_weight * product->eq_tun_specific_heat + step_infused * SpecificHeatWater + step_mashkg * SpecificHeatMalt);
     double vol = round(((b - a) / ((infuse_temp - step_temp) * SpecificHeatWater)) * 100.0) / 100.0;
 
     if (vol < 0)
@@ -167,7 +167,7 @@
 
 double EditProduct::decoctionVol(double step_volume, double step_temp, double prev_temp)
 {
-    double a = (equip_tun_weight * equip_tun_specific_heat + step_volume * SpecificHeatWater) * (step_temp - prev_temp);
+    double a = (product->eq_tun_weight * product->eq_tun_specific_heat + step_volume * SpecificHeatWater) * (step_temp - prev_temp);
     double b = SpecificHeatWater * (99 - step_temp);
     double vol = 0;
 
@@ -198,9 +198,9 @@
 		    n = 20; // tun is preheated.
 		    tuntemp = product->mashs.at(i).step_temp;
 		    for (j = 0; j < n; j++) {
-			a = product->mashs_kg * graintemp * SpecificHeatMalt + equip_tun_weight * tuntemp * equip_tun_specific_heat;
+			a = product->mashs_kg * graintemp * SpecificHeatMalt + product->eq_tun_weight * tuntemp * product->eq_tun_specific_heat;
 			b = product->mashs[i].step_temp *
-			      (equip_tun_weight * equip_tun_specific_heat +
+			      (product->eq_tun_weight * product->eq_tun_specific_heat +
 			       product->mashs.at(i).step_infuse_amount * SpecificHeatWater + 
 			       product->mashs_kg * SpecificHeatMalt) -
 			      SlakingHeat * product->mashs_kg;