Mercurial > bmsapp / changeset

changeset

Added show package color and ibu and take dillution in account

Sun, 27 Nov 2022 15:14:21 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Sun, 27 Nov 2022 15:14:21 +0100
changeset 447
9b5acb1f5776
parent 446
f12becbdd042
child 448
9e0da3824cf9

Added show package color and ibu and take dillution in account

src/EditProductTab11.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	Sat Nov 26 15:41:11 2022 +0100
+++ b/src/EditProductTab11.cpp	Sun Nov 27 15:14:21 2022 +0100
@@ -60,6 +60,15 @@
 	return;
     }
 
+    if (product->stage > PROD_STAGE_TERTIARY) {
+	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;
+    }
+
     double bvol = product->package_volume - (product->package_abv * product->package_volume) / 100.0;
     double balc = product->package_volume - bvol;
     double mvol = product->package_infuse_amount - (product->package_infuse_abv * product->package_infuse_amount) / 100.0;
@@ -68,8 +77,16 @@
     double tvol = bvol + mvol;
 
     product->final_abv = round(talc / (tvol + talc) * 10000.0) / 100.0;
+    ui->pack_abvShow->setValue(product->package_abv);
     ui->pack_finalabvShow->setValue(product->final_abv);
 
+    double pack_color = product->brew_fermenter_color * (product->package_volume / (product->package_volume + product->package_infuse_amount));
+    double pack_ibu = product->brew_fermenter_ibu * (product->package_volume / (product->package_volume + product->package_infuse_amount));
+
+    ui->pack_finalcolorShow->setValue(pack_color);
+    ui->pack_finalcolorShow->setStyleSheet(Utils::ebc_to_style(pack_color));
+    ui->pack_finalibuShow->setValue(pack_ibu);
+
     TSec = product->secondary_temp;
     if (TSec < 1)
 	TSec = product->primary_end_temp;
@@ -346,14 +363,14 @@
     const QSignalBlocker blocker1(ui->keg_volumeEdit);
     if (product->keg_amount < 0)
 	product->keg_amount = 0;	/* Failsafe - bugfix */
