Mercurial > bmsapp / changeset

changeset

With estimate_fg added a boolean parameter sta1 to correct the outcome if a primary yeast with sta1 gen is used. Fixed a spelling error in EditProduct yeast tab for dry yeast.

Sun, 08 Jan 2023 15:53:16 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Sun, 08 Jan 2023 15:53:16 +0100
changeset 449
00757c056ca6
parent 448
9e0da3824cf9
child 450
d4cff87ea156

With estimate_fg added a boolean parameter sta1 to correct the outcome if a primary yeast with sta1 gen is used. Fixed a spelling error in EditProduct yeast tab for dry yeast.

src/EditProductTab3.cpp file | annotate | diff | comparison | revisions
src/EditRecipeTab2.cpp file | annotate | diff | comparison | revisions
src/Utils.cpp file | annotate | diff | comparison | revisions
src/Utils.h file | annotate | diff | comparison | revisions
translations/bmsapp_en.ts file | annotate | diff | comparison | revisions
translations/bmsapp_nl.ts file | annotate | diff | comparison | revisions
ui/EditProduct.ui file | annotate | diff | comparison | revisions 
--- a/src/EditProductTab3.cpp	Sat Dec 03 16:32:24 2022 +0100
+++ b/src/EditProductTab3.cpp	Sun Jan 08 15:53:16 2023 +0100
@@ -491,12 +491,15 @@
      */
     double svg = 0;
     double initcells = 0;
+    bool sta1 = false;
     product->yeasts_ok = true;
     if (product->yeasts.size() > 0) {
         for (i = 0; i < product->yeasts.size(); i++) {
 	    if (product->yeasts.at(i).use == 0) {		// Used in primary
 		if (product->yeasts.at(i).attenuation > svg)
 		    svg = product->yeasts.at(i).attenuation;	// Take the highest if multiple yeasts.
+		if (product->yeasts.at(i).sta1)
+		    sta1 = true;
 	    }
 	    if (product->yeasts.at(i).form == 0)
 		initcells += (product->yeasts.at(i).cells / 1000000000) * product->yeasts.at(i).amount * (product->starter_viability / 100);
@@ -518,9 +521,9 @@
     ui->est_svgEdit->setValue(svg);
 
     if (product->mashs_kg > 0 && mashinfuse > 0 && mashtime > 0 && mashtemp > 0)
-	product->est_fg = Utils::estimate_fg(psugar, pcara, mashinfuse / product->mashs_kg, mashtime, mashtemp, svg, product->est_og);
+	product->est_fg = Utils::estimate_fg(psugar, pcara, mashinfuse / product->mashs_kg, mashtime, mashtemp, svg, product->est_og, sta1);
     else
-	product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og);
+	product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og, sta1);
     qDebug() << "  est FG" << ui->est_fgEdit->value() << product->est_fg;
     product->est_abv = Utils::abvol(product->est_og, product->est_fg);
 //    qDebug() << "  est ABV" << ui->est_abvEdit->value() << product->est_abv;
--- a/src/EditRecipeTab2.cpp	Sat Dec 03 16:32:24 2022 +0100
+++ b/src/EditRecipeTab2.cpp	Sun Jan 08 15:53:16 2023 +0100
@@ -307,11 +307,14 @@
      * Calculate the apparant attenuation.
      */
     double svg = 0;
+    bool sta1 = false;
     if (recipe->yeasts.size() > 0) {
         for (i = 0; i < recipe->yeasts.size(); i++) {
 	    if (recipe->yeasts.at(i).use == 0) {		// Used in primary
 		if (recipe->yeasts.at(i).attenuation > svg)
 		    svg = recipe->yeasts.at(i).attenuation;	// Take the highest if multiple yeasts.
+		if (recipe->yeasts.at(i).sta1)
+		    sta1 = true;
 	    }
 	    // TODO: brett or others in secondary.
 	}
@@ -323,9 +326,9 @@
 
     double fg;
     if (recipe->mashs_kg > 0 && mashinfuse > 0 && mashtime > 0 && mashtemp > 0)
-	fg = Utils::estimate_fg(psugar, pcara, mashinfuse / recipe->mashs_kg, mashtime, mashtemp, svg, og);
+	fg = Utils::estimate_fg(psugar, pcara, mashinfuse / recipe->mashs_kg, mashtime, mashtemp, svg, og, sta1);
     else
-	fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, og);
+	fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, og, sta1);
     qDebug() << "  FG" << ui->est_fgEdit->value() << fg;
     recipe->est_fg = fg;
     ui->est_fgEdit->setValue(fg);
