diff -r d1d208a857b0 -r 242a68fa7186 src/EditRecipeExport.cpp --- a/src/EditRecipeExport.cpp Mon Jun 13 15:47:16 2022 +0200 +++ b/src/EditRecipeExport.cpp Mon Jun 13 16:47:52 2022 +0200 @@ -134,26 +134,26 @@ for (int i = 0; i < recipe->fermentables.size(); i++) { xmlWriter->writeStartElement("FERMENTABLE"); xmlWriter->writeTextElement("VERSION", "1"); - xmlWriter->writeTextElement("NAME", recipe->fermentables.at(i).f_name); - xmlWriter->writeTextElement("TYPE", fermentable_type[recipe->fermentables.at(i).f_type]); - xmlWriter->writeTextElement("AMOUNT", QString::number(recipe->fermentables.at(i).f_amount, 'f', 4)); - xmlWriter->writeTextElement("YIELD", QString::number(recipe->fermentables.at(i).f_yield, 'f', 1)); - xmlWriter->writeTextElement("COLOR", QString::number(Utils::ebc_to_srm(recipe->fermentables.at(i).f_color), 'f', 1)); - xmlWriter->writeTextElement("ADD_AFTER_BOIL", recipe->fermentables.at(i).f_add_after_boil ? "TRUE":"FALSE"); - xmlWriter->writeTextElement("ORIGIN", recipe->fermentables.at(i).f_origin); - xmlWriter->writeTextElement("SUPPLIER", recipe->fermentables.at(i).f_supplier); - if (recipe->fermentables.at(i).f_coarse_fine_diff) - xmlWriter->writeTextElement("COARSE_FINE_DIFF", QString::number(recipe->fermentables.at(i).f_coarse_fine_diff, 'f', 4)); - if (recipe->fermentables.at(i).f_moisture) - xmlWriter->writeTextElement("MOISTURE", QString::number(recipe->fermentables.at(i).f_moisture, 'f', 4)); - if (recipe->fermentables.at(i).f_diastatic_power) - xmlWriter->writeTextElement("DIASTATIC_POWER", QString::number(recipe->fermentables.at(i).f_diastatic_power, 'f', 4)); - if (recipe->fermentables.at(i).f_protein) - xmlWriter->writeTextElement("PROTEIN", QString::number(recipe->fermentables.at(i).f_protein, 'f', 4)); - if (recipe->fermentables.at(i).f_max_in_batch) - xmlWriter->writeTextElement("MAX_IN_BATCH", QString::number(recipe->fermentables.at(i).f_max_in_batch, 'f', 1)); - xmlWriter->writeTextElement("RECOMMEND_MASH", recipe->fermentables.at(i).f_recommend_mash ? "TRUE":"FALSE"); - xmlWriter->writeTextElement("GRAINTYPE", fermentable_graintype[recipe->fermentables.at(i).f_graintype]); + xmlWriter->writeTextElement("NAME", recipe->fermentables.at(i).name); + xmlWriter->writeTextElement("TYPE", fermentable_type[recipe->fermentables.at(i).type]); + xmlWriter->writeTextElement("AMOUNT", QString::number(recipe->fermentables.at(i).amount, 'f', 4)); + xmlWriter->writeTextElement("YIELD", QString::number(recipe->fermentables.at(i).yield, 'f', 1)); + xmlWriter->writeTextElement("COLOR", QString::number(Utils::ebc_to_srm(recipe->fermentables.at(i).color), 'f', 1)); + xmlWriter->writeTextElement("ADD_AFTER_BOIL", recipe->fermentables.at(i).add_after_boil ? "TRUE":"FALSE"); + xmlWriter->writeTextElement("ORIGIN", recipe->fermentables.at(i).origin); + xmlWriter->writeTextElement("SUPPLIER", recipe->fermentables.at(i).supplier); + if (recipe->fermentables.at(i).coarse_fine_diff) + xmlWriter->writeTextElement("COARSE_FINE_DIFF", QString::number(recipe->fermentables.at(i).coarse_fine_diff, 'f', 4)); + if (recipe->fermentables.at(i).moisture) + xmlWriter->writeTextElement("MOISTURE", QString::number(recipe->fermentables.at(i).moisture, 'f', 4)); + if (recipe->fermentables.at(i).diastatic_power) + xmlWriter->writeTextElement("DIASTATIC_POWER", QString::number(recipe->fermentables.at(i).diastatic_power, 'f', 4)); + if (recipe->fermentables.at(i).protein) + xmlWriter->writeTextElement("PROTEIN", QString::number(recipe->fermentables.at(i).protein, 'f', 4)); + if (recipe->fermentables.at(i).max_in_batch) + xmlWriter->writeTextElement("MAX_IN_BATCH", QString::number(recipe->fermentables.at(i).max_in_batch, 'f', 1)); + xmlWriter->writeTextElement("RECOMMEND_MASH", recipe->fermentables.at(i).recommend_mash ? "TRUE":"FALSE"); + xmlWriter->writeTextElement("GRAINTYPE", fermentable_graintype[recipe->fermentables.at(i).graintype]); xmlWriter->writeEndElement(); } xmlWriter->writeEndElement(); // FERMENTABLES @@ -476,11 +476,11 @@ memo.append("[tabular]\n"); memo.append("[head]Mout, granen en suikers[/head][head]EBC[/head][head]Gewicht kg[/head][head]%[/head][head]Gebruik tijdens[/head]\n"); for (int i = 0; i < recipe->fermentables.size(); i++) { - memo.append("[row][data]" + recipe->fermentables.at(i).f_name + " (" + recipe->fermentables.at(i).f_supplier + ")[/data]"); - memo.append("[data]" + QString::number(recipe->fermentables.at(i).f_color) + "[/data]"); - memo.append("[data]" + QString::number(recipe->fermentables.at(i).f_amount, 'f', 3) + "[/data]"); - memo.append("[data]" + QString::number(recipe->fermentables.at(i).f_percentage, 'f', 1) + "[/data]"); - memo.append("[data]" + fermentable_added[recipe->fermentables.at(i).f_added] + "[/data][/row]\n"); + memo.append("[row][data]" + recipe->fermentables.at(i).name + " (" + recipe->fermentables.at(i).supplier + ")[/data]"); + memo.append("[data]" + QString::number(recipe->fermentables.at(i).color) + "[/data]"); + memo.append("[data]" + QString::number(recipe->fermentables.at(i).amount, 'f', 3) + "[/data]"); + memo.append("[data]" + QString::number(recipe->fermentables.at(i).percentage, 'f', 1) + "[/data]"); + memo.append("[data]" + fermentable_added[recipe->fermentables.at(i).added] + "[/data][/row]\n"); } memo.append("[/tabular]\n\n");