Mercurial > bmsapp / file diff

--- a/src/EditProductExport.cpp	Sun Jun 12 20:06:39 2022 +0200
+++ b/src/EditProductExport.cpp	Mon Jun 13 10:54:23 2022 +0200
@@ -172,12 +172,12 @@
     for (int i = 0; i < product->miscs.size(); i++) {
         xmlWriter->writeStartElement("MISC");
         xmlWriter->writeTextElement("VERSION", "1");
-        xmlWriter->writeTextElement("NAME", product->miscs.at(i).m_name);
-	xmlWriter->writeTextElement("TYPE", misc_type[product->miscs.at(i).m_type]);
-	xmlWriter->writeTextElement("AMOUNT", QString::number(product->miscs.at(i).m_amount, 'f', 5));
-	xmlWriter->writeTextElement("AMOUNT_IS_WEIGHT", product->miscs.at(i).m_amount_is_weight ? "TRUE":"FALSE");
-	xmlWriter->writeTextElement("USE", misc_use[product->miscs.at(i).m_use_use]);
-	xmlWriter->writeTextElement("TIME", QString::number(product->miscs.at(i).m_time, 'f', 0));
+        xmlWriter->writeTextElement("NAME", product->miscs.at(i).name);
+	xmlWriter->writeTextElement("TYPE", misc_type[product->miscs.at(i).type]);
+	xmlWriter->writeTextElement("AMOUNT", QString::number(product->miscs.at(i).amount, 'f', 5));
+	xmlWriter->writeTextElement("AMOUNT_IS_WEIGHT", product->miscs.at(i).amount_is_weight ? "TRUE":"FALSE");
+	xmlWriter->writeTextElement("USE", misc_use[product->miscs.at(i).use_use]);
+	xmlWriter->writeTextElement("TIME", QString::number(product->miscs.at(i).time, 'f', 0));
 	xmlWriter->writeEndElement();
     }
     xmlWriter->writeEndElement();	// MISCS
@@ -492,13 +492,13 @@
     memo.append("[tabular]\n");
     memo.append("[head]Specerij, kruid, brouwzout[/head][head]Type grondstof[/head][head]Gebruik tijdens[/head][head]Hoeveel[/head]\n");
     for (int i = 0; i < product->miscs.size(); i++) {
-        memo.append("[row][data]" + product->miscs.at(i).m_name + "[/data]");
-        memo.append("[data]" + misc_type[product->miscs.at(i).m_type] + "[/data]");
-        if (product->miscs.at(i).m_use_use == MISC_USES_BOIL)
-            memo.append("[data]" + misc_use[product->miscs.at(i).m_use_use] + " " + QString::number(product->miscs.at(i).m_time) + " min[/data]");
+        memo.append("[row][data]" + product->miscs.at(i).name + "[/data]");
+        memo.append("[data]" + misc_type[product->miscs.at(i).type] + "[/data]");
+        if (product->miscs.at(i).use_use == MISC_USES_BOIL)
+            memo.append("[data]" + misc_use[product->miscs.at(i).use_use] + " " + QString::number(product->miscs.at(i).time) + " min[/data]");
         else
-            memo.append("[data]" + misc_use[product->miscs.at(i).m_use_use] + "[/data]");
-        memo.append("[data]"+QString::number(product->miscs.at(i).m_amount * 1000, 'f', 2)+((product->miscs.at(i).m_amount_is_weight)?" gr":" ml")+"[/data][/row]\n");
+            memo.append("[data]" + misc_use[product->miscs.at(i).use_use] + "[/data]");
+        memo.append("[data]"+QString::number(product->miscs.at(i).amount * 1000, 'f', 2)+((product->miscs.at(i).amount_is_weight)?" gr":" ml")+"[/data][/row]\n");
     }
     memo.append("[/tabular]\n\n");
 
@@ -932,7 +932,7 @@
 		sp->hops[j].h_amount = round(sp->hops.at(j).h_amount * factor * 100000) / 100000;
 	    }
 	    for (int j = 0; j < sp->miscs.size(); j++) {
-                sp->miscs[j].m_amount = round(sp->miscs.at(j).m_amount * factor * 100000) / 100000;
+                sp->miscs[j].amount = round(sp->miscs.at(j).amount * factor * 100000) / 100000;
             }
 	    for (int j = 0; j < sp->yeasts.size(); j++) {
                 sp->yeasts[j].y_amount = round(sp->yeasts.at(j).y_amount * factor * 100000) / 100000;
@@ -989,7 +989,7 @@
                 sp->hops[j].h_amount = round(sp->hops.at(j).h_amount * factor * 100000) / 100000;
             }
             for (int j = 0; j < sp->miscs.size(); j++) {
-                sp->miscs[j].m_amount = round(sp->miscs.at(j).m_amount * factor * 100000) / 100000;
+                sp->miscs[j].amount = round(sp->miscs.at(j).amount * factor * 100000) / 100000;
             }
             for (int j = 0; j < sp->yeasts.size(); j++) {
                 sp->yeasts[j].y_amount = round(sp->yeasts.at(j).y_amount * factor * 100000) / 100000;