# HG changeset patch # User Michiel Broek # Date 1673788549 -3600 # Node ID 1654ff5446c77d58459636315daad4c9066eef6d # Parent add4dbef0c81c2001d732543ebfe0afbc4da6076 Removed the last bits of equipent calc_volume setting. Changed to the equipment setup screen using suffixes in the fields. Updated the translations. diff -r add4dbef0c81 -r 1654ff5446c7 src/EditEquipment.cpp --- a/src/EditEquipment.cpp Sun Jan 15 12:35:04 2023 +0100 +++ b/src/EditEquipment.cpp Sun Jan 15 14:15:49 2023 +0100 @@ -54,7 +54,6 @@ ui->trub_lossEdit->setValue(query.value("trub_loss").toDouble()); ui->evap_rateEdit->setValue(query.value("evap_rate").toDouble()); ui->boil_timeEdit->setValue(query.value("boil_time").toDouble()); - ui->calcboilEdit->setChecked(query.value("calc_boil_volume").toInt() ? true:false); ui->top_up_kettleEdit->setValue(query.value("top_up_kettle").toDouble()); ui->notesEdit->setPlainText(query.value("notes").toString()); ui->lauter_deadspaceEdit->setValue(query.value("lauter_deadspace").toDouble()); @@ -90,7 +89,6 @@ ui->trub_lossEdit->setValue(0.5); ui->evap_rateEdit->setValue(1.8); ui->boil_timeEdit->setValue(90); - ui->calcboilEdit->setChecked(true); ui->top_up_kettleEdit->setValue(0); ui->lauter_deadspaceEdit->setValue(0.5); ui->kettle_volumeEdit->setValue(20); @@ -120,7 +118,6 @@ connect(ui->trub_lossEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed); connect(ui->evap_rateEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed); connect(ui->boil_timeEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed); - connect(ui->calcboilEdit, &QCheckBox::stateChanged, this, &EditEquipment::is_changed); connect(ui->top_up_kettleEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed); connect(ui->notesEdit, SIGNAL(textChanged()), this, SLOT(is_changed())); connect(ui->lauter_deadspaceEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed); @@ -189,7 +186,7 @@ "batch_size=:batch_size, tun_volume=:tun_volume, tun_weight=:tun_weight, " "tun_specific_heat=:tun_specific_heat, tun_material=:tun_material, tun_height=:tun_height, " "top_up_water=:top_up_water, trub_loss=:trub_loss, evap_rate=:evap_rate, " - "boil_time=:boil_time, calc_boil_volume=:calcboil, top_up_kettle=:top_up_kettle, " + "boil_time=:boil_time, top_up_kettle=:top_up_kettle, " "notes=:notes, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, " "kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, " "efficiency=:efficiency, chiller_type=:chiller_type, chiller_to79=:chiller_to79, " @@ -212,7 +209,6 @@ query.bindValue(":trub_loss", QString("%1").arg(ui->trub_lossEdit->value(), 2, 'f', 1, '0')); query.bindValue(":evap_rate", QString("%1").arg(ui->evap_rateEdit->value(), 3, 'f', 2, '0')); query.bindValue(":boil_time", QString("%1").arg(ui->boil_timeEdit->value(), 1, 'f', 0, '0')); - query.bindValue(":calcboil", ui->calcboilEdit->isChecked() ? 1:0); query.bindValue(":top_up_kettle", QString("%1").arg(ui->top_up_kettleEdit->value(), 2, 'f', 1, '0')); query.bindValue(":notes", ui->notesEdit->toPlainText()); query.bindValue(":lauter_deadspace", QString("%1").arg(ui->lauter_deadspaceEdit->value(), 2, 'f', 1, '0')); @@ -259,7 +255,7 @@ "batch_size=:batch_size, tun_volume=:tun_volume, tun_weight=:tun_weight, " "tun_specific_heat=:tun_specific_heat, tun_material=:tun_material, tun_height=:tun_height, " "top_up_water=:top_up_water, trub_loss=:trub_loss, evap_rate=:evap_rate, " - "boil_time=:boil_time, calc_boil_volume=:calcboil, top_up_kettle=:top_up_kettle, " + "boil_time=:boil_time, top_up_kettle=:top_up_kettle, " "notes=:notes, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, " "kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, " "efficiency=:efficiency, chiller_type=:chiller_type, chiller_to79=:chiller_to79, " @@ -277,7 +273,6 @@ query.bindValue(":trub_loss", QString("%1").arg(ui->trub_lossEdit->value(), 2, 'f', 1, '0')); query.bindValue(":evap_rate", QString("%1").arg(ui->evap_rateEdit->value(), 3, 'f', 2, '0')); query.bindValue(":boil_time", QString("%1").arg(ui->boil_timeEdit->value(), 1, 'f', 0, '0')); - query.bindValue(":calcboil", ui->calcboilEdit->isChecked() ? 1:0); query.bindValue(":top_up_kettle", QString("%1").arg(ui->top_up_kettleEdit->value(), 2, 'f', 1, '0')); query.bindValue(":notes", ui->notesEdit->toPlainText()); query.bindValue(":lauter_deadspace", QString("%1").arg(ui->lauter_deadspaceEdit->value(), 2, 'f', 1, '0')); diff -r add4dbef0c81 -r 1654ff5446c7 src/ImportXML.cpp --- a/src/ImportXML.cpp Sun Jan 15 12:35:04 2023 +0100 +++ b/src/ImportXML.cpp Sun Jan 15 14:15:49 2023 +0100 @@ -103,7 +103,7 @@ "batch_size=:batch_size, tun_volume=:tun_volume, tun_weight=:tun_weight, " "tun_specific_heat=:tun_specific_heat, tun_material=:tun_material, tun_height=:tun_height, " "top_up_water=:top_up_water, trub_loss=:chiller_loss, evap_rate=:evap_rate, " - "boil_time=:boil_time, calc_boil_volume=:calcboil, top_up_kettle=:top_up_kettle, " + "boil_time=:boil_time, top_up_kettle=:top_up_kettle, " "hop_utilization=:hopfactor, notes=:notes, lauter_volume=:lauter_volume, " "lauter_height=:lauter_height, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, " "kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, " @@ -121,7 +121,6 @@ /* The evaporation in beerxml is percentage, but we use the real volume per hour */ query.bindValue(":evap_rate", QString("%1").arg((eq->evap_rate / 100) * eq->boil_size, 3, 'f', 2, '0')); query.bindValue(":boil_time", QString("%1").arg(eq->boil_time, 1, 'f', 0, '0')); - query.bindValue(":calcboil", eq->calc_boil_volume ? 1:0); query.bindValue(":top_up_kettle", QString("%1").arg(eq->top_up_kettle, 2, 'f', 1, '0')); query.bindValue(":hopfactor", QString("%1").arg(eq->hop_utilization, 1, 'f', 0, '0')); query.bindValue(":notes", eq->notes); @@ -150,7 +149,7 @@ (xml->name() == "DISPLAY_LAUTERDEADSPACE") || (xml->name() == "TUN_MATERIAL") || (xml->name() == "ATTENUATION_FACTOR_YEAST") || (xml->name() == "ATTENUATION_FACTOR_WATER_TO_GRAIN_RATIO") || (xml->name() == "ATTENUATION_FACTOR_TOTAL_MASH_TIME") || (xml->name() == "ATTENUATION_FACTOR_PERC_SIMPLE_SUGAR") || - (xml->name() == "ATTENUATION_FACTOR_CONSTANT"))) { + (xml->name() == "ATTENUATION_FACTOR_CONSTANT") || (xml->name() == "CALC_BOIL_VOLUME"))) { // Ignore. } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "NAME")) { eq->name = xml->readElementText(); @@ -183,8 +182,6 @@ eq->evap_rate = xml->readElementText().toDouble(); } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "BOIL_TIME")) { eq->boil_time = xml->readElementText().toDouble(); - } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "CALC_BOIL_VOLUME")) { - eq->calc_boil_volume = (xml->readElementText() == "TRUE") ? true:false; } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "TOP_UP_KETTLE")) { eq->top_up_kettle = xml->readElementText().toDouble(); } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "HOP_UTILIZATION")) { diff -r add4dbef0c81 -r 1654ff5446c7 src/global.h --- a/src/global.h Sun Jan 15 12:35:04 2023 +0100 +++ b/src/global.h Sun Jan 15 14:15:49 2023 +0100 @@ -251,7 +251,7 @@ double trub_loss; double evap_rate; double boil_time; - bool calc_boil_volume; + bool x_calc_boil_volume; double top_up_kettle; double hop_utilization; QString notes; diff -r add4dbef0c81 -r 1654ff5446c7 translations/bmsapp_en.ts --- a/translations/bmsapp_en.ts Sun Jan 15 12:35:04 2023 +0100 +++ b/translations/bmsapp_en.ts Sun Jan 15 14:15:49 2023 +0100 @@ -1049,245 +1049,299 @@ + + + + + + + + + + + + + L + + + + + Tun volume: + + + + + Tun height: + + + + + Tun weight: + + + + + Mash water: + + + + + Maximum malts: + + + + + + cm + + + + + + kg + + + + + Lauter deadspace: + + + + + Brewhouse efficiency: + + + + + % + + + + + Kettle volume: + + + + + Kettle height: + + + + + Boil size at 100 °C: + + + + + Evaporation Liter/hour: + + + + + Boil time: + + + + + Top up kettle: + + + + + Batch size at 100 °C: + + + + + L/h + + + + + + min + + + + + Added extra water during boil + + + + + Kettle trub loss: + + + + + Extra water in fermenter: + + + + + Volume in fermenter: + + + + + Extra water to add to the fermenter + + + + + Transfer loss: + + + + + Immersion chiller: + + + - Calculate boil volume: - - - - - Yes - - - - Mashing - - Tun volume L: - - - - - Tun height cm: - - - - - Tun weight kg: - - - - + Tun material: - + Tun specific heat: - - Mash water L: - - - - - Maximum malts kg: - - - - + Lautering - - Lauter deadspace L: - - - - - Brewhouse efficiency %: - - - - + Boiling - - Kettle volume L: - - - - - Kettle height cm: - - - - + 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: - - - - - Kettle trub loss L: - - - - + + Trub loss to leave behind in the kettle + + + + Transfer - - Extra water in fermenter L: - - - - - Volume in fermenter L: - - - - + Clone - + Chilling - + Wort chiller type: - - Minutes elapsed to cool to 79 °C - - - + 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. - + + L/m + + + + Transfer liters/minute: - + BMSapp - Add new equipment - + BMSapp - Edit equipment %1 - + Edit Equipment - + Name empty or too short. - - - + + + Database error - - - + + + MySQL error: %1 %2 %3 - + Delete equipment - + Delete %1 - + Equipment changed - + This equipment has been modified. Save changes? diff -r add4dbef0c81 -r 1654ff5446c7 translations/bmsapp_nl.ts --- a/translations/bmsapp_nl.ts Sun Jan 15 12:35:04 2023 +0100 +++ b/translations/bmsapp_nl.ts Sun Jan 15 14:15:49 2023 +0100 @@ -1126,136 +1126,282 @@ Verwijder - + + + + + + + + + + + + + L + L + + + + Tun volume: + Maischkuip volume: + + + + Tun height: + Maischkuip hoogte: + + + + Tun weight: + Maischkuip gewicht: + + + + Mash water: + Maisch water: + + + + Maximum malts: + Maximum moutstort: + + + + + cm + cm + + + + + kg + Kg + + + + Lauter deadspace: + Filterkuip dode ruimte: + + + + Brewhouse efficiency: + Brouwzaal rendement: + + + + % + % + + + + Kettle volume: + Kookketel volume: + + + + Kettle height: + Kookketel hoogte: + + + + Boil size at 100 °C: + Kook volume bij 100 °C: + + + + Evaporation Liter/hour: + Verdamping Liter per uur: + + + + Boil time: + Kooktijd: + + + + Top up kettle: + Extra water bij koken: + + + + Batch size at 100 °C: + Eind volume bij 100 °C: + + + + L/h + L/u + + + + + min + min + + + + Added extra water during boil + Toegevoegd extra water tijdens koken + + + + Kettle trub loss: + Kookketel trub verlies: + + + + Trub loss to leave behind in the kettle + Trub verlies wat achterblijft in de kookketel + + + + Transfer loss: + Overbrengen verlies: + + + + Immersion chiller: + Dompelkoeler: + + Calculate boil volume: - Bereken kook volume: - - - + Bereken kook volume: + + Yes - Ja - - - + Ja + + + Mashing Maischen - Tun volume L: - Maischkuip volume L: - - - + Maischkuip volume L: + + Tun height cm: - Maischkuip hoogte cm: - - - + Maischkuip hoogte cm: + + Tun weight kg: - Maischkuip gewicht kg: - - - + Maischkuip gewicht kg: + + + Tun material: Maischkuip materiaal: - + Tun specific heat: Maischkuip specific heat: - Mash water L: - Maischwater L: - - - + Maischwater L: + + Maximum malts kg: - Maximum moutstort kg: - - - + Maximum moutstort kg: + + + Lautering Filteren - Kettle height cm: - Kookketel hoogte cm: - - - + Kookketel hoogte cm: + + + Measured inside the kettle Gemeten binnen in de ketel - Boil size at 100 °C L: - Kook volume bij 100 °C L: - - - + Kook volume bij 100 °C L: + + Batch size at 100 °C L: - Eind volume bij 100 °C L: - - - + Eind volume bij 100 °C L: + + Kettle trub loss L: - Kookketel trub verlies L: - - - + Kookketel trub verlies L: + + + Transfer Overbrengen - + + Extra water in fermenter: + Extra water in gistvat: + + + + Volume in fermenter: + Volume naar het gistvat: + + + + Extra water to add to the fermenter + Extra water toevoegen in het gistvat + + + Wort chiller type: Wort koeler type: - - Minutes elapsed to cool to 79 °C - Nodige minuten om tot 79 °C te koelen - - + 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: - - - + Overbrengen verlies L: + + Immersion chiller L: - Dompelkoeler 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. - + + L/m + L/m + + + Transfer liters/minute: Overbrengen liters/minuut: @@ -1268,24 +1414,21 @@ Filterkuip hoogte cm: - Lauter deadspace L: - Filterkuip dode ruimte L: - - - + Filterkuip dode ruimte L: + + Brewhouse efficiency %: - Brouwzaal rendement %: - - - + Brouwzaal rendement %: + + + Boiling Koken - Kettle volume L: - Kookketel volume L: + Kookketel volume L: Kettle heigh cmt: @@ -1296,19 +1439,16 @@ Kook volume L: - Evaporation L/hour: - Verdamping per uur L: - - - + Verdamping per uur L: + + Boil time minutes: - Kooktijd minuten: - - - + Kooktijd minuten: + + Top up kettle L: - Extra water bij koken L: + Extra water bij koken L: Hop utilization %: @@ -1323,7 +1463,7 @@ 100% voor kleine brouwerijen, hoger voor grote. - + Chilling Koelen @@ -1332,17 +1472,15 @@ Trub en koeler verlies L: - Extra water in fermenter L: - Extra water in gistvat L: - - - + Extra water in gistvat L: + + Volume in fermenter L: - Volume naar het gistvat L: - - - + Volume naar het gistvat L: + + + Clone Kloon @@ -1363,36 +1501,36 @@ Koper - + BMSapp - Add new equipment BMSapp - Nieuwe apparatuur - + BMSapp - Edit equipment %1 BMSapp - Wijzig apparatuur %1 - + Edit Equipment Wijzig apparatuur - + Name empty or too short. De naam is leeg of te kort. - - - + + + Database error Database fout - - - + + + MySQL error: %1 %2 %3 @@ -1401,22 +1539,22 @@ %3 - + Delete equipment Verwijder apparatuur - + Delete %1 Verwijder %1 - + Equipment changed Apparatuur gewijzigd - + This equipment has been modified. Save changes? Deze installatie is gewijzigd. Wijzigingen opslaan? @@ -5538,7 +5676,7 @@ Measure with placed immersion chiller. - + Opmeten met geplaatste spiraalkoeler. diff -r add4dbef0c81 -r 1654ff5446c7 ui/EditEquipment.ui --- a/ui/EditEquipment.ui Sun Jan 15 12:35:04 2023 +0100 +++ b/ui/EditEquipment.ui Sun Jan 15 14:15:49 2023 +0100 @@ -140,35 +140,6 @@ :icons/silk/delete.png:icons/silk/delete.png - - - - 720 - 10 - 141 - 16 - - - - Calculate boil volume: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 870 - 10 - 85 - 21 - - - - Yes - - @@ -202,6 +173,9 @@ true + + L + 1 @@ -225,7 +199,7 @@ - Tun volume L: + Tun volume: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -241,7 +215,7 @@ - Tun height cm: + Tun height: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -257,7 +231,7 @@ - Tun weight kg: + Tun weight: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -305,7 +279,7 @@ - Mash water L: + Mash water: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -321,7 +295,7 @@ - Maximum malts kg: + Maximum malts: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -342,6 +316,9 @@ true + + cm + 1 @@ -370,6 +347,9 @@ true + + kg + 1 @@ -435,6 +415,9 @@ true + + L + 1 @@ -463,6 +446,9 @@ true + + kg + 1 @@ -512,7 +498,7 @@ - Lauter deadspace L: + Lauter deadspace: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -528,7 +514,7 @@ - Brewhouse efficiency %: + Brewhouse efficiency: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -549,6 +535,9 @@ true + + L + 1 @@ -577,6 +566,9 @@ true + + % + 1 @@ -613,7 +605,7 @@ - Kettle volume L: + Kettle volume: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -634,6 +626,9 @@ true + + L + 1 @@ -657,7 +652,7 @@ - Kettle height cm: + Kettle height: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -681,6 +676,9 @@ true + + cm + 1 @@ -704,7 +702,7 @@ - Boil size at 100 °C L: + Boil size at 100 °C: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -725,6 +723,9 @@ true + + L + 1 @@ -748,7 +749,7 @@ - Evaporation L/hour: + Evaporation Liter/hour: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -764,7 +765,7 @@ - Boil time minutes: + Boil time: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -780,7 +781,7 @@ - Top up kettle L: + Top up kettle: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -796,7 +797,7 @@ - Batch size at 100 °C L: + Batch size at 100 °C: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -817,6 +818,9 @@ true + + L/h + 2 @@ -845,6 +849,9 @@ true + + min + 0 @@ -867,12 +874,18 @@ 24 + + Added extra water during boil + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter true + + L + 1 @@ -907,6 +920,9 @@ true + + L + 2 @@ -930,7 +946,7 @@ - Kettle trub loss L: + Kettle trub loss: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -945,12 +961,18 @@ 24 + + Trub loss to leave behind in the kettle + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter true + + L + 1 @@ -990,7 +1012,7 @@ - Extra water in fermenter L: + Extra water in fermenter: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1006,7 +1028,7 @@ - Volume in fermenter L: + Volume in fermenter: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1021,12 +1043,18 @@ 24 + + Extra water to add to the fermenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter true + + L + 1 @@ -1061,6 +1089,9 @@ true + + L + 2 @@ -1148,6 +1179,9 @@ true + + min + 0 @@ -1195,6 +1229,9 @@ true + + L + 2 @@ -1227,7 +1264,7 @@ - Transfer loss L: + Transfer loss: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1243,7 +1280,7 @@ - Immersion chiller L: + Immersion chiller: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1268,6 +1305,9 @@ true + + L + 2 @@ -1300,6 +1340,9 @@ true + + L/m + 2