Mercurial > bmsapp / changeset

--- a/src/PrinterDialog.cpp	Wed Jul 20 12:44:02 2022 +0200
+++ b/src/PrinterDialog.cpp	Wed Jul 20 12:54:13 2022 +0200
@@ -587,7 +587,7 @@
 	    y += 20;
 	}
 
-	if ((y + 80 + ((recipe->w2_amount > 0) ? 40:0)) > painter.device()->height()) {      /* waters + header + blank */
+	if ((y + 100 + ((recipe->w2_amount > 0) ? 40:0)) > painter.device()->height()) {      /* waters + header + blank */
             printer->newPage();
             printHeader(&painter);
             y = 120;
@@ -648,7 +648,7 @@
             y += 20;
 	}
 	painter.fillRect( 20, y,   715, 20, w_line);
-        painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft,  tr("Treated water"));
+        painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft,  tr("Treated mash water"));
         painter.drawText(240, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_calcium, 1, 'f', 1));
         painter.drawText(310, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_magnesium, 1, 'f', 1));
         painter.drawText(380, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_total_alkalinity, 1, 'f', 1));
@@ -657,6 +657,17 @@
         painter.drawText(590, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_sulfate, 1, 'f', 1));
         painter.drawText(660, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_ph, 1, 'f', 2));
 	y += 20;
+	painter.fillRect( 20, y,   715, 20, w_line);
+        painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft,  tr("Treated sparge water"));
+        painter.drawText(170, y+4,  70, 20, Qt::AlignRight, QString("%1 L").arg(recipe->sparge_volume, 1, 'f', 1));
+        painter.drawText(240, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_calcium, 1, 'f', 1));
+        painter.drawText(310, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_magnesium, 1, 'f', 1));
+        painter.drawText(380, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_total_alkalinity, 1, 'f', 1));
+        painter.drawText(450, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_sodium, 1, 'f', 1));
+        painter.drawText(520, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_chloride, 1, 'f', 1));
+        painter.drawText(590, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_sulfate, 1, 'f', 1));
+        painter.drawText(660, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(recipe->sparge_ph, 1, 'f', 2));
+        y += 20;
 
     	/*
     	 * Print recipe notes if present.
@@ -1077,12 +1088,12 @@
 	painter.fillRect( 20, y,   715, 20, w_line);
         painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft,  tr("Treated sparge water"));
 	painter.drawText(170, y+4,  70, 20, Qt::AlignRight, QString("%1 L").arg(product->sparge_volume, 1, 'f', 1));
-        //painter.drawText(240, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->sp_calcium, 1, 'f', 1));
-        //painter.drawText(310, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->sp_magnesium, 1, 'f', 1));
-        //painter.drawText(380, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->sp_total_alkalinity, 1, 'f', 1));
-        //painter.drawText(450, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->sp_sodium, 1, 'f', 1));
-        //painter.drawText(520, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->sp_chloride, 1, 'f', 1));
-        //painter.drawText(590, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->sp_sulfate, 1, 'f', 1));
+        painter.drawText(240, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->ws_calcium, 1, 'f', 1));
+        painter.drawText(310, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->ws_magnesium, 1, 'f', 1));
+        painter.drawText(380, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->ws_total_alkalinity, 1, 'f', 1));
+        painter.drawText(450, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->ws_sodium, 1, 'f', 1));
+        painter.drawText(520, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->ws_chloride, 1, 'f', 1));
+        painter.drawText(590, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->ws_sulfate, 1, 'f', 1));
         painter.drawText(660, y+4,  70, 20, Qt::AlignRight, QString("%1").arg(product->sparge_ph, 1, 'f', 2));
         y += 20;