Mercurial > bmsapp / file diff

--- a/src/EditHop.cpp	Fri Jul 29 20:59:21 2022 +0200
+++ b/src/EditHop.cpp	Sat Jul 30 16:30:02 2022 +0200
@@ -71,9 +71,9 @@
 	ui->bufactorEdit->setValue(query.value("bu_factor").toDouble());
     } else {
 	/* Set some defaults */
-	ui->typeEdit->setCurrentIndex(0);
-	ui->formEdit->setCurrentIndex(0);
-	ui->utilisationEdit->setValue(20.0);
+	ui->typeEdit->setCurrentIndex(HOP_TYPE_BITTERING);
+	ui->formEdit->setCurrentIndex(HOP_FORMS_PELLET);
+	ui->utilisationEdit->setValue(my_ut_pellet);
 	ui->bufactorEdit->setValue(1.0);
 	ui->prodEdit->clear();
 	ui->thtEdit->clear();
@@ -87,7 +87,7 @@
     connect(ui->myrceneEdit, &QDoubleSpinBox::textChanged, this, &EditHop::is_changed);
     connect(ui->hsiEdit, &QDoubleSpinBox::textChanged, this, &EditHop::is_changed);
     connect(ui->typeEdit, &QComboBox::currentTextChanged, this, &EditHop::is_changed);
-    connect(ui->formEdit, &QComboBox::currentTextChanged, this, &EditHop::is_changed);
+    connect(ui->formEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditHop::form_changed);
     connect(ui->notesEdit, SIGNAL(textChanged()), this, SLOT(is_changed()));
     connect(ui->originEdit, &QLineEdit::textChanged, this, &EditHop::is_changed);
     connect(ui->substitutesEdit, &QLineEdit::textChanged, this, &EditHop::is_changed);
@@ -136,12 +136,6 @@
 	txt.append((QString(" **")));
     }
     setWindowTitle(txt);
-
-    if (ui->formEdit->currentIndex() < HOP_FORMS_CO2EXTRACT) {
-        ui->inventoryEdit->setSuffix(tr(" Kg"));
-    } else {
-        ui->inventoryEdit->setSuffix(tr(" L"));
-    }
 }
 
 
@@ -306,6 +300,20 @@
 }
 
 
+void EditHop::form_changed(int val)
+{
+    switch (val) {
+	case HOP_FORMS_PELLET:		ui->utilisationEdit->setValue(my_ut_pellet);		break;
+	case HOP_FORMS_PLUG:		ui->utilisationEdit->setValue(my_ut_plug);		break;
+	case HOP_FORMS_LEAF:		ui->utilisationEdit->setValue(my_ut_leaf);		break;
+	case HOP_FORMS_LEAF_WET:	ui->utilisationEdit->setValue(my_ut_wethop);		break;
+	case HOP_FORMS_CRYO:		ui->utilisationEdit->setValue(my_ut_t45);		break;
+	case HOP_FORMS_CO2EXTRACT:	ui->utilisationEdit->setValue(my_ut_co2extract);	break;
+    }
+    is_changed();
+}
+
+
 void EditHop::on_quitButton_clicked()
 {
     if (this->textIsChanged) {