Mercurial > bmsapp / file diff

--- a/src/Utils.cpp	Sun Jun 19 13:34:18 2022 +0200
+++ b/src/Utils.cpp	Sun Jun 19 19:42:29 2022 +0200
@@ -373,7 +373,7 @@
     double mass = Amount * 1000.0;
     double time = Boiltime;
 
-    if ((Use == HOP_USEAT_AROMA) || (Use == HOP_USEAT_WHIRLPOOL) || (Use == HOP_USEAT_DRY_HOP)) {
+    if ((Use == HOP_USEAT_AROMA) || (Use == HOP_USEAT_WHIRLPOOL) || (Use == HOP_USEAT_DRY_HOP) || (Use == HOP_USEAT_BOTTLING)) {
 	fmoment = 0.0;
     } else if (Use == HOP_USEAT_MASH) {
 	fmoment += my_factor_mashhop / 100.0;	// Brouwhulp
@@ -391,6 +391,8 @@
 	pfactor += my_factor_wethop / 100.0;	// From https://github.com/chrisgilmerproj/brewday/blob/master/brew/constants.py
     } else if (Form == HOP_FORMS_CRYO) {
 	pfactor += my_factor_cryohop / 100.0;
+    } else if (Form == HOP_FORMS_EXTRACT) {
+	// Nothing for now.
     }
 
     // Ideas from Zymurgy March-April 2018. These are not exact formulas!
@@ -456,9 +458,9 @@
 {
     double result;
 
-    if (use == 4 || use == 5) // Whirlpool or Dry-hop
+    if (use == HOP_USEAT_WHIRLPOOL || use == HOP_USEAT_DRY_HOP)
 	return 0;
-    if (use == 1) {   // First wort
+    if (use == HOP_USEAT_FWH) {
 	result = 0.15;   // assume 15% flavourcontribution for fwh
     } else if (bt > 50) {
 	result = 0.10;   // assume 10% flavourcontribution as a minimum
@@ -475,9 +477,9 @@
 {
     double result = 0.0;
 
-    if (use == 5) {         // Dry hop
+    if (use == HOP_USEAT_DRY_HOP) {
 	result = 1.33;
-    } else if (use == 4) { // Whirlpool
+    } else if (use == HOP_USEAT_WHIRLPOOL) {
 	if (bt > 30)
 	    bt = 30; // Max 30 minutes
 	result = 0.62 * bt / 30.0;
@@ -485,9 +487,9 @@
 	result = 0.0;
     } else if (bt > 7.5) {
 	result = 10.03 / (4 * sqrt(2 * 3.1416)) * exp(-0.5 * pow((bt - 7.5) / 4.0, 2.0));
-    } else if (use == 2) {  // Boil
+    } else if (use == HOP_USEAT_BOIL) {  // Boil
 	result = 1;
-    } else if (use == 3) {  // Aroma
+    } else if (use == HOP_USEAT_AROMA) {  // Aroma
 	result = 1.2;
     }
     return (result * amount * 1000.0) / vol;