Mercurial > bmsapp / file diff

--- a/src/Utils.cpp	Sun May 15 09:57:32 2022 +0200
+++ b/src/Utils.cpp	Sun May 15 11:27:06 2022 +0200
@@ -342,7 +342,7 @@
 
 
 double Utils::toIBU(int Use, int Form, double SG, double Volume, double Amount, double Boiltime, double Alpha,
-		    int Method, double Whirlpool9, double Whirlpool7, double Whirlpool6)
+		    int Method, double Whirlpool9, double Whirlpool7, double Whirlpool6, double Fulltime)
 {
     double	fmoment = 1.0, pfactor = 1.0, ibu = 0, boilfactor;
     double	sgfactor, AddedAlphaAcids, Bigness_factor, BoilTime_factor, utiisation;
@@ -353,27 +353,29 @@
     double mass = Amount * 1000.0;
     double time = Boiltime;
 
-    if ((Use == 3) || (Use == 4) || (Use == 5)) {	// Aroma, Whirlpool or Dry hop.
+    if ((Use == HOP_USEAT_AROMA) || (Use == HOP_USEAT_WHIRLPOOL) || (Use == HOP_USEAT_DRY_HOP)) {
 	fmoment = 0.0;
-    } else if (Use == 0) { // Mash
-	fmoment += my_factor_mashhop / 100.0;		// Brouwhulp
-    } else if (Use == 1) { // First wort
-	fmoment += my_factor_fwh / 100.0;			// Brouwhulp, Louis, Ozzie
+    } else if (Use == HOP_USEAT_MASH) {
+	fmoment += my_factor_mashhop / 100.0;	// Brouwhulp
+	time = Fulltime;			// Take the full boiltime
+    } else if (Use == HOP_USEAT_FWH) {
+	fmoment += my_factor_fwh / 100.0;	// Brouwhulp, Louis, Ozzie
+	time = Fulltime;
     }
 
-    if (Form == 0) {				// Pellet
+    if (Form == HOP_FORMS_PELLET) {
 	pfactor += my_factor_pellet / 100.0;
-    } else if (Form == 1) {			// Plug
+    } else if (Form == HOP_FORMS_PLUG) {
 	pfactor += my_factor_plug / 100.0;
-    } else if (Form == 3) {			// Wet leaf
+    } else if (Form == HOP_FORMS_LEAF_WET) {
 	pfactor += my_factor_wethop / 100.0;	// From https://github.com/chrisgilmerproj/brewday/blob/master/brew/constants.py
-    } else if (Form == 4) {			// Cryo hop
+    } else if (Form == HOP_FORMS_CRYO) {
 	pfactor += my_factor_cryohop / 100.0;
     }
 
     // Ideas from Zymurgy March-April 2018. These are not exact formulas!
     double whirlibus = 0.0;
-    if (Use == 3 || Use == 4) { // Flameout or any whirlpool
+    if (Use == HOP_USEAT_AROMA || Use == HOP_USEAT_WHIRLPOOL) { // Flameout or any whirlpool
 
 	if (Whirlpool9) {
 	    // 20 mg/l/50 min