--- a/src/Utils.cpp	Sat Dec 03 16:32:24 2022 +0100
+++ b/src/Utils.cpp	Sun Jan 08 15:53:16 2023 +0100
@@ -282,7 +282,7 @@
 }
 
 
-double Utils::estimate_fg(double psugar, double pcara, double wgratio, double mashtime, double mashtemp, double svg, double og)
+double Utils::estimate_fg(double psugar, double pcara, double wgratio, double mashtime, double mashtemp, double svg, double og, bool sta1)
 {
     double BD;
 
@@ -310,16 +310,19 @@
 	svg = 77;
 
     /*
-     * From brouwhulp:
-     * 0.00825 Attenuation factor yeast
+     * Original from brouwhulp:
+     * 0.00825 Attenuation factor yeast (Real to apparant ??)
      * 0.00817 Attenuation factor water/grain ratio
      * -0.00684 Attenuation factor mash temperature
-     * 0.00026 Attenuation factor total mash time  (at some places this is 0.0026 this is wrong!)
+     * 0.00026 Attenuation factor total mash time
      * -0.00356 Attenuation factor percentage crystal malt
      * 0.00553 Attenuation factor percentage simple sugars
      * 0.547 Attenuation factor constant
+     * 0.597 Attenuation factor constant when STA1 gen is true.
      */
-    double AttBeer = 0.00825 * svg + 0.00817 * BD - 0.00684 * mashtemp + 0.00026 * mashtime - 0.00356 * pcara + 0.00553 * psugar + 0.547;
+    double AttBeer = 0.00825 * svg + 0.00817 * BD - 0.00684 * mashtemp + 0.00026 * mashtime - 0.00356 * pcara + 0.00553 * psugar;
+    AttBeer += (sta1) ? 0.597:0.547;
+    qDebug() << "estimate_fg(" << psugar << pcara << wgratio << mashtime << mashtemp << svg << og << sta1 << ") AttBeer:" << AttBeer;
     return round((1 + (1 - AttBeer) * (og -1)) * 10000) / 10000;
 }
 
--- a/src/Utils.h	Sat Dec 03 16:32:24 2022 +0100
+++ b/src/Utils.h	Sun Jan 08 15:53:16 2023 +0100
@@ -27,7 +27,20 @@
     double brix_to_fg(double o_plato, double refracto);
     double calc_svg(double og, double fg);
     double estimate_sg(double sugars, double batch_size);
-    double estimate_fg(double psugar, double pcara, double wgratio, double mashtime, double mashtemp, double svg, double og);
+
+    /**
+     * @brief Predict FG using recipe data.
+     * @param psugar Percentage sugar in the wort.
+     * @param pcara Percentage cara/crystal malts in the wort.
+     * @param wgratio The water/grain ratio of the mash.
+     * @param mashtime The total mash time in minutes.
+     * @param mashtemp The average mash temperature.
+     * @param svg The SVG percentage of the primary yeast.
+     * @param og The Original Gravity of the wort.
+     * @param sta1 The STA1 gen present in the yeast flag.
+     * @return The predicted Final Gravity.
+     */
+    double estimate_fg(double psugar, double pcara, double wgratio, double mashtime, double mashtemp, double svg, double og, bool sta1);
     double kw_to_srm(int colormethod, double c);
     double kw_to_ebc(int colormethod, double c);
     double kw_to_newebc(int colormethod, double c);
--- a/translations/bmsapp_en.ts	Sat Dec 03 16:32:24 2022 +0100
+++ b/translations/bmsapp_en.ts	Sun Jan 08 15:53:16 2023 +0100
@@ -2661,6 +2661,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../ui/EditProduct.ui" line="3687"/>
+        <source>Dry yeast calculation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../ui/EditProduct.ui" line="8339"/>
         <source>Top up water:</source>
         <translation type="unfinished"></translation>
