changeset
Initial setup to print sparge water.
Tue, 19 Jul 2022 16:00:52 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Tue, 19 Jul 2022 16:00:52 +0200
- changeset 364
- 1efe29f64551
- parent 363
- 313cdeb309d2
- child 365
- 4bc746c65650
Initial setup to print sparge water.
| src/PrinterDialog.cpp | file | annotate | diff | comparison | revisions |
--- a/src/PrinterDialog.cpp Tue Jul 19 15:59:50 2022 +0200 +++ b/src/PrinterDialog.cpp Tue Jul 19 16:00:52 2022 +0200 @@ -1004,7 +1004,7 @@ y += 20; } - if ((y + 80 + ((product->w2_amount > 0) ? 40:0)) > painter.device()->height()) { /* waters + header + blank */ + if ((y + 100 + ((product->w2_amount > 0) ? 40:0)) > painter.device()->height()) { /* waters + header + blank */ printer->newPage(); printHeader(&painter); y = 120; @@ -1065,7 +1065,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(product->wb_calcium, 1, 'f', 1)); painter.drawText(310, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_magnesium, 1, 'f', 1)); painter.drawText(380, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_total_alkalinity, 1, 'f', 1)); @@ -1074,6 +1074,17 @@ painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_sulfate, 1, 'f', 1)); painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->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(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(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sparge_ph, 1, 'f', 2)); + y += 20; /* * Print product notes if present.
