Mercurial > bmsapp / changeset

changeset

Make sure the package abv is final when the tertiary fermentation data is filled in.

Sat, 03 Dec 2022 16:32:24 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Sat, 03 Dec 2022 16:32:24 +0100
changeset 448
9e0da3824cf9
parent 447
9b5acb1f5776
child 449
00757c056ca6

Make sure the package abv is final when the tertiary fermentation data is filled in.

src/EditProductTab11.cpp file | annotate | diff | comparison | revisions
src/EditProductTab3.cpp 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/EditProductTab11.cpp	Sun Nov 27 15:14:21 2022 +0100
+++ b/src/EditProductTab11.cpp	Sat Dec 03 16:32:24 2022 +0100
@@ -60,10 +60,11 @@
 	return;
     }
 
-    if (product->stage > PROD_STAGE_TERTIARY) {
+    if ((product->stage >= PROD_STAGE_TERTIARY) && (product->fg >= 0.990)) {
+	/* Make sure we have the final value. */
+	product->package_abv = Utils::abvol(product->brew_fermenter_sg, product->fg);
 	ui->pack_abvLabel->setText(tr("Package ABV %:"));
 	ui->pack_finalabvLabel->setText(tr("Final ABV %:"));
-	ui->pack_finalcolorLabel->setText(tr("Final EBC:"));
 	ui->pack_finalibuLabel->setText(tr("Final IBU:"));
     } else {
 	product->package_abv = product->est_abv;
--- a/src/EditProductTab3.cpp	Sun Nov 27 15:14:21 2022 +0100
+++ b/src/EditProductTab3.cpp	Sat Dec 03 16:32:24 2022 +0100
@@ -464,6 +464,7 @@
 	ui->est_colorEdit->setValue(product->brew_fermenter_color);
 	ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(product->brew_fermenter_color));
 	ui->est_colorShow->setValue(product->brew_fermenter_color);
+	ui->pack_finalcolorLabel->setText(tr("Final EBC:"));
     } else {
 	ui->est_colorEdit->setValue(color);
 	ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(color));
@@ -520,7 +521,7 @@
 	product->est_fg = Utils::estimate_fg(psugar, pcara, mashinfuse / product->mashs_kg, mashtime, mashtemp, svg, product->est_og);
     else
 	product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og);
-//    qDebug() << "  est FG" << ui->est_fgEdit->value() << product->est_fg;
+    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/translations/bmsapp_en.ts	Sun Nov 27 15:14:21 2022 +0100
+++ b/translations/bmsapp_en.ts	Sat Dec 03 16:32:24 2022 +0100
@@ -2983,7 +2983,7 @@
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="4137"/>
-        <location filename="../src/EditProductTab3.cpp" line="1115"/>
+        <location filename="../src/EditProductTab3.cpp" line="1116"/>
         <location filename="../src/EditProductTab5.cpp" line="719"/>
         <source>Mash</source>
         <translation type="unfinished"></translation>
@@ -4202,27 +4202,27 @@
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="463"/>
-        <location filename="../src/EditProductTab11.cpp" line="66"/>
+        <location filename="../src/EditProductTab3.cpp" line="467"/>
         <source>Final EBC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="528"/>
+        <location filename="../src/EditProductTab3.cpp" line="529"/>
         <source>Final FG:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="531"/>
+        <location filename="../src/EditProductTab3.cpp" line="532"/>
         <source>Final ABV:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="709"/>
+        <location filename="../src/EditProductTab3.cpp" line="710"/>
         <source>Delete fermentable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="709"/>
+        <location filename="../src/EditProductTab3.cpp" line="710"/>
         <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="1025"/>
+        <location filename="../src/EditProductTab3.cpp" line="1026"/>
         <location filename="../src/EditProductTab5.cpp" line="644"/>
         <source>Current ingredient:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1030"/>
+        <location filename="../src/EditProductTab3.cpp" line="1031"/>
         <source>Supplier:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1035"/>
+        <location filename="../src/EditProductTab3.cpp" line="1036"/>
         <source>Amount in kg:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1040"/>
+        <location filename="../src/EditProductTab3.cpp" line="1041"/>
         <source>Percentage in batch:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1045"/>
+        <location filename="../src/EditProductTab3.cpp" line="1046"/>
         <source>Auto fill to 100%:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1050"/>
+        <location filename="../src/EditProductTab3.cpp" line="1051"/>
         <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="1055"/>
+        <location filename="../src/EditProductTab3.cpp" line="1056"/>
         <location filename="../src/EditProductTab5.cpp" line="670"/>
         <source>Select ingredient:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1060"/>
+        <location filename="../src/EditProductTab3.cpp" line="1061"/>
         <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="1065"/>
+        <location filename="../src/EditProductTab3.cpp" line="1066"/>
         <source>Max in batch:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1116"/>
-        <location filename="../src/EditProductTab5.cpp" line="720"/>
-        <source>Boil</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/EditProductTab3.cpp" line="1117"/>
-        <source>Fermentation</source>
+        <location filename="../src/EditProductTab5.cpp" line="720"/>
+        <source>Boil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="1118"/>
+        <source>Fermentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab3.cpp" line="1119"/>
         <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="67"/>
+        <location filename="../src/EditProductTab11.cpp" line="66"/>
         <source>Final IBU:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4866,12 +4866,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="297"/>
+        <location filename="../src/EditProductTab11.cpp" line="296"/>
         <source>Confirm package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="297"/>
+        <location filename="../src/EditProductTab11.cpp" line="296"/>
         <source>Confirm that the beer is packaged and all data is correct</source>
         <translation type="unfinished"></translation>
     </message>
