Mercurial > bmsapp / file diff

--- 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")) {