Mercurial > bmsapp / file diff

--- a/src/EditProductTab8.cpp	Sun Jun 09 17:00:00 2024 +0200
+++ b/src/EditProductTab8.cpp	Tue Jun 11 15:51:17 2024 +0200
@@ -499,6 +499,15 @@
     waterTreated_Show(ui->wx_Select->isChecked());
     waterAdjust_Show(false);
 
+    product->fw_calcium = calcium;
+    product->fw_magnesium = magnesium;
+    product->fw_bicarbonate = bicarbonate;
+    product->fw_total_alkalinity = total_alkalinity;
+    product->fw_sodium = sodium;
+    product->fw_chloride = chloride;
+    product->fw_sulfate = sulfate;
+    product->fw_ph = ph;
+
     ui->wb_phEdit->setValue(ph);
     ui->wb_caEdit->setValue(calcium);
     ui->wb_mgEdit->setValue(magnesium);
@@ -665,7 +674,7 @@
 {
     if (val != product->sparge_source) {
 	product->sparge_source = val;
-	calcSparge();
+	calcWater();
 	is_changed();
     }
 }
@@ -712,6 +721,7 @@
         sulfate = product->ws_sulfate;
         ph = product->sparge_ph;
         volume = product->sparge_volume;
+	ui->wx_phEdit->setToolTip(tr("Sparge pH should be between 5.6 and 5.8."));
     } else {
 	ui->wx_Select->setText(tr("Treated Mash Water"));
 	calcium = product->wb_calcium;
@@ -722,6 +732,7 @@
 	sulfate = product->wb_sulfate;
 	ph = product->wb_ph;
 	volume = product->wg_amount;
+	ui->wx_phEdit->setToolTip(tr("Mash pH should be between 5.2 and 5.6. Use 5.2 for light and 5.5 for dark beers."));
     }
 
     bicarbonate = Utils::Bicarbonate(total_alkalinity, ph);
@@ -761,22 +772,6 @@
 }
 
 
-
-void EditProduct::sp_volume_changed(double val)
-{
-    if (! product->calc_acid) {
-	product->sparge_acid_amount *= val / product->sparge_volume;
-	const QSignalBlocker blocker1(ui->sp_acidvolEdit);
-	ui->sp_acidvolEdit->setValue(product->sparge_acid_amount * 1000.0);
-    }
-
-    product->sparge_volume = val;
-    ui->brew_spargevolShow->setValue(val);
-    calcSparge();
-    is_changed();
-}
-
-
 void EditProduct::sp_temp_changed(double val)
 {
     product->sparge_temp = val;
@@ -804,7 +799,7 @@
     ui->sp_acidpercEdit->setValue(product->sparge_acid_perc);
     brewing_salt_sub(w, ui->sp_acidvolEdit->value(), MISC_USES_SPARGE);	// For now, set old amount.
 
-    calcSparge();
+    calcWater();
     is_changed();
 }
 
@@ -813,7 +808,7 @@
 {
     product->sparge_ph = val;
     ui->brew_spargephShow->setValue(product->sparge_ph);
-    calcSparge();
+    calcWater();
     is_changed();
 }