# HG changeset patch # User Michiel Broek # Date 1651051570 -7200 # Node ID 5093db5665c60efba2815ad4ca20a33246069911 # Parent 60ea10dcc0e4732239ef2eea72209d3218dd730f Replaced ui variables by record variables. diff -r 60ea10dcc0e4 -r 5093db5665c6 src/EditRecipeTab2.cpp --- a/src/EditRecipeTab2.cpp Wed Apr 27 10:45:22 2022 +0200 +++ b/src/EditRecipeTab2.cpp Wed Apr 27 11:26:10 2022 +0200 @@ -256,7 +256,7 @@ qDebug() << " psugar" << psugar << "pcara" << pcara << "mvol" << mvol; qDebug() << " sugarsf" << sugarsf << "sugarsm" << sugarsm; - double og = Utils::estimate_sg(sugarsf + addedS, ui->batch_sizeEdit->value()); + double og = Utils::estimate_sg(sugarsf + addedS, recipe->batch_size); qDebug() << " OG" << ui->est_ogEdit->value() << og; recipe->est_og = og; ui->est_ogEdit->setValue(og); @@ -264,20 +264,20 @@ ui->est_og3Edit->setValue(og); ui->est_ogShow->setValue(og); - recipe->preboil_sg = Utils::estimate_sg(sugarsm, ui->boil_sizeEdit->value()); + recipe->preboil_sg = Utils::estimate_sg(sugarsm, recipe->boil_size); qDebug() << " preboil SG" << recipe->preboil_sg; /* * Color of the wort */ if (recipe->color_method == 4) { // Naudts - color = round(((Utils::sg_to_plato(og) / 8.6) * colorn) + (ui->boil_timeEdit->value() / 60)); + color = round(((Utils::sg_to_plato(og) / 8.6) * colorn) + (recipe->boil_time / 60)); } else if (recipe->color_method == 3) { // Hans Halberstadt double bv = 0.925; // Beer loss efficiency double sr = 0.95; // Mash and sparge efficiency - color = round((4.46 * bv * sr) / ui->batch_sizeEdit->value() * colorh); + color = round((4.46 * bv * sr) / recipe->batch_size * colorh); } else { - double cw = colort / ui->batch_sizeEdit->value() * 8.34436; + double cw = colort / recipe->batch_size * 8.34436; color = Utils::kw_to_ebc(recipe->color_method, cw); } qDebug() << " color" << ui->est_colorEdit->value() << color << recipe->est_color; @@ -292,7 +292,7 @@ * We don't have a equipment profile in recipes, * so we assume a certain guessed mashtun size. */ - ui->perc_mashShow->setValue(round(recipe->mashs_kg / (ui->boil_sizeEdit->value() / 3) * 100)); + ui->perc_mashShow->setValue(round(recipe->mashs_kg / (recipe->boil_size / 3) * 100)); ui->perc_sugarsShow->setValue(round(psugar)); ui->perc_caraShow->setValue(round(pcara)); if (recipe->mashs_kg > 0) {