@@ -2909,11 +2914,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="3687"/>
-        <source>Dry yeast claculation.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../ui/EditProduct.ui" line="3700"/>
         <source>Low grams/hl:</source>
         <translation type="unfinished"></translation>
@@ -2983,7 +2983,7 @@
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="4137"/>
-        <location filename="../src/EditProductTab3.cpp" line="1116"/>
+        <location filename="../src/EditProductTab3.cpp" line="1119"/>
         <location filename="../src/EditProductTab5.cpp" line="719"/>
         <source>Mash</source>
         <translation type="unfinished"></translation>
@@ -4207,22 +4207,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="529"/>
+        <location filename="../src/EditProductTab3.cpp" line="532"/>
         <source>Final FG:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="532"/>
+        <location filename="../src/EditProductTab3.cpp" line="535"/>
         <source>Final ABV:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="710"/>
+        <location filename="../src/EditProductTab3.cpp" line="713"/>
         <source>Delete fermentable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="710"/>
+        <location filename="../src/EditProductTab3.cpp" line="713"/>
         <location filename="../src/EditProductTab4.cpp" line="362"/>
         <location filename="../src/EditProductTab5.cpp" line="400"/>
         <location filename="../src/EditProductTab6.cpp" line="748"/>
@@ -4232,46 +4232,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1026"/>
+        <location filename="../src/EditProductTab3.cpp" line="1029"/>
         <location filename="../src/EditProductTab5.cpp" line="644"/>
         <source>Current ingredient:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1031"/>
+        <location filename="../src/EditProductTab3.cpp" line="1034"/>
         <source>Supplier:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1036"/>
+        <location filename="../src/EditProductTab3.cpp" line="1039"/>
         <source>Amount in kg:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1041"/>
+        <location filename="../src/EditProductTab3.cpp" line="1044"/>
         <source>Percentage in batch:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1046"/>
+        <location filename="../src/EditProductTab3.cpp" line="1049"/>
         <source>Auto fill to 100%:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1051"/>
+        <location filename="../src/EditProductTab3.cpp" line="1054"/>
         <location filename="../src/EditProductTab4.cpp" line="634"/>
         <location filename="../src/EditProductTab6.cpp" line="1007"/>
         <source>Use at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1056"/>
+        <location filename="../src/EditProductTab3.cpp" line="1059"/>
         <location filename="../src/EditProductTab5.cpp" line="670"/>
         <source>Select ingredient:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1061"/>
+        <location filename="../src/EditProductTab3.cpp" line="1064"/>
         <location filename="../src/EditProductTab4.cpp" line="644"/>
         <location filename="../src/EditProductTab5.cpp" line="675"/>
         <location filename="../src/EditProductTab6.cpp" line="992"/>
@@ -4279,23 +4279,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1066"/>
+        <location filename="../src/EditProductTab3.cpp" line="1069"/>
         <source>Max in batch:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1117"/>
+        <location filename="../src/EditProductTab3.cpp" line="1120"/>
         <location filename="../src/EditProductTab5.cpp" line="720"/>
         <source>Boil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1118"/>
+        <location filename="../src/EditProductTab3.cpp" line="1121"/>
         <source>Fermentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1119"/>
+        <location filename="../src/EditProductTab3.cpp" line="1122"/>
         <source>Lagering</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4375,7 +4375,7 @@
     </message>
     <message>
         <location filename="../src/EditProductTab4.cpp" line="303"/>
-        <location filename="../src/EditProductTab11.cpp" line="66"/>
+        <location filename="../src/EditProductTab11.cpp" line="68"/>
         <source>Final IBU:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4856,22 +4856,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="64"/>
+        <location filename="../src/EditProductTab11.cpp" line="66"/>
         <source>Package ABV %:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="65"/>
+        <location filename="../src/EditProductTab11.cpp" line="67"/>
         <source>Final ABV %:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="296"/>
+        <location filename="../src/EditProductTab11.cpp" line="298"/>
         <source>Confirm package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="296"/>
+        <location filename="../src/EditProductTab11.cpp" line="298"/>
         <source>Confirm that the beer is packaged and all data is correct</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6196,7 +6196,7 @@
     </message>
     <message>
         <location filename="../ui/EditRecipe.ui" line="2419"/>
