Mercurial > bmsapp / file diff

--- a/src/EditProduct.cpp	Sun May 01 11:38:53 2022 +0200
+++ b/src/EditProduct.cpp	Sun May 01 16:27:00 2022 +0200
@@ -730,7 +730,6 @@
     ui->nameEdit->setText(product->name);
     ui->codeEdit->setText(product->code);
     ui->birthEdit->setText(product->birth.toString("dd MMM yyyy"));
-    ui->stageEdit->setText(prod_stages[product->stage]);
     ui->notesEdit->setPlainText(product->notes);
     ui->typeEdit->setCurrentIndex(product->type);
     ui->batch_sizeEdit->setValue(product->batch_size);
@@ -909,12 +908,23 @@
     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_spargevolShow->setValue(product->sparge_volume);
     ui->brew_spargeestShow->setValue(product->brew_sparge_est);
     ui->brew_spargephEdit->setValue(product->brew_sparge_ph);
 
+    ui->brew_boilBox->setTitle(tr("Boiling %1 minutes").arg(product->boil_time));
+    ui->brew_preboilphEdit->setValue(product->brew_preboil_ph);
+    ui->brew_preboilsgEdit->setValue(product->brew_preboil_sg);
+    ui->brew_preboilvolEdit->setValue(product->brew_preboil_volume);
+    ui->brew_preboilvolShow->setValue(product->boil_size * 1.04);
+    ui->brew_preboileffShow->setValue(product->brew_preboil_efficiency);
+    ui->brew_aboilphEdit->setValue(product->brew_aboil_ph);
+    ui->brew_aboilsgEdit->setValue(product->brew_aboil_sg);
+    ui->brew_aboilvolEdit->setValue(product->brew_aboil_volume);
+    ui->brew_aboilvolShow->setValue(product->batch_size * 1.04);
+    ui->brew_aboileffShow->setValue(product->brew_aboil_efficiency);
+
     // Tab fermentation.
 
     // Tab packaging.
@@ -984,7 +994,7 @@
     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);
 
-    setLocked(product->locked);
+    setStage();
 
     ui->saveButton->setEnabled(false);
     ui->deleteButton->setEnabled((id >= 0 && ! product->locked) ? true:false);
@@ -1257,15 +1267,15 @@
 	query.bindValue(":brew_whirlpool7", round(product->brew_whirlpool7));
 	query.bindValue(":brew_whirlpool6", round(product->brew_whirlpool6));
 	query.bindValue(":brew_whirlpool2", round(product->brew_whirlpool2));
-	query.bindValue(":brew_fermenter_volume", round(product->brew_aboil_efficiency * 10) / 10);
-	query.bindValue(":brew_fermenter_extrawater", round(product->brew_aboil_efficiency * 10) / 10);
-	query.bindValue(":brew_fermenter_tcloss", round(product->brew_aboil_efficiency * 10) / 10);
+	query.bindValue(":brew_fermenter_volume", round(product->brew_fermenter_volume * 10) / 10);
+	query.bindValue(":brew_fermenter_extrawater", round(product->brew_fermenter_extrawater * 10) / 10);
+	query.bindValue(":brew_fermenter_tcloss", round(product->brew_fermenter_tcloss * 10) / 10);
 	query.bindValue(":brew_aeration_time", round(product->brew_aeration_time));
-	query.bindValue(":brew_aeration_speed", round(product->brew_aboil_efficiency * 10) / 10);
+	query.bindValue(":brew_aeration_speed", round(product->brew_aeration_speed * 10) / 10);
 	query.bindValue(":brew_aeration_type", product->brew_aeration_type);
-	query.bindValue(":brew_fermenter_sg", round(product->brew_aboil_efficiency * 1000) / 1000);
-	query.bindValue(":brew_fermenter_ibu", round(product->brew_aboil_efficiency * 10) / 10);
-	query.bindValue(":brew_fermenter_color", round(product->brew_aboil_efficiency * 10) / 10);
+	query.bindValue(":brew_fermenter_sg", round(product->brew_fermenter_sg * 1000) / 1000);
+	query.bindValue(":brew_fermenter_ibu", round(product->brew_fermenter_ibu * 10) / 10);
+	query.bindValue(":brew_fermenter_color", round(product->brew_fermenter_color * 10) / 10);
 	query.bindValue(":brew_date_end", product->brew_date_end);
 	query.bindValue(":og", round(product->og * 1000) / 1000);
 	query.bindValue(":fg", round(product->fg * 1000) / 1000);