Mercurial > bmsapp / file diff

--- a/src/EditProduct.cpp	Sun Jul 17 22:18:48 2022 +0200
+++ b/src/EditProduct.cpp	Mon Jul 18 17:04:02 2022 +0200
@@ -59,10 +59,6 @@
 	ui->sp_acidtypeEdit->addItem(my_acids.at(i).name_en);
     }
 
-    ui->sp_sourceEdit->addItem(tr("Source 1"));
-    ui->sp_sourceEdit->addItem(tr("Source 2"));
-    ui->sp_sourceEdit->addItem(tr("Mixed"));
-
     query.prepare("SELECT name FROM inventory_waters ORDER BY record");
     query.exec();
     ui->w1_nameEdit->addItem("");
@@ -109,6 +105,10 @@
 	ui->keg_sugarEdit->addItem(query.value(0).toString());
     }
 
+    ui->spargeGroup->setId(ui->w1_spButton, 0);
+    ui->spargeGroup->setId(ui->w2_spButton, 1);
+    ui->spargeGroup->setId(ui->wg_spButton, 2);
+
     if (id >= 0) {
 	if (! DB_product::load(product, this, id))
 	    return;
@@ -405,7 +405,7 @@
     ui->w1_volEdit->setValue(product->w1_amount);
     ui->w1_caEdit->setValue(product->w1_calcium);
     ui->w1_mgEdit->setValue(product->w1_magnesium);
-    ui->w1_hco3Edit->setValue(product->w1_total_alkalinity * 1.22);
+    ui->w1_hco3Edit->setValue(Utils::Bicarbonate(product->w1_total_alkalinity, product->w1_ph));
     ui->w1_caco3Edit->setValue(product->w1_total_alkalinity);
     ui->w1_naEdit->setValue(product->w1_sodium);
     ui->w1_clEdit->setValue(product->w1_chloride);
@@ -441,7 +441,7 @@
     ui->w2_volEdit->setValue(product->w2_amount);
     ui->w2_caEdit->setValue(product->w2_calcium);
     ui->w2_mgEdit->setValue(product->w2_magnesium);
-    ui->w2_hco3Edit->setValue(product->w2_total_alkalinity * 1.22);
+    ui->w2_hco3Edit->setValue(Utils::Bicarbonate(product->w2_total_alkalinity, product->w2_ph));
     ui->w2_caco3Edit->setValue(product->w2_total_alkalinity);
     ui->w2_naEdit->setValue(product->w2_sodium);
     ui->w2_clEdit->setValue(product->w2_chloride);
@@ -452,11 +452,12 @@
     ui->mw_phEdit->setButtonSymbols(product->calc_acid ? QAbstractSpinBox::UpDownArrows : QAbstractSpinBox::NoButtons);
     ui->mw_acidvolEdit->setReadOnly(product->calc_acid);
     ui->mw_acidvolEdit->setButtonSymbols(product->calc_acid ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
-
+    ui->sp_phEdit->setReadOnly(! product->calc_acid);
+    ui->sp_phEdit->setButtonSymbols(product->calc_acid ? QAbstractSpinBox::UpDownArrows : QAbstractSpinBox::NoButtons);
+    ui->sp_acidvolEdit->setReadOnly(product->calc_acid);
+    ui->sp_acidvolEdit->setButtonSymbols(product->calc_acid ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
     ui->sp_volEdit->setValue(product->sparge_volume);
-    ui->sp_tempEdit->setValue(product->sparge_temp);
     ui->sp_phEdit->setValue(product->sparge_ph);
-    ui->sp_sourceEdit->setCurrentIndex(product->sparge_source);
     ui->sp_acidtypeEdit->setCurrentIndex(product->sparge_acid_type);
     ui->sp_acidpercEdit->setValue(product->sparge_acid_perc);
     ui->sp_acidvolEdit->setValue(product->sparge_acid_amount);
@@ -469,7 +470,7 @@
     ui->brew_mashsgEdit->setValue(product->brew_mash_sg);
     ui->brew_mashsgShow->setValue(0);
     ui->brew_masheffShow->setValue(product->brew_mash_efficiency);
-    ui->brew_spargetempShow->setValue(product->sparge_temp);
+    ui->brew_spargetempEdit->setValue(product->sparge_temp);
     ui->brew_spargevolShow->setValue(product->sparge_volume);
     ui->brew_spargeestShow->setValue(product->brew_sparge_est);
     ui->brew_spargephEdit->setValue(product->brew_sparge_ph);
@@ -618,6 +619,11 @@
     connect(ui->bs_mgcl2Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_mgcl2_changed);
     connect(ui->bs_nahco3Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_nahco3_changed);
     connect(ui->bs_caco3Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_caco3_changed);
+    connect(ui->ss_cacl2Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_cacl2_changed);
+    connect(ui->ss_caso4Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_caso4_changed);
+    connect(ui->ss_mgso4Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_mgso4_changed);
+    connect(ui->ss_naclEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_nacl_changed);
+    connect(ui->ss_mgcl2Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_mgcl2_changed);
     connect(ui->mw_autoEdit, &QCheckBox::stateChanged, this, &EditProduct::mw_calc_acid_clicked);
     connect(ui->mw_phEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::mw_ph_changed);
     connect(ui->mw_acidvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::mw_acid_changed);
@@ -627,10 +633,10 @@
     connect(ui->w2_nameEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::w2_name_changed);
     connect(ui->w2_volEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::w2_volume_changed);
     connect(ui->sp_volEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_volume_changed);
-    connect(ui->sp_tempEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_temp_changed);
-    connect(ui->sp_sourceEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::sp_source_changed);
+    connect(ui->spargeGroup, SIGNAL(buttonClicked(int)), this, SLOT(sp_group_changed(int)));
     connect(ui->sp_acidtypeEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::sp_type_changed);
     connect(ui->sp_phEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_ph_changed);
+    connect(ui->sp_acidvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_acid_changed);
 
     /* All signals from tab Brewday */
     calcEfficiencyBeforeBoil();
@@ -646,6 +652,7 @@
     connect(ui->brew_mashphEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_mashph_changed);
     connect(ui->brew_mashsgEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_mashsg_changed);
     connect(ui->brew_spargephEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_spargeph_changed);
+    connect(ui->brew_spargetempEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_temp_changed);
     connect(ui->brew_preboilphEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_preboilph_changed);
     connect(ui->brew_preboilsgEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_preboilsg_changed);
     connect(ui->brew_preboilvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_preboilvol_changed);