-        <location filename="../src/EditRecipeTab2.cpp" line="921"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="924"/>
         <location filename="../src/EditRecipeTab3.cpp" line="667"/>
         <location filename="../src/EditRecipeTab4.cpp" line="653"/>
         <source>Mash</source>
@@ -6732,12 +6732,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="521"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="524"/>
         <source>Delete fermentable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="521"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="524"/>
         <location filename="../src/EditRecipeTab3.cpp" line="297"/>
         <location filename="../src/EditRecipeTab4.cpp" line="344"/>
         <location filename="../src/EditRecipeTab5.cpp" line="262"/>
@@ -6747,46 +6747,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="831"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="834"/>
         <location filename="../src/EditRecipeTab4.cpp" line="578"/>
         <source>Current ingredient:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="836"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="839"/>
         <source>Supplier:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="841"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="844"/>
         <source>Amount in kg:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="846"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="849"/>
         <source>Percentage in batch:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="851"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="854"/>
         <source>Auto fill to 100%:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="856"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="859"/>
         <location filename="../src/EditRecipeTab3.cpp" line="593"/>
         <location filename="../src/EditRecipeTab5.cpp" line="498"/>
         <source>Use at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="861"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="864"/>
         <location filename="../src/EditRecipeTab4.cpp" line="604"/>
         <source>Select ingredient:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="866"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="869"/>
         <location filename="../src/EditRecipeTab3.cpp" line="608"/>
         <location filename="../src/EditRecipeTab4.cpp" line="609"/>
         <location filename="../src/EditRecipeTab5.cpp" line="483"/>
@@ -6794,35 +6794,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="871"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="874"/>
         <source>Max in batch:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="922"/>
-        <location filename="../src/EditRecipeTab3.cpp" line="669"/>
-        <location filename="../src/EditRecipeTab4.cpp" line="654"/>
-        <source>Boil</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="923"/>
-        <source>Fermentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="924"/>
-        <source>Lagering</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/EditRecipeTab2.cpp" line="925"/>
-        <location filename="../src/EditRecipeTab5.cpp" line="549"/>
-        <source>Bottle</source>
+        <location filename="../src/EditRecipeTab3.cpp" line="669"/>
+        <location filename="../src/EditRecipeTab4.cpp" line="654"/>
+        <source>Boil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditRecipeTab2.cpp" line="926"/>
+        <source>Fermentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditRecipeTab2.cpp" line="927"/>
+        <source>Lagering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditRecipeTab2.cpp" line="928"/>
+        <location filename="../src/EditRecipeTab5.cpp" line="549"/>
+        <source>Bottle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditRecipeTab2.cpp" line="929"/>
         <source>Kegs</source>
         <translation type="unfinished"></translation>
     </message>
--- a/translations/bmsapp_nl.ts	Sat Dec 03 16:32:24 2022 +0100
+++ b/translations/bmsapp_nl.ts	Sun Jan 08 15:53:16 2023 +0100
@@ -3006,9 +3006,8 @@
         <translation>Nodig miljard cellen:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="3687"/>
         <source>Dry yeast claculation.</source>
-        <translation>Droge gist berekening.</translation>
+        <translation type="vanished">Droge gist berekening.</translation>
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="3700"/>
@@ -3080,7 +3079,7 @@
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="4137"/>
-        <location filename="../src/EditProductTab3.cpp" line="1116"/>
+        <location filename="../src/EditProductTab3.cpp" line="1119"/>
         <location filename="../src/EditProductTab5.cpp" line="719"/>
         <source>Mash</source>
         <translation>Maischen</translation>
@@ -3579,7 +3578,7 @@
         <translation>Toevoeging opmerking:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="65"/>
+        <location filename="../src/EditProductTab11.cpp" line="67"/>
         <source>Final ABV %:</source>
         <translation>Finale ABV %:</translation>
     </message>
@@ -3991,7 +3990,7 @@
         <translation>Verpakken volume:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="64"/>
+        <location filename="../src/EditProductTab11.cpp" line="66"/>
         <source>Package ABV %:</source>
         <translation>Verpakken ABV %:</translation>
     </message>
@@ -4139,6 +4138,11 @@
         <translation>Schijnbare vergisting:</translation>
     </message>
     <message>
