Mercurial > bmsapp / file diff

--- a/src/EditProductTab8.cpp	Mon Jun 13 15:47:16 2022 +0200
+++ b/src/EditProductTab8.cpp	Mon Jun 13 16:47:52 2022 +0200
@@ -61,20 +61,20 @@
 {
     double C1 = 0;
 
-    if ((F.f_di_ph != 5.7) && ((F.f_acid_to_ph_57 < - 0.1) || (F.f_acid_to_ph_57 > 0.1))) {
-	C1 = F.f_acid_to_ph_57 / (F.f_di_ph - 5.7);
+    if ((F.di_ph != 5.7) && ((F.acid_to_ph_57 < - 0.1) || (F.acid_to_ph_57 > 0.1))) {
+	C1 = F.acid_to_ph_57 / (F.di_ph - 5.7);
     } else {
 	/*
 	 * If the acid_to_ph_5.7 is unknown from the maltster, guess the required acid.
 	 */
-	switch (F.f_graintype) {
+	switch (F.graintype) {
 	   case FERMENTABLE_GRAINTYPE_BASE:
 	   case FERMENTABLE_GRAINTYPE_KILNED:
-	   case FERMENTABLE_GRAINTYPE_SPECIAL:		C1 = 0.014 * F.f_color - 34.192;
+	   case FERMENTABLE_GRAINTYPE_SPECIAL:		C1 = 0.014 * F.color - 34.192;
 							break;
-	   case FERMENTABLE_GRAINTYPE_CRYSTAL:		C1 = -0.0597 * F.f_color - 32.457;
+	   case FERMENTABLE_GRAINTYPE_CRYSTAL:		C1 = -0.0597 * F.color - 32.457;
 							break;
-	   case FERMENTABLE_GRAINTYPE_ROAST:		C1 = 0.0107 * F.f_color - 54.768;
+	   case FERMENTABLE_GRAINTYPE_ROAST:		C1 = 0.0107 * F.color - 54.768;
 							break;
 	   case FERMENTABLE_GRAINTYPE_SOUR_MALT:	C1 = -149;
 							break;
@@ -87,7 +87,7 @@
 double EditProduct::AcidRequired(double ZpH, Fermentables F)
 {
     double C1 = BufferCapacity(F);
-    double x = F.f_di_ph;
+    double x = F.di_ph;
     return C1 * (ZpH - x);
 }
 
@@ -105,8 +105,8 @@
     if (product->fermentables.size()) {
 	for (i = 0; i < product->fermentables.size(); i++) {
 	    F = product->fermentables.at(i);
-	    if (F.f_added == FERMENTABLE_ADDED_MASH && F.f_graintype != FERMENTABLE_GRAINTYPE_NO_MALT) {
-		x = AcidRequired(pHZ, F) * F.f_amount;
+	    if (F.added == FERMENTABLE_ADDED_MASH && F.graintype != FERMENTABLE_GRAINTYPE_NO_MALT) {
+		x = AcidRequired(pHZ, F) * F.amount;
 		Result += x;
 	    }
 	}