# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1667573774 -3600
# Node ID bfac9a7008a3a58c9c414d476451ede335838d1c
# Parent  ef2638cfc1b78f28e02d661777c59ea2932c0811
Use hop absorption factors from the global setup.

diff -r ef2638cfc1b7 -r bfac9a7008a3 src/EditProductTab3.cpp
--- a/src/EditProductTab3.cpp	Fri Nov 04 14:17:56 2022 +0100
+++ b/src/EditProductTab3.cpp	Fri Nov 04 15:56:14 2022 +0100
@@ -238,18 +238,28 @@
 	for (i = 0; i < product->hops.size(); i++) {
 	    if (product->hops.at(i).useat == HOP_USEAT_FWH || product->hops.at(i).useat == HOP_USEAT_BOIL ||
 		product->hops.at(i).useat == HOP_USEAT_AROMA || product->hops.at(i).useat == HOP_USEAT_WHIRLPOOL) {
-		if (product->hops.at(i).form == HOP_FORMS_PELLET || product->hops.at(i).form == HOP_FORMS_PLUG ||
-		    product->hops.at(i).form == HOP_FORMS_CRYO) {
-		    product->boil_absorb += 2.67 * product->hops.at(i).amount;
+		if (product->hops.at(i).form == HOP_FORMS_PELLET) {
+		    product->boil_absorb += my_ha_pellet * product->hops.at(i).amount;
+		} else if (product->hops.at(i).form == HOP_FORMS_PLUG) {
+		    product->boil_absorb += my_ha_plug * product->hops.at(i).amount;
 		} else if (product->hops.at(i).form == HOP_FORMS_LEAF) {
-		    product->boil_absorb += 6.01 * product->hops.at(i).amount;
+		    product->boil_absorb += my_ha_leaf * product->hops.at(i).amount;
+		} else if (product->hops.at(i).form == HOP_FORMS_LEAF_WET) {
+		    product->boil_absorb += my_ha_wethop * product->hops.at(i).amount;
+		} else if (product->hops.at(i).form == HOP_FORMS_CRYO) {
+		    product->boil_absorb += my_ha_t45 * product->hops.at(i).amount;
 		}
 	    } else if (product->hops.at(i).useat == HOP_USEAT_DRY_HOP) {
-		if (product->hops.at(i).form == HOP_FORMS_PELLET || product->hops.at(i).form == HOP_FORMS_PLUG ||
-                    product->hops.at(i).form == HOP_FORMS_CRYO) {
-                    product->ferment_absorb += 2.67 * product->hops.at(i).amount;
+		if (product->hops.at(i).form == HOP_FORMS_PELLET) {
+                    product->ferment_absorb += my_ha_pellet * product->hops.at(i).amount;
+                } else if (product->hops.at(i).form == HOP_FORMS_PLUG) {
+                    product->ferment_absorb += my_ha_plug * product->hops.at(i).amount;
                 } else if (product->hops.at(i).form == HOP_FORMS_LEAF) {
-                    product->ferment_absorb += 6.01 * product->hops.at(i).amount;
+                    product->ferment_absorb += my_ha_leaf * product->hops.at(i).amount;
+		} else if (product->hops.at(i).form == HOP_FORMS_LEAF_WET) {
+                    product->ferment_absorb += my_ha_wethop * product->hops.at(i).amount;
+                } else if (product->hops.at(i).form == HOP_FORMS_CRYO) {
+                    product->ferment_absorb += my_ha_t45 * product->hops.at(i).amount;
                 }
 	    }
 	}
diff -r ef2638cfc1b7 -r bfac9a7008a3 translations/bmsapp_en.ts
--- a/translations/bmsapp_en.ts	Fri Nov 04 14:17:56 2022 +0100
+++ b/translations/bmsapp_en.ts	Fri Nov 04 15:56:14 2022 +0100
@@ -2913,7 +2913,7 @@
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="4137"/>
-        <location filename="../src/EditProductTab3.cpp" line="1109"/>
+        <location filename="../src/EditProductTab3.cpp" line="1114"/>
         <location filename="../src/EditProductTab5.cpp" line="719"/>
         <source>Mash</source>
         <translation type="unfinished"></translation>
@@ -4116,32 +4116,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="356"/>
+        <location filename="../src/EditProductTab3.cpp" line="361"/>
         <source>Final OG:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="456"/>
+        <location filename="../src/EditProductTab3.cpp" line="461"/>
         <source>Final EBC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="521"/>
+        <location filename="../src/EditProductTab3.cpp" line="526"/>
         <source>Final FG:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="524"/>
+        <location filename="../src/EditProductTab3.cpp" line="529"/>
         <source>Final ABV:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="703"/>
+        <location filename="../src/EditProductTab3.cpp" line="708"/>
         <source>Delete fermentable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="703"/>
+        <location filename="../src/EditProductTab3.cpp" line="708"/>
         <location filename="../src/EditProductTab4.cpp" line="358"/>
         <location filename="../src/EditProductTab5.cpp" line="400"/>
         <location filename="../src/EditProductTab6.cpp" line="748"/>
@@ -4151,46 +4151,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1019"/>
+        <location filename="../src/EditProductTab3.cpp" line="1024"/>
         <location filename="../src/EditProductTab5.cpp" line="644"/>
         <source>Current ingredient:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1024"/>
-        <source>Supplier:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/EditProductTab3.cpp" line="1029"/>
-        <source>Amount in kg:</source>
+        <source>Supplier:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="1034"/>
-        <source>Percentage in batch:</source>
+        <source>Amount in kg:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="1039"/>
-        <source>Auto fill to 100%:</source>
+        <source>Percentage in batch:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="1044"/>
-        <location filename="../src/EditProductTab4.cpp" line="630"/>
-        <location filename="../src/EditProductTab6.cpp" line="1007"/>
-        <source>Use at:</source>
+        <source>Auto fill to 100%:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="1049"/>
-        <location filename="../src/EditProductTab5.cpp" line="670"/>
-        <source>Select ingredient:</source>
+        <location filename="../src/EditProductTab4.cpp" line="630"/>
+        <location filename="../src/EditProductTab6.cpp" line="1007"/>
+        <source>Use at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="1054"/>
+        <location filename="../src/EditProductTab5.cpp" line="670"/>
+        <source>Select ingredient:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab3.cpp" line="1059"/>
         <location filename="../src/EditProductTab4.cpp" line="640"/>
         <location filename="../src/EditProductTab5.cpp" line="675"/>
         <location filename="../src/EditProductTab6.cpp" line="992"/>
@@ -4198,23 +4198,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1059"/>
+        <location filename="../src/EditProductTab3.cpp" line="1064"/>
         <source>Max in batch:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1110"/>
+        <location filename="../src/EditProductTab3.cpp" line="1115"/>
         <location filename="../src/EditProductTab5.cpp" line="720"/>
         <source>Boil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1111"/>
+        <location filename="../src/EditProductTab3.cpp" line="1116"/>
         <source>Fermentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1112"/>
+        <location filename="../src/EditProductTab3.cpp" line="1117"/>
         <source>Lagering</source>
         <translation type="unfinished"></translation>
     </message>
diff -r ef2638cfc1b7 -r bfac9a7008a3 translations/bmsapp_nl.ts
--- a/translations/bmsapp_nl.ts	Fri Nov 04 14:17:56 2022 +0100
+++ b/translations/bmsapp_nl.ts	Fri Nov 04 15:56:14 2022 +0100
@@ -2994,7 +2994,7 @@
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="4137"/>
-        <location filename="../src/EditProductTab3.cpp" line="1109"/>
+        <location filename="../src/EditProductTab3.cpp" line="1114"/>
         <location filename="../src/EditProductTab5.cpp" line="719"/>
         <source>Mash</source>
         <translation>Maischen</translation>
@@ -4478,22 +4478,22 @@
         <translation>Vergistbaar ingredient is al verwerkt</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="356"/>
+        <location filename="../src/EditProductTab3.cpp" line="361"/>
         <source>Final OG:</source>
         <translation>Finale OG:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="456"/>
+        <location filename="../src/EditProductTab3.cpp" line="461"/>
         <source>Final EBC:</source>
         <translation>Finale EBC:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="521"/>
+        <location filename="../src/EditProductTab3.cpp" line="526"/>
         <source>Final FG:</source>
         <translation>Finale FG:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="524"/>
+        <location filename="../src/EditProductTab3.cpp" line="529"/>
         <source>Final ABV:</source>
         <translation>Finale ABV:</translation>
     </message>
@@ -4510,12 +4510,12 @@
         <translation type="vanished">Finale FG:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="703"/>
+        <location filename="../src/EditProductTab3.cpp" line="708"/>
         <source>Delete fermentable</source>
         <translation>Verwijder vergistbaar ingredient</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="703"/>
+        <location filename="../src/EditProductTab3.cpp" line="708"/>
         <location filename="../src/EditProductTab4.cpp" line="358"/>
         <location filename="../src/EditProductTab5.cpp" line="400"/>
         <location filename="../src/EditProductTab6.cpp" line="748"/>
@@ -4525,46 +4525,46 @@
         <translation>Verwijder %1</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1019"/>
+        <location filename="../src/EditProductTab3.cpp" line="1024"/>
         <location filename="../src/EditProductTab5.cpp" line="644"/>
         <source>Current ingredient:</source>
         <translation>Huidig ingredient:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1024"/>
-        <source>Supplier:</source>
-        <translation>Leverancier:</translation>
-    </message>
-    <message>
         <location filename="../src/EditProductTab3.cpp" line="1029"/>
-        <source>Amount in kg:</source>
-        <translation>Gewicht in kg:</translation>
+        <source>Supplier:</source>
+        <translation>Leverancier:</translation>
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="1034"/>
-        <source>Percentage in batch:</source>
-        <translation>Percentage in stort:</translation>
+        <source>Amount in kg:</source>
+        <translation>Gewicht in kg:</translation>
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="1039"/>
-        <source>Auto fill to 100%:</source>
-        <translation>Aanvullen tot 100%:</translation>
+        <source>Percentage in batch:</source>
+        <translation>Percentage in stort:</translation>
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="1044"/>
+        <source>Auto fill to 100%:</source>
+        <translation>Aanvullen tot 100%:</translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab3.cpp" line="1049"/>
         <location filename="../src/EditProductTab4.cpp" line="630"/>
         <location filename="../src/EditProductTab6.cpp" line="1007"/>
         <source>Use at:</source>
         <translation>Toevoegen bij:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1049"/>
+        <location filename="../src/EditProductTab3.cpp" line="1054"/>
         <location filename="../src/EditProductTab5.cpp" line="670"/>
         <source>Select ingredient:</source>
         <translation>Kies ingredient:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1054"/>
+        <location filename="../src/EditProductTab3.cpp" line="1059"/>
         <location filename="../src/EditProductTab4.cpp" line="640"/>
         <location filename="../src/EditProductTab5.cpp" line="675"/>
         <location filename="../src/EditProductTab6.cpp" line="992"/>
@@ -4572,23 +4572,23 @@
         <translation>In voorraad:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1059"/>
+        <location filename="../src/EditProductTab3.cpp" line="1064"/>
         <source>Max in batch:</source>
         <translation>Max. in stort:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1110"/>
+        <location filename="../src/EditProductTab3.cpp" line="1115"/>
         <location filename="../src/EditProductTab5.cpp" line="720"/>
         <source>Boil</source>
         <translation>Koken</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1111"/>
+        <location filename="../src/EditProductTab3.cpp" line="1116"/>
         <source>Fermentation</source>
         <translation>Hoofdvergisting</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1112"/>
+        <location filename="../src/EditProductTab3.cpp" line="1117"/>
         <source>Lagering</source>
         <translation>Nagisting/lagering</translation>
     </message>