comparison: src/ImportXML.cpp
src/ImportXML.cpp
- changeset 462
- 1654ff5446c7
- parent 458
- ac216a75ca9b
equal
deleted
inserted
replaced
| 461:add4dbef0c81 | 462:1654ff5446c7 |
|---|---|
| 101 if ((xml->tokenType() == QXmlStreamReader::EndElement) && (xml->name() == "EQUIPMENT")) { | 101 if ((xml->tokenType() == QXmlStreamReader::EndElement) && (xml->name() == "EQUIPMENT")) { |
| 102 query.prepare("INSERT INTO inventory_equipments SET name=:name, boil_size=:boil_size, " | 102 query.prepare("INSERT INTO inventory_equipments SET name=:name, boil_size=:boil_size, " |
| 103 "batch_size=:batch_size, tun_volume=:tun_volume, tun_weight=:tun_weight, " | 103 "batch_size=:batch_size, tun_volume=:tun_volume, tun_weight=:tun_weight, " |
| 104 "tun_specific_heat=:tun_specific_heat, tun_material=:tun_material, tun_height=:tun_height, " | 104 "tun_specific_heat=:tun_specific_heat, tun_material=:tun_material, tun_height=:tun_height, " |
| 105 "top_up_water=:top_up_water, trub_loss=:chiller_loss, evap_rate=:evap_rate, " | 105 "top_up_water=:top_up_water, trub_loss=:chiller_loss, evap_rate=:evap_rate, " |
| 106 "boil_time=:boil_time, calc_boil_volume=:calcboil, top_up_kettle=:top_up_kettle, " | 106 "boil_time=:boil_time, top_up_kettle=:top_up_kettle, " |
| 107 "hop_utilization=:hopfactor, notes=:notes, lauter_volume=:lauter_volume, " | 107 "hop_utilization=:hopfactor, notes=:notes, lauter_volume=:lauter_volume, " |
| 108 "lauter_height=:lauter_height, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, " | 108 "lauter_height=:lauter_height, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, " |
| 109 "kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, " | 109 "kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, " |
| 110 "efficiency=:efficiency, uuid=:uuid"); | 110 "efficiency=:efficiency, uuid=:uuid"); |
| 111 query.bindValue(":name", eq->name); | 111 query.bindValue(":name", eq->name); |
| 119 query.bindValue(":top_up_water", QString("%1").arg(eq->top_up_water, 2, 'f', 1, '0')); | 119 query.bindValue(":top_up_water", QString("%1").arg(eq->top_up_water, 2, 'f', 1, '0')); |
| 120 query.bindValue(":chiller_loss", QString("%1").arg(eq->trub_loss, 2, 'f', 1, '0')); | 120 query.bindValue(":chiller_loss", QString("%1").arg(eq->trub_loss, 2, 'f', 1, '0')); |
| 121 /* The evaporation in beerxml is percentage, but we use the real volume per hour */ | 121 /* The evaporation in beerxml is percentage, but we use the real volume per hour */ |
| 122 query.bindValue(":evap_rate", QString("%1").arg((eq->evap_rate / 100) * eq->boil_size, 3, 'f', 2, '0')); | 122 query.bindValue(":evap_rate", QString("%1").arg((eq->evap_rate / 100) * eq->boil_size, 3, 'f', 2, '0')); |
| 123 query.bindValue(":boil_time", QString("%1").arg(eq->boil_time, 1, 'f', 0, '0')); | 123 query.bindValue(":boil_time", QString("%1").arg(eq->boil_time, 1, 'f', 0, '0')); |
| 124 query.bindValue(":calcboil", eq->calc_boil_volume ? 1:0); | |
| 125 query.bindValue(":top_up_kettle", QString("%1").arg(eq->top_up_kettle, 2, 'f', 1, '0')); | 124 query.bindValue(":top_up_kettle", QString("%1").arg(eq->top_up_kettle, 2, 'f', 1, '0')); |
| 126 query.bindValue(":hopfactor", QString("%1").arg(eq->hop_utilization, 1, 'f', 0, '0')); | 125 query.bindValue(":hopfactor", QString("%1").arg(eq->hop_utilization, 1, 'f', 0, '0')); |
| 127 query.bindValue(":notes", eq->notes); | 126 query.bindValue(":notes", eq->notes); |
| 128 query.bindValue(":lauter_volume", QString("%1").arg(eq->lauter_volume, 2, 'f', 1, '0')); | 127 query.bindValue(":lauter_volume", QString("%1").arg(eq->lauter_volume, 2, 'f', 1, '0')); |
| 129 query.bindValue(":lauter_height", QString("%1").arg(eq->lauter_height, 4, 'f', 3, '0')); | 128 query.bindValue(":lauter_height", QString("%1").arg(eq->lauter_height, 4, 'f', 3, '0')); |
| 148 (xml->name() == "DISPLAY_BATCH_SIZE") || (xml->name() == "DISPLAY_TUN_VOLUME") || | 147 (xml->name() == "DISPLAY_BATCH_SIZE") || (xml->name() == "DISPLAY_TUN_VOLUME") || |
| 149 (xml->name() == "DISPLAY_TUN_WEIGHT") || (xml->name() == "DISPLAY_TRUB_CHILLER_LOSS") || | 148 (xml->name() == "DISPLAY_TUN_WEIGHT") || (xml->name() == "DISPLAY_TRUB_CHILLER_LOSS") || |
| 150 (xml->name() == "DISPLAY_LAUTERDEADSPACE") || (xml->name() == "TUN_MATERIAL") || | 149 (xml->name() == "DISPLAY_LAUTERDEADSPACE") || (xml->name() == "TUN_MATERIAL") || |
| 151 (xml->name() == "ATTENUATION_FACTOR_YEAST") || (xml->name() == "ATTENUATION_FACTOR_WATER_TO_GRAIN_RATIO") || | 150 (xml->name() == "ATTENUATION_FACTOR_YEAST") || (xml->name() == "ATTENUATION_FACTOR_WATER_TO_GRAIN_RATIO") || |
| 152 (xml->name() == "ATTENUATION_FACTOR_TOTAL_MASH_TIME") || (xml->name() == "ATTENUATION_FACTOR_PERC_SIMPLE_SUGAR") || | 151 (xml->name() == "ATTENUATION_FACTOR_TOTAL_MASH_TIME") || (xml->name() == "ATTENUATION_FACTOR_PERC_SIMPLE_SUGAR") || |
| 153 (xml->name() == "ATTENUATION_FACTOR_CONSTANT"))) { | 152 (xml->name() == "ATTENUATION_FACTOR_CONSTANT") || (xml->name() == "CALC_BOIL_VOLUME"))) { |
| 154 // Ignore. | 153 // Ignore. |
| 155 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "NAME")) { | 154 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "NAME")) { |
| 156 eq->name = xml->readElementText(); | 155 eq->name = xml->readElementText(); |
| 157 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "NOTES")) { | 156 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "NOTES")) { |
| 158 eq->notes = xml->readElementText(); | 157 eq->notes = xml->readElementText(); |
| 181 eq->trub_loss = xml->readElementText().toDouble(); | 180 eq->trub_loss = xml->readElementText().toDouble(); |
| 182 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "EVAP_RATE")) { | 181 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "EVAP_RATE")) { |
| 183 eq->evap_rate = xml->readElementText().toDouble(); | 182 eq->evap_rate = xml->readElementText().toDouble(); |
| 184 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "BOIL_TIME")) { | 183 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "BOIL_TIME")) { |
| 185 eq->boil_time = xml->readElementText().toDouble(); | 184 eq->boil_time = xml->readElementText().toDouble(); |
| 186 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "CALC_BOIL_VOLUME")) { | |
| 187 eq->calc_boil_volume = (xml->readElementText() == "TRUE") ? true:false; | |
| 188 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "TOP_UP_KETTLE")) { | 185 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "TOP_UP_KETTLE")) { |
| 189 eq->top_up_kettle = xml->readElementText().toDouble(); | 186 eq->top_up_kettle = xml->readElementText().toDouble(); |
| 190 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "HOP_UTILIZATION")) { | 187 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "HOP_UTILIZATION")) { |
| 191 eq->hop_utilization = xml->readElementText().toDouble(); | 188 eq->hop_utilization = xml->readElementText().toDouble(); |
| 192 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "LAUTER_VOLUME")) { | 189 } else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "LAUTER_VOLUME")) { |
