Mercurial > bmsapp / file diff

--- a/src/PrinterDialog.cpp	Wed Jul 20 12:54:13 2022 +0200
+++ b/src/PrinterDialog.cpp	Wed Jul 20 14:14:10 2022 +0200
@@ -1616,14 +1616,14 @@
 	}
 
 	checkHeader(&painter, &y, tr("Mash water and treatment"));
-	checkLine(&painter, &y, QString("%1 liter water %2").arg(product->w1_amount * factor, 1, 'f', 1).arg(product->w1_name));
+	checkLine(&painter, &y, QString("%1 liter water `%2`").arg(product->w1_amount * factor, 1, 'f', 1).arg(product->w1_name));
 	mashwater += product->w1_amount * factor;
 	if (product->w2_name != "" && product->w2_amount > 0) {
-	    checkLine(&painter, &y, QString("%1 liter water %2").arg(product->w2_amount * factor, 1, 'f', 1).arg(product->w2_name));
+	    checkLine(&painter, &y, QString("%1 liter water `%2`").arg(product->w2_amount * factor, 1, 'f', 1).arg(product->w2_name));
 	    mashwater += product->w2_amount * factor;
 	}
 	for (int i = 0; i < product->miscs.size(); i++) {
-	    if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
+	    if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT && product->miscs.at(i).use_use == MISC_USES_MASH) {
 		QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml";
 		checkLine(&painter, &y, QString("%1 %2 %3").arg(product->miscs.at(i).amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(i).name));
 		numsalts++;
@@ -1631,6 +1631,29 @@
 	}
 	y += 20;
 
+	checkHeader(&painter, &y, tr("Sparge water and treatment"));
+	QString sw = "";
+	if (product->sparge_source == 0) {
+	    checkLine(&painter, &y, QString("%1 liter water `%2`").arg(product->sparge_volume * factor, 1, 'f', 1).arg(product->w1_name));
+	} else if (product->sparge_source == 1) {
+	    checkLine(&painter, &y, QString("%1 liter water `%2`").arg(product->sparge_volume * factor, 1, 'f', 1).arg(product->w2_name));
+	} else if (product->sparge_source == 2) {
+	    checkLine(&painter, &y, QString("%1 liter water `%2`")
+			    .arg(product->sparge_volume * (product->w1_amount / (product->w1_amount+product->w2_amount)) * factor, 1, 'f', 1)
+			    .arg(product->w1_name));
+	    checkLine(&painter, &y, QString("%1 liter water `%2`")
+			    .arg(product->sparge_volume * (product->w2_amount / (product->w1_amount+product->w2_amount)) * factor, 1, 'f', 1)
+			    .arg(product->w2_name));
+	}
+	for (int i = 0; i < product->miscs.size(); i++) {
+            if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT && product->miscs.at(i).use_use == MISC_USES_SPARGE) {
+                QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml";
+                checkLine(&painter, &y, QString("%1 %2 %3").arg(product->miscs.at(i).amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(i).name));
+                numsalts++;
+            }
+        }
+	y += 20;
+
 	checkHeader(&painter, &y, tr("Weight and mill the malts"));
 	for (int i = 0; i < product->fermentables.size(); i++) {
 	    if (product->fermentables.at(i).added == FERMENTABLE_ADDED_MASH) {
@@ -1716,9 +1739,8 @@
 	}
 
 	checkHeader(&painter, &y, tr("Lauter and Sparge"));
-	checkLine(&painter, &y, QString(tr("Heat %1 liter sparge water to %2°C")).arg(product->sparge_volume * factor, 1, 'f', 1)
-			.arg(product->sparge_temp, 1, 'f', 1));
-	checkInput(&painter, &y, QString(tr("Bring to %1 pH with %2 ml. `%3`")).arg(product->sparge_ph, 1, 'f', 2)
+	checkLine(&painter, &y, QString(tr("Heat sparge water to %1°C")).arg(product->sparge_temp, 1, 'f', 1));
+	checkInput(&painter, &y, QString(tr("Bring water to %1 pH with %2 ml. `%3`")).arg(product->sparge_ph, 1, 'f', 2)
 			.arg(product->sparge_acid_amount * 1000 * factor, 1, 'f', 2).arg(my_acids.at(product->sparge_acid_type).name_en), QString(tr("pH")));
 	checkLine(&painter, &y, QString(tr("Sparge with close to %1 liter water"))
 			.arg(((product->boil_size * factor) - mashwater + grainabsorbtion + product->eq_lauter_deadspace) * 1.03, 1, 'f', 1));