# HG changeset patch # User Michiel Broek # Date 1673702099 -3600 # Node ID fbb250c725bb7bfef8706fc32be6a43389c8f11e # Parent ac216a75ca9b70ccf72cd33320337bed723379de In print checklist show volume after boil inclusive immersion chiller volume. Improved some prompts in equipment edit. diff -r ac216a75ca9b -r fbb250c725bb src/PrinterDialog.cpp --- a/src/PrinterDialog.cpp Sat Jan 14 11:34:51 2023 +0100 +++ b/src/PrinterDialog.cpp Sat Jan 14 14:14:59 2023 +0100 @@ -1859,11 +1859,16 @@ } } checkInput(&painter, &y, QString(tr("Target volume at end of boil: %1 liter (%2 cm below kettle top)")) - .arg(product->batch_size * 1.04 * factor, 1, 'f', 1) - .arg(Utils::kettle_cm(product->batch_size * 1.04 * factor, product->eq_kettle_volume, product->eq_kettle_height)), + .arg(((product->batch_size * 1.04) + product->eq_chiller_volume) * factor, 1, 'f', 1) + .arg(Utils::kettle_cm(((product->batch_size * 1.04) + product->eq_chiller_volume) * factor, product->eq_kettle_volume, product->eq_kettle_height)), QString(tr("cm"))); checkInput(&painter, &y, QString(tr("Target SG at end of boil: ")) + strDensity(product->est_og3), QString(tr("SG"))); - checkInput(&painter, &y, "", QString(tr("pH"))); + if (product->brew_cooling_method == CHILLER_TYPE_IMMERSION) { + messageInput(&painter, &y, QString(tr("Note: target volume includes chiller %1 liter")) + .arg(product->eq_chiller_volume, 1, 'f', 1), QString(tr("pH"))); + } else { + checkInput(&painter, &y, "", QString(tr("pH"))); + } if (checkSplit(&painter, &y, 2)) factor = 1; } else { @@ -2439,6 +2444,17 @@ } +void PrinterDialog::messageInput(QPainter *painter, qreal *y, QString text, QString prompt) +{ + if (text != "") { + painter->drawText(50, *y,480, 20, Qt::AlignLeft, text); + } + painter->drawText(515, *y, 150, 20, Qt::AlignRight, QString(tr("Measured:")) + QString(" _________")); + painter->drawText(675, *y, 60, 20, Qt::AlignLeft, prompt); + *y += 20; +} + + bool PrinterDialog::checkSplit(QPainter *painter, qreal *y, int moment) { if (product->divide_type && product->divide_type == moment) { diff -r ac216a75ca9b -r fbb250c725bb src/PrinterDialog.h --- a/src/PrinterDialog.h Sat Jan 14 11:34:51 2023 +0100 +++ b/src/PrinterDialog.h Sat Jan 14 14:14:59 2023 +0100 @@ -42,6 +42,7 @@ void checkHeader(QPainter *painter, qreal *y, QString text); void checkLine(QPainter *painter, qreal *y, QString text); void checkInput(QPainter *painter, qreal *y, QString text, QString prompt); + void messageInput(QPainter *painter, qreal *y, QString text, QString prompt); bool checkSplit(QPainter *painter, qreal *y, int moment); }; diff -r ac216a75ca9b -r fbb250c725bb translations/bmsapp_en.ts --- a/translations/bmsapp_en.ts Sat Jan 14 11:34:51 2023 +0100 +++ b/translations/bmsapp_en.ts Sat Jan 14 14:14:59 2023 +0100 @@ -1129,104 +1129,109 @@ - - Boil size L: - - - - + + Measured inside the kettle + + + + + Boil size at 100 °C L: + + + + + Batch size at 100 °C L: + + + + Evaporation L/hour: - + Boil time minutes: - + Top up kettle L: - - Batch size L: - - - - + Kettle trub loss L: - + Transfer - + Extra water in fermenter L: - + Volume in fermenter L: - + Clone - + Chilling - + Wort chiller type: - + Minutes elapsed to cool to 79 °C - + Minutes to cool to 79 °C: - + Volume lost in hoses, pump ... - + Transfer loss L: - + Immersion chiller L: - + Temporary extra volume of the immersion chiller in the kettle. Used to correct the after boil volume. - + Liters per minute to pump trough the chiller. Used to calculate the time needed to transfer the wort. - + Transfer liters/minute: @@ -9752,7 +9757,7 @@ - + Yeast @@ -10025,7 +10030,8 @@ - + + pH @@ -10060,9 +10066,9 @@ - - - + + + Beer style @@ -10700,362 +10706,368 @@ - + + Note: target volume includes chiller %1 liter + + + + This is a `no-boil` recipe - + Whirlpool(s) and cooling - + Wirlpool for %1 minutes. Keep temp above 85°C - - Wirlpool for %1 minutes. Keep temp between 72 and 79°C - - - - - Wirlpool for %1 minutes. Keep temp between 60 and 66°C - - - + Wirlpool for %1 minutes. Keep temp between 72 and 79°C + + + + + Wirlpool for %1 minutes. Keep temp between 60 and 66°C + + + + %1 gr `%2` for %3 minutes in the whirlpool - + Cool to %1°C - - Wirlpool for %1 minutes. - - - - - Cooling - - - - Desinfect fermenter and pump and hoses if needed - - - - - Transfer about %1 liter wort to the fermenter + Wirlpool for %1 minutes. + Cooling + + + + + Desinfect fermenter and pump and hoses if needed + + + + + Transfer about %1 liter wort to the fermenter + + + + Liter - + Yeast pitching and fermentation - + %1 pack %2, `%3` yeast - + %1 gram %2, `%3` yeast - + %1 ml %2, `%3` yeast - + Pitch yeast at %1°C - - Pitch yeast dry into the wort - - - - - Add decanted yeast starter - - - - Add the yeast + Pitch yeast dry into the wort - Add %1 liter water in the fermenter + Add decanted yeast starter - Aerate %1 minutes with %2 - - - - - Set fermentation start temperature to %1°C + Add the yeast + Add %1 liter water in the fermenter + + + + + Aerate %1 minutes with %2 + + + + + Set fermentation start temperature to %1°C + + + + Start fermentation - + Primary fermentation - + Add %1 kg `%2` on day 3 or 4 - + Add %1 %2 `%3` on day 3 or 4 - + Secondary fermentation - - + + Add %1 pack %2, `%3` yeast (with starter if needed) - - + + Add %1 gram %2, `%3` - + Add %1 gram %2, `%3` yeast (with starter if needed) - + After %1 hours harvest yeast from the %2 - + Tertiary fermentation - - Add %1 kg `%2` - - - + Add %1 kg `%2` + + + + Add %1 gram `%2` for %3 days - + Add %1 ml %2, `%3` yeast (with starter if needed) - + Add %1 %2 `%3` for %4 days - + Packaging - + Bottling add %1 kg `%2` with %3 liter water - + Kegging add %1 kg `%2` with %3 liter water - + Add %1, `%2` as bottle yeast - + Add %1 gram %2, `%3` as bottle yeast - + Add %1 ml %2, `%3` as bottle yeast - + Add %1 %2 `%3` during bottling - + Add %1 gr `%2` - + Number - + Year - + Brew sessions - + Brew volume - + Average volume - - - Code - - - - - - Name - - - - - Max extract - - - - - Mash eff. - - - - Sparge eff + + Code + + Name + + + + + Max extract + + + + + Mash eff. + + + + + Sparge eff + + + + Boil eff - - Primary - - - - - Secondary - - - - - Tertiary - - - - - Days - - - - - OG - - - - FG + Primary + Secondary + + + + + Tertiary + + + + + Days + + + + + OG + + + + + FG + + + + AA - + + Measured: - + %1 split the batch here! - + Inventory - - Yeastbank - - - - - Year production - - - - - Brew efficiency - - - - - Fermentations - - - + Yeastbank + + + + + Year production + + + + + Brew efficiency + + + + + Fermentations + + + + Date and time diff -r ac216a75ca9b -r fbb250c725bb translations/bmsapp_nl.ts --- a/translations/bmsapp_nl.ts Sat Jan 14 11:34:51 2023 +0100 +++ b/translations/bmsapp_nl.ts Sat Jan 14 14:14:59 2023 +0100 @@ -1186,61 +1186,76 @@ Kookketel hoogte cm: - + + Measured inside the kettle + Gemeten binnen in de ketel + + + + Boil size at 100 °C L: + Kook volume bij 100 °C L: + + + + Batch size at 100 °C L: + Eind volume bij 100 °C L: + + + Kettle trub loss L: Kookketel trub verlies L: - + Transfer Overbrengen - + Wort chiller type: Wort koeler type: - + Minutes elapsed to cool to 79 °C Nodige minuten om tot 79 °C te koelen - + Minutes to cool to 79 °C: Minuten koelen tot 79 °C: - + Volume lost in hoses, pump ... Verlies in slangen, pomp ... - + Transfer loss L: Overbrengen verlies L: - + Immersion chiller L: Dompelkoeler L: - + Temporary extra volume of the immersion chiller in the kettle. Used to correct the after boil volume. Tijdelijk extra volume in de kookketel. Wordt gebruikt als correctie voor na koken volume. - + Liters per minute to pump trough the chiller. Used to calculate the time needed to transfer the wort. Liters per minuut pompen door de koeler. Gebruikt om de tijd te berekenen om het wort weg te pompen. - + Transfer liters/minute: Overbrengen liters/minuut: @@ -1277,22 +1292,21 @@ Kookketel hoogte cm: - Boil size L: - Kook volume L: - - - + Kook volume L: + + + Evaporation L/hour: Verdamping per uur L: - + Boil time minutes: Kooktijd minuten: - + Top up kettle L: Extra water bij koken L: @@ -1301,16 +1315,15 @@ Hop efficientie %: - Batch size L: - Volume einde kook L: + Volume einde kook L: 100% for small breweries, higher for large breweries. 100% voor kleine brouwerijen, hoger voor grote. - + Chilling Koelen @@ -1319,17 +1332,17 @@ Trub en koeler verlies L: - + Extra water in fermenter L: Extra water in gistvat L: - + Volume in fermenter L: Volume naar het gistvat L: - + Clone Kloon @@ -10821,7 +10834,7 @@ - + Yeast Gist @@ -11094,7 +11107,8 @@ - + + pH pH @@ -11688,7 +11702,12 @@ Plaats spiraalkoeler 10 minuten voor het eind van de kook - + + Note: target volume includes chiller %1 liter + Noot: doel volume inclusief koeler %1 liter + + + Transfer about %1 liter wort to the fermenter Breng ongeveer %1 liter wort over naar het gistvat @@ -11776,53 +11795,53 @@ Doel SG einde koken: - + This is a `no-boil` recipe Dit is een `no-boil` recept - + Whirlpool(s) and cooling Whirlpools en koelen - + Wirlpool for %1 minutes. Keep temp above 85°C Whirlpool voor %1 minuten. Houd temp boven 85°C - - Wirlpool for %1 minutes. Keep temp between 72 and 79°C - Whirlpool voor %1 minuten. Houd temp tussen 72 en 79°C - - - - Wirlpool for %1 minutes. Keep temp between 60 and 66°C - Whirlpool voor %1 minuten. Houd temp tussen 60 en 66°C - - + Wirlpool for %1 minutes. Keep temp between 72 and 79°C + Whirlpool voor %1 minuten. Houd temp tussen 72 en 79°C + + + + Wirlpool for %1 minutes. Keep temp between 60 and 66°C + Whirlpool voor %1 minuten. Houd temp tussen 60 en 66°C + + + %1 gr `%2` for %3 minutes in the whirlpool %1 gr `%2` voor %3 minuten in de whirlpool - + Cool to %1°C Koel tot %1°C - - Wirlpool for %1 minutes. - Whirlpool voor %1 minuten. - - - - Cooling - Koelen - - + Wirlpool for %1 minutes. + Whirlpool voor %1 minuten. + + + + Cooling + Koelen + + + Desinfect fermenter and pump and hoses if needed Ontsmet het gistvat en eventueel de pomp en slangen @@ -11831,314 +11850,315 @@ Breng het wort over naar het gistvat - + Liter Liter - + Yeast pitching and fermentation Gist enten en vergisten - + %1 pack %2, `%3` yeast %1 pak %2, `%3` gist - + %1 gram %2, `%3` yeast %1 gram %2, `%3` gist - + %1 ml %2, `%3` yeast %1 ml %2, `%3` gist - + Pitch yeast at %1°C Ent gist bij %1°C - - Pitch yeast dry into the wort - Strooi de gist over het wort - - - - Add decanted yeast starter - Toevoegen afgegoten giststarter - - - Add the yeast - Gist toevoegen + Pitch yeast dry into the wort + Strooi de gist over het wort - Add %1 liter water in the fermenter - Voeg %1 liter water toe in het gistvat + Add decanted yeast starter + Toevoegen afgegoten giststarter - Aerate %1 minutes with %2 - Belucht %1 minuten met %2 - - - - Set fermentation start temperature to %1°C - Zet de vergisting start temperatuur op %1°C + Add the yeast + Gist toevoegen + Add %1 liter water in the fermenter + Voeg %1 liter water toe in het gistvat + + + + Aerate %1 minutes with %2 + Belucht %1 minuten met %2 + + + + Set fermentation start temperature to %1°C + Zet de vergisting start temperatuur op %1°C + + + Start fermentation Start vergisten - + Primary fermentation Hoofdvergisting - + Add %1 kg `%2` on day 3 or 4 Voeg %1 kg `%2` toe op dag 3 of 4 - + Add %1 %2 `%3` on day 3 or 4 Voeg %1 %2 `%3` toe op dag 3 of 4 - + Secondary fermentation Nagisting - - + + Add %1 pack %2, `%3` yeast (with starter if needed) Voeg %1 pak(ken) %2, `%3` gist toe (eventueel met starter) - - + + Add %1 gram %2, `%3` Toevoegen %1 gram %2, `%3` - + Add %1 gram %2, `%3` yeast (with starter if needed) Voeg %1 gram %2, `%3` gist toe (eventueel met starter) - + After %1 hours harvest yeast from the %2 Na %1 uur oogst de gist vanaf de %2 - + Tertiary fermentation Lageren - - Add %1 kg `%2` - Toevoegen %1 kg `%2` - - + Add %1 kg `%2` + Toevoegen %1 kg `%2` + + + Add %1 gram `%2` for %3 days Toevoegen %1 gram `%2` voor %3 dagen - + Add %1 ml %2, `%3` yeast (with starter if needed) Voeg %1 ml %2, `%3` gist toe (eventueel met starter) - + Add %1 %2 `%3` for %4 days Toevoegen %1 %2 `%3` voor %4 dagen - + Packaging Verpakken - + Bottling add %1 kg `%2` with %3 liter water Bottelen met %1 kg `%2` en %3 liter water - + Kegging add %1 kg `%2` with %3 liter water Keggen met %1 kg `%2` en %3 liter water - + Add %1, `%2` as bottle yeast Toevoegen %1, `%%2` als bottelgist - + Add %1 gram %2, `%3` as bottle yeast Toevoegen %1 gram %2, `%3` als bottelgist - + Add %1 ml %2, `%3` as bottle yeast Toevoegen %1 ml %2, `%3` als bottelgist - + Add %1 %2 `%3` during bottling Toevoegen %1 %2 `%3` tijdens bottelen - + Add %1 gr `%2` Toevoegen %1 gr `%2` - + Number Nummer - + Year Jaar - + Brew sessions Brouw sessies - + Brew volume Brouw volume - + Average volume Gemiddeld volume - - - Code - Code - - - - - Name - Naam - - - - Max extract - Max extract - - - - Mash eff. - Maisch % - - - Sparge eff - Spoelen % + + Code + Code + + Name + Naam + + + + Max extract + Max extract + + + + Mash eff. + Maisch % + + + + Sparge eff + Spoelen % + + + Boil eff Koken % - - Primary - Hoofdgisting - - - - Secondary - Nagisten - - - - Tertiary - Lageren - - - - Days - Dagen - - - - OG - OG - - - FG - FG + Primary + Hoofdgisting + Secondary + Nagisten + + + + Tertiary + Lageren + + + + Days + Dagen + + + + OG + OG + + + + FG + FG + + + AA SVG - + + Measured: Gemeten: - + %1 split the batch here! %1 splits de batch hier! - + Inventory Inventaris - - Yeastbank - Gistbank - - - - Year production - Jaar productie - - - - Brew efficiency - Brouw rendement - - - - Fermentations - Vergistingen - - + Yeastbank + Gistbank + + + + Year production + Jaar productie + + + + Brew efficiency + Brouw rendement + + + + Fermentations + Vergistingen + + + Date and time Datum en tijd - - - + + + Beer style Bierstijl diff -r ac216a75ca9b -r fbb250c725bb ui/EditEquipment.ui --- a/ui/EditEquipment.ui Sat Jan 14 11:34:51 2023 +0100 +++ b/ui/EditEquipment.ui Sat Jan 14 14:14:59 2023 +0100 @@ -672,6 +672,9 @@ 24 + + Measured inside the kettle + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -701,7 +704,7 @@ - Boil size L: + Boil size at 100 °C L: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -793,7 +796,7 @@ - Batch size L: + Batch size at 100 °C L: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter