--- a/src/ImportXML.cpp Fri Jan 13 15:08:57 2023 +0100 +++ b/src/ImportXML.cpp Sat Jan 14 11:34:51 2023 +0100 @@ -102,7 +102,7 @@ query.prepare("INSERT INTO inventory_equipments SET name=:name, boil_size=:boil_size, " "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_chiller_loss=:chiller_loss, evap_rate=:evap_rate, " + "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, " "hop_utilization=:hopfactor, notes=:notes, lauter_volume=:lauter_volume, " "lauter_height=:lauter_height, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, " @@ -117,7 +117,7 @@ query.bindValue(":tun_material", eq->tun_material); query.bindValue(":tun_height", QString("%1").arg(eq->tun_height, 4, 'f', 3, '0')); query.bindValue(":top_up_water", QString("%1").arg(eq->top_up_water, 2, 'f', 1, '0')); - query.bindValue(":chiller_loss", QString("%1").arg(eq->trub_chiller_loss, 2, 'f', 1, '0')); + query.bindValue(":chiller_loss", QString("%1").arg(eq->trub_loss, 2, 'f', 1, '0')); /* 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')); @@ -178,7 +178,7 @@ } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "TUN_HEIGHT")) { eq->tun_height = xml->readElementText().toDouble(); } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "TRUB_CHILLER_LOSS")) { - eq->trub_chiller_loss = xml->readElementText().toDouble(); + eq->trub_loss = xml->readElementText().toDouble(); } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "EVAP_RATE")) { eq->evap_rate = xml->readElementText().toDouble(); } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "BOIL_TIME")) {