Mercurial > bmsapp / file diff

--- a/src/EditProductExport.cpp	Mon Jun 13 15:47:16 2022 +0200
+++ b/src/EditProductExport.cpp	Mon Jun 13 16:47:52 2022 +0200
@@ -140,29 +140,29 @@
 
     xmlWriter->writeStartElement("FERMENTABLES");
     for (int i = 0; i < product->fermentables.size(); i++) {
-	if (product->fermentables.at(i).f_added < FERMENTABLE_ADDED_BOTTLE) {
+	if (product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) {
             xmlWriter->writeStartElement("FERMENTABLE");
             xmlWriter->writeTextElement("VERSION", "1");
-	    xmlWriter->writeTextElement("NAME", product->fermentables.at(i).f_name);
-	    xmlWriter->writeTextElement("TYPE", fermentable_type[product->fermentables.at(i).f_type]);
-	    xmlWriter->writeTextElement("AMOUNT", QString::number(product->fermentables.at(i).f_amount, 'f', 4));
-	    xmlWriter->writeTextElement("YIELD", QString::number(product->fermentables.at(i).f_yield, 'f', 1));
-	    xmlWriter->writeTextElement("COLOR", QString::number(Utils::ebc_to_srm(product->fermentables.at(i).f_color), 'f', 1));
-	    xmlWriter->writeTextElement("ADD_AFTER_BOIL", product->fermentables.at(i).f_add_after_boil ? "TRUE":"FALSE");
-	    xmlWriter->writeTextElement("ORIGIN", product->fermentables.at(i).f_origin);
-	    xmlWriter->writeTextElement("SUPPLIER", product->fermentables.at(i).f_supplier);
-	    if (product->fermentables.at(i).f_coarse_fine_diff)
-	    	xmlWriter->writeTextElement("COARSE_FINE_DIFF", QString::number(product->fermentables.at(i).f_coarse_fine_diff, 'f', 4));
-	    if (product->fermentables.at(i).f_moisture)
-	    	xmlWriter->writeTextElement("MOISTURE", QString::number(product->fermentables.at(i).f_moisture, 'f', 4));
-	    if (product->fermentables.at(i).f_diastatic_power)
-	    	xmlWriter->writeTextElement("DIASTATIC_POWER", QString::number(product->fermentables.at(i).f_diastatic_power, 'f', 4));
-	    if (product->fermentables.at(i).f_protein)
-	    	xmlWriter->writeTextElement("PROTEIN", QString::number(product->fermentables.at(i).f_protein, 'f', 4));
-	    if (product->fermentables.at(i).f_max_in_batch)
-	    	xmlWriter->writeTextElement("MAX_IN_BATCH", QString::number(product->fermentables.at(i).f_max_in_batch, 'f', 1));
-	    xmlWriter->writeTextElement("RECOMMEND_MASH", product->fermentables.at(i).f_recommend_mash ? "TRUE":"FALSE");
-	    xmlWriter->writeTextElement("GRAINTYPE", fermentable_graintype[product->fermentables.at(i).f_graintype]);
+	    xmlWriter->writeTextElement("NAME", product->fermentables.at(i).name);
+	    xmlWriter->writeTextElement("TYPE", fermentable_type[product->fermentables.at(i).type]);
+	    xmlWriter->writeTextElement("AMOUNT", QString::number(product->fermentables.at(i).amount, 'f', 4));
+	    xmlWriter->writeTextElement("YIELD", QString::number(product->fermentables.at(i).yield, 'f', 1));
+	    xmlWriter->writeTextElement("COLOR", QString::number(Utils::ebc_to_srm(product->fermentables.at(i).color), 'f', 1));
+	    xmlWriter->writeTextElement("ADD_AFTER_BOIL", product->fermentables.at(i).add_after_boil ? "TRUE":"FALSE");
+	    xmlWriter->writeTextElement("ORIGIN", product->fermentables.at(i).origin);
+	    xmlWriter->writeTextElement("SUPPLIER", product->fermentables.at(i).supplier);
+	    if (product->fermentables.at(i).coarse_fine_diff)
+	    	xmlWriter->writeTextElement("COARSE_FINE_DIFF", QString::number(product->fermentables.at(i).coarse_fine_diff, 'f', 4));
+	    if (product->fermentables.at(i).moisture)
+	    	xmlWriter->writeTextElement("MOISTURE", QString::number(product->fermentables.at(i).moisture, 'f', 4));
+	    if (product->fermentables.at(i).diastatic_power)
+	    	xmlWriter->writeTextElement("DIASTATIC_POWER", QString::number(product->fermentables.at(i).diastatic_power, 'f', 4));
+	    if (product->fermentables.at(i).protein)
+	    	xmlWriter->writeTextElement("PROTEIN", QString::number(product->fermentables.at(i).protein, 'f', 4));
+	    if (product->fermentables.at(i).max_in_batch)
+	    	xmlWriter->writeTextElement("MAX_IN_BATCH", QString::number(product->fermentables.at(i).max_in_batch, 'f', 1));
+	    xmlWriter->writeTextElement("RECOMMEND_MASH", product->fermentables.at(i).recommend_mash ? "TRUE":"FALSE");
+	    xmlWriter->writeTextElement("GRAINTYPE", fermentable_graintype[product->fermentables.at(i).graintype]);
 	    xmlWriter->writeEndElement();
 	}
     }
@@ -459,11 +459,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 < product->fermentables.size(); i++) {
-        memo.append("[row][data]" + product->fermentables.at(i).f_name + " (" + product->fermentables.at(i).f_supplier + ")[/data]");
-        memo.append("[data]" + QString::number(product->fermentables.at(i).f_color) + "[/data]");
-        memo.append("[data]" + QString::number(product->fermentables.at(i).f_amount, 'f', 3) + "[/data]");
-        memo.append("[data]" + QString::number(product->fermentables.at(i).f_percentage, 'f', 1) + "[/data]");
-        memo.append("[data]" + fermentable_added[product->fermentables.at(i).f_added] + "[/data][/row]\n");
+        memo.append("[row][data]" + product->fermentables.at(i).name + " (" + product->fermentables.at(i).supplier + ")[/data]");
+        memo.append("[data]" + QString::number(product->fermentables.at(i).color) + "[/data]");
+        memo.append("[data]" + QString::number(product->fermentables.at(i).amount, 'f', 3) + "[/data]");
+        memo.append("[data]" + QString::number(product->fermentables.at(i).percentage, 'f', 1) + "[/data]");
+        memo.append("[data]" + fermentable_added[product->fermentables.at(i).added] + "[/data][/row]\n");
     }
     memo.append("[/tabular]\n\n");
 
