Mon, 09 Jan 2023 17:03:19 +0100
Limit mash steptime to 240 minutes. Limit mash steps to 82 degrees celsius. In estimate_fg limit total mash time to 240 minutes and increased the water/grain ration from 5.5 to 6 l/kg.
--- a/src/EditProductTab7.cpp Mon Jan 09 15:35:04 2023 +0100 +++ b/src/EditProductTab7.cpp Mon Jan 09 17:03:19 2023 +0100 @@ -586,6 +586,9 @@ steptempEdit->setGeometry(QRect(160, 70, 121, 24)); steptempEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); steptempEdit->setDecimals(1); + steptempEdit->setAccelerated(true); + steptempEdit->setSingleStep(0.5); + steptempEdit->setMaximum(82); steptempEdit->setValue(product->mashs.at(product->mashs_row).step_temp); QLabel *endLabel = new QLabel(dialog); @@ -598,6 +601,9 @@ endtempEdit->setGeometry(QRect(510, 70, 121, 24)); endtempEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); endtempEdit->setDecimals(1); + endtempEdit->setAccelerated(true); + endtempEdit->setSingleStep(0.5); + endtempEdit->setMaximum(82); endtempEdit->setValue(product->mashs.at(product->mashs_row).end_temp); QLabel *timeLabel = new QLabel(dialog); @@ -610,6 +616,8 @@ steptimeEdit->setGeometry(QRect(160, 100, 121, 24)); steptimeEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); steptimeEdit->setDecimals(0); + steptimeEdit->setAccelerated(true); + steptimeEdit->setMaximum(240.0); steptimeEdit->setValue(product->mashs.at(product->mashs_row).step_time); QLabel *rampLabel = new QLabel(dialog);
--- a/src/EditRecipeTab6.cpp Mon Jan 09 15:35:04 2023 +0100 +++ b/src/EditRecipeTab6.cpp Mon Jan 09 17:03:19 2023 +0100 @@ -481,6 +481,9 @@ steptempEdit->setGeometry(QRect(160, 70, 121, 24)); steptempEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); steptempEdit->setDecimals(1); + steptempEdit->setAccelerated(true); + steptempEdit->setSingleStep(0.5); + steptempEdit->setMaximum(82); steptempEdit->setValue(recipe->mashs.at(recipe->mashs_row).step_temp); QLabel *endLabel = new QLabel(dialog); @@ -493,6 +496,9 @@ endtempEdit->setGeometry(QRect(510, 70, 121, 24)); endtempEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); endtempEdit->setDecimals(1); + endtempEdit->setAccelerated(true); + endtempEdit->setSingleStep(0.5); + endtempEdit->setMaximum(82); endtempEdit->setValue(recipe->mashs.at(recipe->mashs_row).end_temp); QLabel *timeLabel = new QLabel(dialog); @@ -505,6 +511,8 @@ steptimeEdit->setGeometry(QRect(160, 100, 121, 24)); steptimeEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); steptimeEdit->setDecimals(0); + steptimeEdit->setAccelerated(true); + steptimeEdit->setMaximum(240.0); steptimeEdit->setValue(recipe->mashs.at(recipe->mashs_row).step_time); QLabel *rampLabel = new QLabel(dialog);
--- a/src/Utils.cpp Mon Jan 09 15:35:04 2023 +0100 +++ b/src/Utils.cpp Mon Jan 09 17:03:19 2023 +0100 @@ -296,8 +296,8 @@ BD = wgratio; if (BD < 2) BD = 2; - if (BD > 5.5) - BD = 5.5; + if (BD > 6) + BD = 6; } else { BD = 3.5; mashtemp = 67; @@ -305,17 +305,19 @@ } if (svg < 30) svg = 77; + if (mashtime > 240) + mashtime = 240; /* * Original from brouwhulp: - * 0.00825 Attenuation factor yeast (Real to apparant ??) - * 0.00817 Attenuation factor water/grain ratio + * 0.00825 Attenuation factor yeast (Real to apparant ??) + * 0.00817 Attenuation factor water/grain ratio * -0.00684 Attenuation factor mash temperature - * 0.00026 Attenuation factor total mash time + * 0.00026 Attenuation factor total mash time * -0.00356 Attenuation factor percentage crystal malt - * 0.00553 Attenuation factor percentage simple sugars - * 0.547 Attenuation factor constant - * 0.597 Attenuation factor constant when STA1 gen is true. + * 0.00553 Attenuation factor percentage simple sugars + * 0.547 Attenuation factor constant + * 0.597 Attenuation factor constant when STA1 gen is true. */ double top_mashtemp = 66.11; /* Highest fermentable at 151 degrees fahrenheit */ /* @@ -323,15 +325,15 @@ */ if (mashtemp > top_mashtemp) { /* Above optimum mash temperature decrease attenuation */ - att_mashtemp = - 0.00684 * mashtemp; + att_mashtemp = -0.00684 * mashtemp; } else { /* Below optimum mash temperature decrease slowly attenuation */ - att_mashtemp = - 0.00684 * (top_mashtemp + (top_mashtemp - mashtemp) / 4); + att_mashtemp = -0.00684 * (top_mashtemp + (top_mashtemp - mashtemp) / 4); } double AttBeer = 0.00825 * svg + 0.00817 * BD + att_mashtemp + 0.00026 * mashtime - 0.00356 * pcara + 0.00553 * psugar; AttBeer += (sta1) ? 0.597:0.547; - qDebug() << "estimate_fg(" << psugar << pcara << wgratio << mashtime << mashtemp << svg << og << sta1 << ") AttBeer:" << AttBeer; + qDebug() << "estimate_fg(" << psugar << pcara << BD << mashtime << mashtemp << svg << og << sta1 << ") AttBeer:" << AttBeer; return round((1 + (1 - AttBeer) * (og -1)) * 10000) / 10000; }
--- a/translations/bmsapp_en.ts Mon Jan 09 15:35:04 2023 +0100 +++ b/translations/bmsapp_en.ts Mon Jan 09 17:03:19 2023 +0100 @@ -3464,14 +3464,14 @@ <message> <location filename="../ui/EditProduct.ui" line="7849"/> <location filename="../ui/EditProduct.ui" line="8957"/> - <location filename="../src/EditProductTab7.cpp" line="629"/> + <location filename="../src/EditProductTab7.cpp" line="637"/> <source>Measured pH:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="7865"/> <location filename="../ui/EditProduct.ui" line="9024"/> - <location filename="../src/EditProductTab7.cpp" line="661"/> + <location filename="../src/EditProductTab7.cpp" line="669"/> <source>Measured SG:</source> <translation type="unfinished"></translation> </message> @@ -4692,32 +4692,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="593"/> + <location filename="../src/EditProductTab7.cpp" line="596"/> <source>Step end temp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="605"/> + <location filename="../src/EditProductTab7.cpp" line="611"/> <source>Step rest time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="617"/> + <location filename="../src/EditProductTab7.cpp" line="625"/> <source>Step ramp time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="647"/> + <location filename="../src/EditProductTab7.cpp" line="655"/> <source>Measured Brix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="681"/> + <location filename="../src/EditProductTab7.cpp" line="689"/> <source>Infusion volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="698"/> + <location filename="../src/EditProductTab7.cpp" line="706"/> <source>Infusion Temperature:</source> <translation type="unfinished"></translation> </message> @@ -6196,7 +6196,7 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="2419"/> - <location filename="../src/EditRecipeTab2.cpp" line="924"/> + <location filename="../src/EditRecipeTab2.cpp" line="927"/> <location filename="../src/EditRecipeTab3.cpp" line="667"/> <location filename="../src/EditRecipeTab4.cpp" line="653"/> <source>Mash</source> @@ -6732,12 +6732,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="524"/> + <location filename="../src/EditRecipeTab2.cpp" line="527"/> <source>Delete fermentable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="524"/> + <location filename="../src/EditRecipeTab2.cpp" line="527"/> <location filename="../src/EditRecipeTab3.cpp" line="297"/> <location filename="../src/EditRecipeTab4.cpp" line="344"/> <location filename="../src/EditRecipeTab5.cpp" line="262"/> @@ -6747,46 +6747,46 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="834"/> + <location filename="../src/EditRecipeTab2.cpp" line="837"/> <location filename="../src/EditRecipeTab4.cpp" line="578"/> <source>Current ingredient:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="839"/> + <location filename="../src/EditRecipeTab2.cpp" line="842"/> <source>Supplier:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="844"/> + <location filename="../src/EditRecipeTab2.cpp" line="847"/> <source>Amount in kg:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="849"/> + <location filename="../src/EditRecipeTab2.cpp" line="852"/> <source>Percentage in batch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="854"/> + <location filename="../src/EditRecipeTab2.cpp" line="857"/> <source>Auto fill to 100%:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="859"/> + <location filename="../src/EditRecipeTab2.cpp" line="862"/> <location filename="../src/EditRecipeTab3.cpp" line="593"/> <location filename="../src/EditRecipeTab5.cpp" line="498"/> <source>Use at:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="864"/> + <location filename="../src/EditRecipeTab2.cpp" line="867"/> <location filename="../src/EditRecipeTab4.cpp" line="604"/> <source>Select ingredient:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="869"/> + <location filename="../src/EditRecipeTab2.cpp" line="872"/> <location filename="../src/EditRecipeTab3.cpp" line="608"/> <location filename="../src/EditRecipeTab4.cpp" line="609"/> <location filename="../src/EditRecipeTab5.cpp" line="483"/> @@ -6794,35 +6794,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="874"/> + <location filename="../src/EditRecipeTab2.cpp" line="877"/> <source>Max in batch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="925"/> - <location filename="../src/EditRecipeTab3.cpp" line="669"/> - <location filename="../src/EditRecipeTab4.cpp" line="654"/> - <source>Boil</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="926"/> - <source>Fermentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditRecipeTab2.cpp" line="927"/> - <source>Lagering</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditRecipeTab2.cpp" line="928"/> - <location filename="../src/EditRecipeTab5.cpp" line="549"/> - <source>Bottle</source> + <location filename="../src/EditRecipeTab3.cpp" line="669"/> + <location filename="../src/EditRecipeTab4.cpp" line="654"/> + <source>Boil</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="929"/> + <source>Fermentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab2.cpp" line="930"/> + <source>Lagering</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab2.cpp" line="931"/> + <location filename="../src/EditRecipeTab5.cpp" line="549"/> + <source>Bottle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab2.cpp" line="932"/> <source>Kegs</source> <translation type="unfinished"></translation> </message> @@ -7185,27 +7185,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="488"/> + <location filename="../src/EditRecipeTab6.cpp" line="491"/> <source>Step end temp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="500"/> + <location filename="../src/EditRecipeTab6.cpp" line="506"/> <source>Step rest time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="512"/> + <location filename="../src/EditRecipeTab6.cpp" line="520"/> <source>Step ramp time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="527"/> + <location filename="../src/EditRecipeTab6.cpp" line="535"/> <source>Infusion volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="544"/> + <location filename="../src/EditRecipeTab6.cpp" line="552"/> <source>Infusion Temperature:</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Mon Jan 09 15:35:04 2023 +0100 +++ b/translations/bmsapp_nl.ts Mon Jan 09 17:03:19 2023 +0100 @@ -5119,46 +5119,46 @@ <translation>Start temperatuur:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="593"/> + <location filename="../src/EditProductTab7.cpp" line="596"/> <source>Step end temp:</source> <translation>Eind temperatuur:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="605"/> + <location filename="../src/EditProductTab7.cpp" line="611"/> <source>Step rest time:</source> <translation>Rust tijd:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="617"/> + <location filename="../src/EditProductTab7.cpp" line="625"/> <source>Step ramp time:</source> <translation>Verwarm tijd:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="7849"/> <location filename="../ui/EditProduct.ui" line="8957"/> - <location filename="../src/EditProductTab7.cpp" line="629"/> + <location filename="../src/EditProductTab7.cpp" line="637"/> <source>Measured pH:</source> <translation>Gemeten pH:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="647"/> + <location filename="../src/EditProductTab7.cpp" line="655"/> <source>Measured Brix:</source> <translation>Gemeten Brix:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="7865"/> <location filename="../ui/EditProduct.ui" line="9024"/> - <location filename="../src/EditProductTab7.cpp" line="661"/> + <location filename="../src/EditProductTab7.cpp" line="669"/> <source>Measured SG:</source> <translation>Gemeten SG:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="681"/> + <location filename="../src/EditProductTab7.cpp" line="689"/> <source>Infusion volume:</source> <translation>Infusie volume:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="698"/> + <location filename="../src/EditProductTab7.cpp" line="706"/> <source>Infusion Temperature:</source> <translation>Infusie temperatuur:</translation> </message> @@ -6715,7 +6715,7 @@ </message> <message> <location filename="../ui/EditRecipe.ui" line="2419"/> - <location filename="../src/EditRecipeTab2.cpp" line="924"/> + <location filename="../src/EditRecipeTab2.cpp" line="927"/> <location filename="../src/EditRecipeTab3.cpp" line="667"/> <location filename="../src/EditRecipeTab4.cpp" line="653"/> <source>Mash</source> @@ -7359,12 +7359,12 @@ <translation>Wijzig</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="524"/> + <location filename="../src/EditRecipeTab2.cpp" line="527"/> <source>Delete fermentable</source> <translation>Verwijder vergistbaar ingredient</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="524"/> + <location filename="../src/EditRecipeTab2.cpp" line="527"/> <location filename="../src/EditRecipeTab3.cpp" line="297"/> <location filename="../src/EditRecipeTab4.cpp" line="344"/> <location filename="../src/EditRecipeTab5.cpp" line="262"/> @@ -7374,46 +7374,46 @@ <translation>Verwijder %1</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="834"/> + <location filename="../src/EditRecipeTab2.cpp" line="837"/> <location filename="../src/EditRecipeTab4.cpp" line="578"/> <source>Current ingredient:</source> <translation>Huidig ingredient:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="839"/> + <location filename="../src/EditRecipeTab2.cpp" line="842"/> <source>Supplier:</source> <translation>Leverancier:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="844"/> + <location filename="../src/EditRecipeTab2.cpp" line="847"/> <source>Amount in kg:</source> <translation>Gewicht in kg:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="849"/> + <location filename="../src/EditRecipeTab2.cpp" line="852"/> <source>Percentage in batch:</source> <translation>Percentage in stort:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="854"/> + <location filename="../src/EditRecipeTab2.cpp" line="857"/> <source>Auto fill to 100%:</source> <translation>Aanvullen tot 100%:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="859"/> + <location filename="../src/EditRecipeTab2.cpp" line="862"/> <location filename="../src/EditRecipeTab3.cpp" line="593"/> <location filename="../src/EditRecipeTab5.cpp" line="498"/> <source>Use at:</source> <translation>Toevoegen bij:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="864"/> + <location filename="../src/EditRecipeTab2.cpp" line="867"/> <location filename="../src/EditRecipeTab4.cpp" line="604"/> <source>Select ingredient:</source> <translation>Kies ingredient:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="869"/> + <location filename="../src/EditRecipeTab2.cpp" line="872"/> <location filename="../src/EditRecipeTab3.cpp" line="608"/> <location filename="../src/EditRecipeTab4.cpp" line="609"/> <location filename="../src/EditRecipeTab5.cpp" line="483"/> @@ -7421,35 +7421,35 @@ <translation>In voorraad:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="874"/> + <location filename="../src/EditRecipeTab2.cpp" line="877"/> <source>Max in batch:</source> <translation>Max. in stort:</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="925"/> + <location filename="../src/EditRecipeTab2.cpp" line="928"/> <location filename="../src/EditRecipeTab3.cpp" line="669"/> <location filename="../src/EditRecipeTab4.cpp" line="654"/> <source>Boil</source> <translation>Koken</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="926"/> + <location filename="../src/EditRecipeTab2.cpp" line="929"/> <source>Fermentation</source> <translation>Hoofdvergisting</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="927"/> + <location filename="../src/EditRecipeTab2.cpp" line="930"/> <source>Lagering</source> <translation>Nagisting/lagering</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="928"/> + <location filename="../src/EditRecipeTab2.cpp" line="931"/> <location filename="../src/EditRecipeTab5.cpp" line="549"/> <source>Bottle</source> <translation>Bottelen</translation> </message> <message> - <location filename="../src/EditRecipeTab2.cpp" line="929"/> + <location filename="../src/EditRecipeTab2.cpp" line="932"/> <source>Kegs</source> <translation>Fusten</translation> </message> @@ -7816,27 +7816,27 @@ <translation>Start temperatuur:</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="488"/> + <location filename="../src/EditRecipeTab6.cpp" line="491"/> <source>Step end temp:</source> <translation>Eind temperatuur:</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="500"/> + <location filename="../src/EditRecipeTab6.cpp" line="506"/> <source>Step rest time:</source> <translation>Rust tijd:</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="512"/> + <location filename="../src/EditRecipeTab6.cpp" line="520"/> <source>Step ramp time:</source> <translation>Verwarm tijd:</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="527"/> + <location filename="../src/EditRecipeTab6.cpp" line="535"/> <source>Infusion volume:</source> <translation>Infusie volume:</translation> </message> <message> - <location filename="../src/EditRecipeTab6.cpp" line="544"/> + <location filename="../src/EditRecipeTab6.cpp" line="552"/> <source>Infusion Temperature:</source> <translation>Infusie temperatuur:</translation> </message>