Mercurial > bmsapp / file diff

--- 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);
     }