Thu, 21 Jul 2022 15:08:27 +0200
Version 0.2.20. Calculate total linther ignore malt color because our database is correct.
CMakeLists.txt | file | annotate | diff | comparison | revisions | |
src/EditProductTab3.cpp | file | annotate | diff | comparison | revisions | |
src/EditRecipeTab2.cpp | file | annotate | diff | comparison | revisions |
--- a/CMakeLists.txt Wed Jul 20 14:27:49 2022 +0200 +++ b/CMakeLists.txt Thu Jul 21 15:08:27 2022 +0200 @@ -9,7 +9,7 @@ SET( bmsapp_VERSION_MAJOR 0 ) SET( bmsapp_VERSION_MINOR 2 ) -SET( bmsapp_VERSION_PATCH 19 ) +SET( bmsapp_VERSION_PATCH 20 ) # Compile flags
--- a/src/EditProductTab3.cpp Wed Jul 20 14:27:49 2022 +0200 +++ b/src/EditProductTab3.cpp Thu Jul 21 15:08:27 2022 +0200 @@ -291,8 +291,7 @@ vol += (x * sugardensity + (1 - x) * 1) * product->fermentables.at(i).amount; } if (product->fermentables.at(i).added == FERMENTABLE_ADDED_MASH && - (product->fermentables.at(i).type == FERMENTABLE_TYPE_GRAIN || product->fermentables.at(i).type == FERMENTABLE_TYPE_ADJUCT) && - product->fermentables.at(i).color < 50) { + (product->fermentables.at(i).type == FERMENTABLE_TYPE_GRAIN || product->fermentables.at(i).type == FERMENTABLE_TYPE_ADJUCT)) { lintner += product->fermentables.at(i).diastatic_power * product->fermentables.at(i).amount; } if (product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) {
--- a/src/EditRecipeTab2.cpp Wed Jul 20 14:27:49 2022 +0200 +++ b/src/EditRecipeTab2.cpp Thu Jul 21 15:08:27 2022 +0200 @@ -219,12 +219,12 @@ recipe->mashs_kg = 0; for (i = 0; i < recipe->fermentables.size(); i++) { - if (recipe->fermentables.at(i).type == 1 && recipe->fermentables.at(i).added < 4) // Sugars + if (recipe->fermentables.at(i).type == FERMENTABLE_TYPE_SUGAR && recipe->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) psugar += recipe->fermentables.at(i).percentage; - if (recipe->fermentables.at(i).graintype == 2 && recipe->fermentables.at(i).added < 4) // Crystal/Cara + if (recipe->fermentables.at(i).graintype == FERMENTABLE_GRAINTYPE_CRYSTAL && recipe->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) pcara += recipe->fermentables.at(i).percentage; d = recipe->fermentables.at(i).amount * (recipe->fermentables.at(i).yield / 100) * (1 - recipe->fermentables.at(i).moisture / 100); - if (recipe->fermentables.at(i).added == 0) { // Mash + if (recipe->fermentables.at(i).added == FERMENTABLE_ADDED_MASH) { if (mvol > 0) { // If mash volume is known mvol += recipe->fermentables.at(i).amount * recipe->fermentables.at(i).moisture / 100; s += d; @@ -233,20 +233,19 @@ sugarsm += d; recipe->mashs_kg += recipe->fermentables.at(i).amount; } - if (recipe->fermentables.at(i).added == 0 || recipe->fermentables.at(i).added == 1) // Mash or boil + if (recipe->fermentables.at(i).added == FERMENTABLE_ADDED_MASH || recipe->fermentables.at(i).added == FERMENTABLE_ADDED_BOIL) sugarsf += d; - if (recipe->fermentables.at(i).added == 2 || recipe->fermentables.at(i).added == 3) { // Fermentation or lagering + if (recipe->fermentables.at(i).added == FERMENTABLE_ADDED_FERMENTATION || recipe->fermentables.at(i).added == FERMENTABLE_ADDED_LAGERING) { x = (recipe->fermentables.at(i).yield / 100) * (1 - recipe->fermentables.at(i).moisture / 100); addedS += recipe->fermentables.at(i).amount * x; addedmass += recipe->fermentables.at(i).amount; vol += (x * sugardensity + (1 - x) * 1) * recipe->fermentables.at(i).amount; } - if (recipe->fermentables.at(i).added == 0 && - (recipe->fermentables.at(i).type == 0 || recipe->fermentables.at(i).type == 4) && - recipe->fermentables.at(i).color < 50) { + if (recipe->fermentables.at(i).added == FERMENTABLE_ADDED_MASH && + (recipe->fermentables.at(i).type == FERMENTABLE_TYPE_GRAIN || recipe->fermentables.at(i).type == FERMENTABLE_TYPE_ADJUCT)) { lintner += recipe->fermentables.at(i).diastatic_power * recipe->fermentables.at(i).amount; } - if (recipe->fermentables.at(i).added < 4) { + if (recipe->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) { colort += recipe->fermentables.at(i).amount * Utils::ebc_to_srm(recipe->fermentables.at(i).color); colorh += recipe->fermentables.at(i).amount * recipe->fermentables.at(i).color * Utils::get_kt(recipe->fermentables.at(i).color); colorn += (recipe->fermentables.at(i).percentage / 100) * recipe->fermentables.at(i).color; // For 8.6 Pt wort.