@@ -926,7 +926,7 @@
 	    sp->prop_volume[2] = sp->prop_volume[2] * factor;
 	    sp->prop_volume[3] = sp->prop_volume[3] * factor;
 	    for (int j = 0; j < sp->fermentables.size(); j++) {
-		sp->fermentables[j].f_amount = round(sp->fermentables.at(j).f_amount * factor * 100000) / 100000;
+		sp->fermentables[j].amount = round(sp->fermentables.at(j).amount * factor * 100000) / 100000;
 	    }
 	    for (int j = 0; j < sp->hops.size(); j++) {
 		sp->hops[j].amount = round(sp->hops.at(j).amount * factor * 100000) / 100000;
@@ -983,7 +983,7 @@
             sp->prop_volume[2] = sp->prop_volume[2] * factor;
             sp->prop_volume[3] = sp->prop_volume[3] * factor;
 	    for (int j = 0; j < sp->fermentables.size(); j++) {
-                sp->fermentables[j].f_amount = round(sp->fermentables.at(j).f_amount * factor * 100000) / 100000;
+                sp->fermentables[j].amount = round(sp->fermentables.at(j).amount * factor * 100000) / 100000;
             }
             for (int j = 0; j < sp->hops.size(); j++) {
                 sp->hops[j].amount = round(sp->hops.at(j).amount * factor * 100000) / 100000;