diff -r 053c0578cf58 -r d11a3e713e3b src/EditRecipe.cpp --- a/src/EditRecipe.cpp Fri Apr 01 16:52:25 2022 +0200 +++ b/src/EditRecipe.cpp Fri Apr 01 17:25:42 2022 +0200 @@ -40,6 +40,10 @@ ui->color_methodEdit->addItem("Halberstadt"); ui->color_methodEdit->addItem("Naudts"); + ui->ibu_methodEdit->addItem("Tinseth"); + ui->ibu_methodEdit->addItem("Rager"); + ui->ibu_methodEdit->addItem("Daniels"); + if (id >= 0) { query.prepare("SELECT * FROM recipes WHERE record = :recno"); query.bindValue(":recno", id); @@ -47,24 +51,13 @@ query.next(); ui->lockedEdit->setChecked(query.value(2).toInt() ? true:false); - // 3 st_name - // 4 st_letter - // 5 st_guide - // 6 st_category - // 7 st_category_number - // 8 st_type - // 9 st_og_min - // 10 st_og_max - // 11 st_fg_min - // 12 st_fg_max - // 13 st_ibu_min - // 14 st_ibu_max - // 15 st_color_min - // 16 st_color_max - // 17 st_carb_min - // 18 st_carb_max - // 19 st_abv_min - // 20 st_abv_max + ui->st_nameEdit->setText(query.value(3).toString()); + ui->st_groupEdit->setText(query.value(4).toString()); + ui->st_guideEdit->setText(query.value(5).toString()); + ui->st_catEdit->setText(query.value(6).toString()); + ui->st_catnrEdit->setText(query.value(7).toString()); + ui->st_typeEdit->setText(query.value(8).toString()); + ui->nameEdit->setText(query.value(21).toString()); ui->notesEdit->setPlainText(query.value(22).toString()); ui->typeEdit->setCurrentIndex(query.value(23).toInt()); @@ -101,9 +94,20 @@ ui->color_methodEdit->setCurrentIndex(query.value(32).toInt()); - // 33 est_ibu - // 34 ibu_method - // 35 est_carb + ui->est_ibuEdit->setValue(query.value(33).toDouble()); + ui->est_ibuShow->setPrecision(0); + ui->est_ibuShow->setMarkerTextIsValue(true); + ui->est_ibuShow->setRange(query.value(13).toDouble(), query.value(14).toDouble()); + ui->est_ibuShow->setValue(query.value(33).toDouble()); + + ui->ibu_methodEdit->setCurrentIndex(query.value(34).toInt()); + + ui->est_carbEdit->setValue(query.value(35).toDouble()); + ui->est_carbShow->setPrecision(1); + ui->est_carbShow->setMarkerTextIsValue(true); + ui->est_carbShow->setRange(query.value(17).toDouble(), query.value(18).toDouble()); + ui->est_carbShow->setValue(query.value(35).toDouble()); + // 36 sparge_temp // 37 sparge_ph // 38 sparge_volume @@ -167,12 +171,13 @@ connect(ui->notesEdit, SIGNAL(textChanged()), this, SLOT(is_changed())); connect(ui->typeEdit, &QComboBox::currentTextChanged, this, &EditRecipe::is_changed); connect(ui->batch_sizeEdit, &QDoubleSpinBox::textChanged, this, &EditRecipe::is_changed); - connect(ui->boil_sizeEdit, &QDoubleSpinBox::textChanged, this, &EditRecipe::is_changed); connect(ui->boil_timeEdit, &QSpinBox::textChanged, this, &EditRecipe::is_changed); connect(ui->efficiencyEdit, &QDoubleSpinBox::textChanged, this, &EditRecipe::is_changed); connect(ui->color_methodEdit, &QComboBox::currentTextChanged, this, &EditRecipe::is_changed); + connect(ui->ibu_methodEdit, &QComboBox::currentTextChanged, this, &EditRecipe::is_changed); + ui->saveButton->setEnabled(false); ui->deleteButton->setEnabled((id >= 0) ? true:false); }