# HG changeset patch # User Michiel Broek # Date 1717858732 -7200 # Node ID 50b057ae50aa40141dbfda3f1534624621d3ce71 # Parent 84091b9cb800c03fc17a7271718b4d3eb57b817a Update total water volume. diff -r 84091b9cb800 -r 50b057ae50aa src/EditProductTab7.cpp --- a/src/EditProductTab7.cpp Sat Jun 08 15:54:30 2024 +0200 +++ b/src/EditProductTab7.cpp Sat Jun 08 16:58:52 2024 +0200 @@ -261,6 +261,7 @@ product->brew_sparge_est = round((product->boil_size - infused + (product->mashs_kg * my_grain_absorption) + product->eq_lauter_deadspace) * 1.03 * 1000) / 1000; ui->brew_spargeestShow->setValue(product->brew_sparge_est); + ui->wb_volEdit->setValue(product->wg_amount + product->brew_sparge_est); } diff -r 84091b9cb800 -r 50b057ae50aa src/EditProductTab8.cpp --- a/src/EditProductTab8.cpp Sat Jun 08 15:54:30 2024 +0200 +++ b/src/EditProductTab8.cpp Sat Jun 08 16:58:52 2024 +0200 @@ -301,6 +301,7 @@ ui->wg_phEdit->setValue(ph); ui->wg_hardnessEdit->setValue(Utils::Hardness(calcium, magnesium)); ui->wg_raEdit->setValue(Utils::ResidualAlkalinity(total_alkalinity, calcium, magnesium)); + ui->wb_volEdit->setValue(product->wg_amount + product->brew_sparge_est); /* Save mixed water ions for later */ double wg_calcium = calcium; @@ -1270,6 +1271,7 @@ } product->wg_amount = mash_infuse; ui->wg_volEdit->setValue(mash_infuse); + ui->wb_volEdit->setValue(product->wg_amount + product->brew_sparge_est); } diff -r 84091b9cb800 -r 50b057ae50aa translations/bmsapp_en.ts --- a/translations/bmsapp_en.ts Sat Jun 08 15:54:30 2024 +0200 +++ b/translations/bmsapp_en.ts Sat Jun 08 16:58:52 2024 +0200 @@ -2490,14 +2490,14 @@ - + Save - + @@ -2542,8 +2542,8 @@ - - + + Efficiency: @@ -2574,22 +2574,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + % @@ -2597,12 +2597,12 @@ - - - - - - + + + + + + min @@ -2634,21 +2634,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + L @@ -2947,7 +2947,7 @@ - + Top up water: @@ -3025,7 +3025,7 @@ - + Kettle trub loss: @@ -3084,7 +3084,7 @@ - + Add @@ -3167,10 +3167,10 @@ - - - - + + + + Set or clear date @@ -3179,29 +3179,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + ... @@ -3258,7 +3258,7 @@ - + Set the date to today. @@ -3269,12 +3269,12 @@ - - - - - - + + + + + + dd-MM-yyyy @@ -3414,8 +3414,8 @@ - - + + gr @@ -3653,14 +3653,13 @@ - Sparge - + Actual Water Adjustment @@ -3677,7 +3676,7 @@ - + Treated Mash Water @@ -3689,443 +3688,449 @@ - + + Sparge +Source + + + + Brewday - + Brewday plan: - + Brewday end: - + Mashing and Sparge - + Mash pH: - + Mash SG: - + Mash efficiency: - + Sparge water pH: - + Sparge supply: - + Sparge estimate: - + Sparge temp: - - - - - - - - - + + + + + + + + + °C - + Pre boil - - - + + + Measured pH: - - - + + + Measured SG: - - + + Volume @100°C: - + Mash, sparge and lauter efficiency. - - - - + + + + Edit volume - + Whirlpools - + Whirlpool 72..79°C: - + Whirlpool 60..66°C: - + Whirlpool cold: - + Whirlpool 85..100°C: - + Transfer to fermenter - + Volume to fermenter: - + SG in fermenter: - + EBC color in fermenter: - + IBU in fermenter: - + Aeration time & speed: - + L/m - + Aeration with: - - - - + + + + Brew log chart - + Cooling - + Cooling method: - + Cooling to: - + Cooling time: - + After boil - + The overall efficiency. - + Edit the brewdate plan or start. - + Clear planned brewdate - + Edit the brewdate start time. - - + + hh:mm - + Edit the brewdate end. - + Edit the brewdate end time. - + Set the brewdate end date. - + End time: - + Start time: - + Show brewlog: - + Confirm brew done: - - - + + + Confirm the brew dates and times. - + Fermenting - + Primary fermentation - + Start density: - + Start temperature: - + Peak temperature: - - + + End temperature: - - + + End density: - - + + End date: - - - + + + Apparent attenuation: - - - + + + Edit SG in Plato, Brix or SG - - + + Set the date to today - + Edit the date the primary fermentation was done. - + Secondary fermentation - + Edit the date the secondary fermentation was done. - + Tertiary fermentation - + Average temperature: - + Final density: - + Expected end density: - + Alcohol volume: - + Show fermenter unit log: - + Show fermentation log: - + Package - + Package date: - + Carbonation range: - + Infusion or Dilution - + Package volume: - + Extra added volume: - + Extra remarks: - + Estimated final ABV %: - + Estimated final IBU: - + Estimated final EBC: - + Extra added ABV %: @@ -4135,231 +4140,231 @@ - + pH from fermenter: - + Extra dilution or infusion added to this batch. - - + + The ABV including the infusion. - + If there is alcohol in the infusion, give the percentage. - + Could be the description of the infusion. - + Estimated package ABV %: - + Bottles - - + + Volume: - - + + Desired volume CO2: - - + + Priming sugar: - - + + Sugar amount: - - + + Priming: - - + + Water amount: - + Bottle fermentation: - - + + gr/L - + Expected pressure in bar: - + Bottles ABV %: - + Kegs - + Kegs ABV %: - + Kegs pressure in bar: - + Kegs temperature: - + Forced carbonation: - + Edit the package date. - + Show carbonation log: - + Tasting - + Taste date: - + Taste rate: - + Color: - + Transparency: - + Head: - + Aroma: - + Taste: - + Aftertaste: - + Mouthfeel: - + Notes: - + Edit the tasting date. - + Images - + Previous - + Next - + Filename: - + Comment: - + Type: - + Export - - + + Print @@ -4559,7 +4564,7 @@ - + Delete %1 @@ -5046,67 +5051,67 @@ - + Delete mash step - + Step name: - + Step type: - - Infusion - - - - Temperature + Infusion + Temperature + + + + Decoction - + Step start temp: - + Step end temp: - + Step rest time: - + Step ramp time: - + Measured Brix: - + Infusion volume: - + Infusion Temperature: @@ -5122,7 +5127,7 @@ - + Balanced @@ -5137,47 +5142,47 @@ - + Too malty - + Very malty - + Malty - + Little bitter - + Bitter - + Very bitter - + Too bitter - + Target Water Adjustment - + Treated Sparge Water @@ -5510,7 +5515,7 @@ - + Image here diff -r 84091b9cb800 -r 50b057ae50aa translations/bmsapp_nl.ts --- a/translations/bmsapp_nl.ts Sat Jun 08 15:54:30 2024 +0200 +++ b/translations/bmsapp_nl.ts Sat Jun 08 16:58:52 2024 +0200 @@ -2831,14 +2831,14 @@ - + Save Bewaar - + @@ -2883,8 +2883,8 @@ - - + + Efficiency: Rendement: @@ -2915,22 +2915,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + % % @@ -2938,12 +2938,12 @@ - - - - - - + + + + + + min min @@ -2975,21 +2975,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + L @@ -3183,7 +3183,7 @@ Trub koeler verlies: - + Top up water: Extra water in gistvat: @@ -3256,7 +3256,7 @@ - + Add Nieuw @@ -3318,10 +3318,10 @@ - - - - + + + + Set or clear date Zet of wis datum @@ -3330,29 +3330,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + ... ... @@ -3408,7 +3408,7 @@ - + Set the date to today. Zet de datum op vandaag. @@ -3419,12 +3419,12 @@ - - - - - - + + + + + + dd-MM-yyyy dd-MM-yyyy @@ -3745,8 +3745,8 @@ - - + + gr gr @@ -3890,92 +3890,92 @@ - + Brewday Brouwdag - + Sparge supply: Spoelwater voorraad: - + Sparge estimate: Spoelwater geschat: - + Sparge temp: Spoelwater temp: - + Start density: Begin densiteit: - + Start temperature: Start temperatuur: - + Peak temperature: Piek temperatuur: - - + + End temperature: Eind temperatuur: - - + + End density: Eind densiteit: - - + + End date: Eind datum: - - - + + + Apparent attenuation: Schijnbare vergisting: - + Edit the date the secondary fermentation was done. Wijzig de datum dat de nagisting gereed was. - + Average temperature: Gemiddelde temperatuur: - + Final density: Finale densiteit: - + Expected end density: Verwachte eind densiteit: - + Extra added volume: Toevoeging volume: - + Extra remarks: Toevoeging opmerking: @@ -3985,45 +3985,45 @@ Finale ABV %: - + Extra added ABV %: Toevoeging extra ABV %: - + Estimated final IBU: Verwacht finale IBU: - + Estimated final EBC: Verwacht finale EBC: - - + + Volume: Volume: - - + + Priming: Carbonatie: - + Bottle fermentation: Flessen hergisting: - - + + gr/L gr/L - + Kegs temperature: Fusten temperatuur: @@ -4032,32 +4032,32 @@ Brouwdag start: - + Brewday end: Brouwdag eind: - + Mashing and Sparge Maischen en Spoelen - + Mash pH: Maisch pH: - + Mash SG: Maisch SG: - + Mash efficiency: Maisch rendement: - + Sparge water pH: Spoelwater pH: @@ -4090,35 +4090,35 @@ Voor koken rendement: - - - - + + + + Edit volume Wijzig volume - + Whirlpool cold: Whirlpool koud: - + Aeration time & speed: Beluchten tijd snelheid: - + Cooling method: Koelen methode: - + Cooling time: Koelen tijd: - + Transfer to fermenter Naar gistvat @@ -4153,61 +4153,61 @@ - + Brewday plan: Brouwdag plan: - - - - - - - - - + + + + + + + + + °C °C - + Pre boil Begin koken - - + + Volume @100°C: Volume @100°C: - + Mash, sparge and lauter efficiency. Maischen, spoelen en filteren rendement. - + Whirlpools Whirlpoolen - + Whirlpool 72..79°C: Whirlpool 72..79°C: - + Whirlpool 60..66°C: Whirlpool 60..66°C: - + Whirlpool 85..100°C: Whirlpool 85..100°C: - + Volume to fermenter: Volume naar gistvat: @@ -4216,17 +4216,17 @@ Trub en koeler verlies: - + SG in fermenter: SG in gistvat: - + EBC color in fermenter: EBC kleur in gistvat: - + IBU in fermenter: IBU in het gistvat: @@ -4235,7 +4235,7 @@ Beluchten - + Aeration with: Beluchten met: @@ -4248,177 +4248,177 @@ Beluchten snelheid: - + L/m L/m - - - - + + + + Brew log chart Brouw log grafiek - + Cooling Koelen - + Cooling to: Koelen tot: - + After boil Einde koken - + The overall efficiency. Het totale brouwzaal rendement. - + Edit the brewdate plan or start. Wijzig de brouwdag plan of start datum. - + Clear planned brewdate Wis geplande brouwdag - + Edit the brewdate start time. Wijzig de brouwdag start tijd. - - + + hh:mm hh:mm - + Edit the brewdate end. Wijzig de brouwdag eind datum. - + Edit the brewdate end time. Wijzig de brouwdag eind tijd. - + Set the brewdate end date. Zet de brouwdag eind datum. - + End time: Eind tijd: - + Start time: Start tijd: - + Show brewlog: Toon brouwlog: - + Confirm brew done: Bevestig brouwdag: - - - + + + Confirm the brew dates and times. Bevestig de brouw datums en tijden. - + Fermenting Vergisten - + Primary fermentation Hoofdvergisting - - - + + + Edit SG in Plato, Brix or SG Wijzig SG in Plato, Brix of SG - - + + Set the date to today Zet de datum op vandaag - + Edit the date the primary fermentation was done. Wijzig de datum dat de hoofdgisting gereed was. - + Secondary fermentation Nagisting - + Tertiary fermentation Lageren - + Alcohol volume: Alcohol vol%: - + Show fermenter unit log: Toon gistkast log: - + Show fermentation log: Toon vergisting log: - + Package Verpakken - + Package date: Verpakken datum: - + Carbonation range: Koolzuur volumes: - + Infusion or Dilution Infusie of verdunnen - + Package volume: Verpakken volume: @@ -4428,7 +4428,7 @@ Verpakken ABV %: - + pH from fermenter: pH vanuit gistvat: @@ -4533,7 +4533,7 @@ - + Kettle trub loss: Kookketel trub verlies: @@ -4642,7 +4642,6 @@ Gemengd spoelwater - Sparge Spoel @@ -4653,7 +4652,7 @@ - + Actual Water Adjustment @@ -4675,208 +4674,214 @@ - + Treated Mash Water - + + Sparge +Source + + + + Estimated final ABV %: Verwacht finale ABV %: - + Extra dilution or infusion added to this batch. Toegevoegde verdunning of infusie aan deze batch. - - + + The ABV including the infusion. Het ABV inclusief infusie. - + If there is alcohol in the infusion, give the percentage. Als er alcohol in de infusie zit, geef hier het percentage. - + Could be the description of the infusion. Hier kun je de toevoeging beschrijven. - + Estimated package ABV %: Verwacht verpakken ABV %: - + Bottles Flessen - - + + Desired volume CO2: Gewenst volume CO2: - - + + Priming sugar: Carbonatie suiker: - - + + Sugar amount: Suiker gewicht: - - + + Water amount: Water volume: - + Expected pressure in bar: Verwachte druk in bar: - + Bottles ABV %: Flessen ABV %: - + Kegs Fusten - + Kegs ABV %: Fusten ABV %: - + Kegs pressure in bar: Fusten druk in bar: - + Forced carbonation: Geforceerde carbonatie: - + Edit the package date. Wijzig de verpakkings datum. - + Show carbonation log: Toon carbonatie log: - + Tasting Proeven - + Taste date: Proeven datum: - + Taste rate: Beoordeling cijfer: - + Color: Kleur: - + Transparency: Helderheid: - + Head: Schuim: - + Aroma: Geur: - + Taste: Smaak: - + Aftertaste: Nasmaak: - + Mouthfeel: Mondgevoel: - + Notes: Opmerkingen: - + Edit the tasting date. Wijzig de datum van proeven. - + Images Plaatjes - + Previous Vorige - + Next Volgende - + Filename: Bestand: - + Comment: Bijschrift: - + Type: Soort: - + Export Exporteer - - + + Print Print @@ -5152,7 +5157,7 @@ - + Delete %1 @@ -5658,81 +5663,81 @@ SG - + Delete mash step Verwijder maisch stap - + Step name: Stap naam: - + Step type: Stap type: - - Infusion - Infusie - - - Temperature - Verwarmen + Infusion + Infusie + Temperature + Verwarmen + + + Decoction Decoctie - + Step start temp: Start temperatuur: - + Step end temp: Eind temperatuur: - + Step rest time: Rust tijd: - + Step ramp time: Verwarm tijd: - - - + + + Measured pH: Gemeten pH: - + Measured Brix: Gemeten Brix: - - - + + + Measured SG: Gemeten SG: - + Infusion volume: Infusie volume: - + Infusion Temperature: Infusie temperatuur: @@ -5748,7 +5753,7 @@ - + Balanced Gebalanceerd @@ -5763,47 +5768,47 @@ Erg hoppig, erg bitter - + Too malty Te moutig - + Very malty Erg moutig - + Malty Moutig - + Little bitter Iets bitter - + Bitter Bitter - + Very bitter Erg bitter - + Too bitter Veel te bitter - + Target Water Adjustment - + Treated Sparge Water @@ -6199,7 +6204,7 @@ Kan niet laden %1: %2 - + Image here Plaatje hier diff -r 84091b9cb800 -r 50b057ae50aa ui/EditProduct.ui --- a/ui/EditProduct.ui Sat Jun 08 15:54:30 2024 +0200 +++ b/ui/EditProduct.ui Sat Jun 08 16:58:52 2024 +0200 @@ -88,6 +88,9 @@ 540 + + Use only the standard source 1 for sparge water. + QTabWidget::North @@ -6240,9 +6243,7 @@ - Total brew and sparge water supply. -In the mash tab set the infusion volumes. -The sparge volume is automatic calculated. + The mixed mash water from both sources. Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -6918,7 +6919,7 @@ - Total brew and sparge water supply without optional dilution water + Total standard water supply without optional dilution water. Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -7717,9 +7718,7 @@ - Total brew and sparge water supply. -In the mash tab set the infusion volumes. -The sparge volume is automatic calculated. + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -7913,7 +7912,7 @@ - Sparge water source 1 + Sparge water source 1 only. @@ -7938,7 +7937,7 @@ - Sparge water source 1 + Sparge water source 2 only. false @@ -7960,7 +7959,7 @@ - Sparge water source 1 + Sparge water mixed just like the mash water. false @@ -7972,17 +7971,18 @@ - 1010 + 1000 10 - 41 - 20 - - - - Sparge - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + 51 + 34 + + + + Sparge +Source + + + Qt::AlignCenter