Mercurial > bmsapp / file diff

--- a/src/EditRecipe.cpp	Sun Jul 17 22:18:48 2022 +0200
+++ b/src/EditRecipe.cpp	Mon Jul 18 17:04:02 2022 +0200
@@ -56,10 +56,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();
     query.first();
@@ -94,6 +90,10 @@
 	query.next();
     }
 
+    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_recipe::load(recipe, this, id))
             return;
@@ -333,10 +333,12 @@
     ui->mw_acidvolEdit->setReadOnly(recipe->calc_acid);
     ui->mw_acidvolEdit->setButtonSymbols(recipe->calc_acid ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
 
+    ui->sp_phEdit->setReadOnly(! recipe->calc_acid);
+    ui->sp_phEdit->setButtonSymbols(recipe->calc_acid ? QAbstractSpinBox::UpDownArrows : QAbstractSpinBox::NoButtons);
+    ui->sp_acidvolEdit->setReadOnly(recipe->calc_acid);
+    ui->sp_acidvolEdit->setButtonSymbols(recipe->calc_acid ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
     ui->sp_volEdit->setValue(recipe->sparge_volume);
-    ui->sp_tempEdit->setValue(recipe->sparge_temp);
     ui->sp_phEdit->setValue(recipe->sparge_ph);
-    ui->sp_sourceEdit->setCurrentIndex(recipe->sparge_source);
     ui->sp_acidtypeEdit->setCurrentIndex(recipe->sparge_acid_type);
     ui->sp_acidpercEdit->setValue(recipe->sparge_acid_perc);
     ui->sp_acidvolEdit->setValue(recipe->sparge_acid_amount);
@@ -392,6 +394,11 @@
     connect(ui->bs_mgcl2Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::wb_mgcl2_changed);
     connect(ui->bs_nahco3Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::wb_nahco3_changed);
     connect(ui->bs_caco3Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::wb_caco3_changed);
+    connect(ui->ss_cacl2Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::sp_cacl2_changed);
+    connect(ui->ss_caso4Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::sp_caso4_changed);
+    connect(ui->ss_mgso4Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::sp_mgso4_changed);
+    connect(ui->ss_naclEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::sp_nacl_changed);
+    connect(ui->ss_mgcl2Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::sp_mgcl2_changed);
     connect(ui->mw_autoEdit, &QCheckBox::stateChanged, this, &EditRecipe::mw_calc_acid_clicked);
     connect(ui->mw_phEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::mw_ph_changed);
     connect(ui->mw_acidvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::mw_acid_changed);
@@ -400,10 +407,10 @@
     connect(ui->w1_nameEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditRecipe::w1_name_changed);
     connect(ui->w2_nameEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditRecipe::w2_name_changed);
     connect(ui->w2_volEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::w2_volume_changed);
-    connect(ui->sp_sourceEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditRecipe::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, &EditRecipe::sp_type_changed);
     connect(ui->sp_phEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::sp_ph_changed);
-
+    connect(ui->sp_acidvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::sp_acid_changed);
     setLocked(recipe->locked);
 
     ui->saveButton->setEnabled(false);