src/EditProductTab11.cpp

changeset 238
047e99c90848
parent 224
d369948a3eb5
child 283
242a68fa7186
--- a/src/EditProductTab11.cpp	Sat May 28 16:59:36 2022 +0200
+++ b/src/EditProductTab11.cpp	Sat May 28 21:06:58 2022 +0200
@@ -158,8 +158,10 @@
 		double pvol = product->bottle_amount - (pabv * product->bottle_amount) / 100;
 		talc = product->bottle_amount - pvol;
   		tvol = pvol + product->bottle_priming_water;
-		ui->bottle_abvShow->setValue(talc / (tvol + talc) * 100);
-		ui->bottle_barShow->setValue(GetPressure(product->bottle_carbonation, TSec, product->bottle_carbonation_temp));
+		product->bottle_abv = talc / (tvol + talc) * 100;
+		product->bottle_bar = GetPressure(product->bottle_carbonation, TSec, product->bottle_carbonation_temp);
+		ui->bottle_abvShow->setValue(product->bottle_abv);
+		ui->bottle_barShow->setValue(product->bottle_bar);
 	    }
 	}
     }
@@ -169,6 +171,8 @@
 	ui->bottle_sug_weightShow->setValue(0);
 	ui->bottle_abvShow->setValue(0);
 	ui->bottle_barShow->setValue(0);
+	product->bottle_abv = 0;
+	product->bottle_bar = 0;
     }
 
     ui->keg_sugarLabel->setEnabled(! product->keg_forced_carb);
@@ -235,8 +239,10 @@
                     double pvol = product->keg_amount - (pabv * product->keg_amount) / 100;
                     talc = product->keg_amount - pvol;
                     tvol = pvol + product->keg_priming_water;
-                    ui->keg_abvShow->setValue(talc / (tvol + talc) * 100);
-                    ui->keg_barShow->setValue(GetPressure(product->keg_carbonation, TSec, product->keg_carbonation_temp));
+		    product->keg_abv = talc / (tvol + talc) * 100;
+		    product->keg_bar = GetPressure(product->keg_carbonation, TSec, product->keg_carbonation_temp);
+                    ui->keg_abvShow->setValue(product->keg_abv);
+                    ui->keg_barShow->setValue(product->keg_bar);
             	}
 	    } // if priming sugar.
 	    if (! found1) {
@@ -244,12 +250,15 @@
         	ui->keg_sug_amountShow->setValue(0);
         	ui->keg_sug_weightShow->setValue(0);
         	ui->keg_abvShow->setValue(0);
+		product->keg_abv = 0;
+		product->keg_bar = 0;
 	    }
         } else {
 	    /*
 	     * Forced carbonation
 	     */
 	    ui->keg_abvShow->setValue(product->final_abv);
+	    product->keg_abv = product->final_abv;
 	    ui->keg_sug_amountShow->setValue(0);
             ui->keg_sug_weightShow->setValue(0);
 	}

mercurial