-    if (val > product->package_volume) {
-	val = product->package_volume;
+    if (val > (product->package_volume + product->package_infuse_amount)) {
+	val = product->package_volume + product->package_infuse_amount;
 	const QSignalBlocker blocker2(ui->bottle_volumeEdit);
 	ui->bottle_volumeEdit->setValue(val);
     }
 
-    if ((val + product->keg_amount) > product->package_volume) {
-        double kegs = product->package_volume - val;
+    if ((val + product->keg_amount) > (product->package_volume + product->package_infuse_amount)) {
+        double kegs = product->package_volume + product->package_infuse_amount - val;
         product->keg_amount = kegs;
         ui->keg_volumeEdit->setValue(kegs);
     }
@@ -454,14 +471,14 @@
     const QSignalBlocker blocker1(ui->bottle_volumeEdit);
     if (product->bottle_amount < 0)
         product->bottle_amount = 0;        /* Failsafe - bugfix */
-    if (val > product->package_volume) {
-        val = product->package_volume;
+    if (val > (product->package_volume + product->package_infuse_amount)) {
+        val = product->package_volume + product->package_infuse_amount;
 	const QSignalBlocker blocker2(ui->keg_volumeEdit);
 	ui->keg_volumeEdit->setValue(val);
     }
 
-    if ((val + product->bottle_amount) > product->package_volume) {
-	double bottle = product->package_volume - val;
+    if ((val + product->bottle_amount) > (product->package_volume + product->package_infuse_amount)) {
+	double bottle = product->package_volume + product->package_infuse_amount - val;
 	product->bottle_amount = bottle;
 	ui->bottle_volumeEdit->setValue(bottle);
     }
--- a/translations/bmsapp_en.ts	Sat Nov 26 15:41:11 2022 +0100
+++ b/translations/bmsapp_en.ts	Sun Nov 27 15:14:21 2022 +0100
@@ -2371,10 +2371,10 @@
         <location filename="../ui/EditProduct.ui" line="10522"/>
         <location filename="../ui/EditProduct.ui" line="10556"/>
         <location filename="../ui/EditProduct.ui" line="10644"/>
-        <location filename="../ui/EditProduct.ui" line="10822"/>
-        <location filename="../ui/EditProduct.ui" line="11007"/>
-        <location filename="../ui/EditProduct.ui" line="11235"/>
-        <location filename="../ui/EditProduct.ui" line="11398"/>
+        <location filename="../ui/EditProduct.ui" line="10922"/>
+        <location filename="../ui/EditProduct.ui" line="11107"/>
+        <location filename="../ui/EditProduct.ui" line="11335"/>
+        <location filename="../ui/EditProduct.ui" line="11498"/>
         <source> %</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2426,10 +2426,10 @@
         <location filename="../ui/EditProduct.ui" line="8935"/>
         <location filename="../ui/EditProduct.ui" line="10457"/>
         <location filename="../ui/EditProduct.ui" line="10488"/>
-        <location filename="../ui/EditProduct.ui" line="10794"/>
-        <location filename="../ui/EditProduct.ui" line="10916"/>
-        <location filename="../ui/EditProduct.ui" line="11276"/>
-        <location filename="../ui/EditProduct.ui" line="11357"/>
+        <location filename="../ui/EditProduct.ui" line="10894"/>
+        <location filename="../ui/EditProduct.ui" line="11016"/>
+        <location filename="../ui/EditProduct.ui" line="11376"/>
+        <location filename="../ui/EditProduct.ui" line="11457"/>
         <location filename="../src/EditProductExport.cpp" line="838"/>
         <location filename="../src/EditProductExport.cpp" line="846"/>
         <source> L</source>
@@ -2869,9 +2869,9 @@
     <message>
         <location filename="../ui/EditProduct.ui" line="3589"/>
         <location filename="../ui/EditProduct.ui" line="10233"/>
-        <location filename="../ui/EditProduct.ui" line="11494"/>
-        <location filename="../ui/EditProduct.ui" line="11571"/>
-        <location filename="../ui/EditProduct.ui" line="11880"/>
+        <location filename="../ui/EditProduct.ui" line="11594"/>
+        <location filename="../ui/EditProduct.ui" line="11671"/>
+        <location filename="../ui/EditProduct.ui" line="11980"/>
         <source>Set or clear date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2896,10 +2896,10 @@
         <location filename="../ui/EditProduct.ui" line="10175"/>
         <location filename="../ui/EditProduct.ui" line="10195"/>
         <location filename="../ui/EditProduct.ui" line="10236"/>
-        <location filename="../ui/EditProduct.ui" line="11497"/>
-        <location filename="../ui/EditProduct.ui" line="11517"/>
-        <location filename="../ui/EditProduct.ui" line="11574"/>
-        <location filename="../ui/EditProduct.ui" line="11883"/>
+        <location filename="../ui/EditProduct.ui" line="11597"/>
+        <location filename="../ui/EditProduct.ui" line="11617"/>
+        <location filename="../ui/EditProduct.ui" line="11674"/>
+        <location filename="../ui/EditProduct.ui" line="11983"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2971,8 +2971,8 @@
         <location filename="../ui/EditProduct.ui" line="9157"/>
         <location filename="../ui/EditProduct.ui" line="9628"/>
         <location filename="../ui/EditProduct.ui" line="9862"/>
-        <location filename="../ui/EditProduct.ui" line="11478"/>
-        <location filename="../ui/EditProduct.ui" line="11864"/>
+        <location filename="../ui/EditProduct.ui" line="11578"/>
+        <location filename="../ui/EditProduct.ui" line="11964"/>
         <source>dd-MM-yyyy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3112,8 +3112,8 @@
         <location filename="../ui/EditProduct.ui" line="4754"/>
         <location filename="../ui/EditProduct.ui" line="4786"/>
         <location filename="../ui/EditProduct.ui" line="4817"/>
-        <location filename="../ui/EditProduct.ui" line="10863"/>
-        <location filename="../ui/EditProduct.ui" line="11207"/>
+        <location filename="../ui/EditProduct.ui" line="10963"/>
+        <location filename="../ui/EditProduct.ui" line="11307"/>
         <source> gr</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3451,8 +3451,8 @@
         <location filename="../ui/EditProduct.ui" line="9497"/>
         <location filename="../ui/EditProduct.ui" line="9731"/>
         <location filename="../ui/EditProduct.ui" line="9949"/>
-        <location filename="../ui/EditProduct.ui" line="10976"/>
-        <location filename="../ui/EditProduct.ui" line="11426"/>
+        <location filename="../ui/EditProduct.ui" line="11076"/>
+        <location filename="../ui/EditProduct.ui" line="11526"/>
         <source> °C</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3566,7 +3566,7 @@
         <location filename="../ui/EditProduct.ui" line="8682"/>
         <location filename="../ui/EditProduct.ui" line="10172"/>
         <location filename="../ui/EditProduct.ui" line="10192"/>
-        <location filename="../ui/EditProduct.ui" line="11514"/>
+        <location filename="../ui/EditProduct.ui" line="11614"/>
         <source>Brew log chart</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3814,7 +3814,17 @@
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="10403"/>
-        <source>Final ABV %:</source>
+        <source>Estimated final ABV %:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="10697"/>
+        <source>Estimated final IBU:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="10713"/>
+        <source>Estimated final EBC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3850,173 +3860,173 @@
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="10616"/>
-        <source>Package ABV %:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditProduct.ui" line="10664"/>
+        <source>Estimated package ABV %:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="10764"/>
         <source>Bottles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10676"/>
-        <location filename="../ui/EditProduct.ui" line="11254"/>
+        <location filename="../ui/EditProduct.ui" line="10776"/>
+        <location filename="../ui/EditProduct.ui" line="11354"/>
         <source>Volume:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10692"/>
-        <location filename="../ui/EditProduct.ui" line="11112"/>
+        <location filename="../ui/EditProduct.ui" line="10792"/>
+        <location filename="../ui/EditProduct.ui" line="11212"/>
         <source>Desired volume CO2:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10708"/>
-        <location filename="../ui/EditProduct.ui" line="11179"/>
+        <location filename="../ui/EditProduct.ui" line="10808"/>
+        <location filename="../ui/EditProduct.ui" line="11279"/>
         <source>Priming sugar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10724"/>
-        <location filename="../ui/EditProduct.ui" line="11096"/>
+        <location filename="../ui/EditProduct.ui" line="10824"/>
+        <location filename="../ui/EditProduct.ui" line="11196"/>
         <source>Sugar amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10740"/>
-        <location filename="../ui/EditProduct.ui" line="11144"/>
+        <location filename="../ui/EditProduct.ui" line="10840"/>
+        <location filename="../ui/EditProduct.ui" line="11244"/>
         <source>Priming:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10756"/>
-        <location filename="../ui/EditProduct.ui" line="11128"/>
+        <location filename="../ui/EditProduct.ui" line="10856"/>
+        <location filename="../ui/EditProduct.ui" line="11228"/>
         <source>Water amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10772"/>
+        <location filename="../ui/EditProduct.ui" line="10872"/>
         <source>Bottle fermentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10891"/>
-        <location filename="../ui/EditProduct.ui" line="11307"/>
+        <location filename="../ui/EditProduct.ui" line="10991"/>
+        <location filename="../ui/EditProduct.ui" line="11407"/>
         <source> gr/L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10938"/>
+        <location filename="../ui/EditProduct.ui" line="11038"/>
         <source>Expected pressure in bar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10954"/>
+        <location filename="../ui/EditProduct.ui" line="11054"/>
         <source>Bottles ABV %:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11052"/>
+        <location filename="../ui/EditProduct.ui" line="11152"/>
         <source>Kegs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11064"/>
+        <location filename="../ui/EditProduct.ui" line="11164"/>
         <source>Kegs ABV %:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11080"/>
+        <location filename="../ui/EditProduct.ui" line="11180"/>
         <source>Kegs pressure in bar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11160"/>
+        <location filename="../ui/EditProduct.ui" line="11260"/>
         <source>Kegs temperature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11448"/>
+        <location filename="../ui/EditProduct.ui" line="11548"/>
         <source>Forced carbonation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11475"/>
+        <location filename="../ui/EditProduct.ui" line="11575"/>
         <source>Edit the package date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11534"/>
+        <location filename="../ui/EditProduct.ui" line="11634"/>
         <source>Show carbonation log:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11543"/>
+        <location filename="../ui/EditProduct.ui" line="11643"/>
         <source>Tasting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11555"/>
+        <location filename="../ui/EditProduct.ui" line="11655"/>
         <source>Taste date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11591"/>
+        <location filename="../ui/EditProduct.ui" line="11691"/>
         <source>Taste rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11632"/>
+        <location filename="../ui/EditProduct.ui" line="11732"/>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11648"/>
-        <source>Transparency:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditProduct.ui" line="11664"/>
-        <source>Head:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditProduct.ui" line="11719"/>
-        <source>Aroma:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../ui/EditProduct.ui" line="11748"/>
+        <source>Transparency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="11764"/>
+        <source>Head:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="11819"/>
+        <source>Aroma:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="11848"/>
         <source>Taste:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11777"/>
+        <location filename="../ui/EditProduct.ui" line="11877"/>
         <source>Aftertaste:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11806"/>
+        <location filename="../ui/EditProduct.ui" line="11906"/>
         <source>Mouthfeel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11835"/>
+        <location filename="../ui/EditProduct.ui" line="11935"/>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11861"/>
+        <location filename="../ui/EditProduct.ui" line="11961"/>
         <source>Edit the tasting date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11902"/>
+        <location filename="../ui/EditProduct.ui" line="12002"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11919"/>
+        <location filename="../ui/EditProduct.ui" line="12019"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4192,6 +4202,7 @@
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="463"/>
+        <location filename="../src/EditProductTab11.cpp" line="66"/>
         <source>Final EBC:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4364,6 +4375,7 @@
     </message>
     <message>
         <location filename="../src/EditProductTab4.cpp" line="303"/>
+        <location filename="../src/EditProductTab11.cpp" line="67"/>
         <source>Final IBU:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4844,12 +4856,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="280"/>
+        <location filename="../src/EditProductTab11.cpp" line="64"/>
+        <source>Package ABV %:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab11.cpp" line="65"/>
+        <source>Final ABV %:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab11.cpp" line="297"/>
         <source>Confirm package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="280"/>
+        <location filename="../src/EditProductTab11.cpp" line="297"/>
         <source>Confirm that the beer is packaged and all data is correct</source>
         <translation type="unfinished"></translation>
     </message>
--- a/translations/bmsapp_nl.ts	Sat Nov 26 15:41:11 2022 +0100
+++ b/translations/bmsapp_nl.ts	Sun Nov 27 15:14:21 2022 +0100
@@ -2579,10 +2579,10 @@
         <location filename="../ui/EditProduct.ui" line="10522"/>
         <location filename="../ui/EditProduct.ui" line="10556"/>
         <location filename="../ui/EditProduct.ui" line="10644"/>
-        <location filename="../ui/EditProduct.ui" line="10822"/>
-        <location filename="../ui/EditProduct.ui" line="11007"/>
-        <location filename="../ui/EditProduct.ui" line="11235"/>
-        <location filename="../ui/EditProduct.ui" line="11398"/>
+        <location filename="../ui/EditProduct.ui" line="10922"/>
+        <location filename="../ui/EditProduct.ui" line="11107"/>
+        <location filename="../ui/EditProduct.ui" line="11335"/>
+        <location filename="../ui/EditProduct.ui" line="11498"/>
         <source> %</source>
         <translation> %</translation>
     </message>
@@ -2634,10 +2634,10 @@
         <location filename="../ui/EditProduct.ui" line="8935"/>
         <location filename="../ui/EditProduct.ui" line="10457"/>
         <location filename="../ui/EditProduct.ui" line="10488"/>
-        <location filename="../ui/EditProduct.ui" line="10794"/>
-        <location filename="../ui/EditProduct.ui" line="10916"/>
-        <location filename="../ui/EditProduct.ui" line="11276"/>
-        <location filename="../ui/EditProduct.ui" line="11357"/>
+        <location filename="../ui/EditProduct.ui" line="10894"/>
+        <location filename="../ui/EditProduct.ui" line="11016"/>
+        <location filename="../ui/EditProduct.ui" line="11376"/>
+        <location filename="../ui/EditProduct.ui" line="11457"/>
         <location filename="../src/EditProductExport.cpp" line="838"/>
         <location filename="../src/EditProductExport.cpp" line="846"/>
         <source> L</source>
@@ -2966,9 +2966,9 @@
     <message>
         <location filename="../ui/EditProduct.ui" line="3589"/>
         <location filename="../ui/EditProduct.ui" line="10233"/>
-        <location filename="../ui/EditProduct.ui" line="11494"/>
-        <location filename="../ui/EditProduct.ui" line="11571"/>
-        <location filename="../ui/EditProduct.ui" line="11880"/>
+        <location filename="../ui/EditProduct.ui" line="11594"/>
+        <location filename="../ui/EditProduct.ui" line="11671"/>
+        <location filename="../ui/EditProduct.ui" line="11980"/>
         <source>Set or clear date</source>
         <translation>Zet of wis datum</translation>
     </message>
@@ -2993,10 +2993,10 @@
         <location filename="../ui/EditProduct.ui" line="10175"/>
         <location filename="../ui/EditProduct.ui" line="10195"/>
         <location filename="../ui/EditProduct.ui" line="10236"/>
-        <location filename="../ui/EditProduct.ui" line="11497"/>
-        <location filename="../ui/EditProduct.ui" line="11517"/>
-        <location filename="../ui/EditProduct.ui" line="11574"/>
-        <location filename="../ui/EditProduct.ui" line="11883"/>
+        <location filename="../ui/EditProduct.ui" line="11597"/>
+        <location filename="../ui/EditProduct.ui" line="11617"/>
+        <location filename="../ui/EditProduct.ui" line="11674"/>
+        <location filename="../ui/EditProduct.ui" line="11983"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -3068,8 +3068,8 @@
         <location filename="../ui/EditProduct.ui" line="9157"/>
         <location filename="../ui/EditProduct.ui" line="9628"/>
         <location filename="../ui/EditProduct.ui" line="9862"/>
-        <location filename="../ui/EditProduct.ui" line="11478"/>
-        <location filename="../ui/EditProduct.ui" line="11864"/>
+        <location filename="../ui/EditProduct.ui" line="11578"/>
+        <location filename="../ui/EditProduct.ui" line="11964"/>
         <source>dd-MM-yyyy</source>
         <translation>dd-MM-yyyy</translation>
     </message>
@@ -3376,8 +3376,8 @@
         <location filename="../ui/EditProduct.ui" line="4754"/>
         <location filename="../ui/EditProduct.ui" line="4786"/>
         <location filename="../ui/EditProduct.ui" line="4817"/>
-        <location filename="../ui/EditProduct.ui" line="10863"/>
-        <location filename="../ui/EditProduct.ui" line="11207"/>
+        <location filename="../ui/EditProduct.ui" line="10963"/>
+        <location filename="../ui/EditProduct.ui" line="11307"/>
         <source> gr</source>
         <translation> gr</translation>
     </message>
@@ -3579,7 +3579,7 @@
         <translation>Toevoeging opmerking:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10403"/>
+        <location filename="../src/EditProductTab11.cpp" line="65"/>
         <source>Final ABV %:</source>
         <translation>Finale ABV %:</translation>
     </message>
@@ -3589,30 +3589,40 @@
         <translation>Toevoeging extra ABV %:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10676"/>
-        <location filename="../ui/EditProduct.ui" line="11254"/>
+        <location filename="../ui/EditProduct.ui" line="10697"/>
+        <source>Estimated final IBU:</source>
+        <translation>Verwacht finale IBU:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="10713"/>
+        <source>Estimated final EBC:</source>
+        <translation>Verwacht finale EBC:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="10776"/>
+        <location filename="../ui/EditProduct.ui" line="11354"/>
         <source>Volume:</source>
         <translation>Volume:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10740"/>
-        <location filename="../ui/EditProduct.ui" line="11144"/>
+        <location filename="../ui/EditProduct.ui" line="10840"/>
+        <location filename="../ui/EditProduct.ui" line="11244"/>
         <source>Priming:</source>
         <translation>Carbonatie:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10772"/>
+        <location filename="../ui/EditProduct.ui" line="10872"/>
         <source>Bottle fermentation:</source>
         <translation>Flessen hergisting:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10891"/>
-        <location filename="../ui/EditProduct.ui" line="11307"/>
+        <location filename="../ui/EditProduct.ui" line="10991"/>
+        <location filename="../ui/EditProduct.ui" line="11407"/>
         <source> gr/L</source>
         <translation> gr/L</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11160"/>
+        <location filename="../ui/EditProduct.ui" line="11260"/>
         <source>Kegs temperature:</source>
         <translation>Fusten temperatuur:</translation>
     </message>
@@ -3722,8 +3732,8 @@
         <location filename="../ui/EditProduct.ui" line="9497"/>
         <location filename="../ui/EditProduct.ui" line="9731"/>
         <location filename="../ui/EditProduct.ui" line="9949"/>
-        <location filename="../ui/EditProduct.ui" line="10976"/>
-        <location filename="../ui/EditProduct.ui" line="11426"/>
+        <location filename="../ui/EditProduct.ui" line="11076"/>
+        <location filename="../ui/EditProduct.ui" line="11526"/>
         <source> °C</source>
         <translation> °C</translation>
     </message>
@@ -3814,7 +3824,7 @@
         <location filename="../ui/EditProduct.ui" line="8682"/>
         <location filename="../ui/EditProduct.ui" line="10172"/>
         <location filename="../ui/EditProduct.ui" line="10192"/>
-        <location filename="../ui/EditProduct.ui" line="11514"/>
+        <location filename="../ui/EditProduct.ui" line="11614"/>
         <source>Brew log chart</source>
         <translation>Brouw log grafiek</translation>
     </message>
@@ -3981,7 +3991,7 @@
         <translation>Verpakken volume:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10616"/>
+        <location filename="../src/EditProductTab11.cpp" line="64"/>
         <source>Package ABV %:</source>
         <translation>Verpakken ABV %:</translation>
     </message>
@@ -4191,6 +4201,11 @@
         <translation>Behandeld spoelwater</translation>
     </message>
     <message>
+        <location filename="../ui/EditProduct.ui" line="10403"/>
+        <source>Estimated final ABV %:</source>
+        <translation>Verwacht finale ABV %:</translation>
+    </message>
+    <message>
         <location filename="../ui/EditProduct.ui" line="10479"/>
         <source>Extra dilution or infusion added to this batch.</source>
         <translation>Toegevoegde verdunning of infusie aan deze batch.</translation>
@@ -4212,141 +4227,146 @@
         <translation>Hier kun je de toevoeging beschrijven.</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10664"/>
+        <location filename="../ui/EditProduct.ui" line="10616"/>
+        <source>Estimated package ABV %:</source>
+        <translation>Verwacht verpakken ABV %:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="10764"/>
         <source>Bottles</source>
         <translation>Flessen</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10692"/>
-        <location filename="../ui/EditProduct.ui" line="11112"/>
+        <location filename="../ui/EditProduct.ui" line="10792"/>
+        <location filename="../ui/EditProduct.ui" line="11212"/>
         <source>Desired volume CO2:</source>
         <translation>Gewenst volume CO2:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10708"/>
-        <location filename="../ui/EditProduct.ui" line="11179"/>
+        <location filename="../ui/EditProduct.ui" line="10808"/>
+        <location filename="../ui/EditProduct.ui" line="11279"/>
         <source>Priming sugar:</source>
         <translation>Carbonatie suiker:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10724"/>
-        <location filename="../ui/EditProduct.ui" line="11096"/>
+        <location filename="../ui/EditProduct.ui" line="10824"/>
+        <location filename="../ui/EditProduct.ui" line="11196"/>
         <source>Sugar amount:</source>
         <translation>Suiker gewicht:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10756"/>
-        <location filename="../ui/EditProduct.ui" line="11128"/>
+        <location filename="../ui/EditProduct.ui" line="10856"/>
+        <location filename="../ui/EditProduct.ui" line="11228"/>
         <source>Water amount:</source>
         <translation>Water volume:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10938"/>
+        <location filename="../ui/EditProduct.ui" line="11038"/>
         <source>Expected pressure in bar:</source>
         <translation>Verwachte druk in bar:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="10954"/>
+        <location filename="../ui/EditProduct.ui" line="11054"/>
         <source>Bottles ABV %:</source>
         <translation>Flessen ABV %:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11052"/>
+        <location filename="../ui/EditProduct.ui" line="11152"/>
         <source>Kegs</source>
         <translation>Fusten</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11064"/>
+        <location filename="../ui/EditProduct.ui" line="11164"/>
         <source>Kegs ABV %:</source>
         <translation>Fusten ABV %:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11080"/>
+        <location filename="../ui/EditProduct.ui" line="11180"/>
         <source>Kegs pressure in bar:</source>
         <translation>Fusten druk in bar:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11448"/>
+        <location filename="../ui/EditProduct.ui" line="11548"/>
         <source>Forced carbonation:</source>
         <translation>Geforceerde carbonatie:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11475"/>
+        <location filename="../ui/EditProduct.ui" line="11575"/>
         <source>Edit the package date.</source>
         <translation>Wijzig de verpakkings datum.</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11534"/>
+        <location filename="../ui/EditProduct.ui" line="11634"/>
         <source>Show carbonation log:</source>
         <translation>Toon carbonatie log:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11543"/>
+        <location filename="../ui/EditProduct.ui" line="11643"/>
         <source>Tasting</source>
         <translation>Proeven</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11555"/>
+        <location filename="../ui/EditProduct.ui" line="11655"/>
         <source>Taste date:</source>
         <translation>Proeven datum:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11591"/>
+        <location filename="../ui/EditProduct.ui" line="11691"/>
         <source>Taste rate:</source>
         <translation>Beoordeling cijfer:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11632"/>
+        <location filename="../ui/EditProduct.ui" line="11732"/>
         <source>Color:</source>
         <translation>Kleur:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11648"/>
-        <source>Transparency:</source>
-        <translation>Helderheid:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditProduct.ui" line="11664"/>
-        <source>Head:</source>
-        <translation>Schuim:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditProduct.ui" line="11719"/>
-        <source>Aroma:</source>
-        <translation>Geur:</translation>
-    </message>
-    <message>
         <location filename="../ui/EditProduct.ui" line="11748"/>
+        <source>Transparency:</source>
+        <translation>Helderheid:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="11764"/>
+        <source>Head:</source>
+        <translation>Schuim:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="11819"/>
+        <source>Aroma:</source>
+        <translation>Geur:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditProduct.ui" line="11848"/>
         <source>Taste:</source>
         <translation>Smaak:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11777"/>
+        <location filename="../ui/EditProduct.ui" line="11877"/>
         <source>Aftertaste:</source>
         <translation>Nasmaak:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11806"/>
+        <location filename="../ui/EditProduct.ui" line="11906"/>
         <source>Mouthfeel:</source>
         <translation>Mondgevoel:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11835"/>
+        <location filename="../ui/EditProduct.ui" line="11935"/>
         <source>Notes:</source>
         <translation>Opmerkingen:</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11861"/>
+        <location filename="../ui/EditProduct.ui" line="11961"/>
         <source>Edit the tasting date.</source>
         <translation>Wijzig de datum van proeven.</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11902"/>
+        <location filename="../ui/EditProduct.ui" line="12002"/>
         <source>Export</source>
         <translation>Exporteer</translation>
     </message>
     <message>
-        <location filename="../ui/EditProduct.ui" line="11919"/>
+        <location filename="../ui/EditProduct.ui" line="12019"/>
         <source>Print</source>
         <translation>Print</translation>
     </message>
@@ -4574,6 +4594,7 @@
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="463"/>
+        <location filename="../src/EditProductTab11.cpp" line="66"/>
         <source>Final EBC:</source>
         <translation>Finale EBC:</translation>
     </message>
@@ -4758,6 +4779,7 @@
     </message>
     <message>
         <location filename="../src/EditProductTab4.cpp" line="303"/>
+        <location filename="../src/EditProductTab11.cpp" line="67"/>
         <source>Final IBU:</source>
         <translation>Finale IBU:</translation>
     </message>
@@ -5526,12 +5548,12 @@
         <translation type="vanished">Batterij volt</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="280"/>
+        <location filename="../src/EditProductTab11.cpp" line="297"/>
         <source>Confirm package</source>
         <translation>Bevestig verpakken</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab11.cpp" line="280"/>
+        <location filename="../src/EditProductTab11.cpp" line="297"/>
         <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	Sat Nov 26 15:41:11 2022 +0100
+++ b/ui/EditProduct.ui	Sun Nov 27 15:14:21 2022 +0100
@@ -10361,9 +10361,9 @@
         <widget class="QLabel" name="pack_addvolLabel">
          <property name="geometry">
           <rect>
-           <x>10</x>
-           <y>50</y>
-           <width>151</width>
+           <x>340</x>
+           <y>80</y>
+           <width>171</width>
            <height>20</height>
           </rect>
          </property>
@@ -10393,14 +10393,14 @@
         <widget class="QLabel" name="pack_finalabvLabel">
          <property name="geometry">
           <rect>
-           <x>560</x>
-           <y>80</y>
-           <width>161</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Final ABV %:</string>
+           <x>690</x>
+           <y>20</y>
+           <width>171</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Estimated final ABV %:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -10409,9 +10409,9 @@
         <widget class="QLabel" name="pack_addabvLabel">
          <property name="geometry">
           <rect>
-           <x>560</x>
+           <x>340</x>
            <y>50</y>
-           <width>161</width>
+           <width>171</width>
            <height>20</height>
           </rect>
          </property>
@@ -10425,9 +10425,9 @@
         <widget class="QLabel" name="pack_phLabel">
          <property name="geometry">
           <rect>
-           <x>270</x>
-           <y>20</y>
-           <width>161</width>
+           <x>10</x>
+           <y>50</y>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
@@ -10469,8 +10469,8 @@
         <widget class="QDoubleSpinBox" name="pack_addvolEdit">
          <property name="geometry">
           <rect>
-           <x>170</x>
-           <y>50</y>
+           <x>520</x>
+           <y>80</y>
            <width>91</width>
            <height>24</height>
           </rect>
@@ -10500,8 +10500,8 @@
         <widget class="QDoubleSpinBox" name="pack_finalabvShow">
          <property name="geometry">
           <rect>
-           <x>730</x>
-           <y>80</y>
+           <x>870</x>
+           <y>20</y>
            <width>91</width>
            <height>24</height>
           </rect>
@@ -10531,7 +10531,7 @@
         <widget class="QDoubleSpinBox" name="pack_addabvEdit">
          <property name="geometry">
           <rect>
-           <x>730</x>
+           <x>520</x>
            <y>50</y>
            <width>91</width>
            <height>24</height>
@@ -10568,8 +10568,8 @@
         <widget class="QDoubleSpinBox" name="pack_phEdit">
          <property name="geometry">
           <rect>
-           <x>440</x>
-           <y>20</y>
+           <x>170</x>
+           <y>50</y>
            <width>91</width>
            <height>24</height>
           </rect>
@@ -10606,14 +10606,14 @@
         <widget class="QLabel" name="pack_abvLabel">
          <property name="geometry">
           <rect>
-           <x>560</x>
+           <x>340</x>
            <y>20</y>
-           <width>161</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Package ABV %:</string>
+           <width>171</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Estimated package ABV %:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -10622,7 +10622,7 @@
         <widget class="QDoubleSpinBox" name="pack_abvShow">
          <property name="geometry">
           <rect>
-           <x>730</x>
+           <x>520</x>
            <y>20</y>
            <width>91</width>
            <height>24</height>
@@ -10650,6 +10650,106 @@
           <double>100.000000000000000</double>
          </property>
         </widget>
+        <widget class="QDoubleSpinBox" name="pack_finalibuShow">
+         <property name="geometry">
+          <rect>
+           <x>870</x>
+           <y>80</y>
+           <width>91</width>
+           <height>24</height>
+          </rect>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+         <property name="buttonSymbols">
+          <enum>QAbstractSpinBox::NoButtons</enum>
+         </property>
+         <property name="accelerated">
+          <bool>false</bool>
+         </property>
+         <property name="decimals">
+          <number>0</number>
+         </property>
+         <property name="minimum">
+          <double>0.000000000000000</double>
+         </property>
+         <property name="maximum">
+          <double>400.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>1.000000000000000</double>
+         </property>
+        </widget>
+        <widget class="QLabel" name="pack_finalibuLabel">
+         <property name="geometry">
+          <rect>
+           <x>690</x>
+           <y>80</y>
+           <width>171</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Estimated final IBU:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+        <widget class="QLabel" name="pack_finalcolorLabel">
+         <property name="geometry">
+          <rect>
+           <x>690</x>
+           <y>50</y>
+           <width>171</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Estimated final EBC:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+        <widget class="QDoubleSpinBox" name="pack_finalcolorShow">
+         <property name="geometry">
+          <rect>
+           <x>870</x>
+           <y>50</y>
+           <width>91</width>
+           <height>24</height>
+          </rect>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+         <property name="buttonSymbols">
+          <enum>QAbstractSpinBox::NoButtons</enum>
+         </property>
+         <property name="accelerated">
+          <bool>false</bool>
+         </property>
+         <property name="decimals">
+          <number>0</number>
+         </property>
+         <property name="minimum">
+          <double>0.000000000000000</double>
+         </property>
+         <property name="maximum">
+          <double>400.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>1.000000000000000</double>
+         </property>
+        </widget>
        </widget>
        <widget class="QGroupBox" name="bottleBox">
         <property name="geometry">

Mercurial Repository: bmsapp

mercurial