+        <location filename="../ui/EditProduct.ui" line="3687"/>
+        <source>Dry yeast calculation.</source>
+        <translation>Droge gist berekening.</translation>
+    </message>
+    <message>
         <location filename="../ui/EditProduct.ui" line="4840"/>
         <source>Acid Additions</source>
         <translation>Zuur toevoegingen</translation>
@@ -4599,12 +4603,12 @@
         <translation>Finale EBC:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="529"/>
+        <location filename="../src/EditProductTab3.cpp" line="532"/>
         <source>Final FG:</source>
         <translation>Finale FG:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="532"/>
+        <location filename="../src/EditProductTab3.cpp" line="535"/>
         <source>Final ABV:</source>
         <translation>Finale ABV:</translation>
     </message>
@@ -4621,12 +4625,12 @@
         <translation type="vanished">Finale FG:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="710"/>
+        <location filename="../src/EditProductTab3.cpp" line="713"/>
         <source>Delete fermentable</source>
         <translation>Verwijder vergistbaar ingredient</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="710"/>
+        <location filename="../src/EditProductTab3.cpp" line="713"/>
         <location filename="../src/EditProductTab4.cpp" line="362"/>
         <location filename="../src/EditProductTab5.cpp" line="400"/>
         <location filename="../src/EditProductTab6.cpp" line="748"/>
@@ -4636,46 +4640,46 @@
         <translation>Verwijder %1</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1026"/>
+        <location filename="../src/EditProductTab3.cpp" line="1029"/>
         <location filename="../src/EditProductTab5.cpp" line="644"/>
         <source>Current ingredient:</source>
         <translation>Huidig ingredient:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1031"/>
+        <location filename="../src/EditProductTab3.cpp" line="1034"/>
         <source>Supplier:</source>
         <translation>Leverancier:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1036"/>
+        <location filename="../src/EditProductTab3.cpp" line="1039"/>
         <source>Amount in kg:</source>
         <translation>Gewicht in kg:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1041"/>
+        <location filename="../src/EditProductTab3.cpp" line="1044"/>
         <source>Percentage in batch:</source>
         <translation>Percentage in stort:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1046"/>
+        <location filename="../src/EditProductTab3.cpp" line="1049"/>
         <source>Auto fill to 100%:</source>
         <translation>Aanvullen tot 100%:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1051"/>
+        <location filename="../src/EditProductTab3.cpp" line="1054"/>
         <location filename="../src/EditProductTab4.cpp" line="634"/>
         <location filename="../src/EditProductTab6.cpp" line="1007"/>
         <source>Use at:</source>
         <translation>Toevoegen bij:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1056"/>
+        <location filename="../src/EditProductTab3.cpp" line="1059"/>
         <location filename="../src/EditProductTab5.cpp" line="670"/>
         <source>Select ingredient:</source>
         <translation>Kies ingredient:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1061"/>
+        <location filename="../src/EditProductTab3.cpp" line="1064"/>
         <location filename="../src/EditProductTab4.cpp" line="644"/>
         <location filename="../src/EditProductTab5.cpp" line="675"/>
         <location filename="../src/EditProductTab6.cpp" line="992"/>
@@ -4683,23 +4687,23 @@
         <translation>In voorraad:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1066"/>
+        <location filename="../src/EditProductTab3.cpp" line="1069"/>
         <source>Max in batch:</source>
         <translation>Max. in stort:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1117"/>
+        <location filename="../src/EditProductTab3.cpp" line="1120"/>
         <location filename="../src/EditProductTab5.cpp" line="720"/>
         <source>Boil</source>
         <translation>Koken</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1118"/>
+        <location filename="../src/EditProductTab3.cpp" line="1121"/>
         <source>Fermentation</source>
         <translation>Hoofdvergisting</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1119"/>
+        <location filename="../src/EditProductTab3.cpp" line="1122"/>
         <source>Lagering</source>
         <translation>Nagisting/lagering</translation>
     </message>
@@ -4779,7 +4783,7 @@
     </message>
     <message>
         <location filename="../src/EditProductTab4.cpp" line="303"/>
-        <location filename="../src/EditProductTab11.cpp" line="66"/>
+        <location filename="../src/EditProductTab11.cpp" line="68"/>
         <source>Final IBU:</source>
         <translation>Finale IBU:</translation>
     </message>
