diff -r 242a68fa7186 -r 33bb98c33e6a src/EditRecipeExport.cpp --- a/src/EditRecipeExport.cpp Mon Jun 13 16:47:52 2022 +0200 +++ b/src/EditRecipeExport.cpp Mon Jun 13 17:34:51 2022 +0200 @@ -176,17 +176,17 @@ for (int i = 0; i < recipe->yeasts.size(); i++) { xmlWriter->writeStartElement("YEAST"); xmlWriter->writeTextElement("VERSION", "1"); - xmlWriter->writeTextElement("NAME", recipe->yeasts.at(i).y_name); - xmlWriter->writeTextElement("TYPE", yeast_type[recipe->yeasts.at(i).y_type]); - xmlWriter->writeTextElement("FORM", yeast_form[recipe->yeasts.at(i).y_form]); - xmlWriter->writeTextElement("AMOUNT", QString::number(recipe->yeasts.at(i).y_amount, 'f', 5)); - xmlWriter->writeTextElement("AMOUNT_IS_WEIGHT", (recipe->yeasts.at(i).y_form == 1) ? "TRUE":"FALSE"); - xmlWriter->writeTextElement("LABORATORY", recipe->yeasts.at(i).y_laboratory); - xmlWriter->writeTextElement("PRODUCT_ID", recipe->yeasts.at(i).y_product_id); - xmlWriter->writeTextElement("MIN_TEMPERATURE", QString::number(recipe->yeasts.at(i).y_min_temperature, 'f', 1)); - xmlWriter->writeTextElement("MAX_TEMPERATURE", QString::number(recipe->yeasts.at(i).y_max_temperature, 'f', 1)); - xmlWriter->writeTextElement("ATTENUATION", QString::number(recipe->yeasts.at(i).y_attenuation, 'f', 1)); - xmlWriter->writeTextElement("ADD_TO_SECONDARY", (recipe->yeasts.at(i).y_use == 0) ? "FALSE":"TRUE"); + xmlWriter->writeTextElement("NAME", recipe->yeasts.at(i).name); + xmlWriter->writeTextElement("TYPE", yeast_type[recipe->yeasts.at(i).type]); + xmlWriter->writeTextElement("FORM", yeast_form[recipe->yeasts.at(i).form]); + xmlWriter->writeTextElement("AMOUNT", QString::number(recipe->yeasts.at(i).amount, 'f', 5)); + xmlWriter->writeTextElement("AMOUNT_IS_WEIGHT", (recipe->yeasts.at(i).form == 1) ? "TRUE":"FALSE"); + xmlWriter->writeTextElement("LABORATORY", recipe->yeasts.at(i).laboratory); + xmlWriter->writeTextElement("PRODUCT_ID", recipe->yeasts.at(i).product_id); + xmlWriter->writeTextElement("MIN_TEMPERATURE", QString::number(recipe->yeasts.at(i).min_temperature, 'f', 1)); + xmlWriter->writeTextElement("MAX_TEMPERATURE", QString::number(recipe->yeasts.at(i).max_temperature, 'f', 1)); + xmlWriter->writeTextElement("ATTENUATION", QString::number(recipe->yeasts.at(i).attenuation, 'f', 1)); + xmlWriter->writeTextElement("ADD_TO_SECONDARY", (recipe->yeasts.at(i).use == 0) ? "FALSE":"TRUE"); xmlWriter->writeEndElement(); } xmlWriter->writeEndElement(); // YEASTS @@ -523,16 +523,16 @@ memo.append("[tabular]\n"); memo.append("[head]Gistlab en code[/head][head]Omschrijving[/head][head]Gebruik[/head][head]Vorm[/head][head]Hoeveel[/head]\n"); for (int i = 0; i < recipe->yeasts.size(); i++) { - memo.append("[row][data]" + recipe->yeasts.at(i).y_laboratory + " " + recipe->yeasts.at(i).y_product_id + "[/data]"); - memo.append("[data]" + recipe->yeasts.at(i).y_name + "[/data]"); - memo.append("[data]" + yeast_use[recipe->yeasts.at(i).y_use] + "[/data]"); - memo.append("[data]" + yeast_form[recipe->yeasts.at(i).y_form] + "[/data]"); - if (recipe->yeasts.at(i).y_form == YEAST_FORMS_LIQUID) - memo.append("[data]" + QString::number(recipe->yeasts.at(i).y_amount, 'f', 0) + " pak[/data][/row]\n"); - else if (recipe->yeasts.at(i).y_form == YEAST_FORMS_DRY || recipe->yeasts.at(i).y_form == YEAST_FORMS_DRIED) - memo.append("[data]" + QString::number(recipe->yeasts.at(i).y_amount * 1000, 'f', 1) + " gr[/data][/row]\n"); + memo.append("[row][data]" + recipe->yeasts.at(i).laboratory + " " + recipe->yeasts.at(i).product_id + "[/data]"); + memo.append("[data]" + recipe->yeasts.at(i).name + "[/data]"); + memo.append("[data]" + yeast_use[recipe->yeasts.at(i).use] + "[/data]"); + memo.append("[data]" + yeast_form[recipe->yeasts.at(i).form] + "[/data]"); + if (recipe->yeasts.at(i).form == YEAST_FORMS_LIQUID) + memo.append("[data]" + QString::number(recipe->yeasts.at(i).amount, 'f', 0) + " pak[/data][/row]\n"); + else if (recipe->yeasts.at(i).form == YEAST_FORMS_DRY || recipe->yeasts.at(i).form == YEAST_FORMS_DRIED) + memo.append("[data]" + QString::number(recipe->yeasts.at(i).amount * 1000, 'f', 1) + " gr[/data][/row]\n"); else - memo.append("[data]" + QString::number(recipe->yeasts.at(i).y_amount * 1000, 'f', 0) + " ml[/data][/row]\n"); + memo.append("[data]" + QString::number(recipe->yeasts.at(i).amount * 1000, 'f', 0) + " ml[/data][/row]\n"); } memo.append("[/tabular]\n\n");