--- a/translations/bmsapp_nl.ts	Sun Nov 27 15:14:21 2022 +0100
+++ b/translations/bmsapp_nl.ts	Sat Dec 03 16:32:24 2022 +0100
@@ -3080,7 +3080,7 @@
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="4137"/>
-        <location filename="../src/EditProductTab3.cpp" line="1115"/>
+        <location filename="../src/EditProductTab3.cpp" line="1116"/>
         <location filename="../src/EditProductTab5.cpp" line="719"/>
         <source>Mash</source>
         <translation>Maischen</translation>
@@ -4594,17 +4594,17 @@
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="463"/>
-        <location filename="../src/EditProductTab11.cpp" line="66"/>
+        <location filename="../src/EditProductTab3.cpp" line="467"/>
         <source>Final EBC:</source>
         <translation>Finale EBC:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="528"/>
+        <location filename="../src/EditProductTab3.cpp" line="529"/>
         <source>Final FG:</source>
         <translation>Finale FG:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="531"/>
+        <location filename="../src/EditProductTab3.cpp" line="532"/>
         <source>Final ABV:</source>
         <translation>Finale ABV:</translation>
     </message>
@@ -4621,12 +4621,12 @@
         <translation type="vanished">Finale FG:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="709"/>
+        <location filename="../src/EditProductTab3.cpp" line="710"/>
         <source>Delete fermentable</source>
         <translation>Verwijder vergistbaar ingredient</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="709"/>
+        <location filename="../src/EditProductTab3.cpp" line="710"/>
         <location filename="../src/EditProductTab4.cpp" line="362"/>
         <location filename="../src/EditProductTab5.cpp" line="400"/>
         <location filename="../src/EditProductTab6.cpp" line="748"/>
@@ -4636,46 +4636,46 @@
         <translation>Verwijder %1</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1025"/>
+        <location filename="../src/EditProductTab3.cpp" line="1026"/>
         <location filename="../src/EditProductTab5.cpp" line="644"/>
         <source>Current ingredient:</source>
         <translation>Huidig ingredient:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1030"/>
+        <location filename="../src/EditProductTab3.cpp" line="1031"/>
         <source>Supplier:</source>
         <translation>Leverancier:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1035"/>
+        <location filename="../src/EditProductTab3.cpp" line="1036"/>
         <source>Amount in kg:</source>
         <translation>Gewicht in kg:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1040"/>
+        <location filename="../src/EditProductTab3.cpp" line="1041"/>
         <source>Percentage in batch:</source>
         <translation>Percentage in stort:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1045"/>
+        <location filename="../src/EditProductTab3.cpp" line="1046"/>
         <source>Auto fill to 100%:</source>
         <translation>Aanvullen tot 100%:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1050"/>
+        <location filename="../src/EditProductTab3.cpp" line="1051"/>
         <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="1055"/>
+        <location filename="../src/EditProductTab3.cpp" line="1056"/>
         <location filename="../src/EditProductTab5.cpp" line="670"/>
         <source>Select ingredient:</source>
         <translation>Kies ingredient:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1060"/>
+        <location filename="../src/EditProductTab3.cpp" line="1061"/>
         <location filename="../src/EditProductTab4.cpp" line="644"/>
         <location filename="../src/EditProductTab5.cpp" line="675"/>
         <location filename="../src/EditProductTab6.cpp" line="992"/>
@@ -4683,23 +4683,23 @@
         <translation>In voorraad:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1065"/>
+        <location filename="../src/EditProductTab3.cpp" line="1066"/>
         <source>Max in batch:</source>
         <translation>Max. in stort:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1116"/>
+        <location filename="../src/EditProductTab3.cpp" line="1117"/>
         <location filename="../src/EditProductTab5.cpp" line="720"/>
         <source>Boil</source>
         <translation>Koken</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1117"/>
+        <location filename="../src/EditProductTab3.cpp" line="1118"/>
         <source>Fermentation</source>
         <translation>Hoofdvergisting</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1118"/>
+        <location filename="../src/EditProductTab3.cpp" line="1119"/>
         <source>Lagering</source>
         <translation>Nagisting/lagering</translation>
     </message>
@@ -4779,7 +4779,7 @@
     </message>
     <message>
         <location filename="../src/EditProductTab4.cpp" line="303"/>
-        <location filename="../src/EditProductTab11.cpp" line="67"/>
+        <location filename="../src/EditProductTab11.cpp" line="66"/>
         <source>Final IBU:</source>
         <translation>Finale IBU:</translation>
     </message>
@@ -5548,12 +5548,24 @@
         <translation type="vanished">Batterij volt</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="297"/>
+        <source>Final ABV %:x</source>
+        <translation type="vanished">Finale ABV %:x</translation>
+    </message>
+    <message>
+        <source>Final EBC:x</source>
+        <translation type="vanished">Finale EBC:x</translation>
+    </message>
+    <message>
+        <source>Final IBU:x</source>
+        <translation type="vanished">Finale IBU:x</translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab11.cpp" line="296"/>
         <source>Confirm package</source>
         <translation>Bevestig verpakken</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="297"/>
+        <location filename="../src/EditProductTab11.cpp" line="296"/>
         <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>
--- a/ui/EditProduct.ui	Sun Nov 27 15:14:21 2022 +0100
+++ b/ui/EditProduct.ui	Sat Dec 03 16:32:24 2022 +0100
@@ -10606,9 +10606,9 @@
         <widget class="QLabel" name="pack_abvLabel">
          <property name="geometry">
           <rect>
-           <x>340</x>
+           <x>320</x>
            <y>20</y>
-           <width>171</width>
+           <width>191</width>
            <height>20</height>
           </rect>
          </property>

Mercurial Repository: bmsapp

mercurial