@@ -5560,12 +5564,12 @@
         <translation type="vanished">Finale IBU:x</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="296"/>
+        <location filename="../src/EditProductTab11.cpp" line="298"/>
         <source>Confirm package</source>
         <translation>Bevestig verpakken</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="296"/>
+        <location filename="../src/EditProductTab11.cpp" line="298"/>
         <source>Confirm that the beer is packaged and all data is correct</source>
         <translation>Bevestig dat het bier verpakt is en de gegevens kloppen</translation>
     </message>
@@ -6711,7 +6715,7 @@
     </message>
     <message>
         <location filename="../ui/EditRecipe.ui" line="2419"/>
-        <location filename="../src/EditRecipeTab2.cpp" line="921"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="924"/>
         <location filename="../src/EditRecipeTab3.cpp" line="667"/>
         <location filename="../src/EditRecipeTab4.cpp" line="653"/>
         <source>Mash</source>
@@ -7355,12 +7359,12 @@
         <translation>Wijzig</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="521"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="524"/>
         <source>Delete fermentable</source>
         <translation>Verwijder vergistbaar ingredient</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="521"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="524"/>
         <location filename="../src/EditRecipeTab3.cpp" line="297"/>
         <location filename="../src/EditRecipeTab4.cpp" line="344"/>
         <location filename="../src/EditRecipeTab5.cpp" line="262"/>
@@ -7370,46 +7374,46 @@
         <translation>Verwijder %1</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="831"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="834"/>
         <location filename="../src/EditRecipeTab4.cpp" line="578"/>
         <source>Current ingredient:</source>
         <translation>Huidig ingredient:</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="836"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="839"/>
         <source>Supplier:</source>
         <translation>Leverancier:</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="841"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="844"/>
         <source>Amount in kg:</source>
         <translation>Gewicht in kg:</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="846"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="849"/>
         <source>Percentage in batch:</source>
         <translation>Percentage in stort:</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="851"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="854"/>
         <source>Auto fill to 100%:</source>
         <translation>Aanvullen tot 100%:</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="856"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="859"/>
         <location filename="../src/EditRecipeTab3.cpp" line="593"/>
         <location filename="../src/EditRecipeTab5.cpp" line="498"/>
         <source>Use at:</source>
         <translation>Toevoegen bij:</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="861"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="864"/>
         <location filename="../src/EditRecipeTab4.cpp" line="604"/>
         <source>Select ingredient:</source>
         <translation>Kies ingredient:</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="866"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="869"/>
         <location filename="../src/EditRecipeTab3.cpp" line="608"/>
         <location filename="../src/EditRecipeTab4.cpp" line="609"/>
         <location filename="../src/EditRecipeTab5.cpp" line="483"/>
@@ -7417,35 +7421,35 @@
         <translation>In voorraad:</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="871"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="874"/>
         <source>Max in batch:</source>
         <translation>Max. in stort:</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="922"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="925"/>
         <location filename="../src/EditRecipeTab3.cpp" line="669"/>
         <location filename="../src/EditRecipeTab4.cpp" line="654"/>
         <source>Boil</source>
         <translation>Koken</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="923"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="926"/>
         <source>Fermentation</source>
         <translation>Hoofdvergisting</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="924"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="927"/>
         <source>Lagering</source>
         <translation>Nagisting/lagering</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="925"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="928"/>
         <location filename="../src/EditRecipeTab5.cpp" line="549"/>
         <source>Bottle</source>
         <translation>Bottelen</translation>
     </message>
     <message>
-        <location filename="../src/EditRecipeTab2.cpp" line="926"/>
+        <location filename="../src/EditRecipeTab2.cpp" line="929"/>
         <source>Kegs</source>
         <translation>Fusten</translation>
     </message>
--- a/ui/EditProduct.ui	Sat Dec 03 16:32:24 2022 +0100
+++ b/ui/EditProduct.ui	Sun Jan 08 15:53:16 2023 +0100
@@ -3684,7 +3684,7 @@
            </font>
           </property>
           <property name="text">
-           <string>Dry yeast claculation.</string>
+           <string>Dry yeast calculation.</string>
           </property>
          </widget>
          <widget class="QLabel" name="lo_gr_hlLabel">

Mercurial Repository: bmsapp

mercurial