Mercurial > bmsapp / file diff

--- a/src/EditProduct.cpp	Sat Jan 14 15:38:28 2023 +0100
+++ b/src/EditProduct.cpp	Sun Jan 15 12:35:04 2023 +0100
@@ -492,8 +492,8 @@
     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_aboilvolEdit->setValue(product->brew_aboil_volume + product->eq_chiller_volume);
+    ui->brew_aboilvolShow->setValue(product->batch_size * 1.04 + product->eq_chiller_volume);
     ui->brew_aboileffShow->setValue(product->brew_aboil_efficiency);
     ui->brew_whirlpool9Edit->setValue(product->brew_whirlpool9);
     ui->brew_whirlpool7Edit->setValue(product->brew_whirlpool7);
@@ -668,10 +668,12 @@
     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);
+    connect(ui->brew_prerefractoButton, SIGNAL(clicked()), this, SLOT(brew_preboil_brix_button()));
     connect(ui->brew_preboilButton, SIGNAL(clicked()), this, SLOT(brew_preboil_button()));
     connect(ui->brew_aboilphEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_aboilph_changed);
     connect(ui->brew_aboilsgEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_aboilsg_changed);
     connect(ui->brew_aboilvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_aboilvol_changed);
+    connect(ui->brew_arefractoButton, SIGNAL(clicked()), this, SLOT(brew_aboil_brix_button()));
     connect(ui->brew_aboilButton, SIGNAL(clicked()), this, SLOT(brew_aboil_button()));
     connect(ui->brew_cooltoEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_cooling_to_changed);
     connect(ui->brew_cooltimeEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_cooling_time_changed);