comparison: src/PrinterDialog.cpp
src/PrinterDialog.cpp
- changeset 364
- 1efe29f64551
- parent 341
- 1b1e2d4c1a3e
- child 366
- 43bf6cccc4ab
equal
deleted
inserted
replaced
| 363:313cdeb309d2 | 364:1efe29f64551 |
|---|---|
| 1002 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->mashs.at(i).step_infuse_temp, 1, 'f', 1)); | 1002 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->mashs.at(i).step_infuse_temp, 1, 'f', 1)); |
| 1003 } | 1003 } |
| 1004 y += 20; | 1004 y += 20; |
| 1005 } | 1005 } |
| 1006 | 1006 |
| 1007 if ((y + 80 + ((product->w2_amount > 0) ? 40:0)) > painter.device()->height()) { /* waters + header + blank */ | 1007 if ((y + 100 + ((product->w2_amount > 0) ? 40:0)) > painter.device()->height()) { /* waters + header + blank */ |
| 1008 printer->newPage(); | 1008 printer->newPage(); |
| 1009 printHeader(&painter); | 1009 printHeader(&painter); |
| 1010 y = 120; | 1010 y = 120; |
| 1011 } else { | 1011 } else { |
| 1012 y += 40; | 1012 y += 40; |
| 1063 painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wg_sulfate, 1, 'f', 1)); | 1063 painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wg_sulfate, 1, 'f', 1)); |
| 1064 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wg_ph, 1, 'f', 2)); | 1064 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wg_ph, 1, 'f', 2)); |
| 1065 y += 20; | 1065 y += 20; |
| 1066 } | 1066 } |
| 1067 painter.fillRect( 20, y, 715, 20, w_line); | 1067 painter.fillRect( 20, y, 715, 20, w_line); |
| 1068 painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Treated water")); | 1068 painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Treated mash water")); |
| 1069 painter.drawText(240, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_calcium, 1, 'f', 1)); | 1069 painter.drawText(240, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_calcium, 1, 'f', 1)); |
| 1070 painter.drawText(310, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_magnesium, 1, 'f', 1)); | 1070 painter.drawText(310, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_magnesium, 1, 'f', 1)); |
| 1071 painter.drawText(380, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_total_alkalinity, 1, 'f', 1)); | 1071 painter.drawText(380, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_total_alkalinity, 1, 'f', 1)); |
| 1072 painter.drawText(450, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_sodium, 1, 'f', 1)); | 1072 painter.drawText(450, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_sodium, 1, 'f', 1)); |
| 1073 painter.drawText(520, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_chloride, 1, 'f', 1)); | 1073 painter.drawText(520, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_chloride, 1, 'f', 1)); |
| 1074 painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_sulfate, 1, 'f', 1)); | 1074 painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_sulfate, 1, 'f', 1)); |
| 1075 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_ph, 1, 'f', 2)); | 1075 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_ph, 1, 'f', 2)); |
| 1076 y += 20; | |
| 1077 painter.fillRect( 20, y, 715, 20, w_line); | |
| 1078 painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Treated sparge water")); | |
| 1079 painter.drawText(170, y+4, 70, 20, Qt::AlignRight, QString("%1 L").arg(product->sparge_volume, 1, 'f', 1)); | |
| 1080 //painter.drawText(240, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sp_calcium, 1, 'f', 1)); | |
| 1081 //painter.drawText(310, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sp_magnesium, 1, 'f', 1)); | |
| 1082 //painter.drawText(380, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sp_total_alkalinity, 1, 'f', 1)); | |
| 1083 //painter.drawText(450, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sp_sodium, 1, 'f', 1)); | |
| 1084 //painter.drawText(520, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sp_chloride, 1, 'f', 1)); | |
| 1085 //painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sp_sulfate, 1, 'f', 1)); | |
| 1086 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sparge_ph, 1, 'f', 2)); | |
| 1076 y += 20; | 1087 y += 20; |
| 1077 | 1088 |
| 1078 /* | 1089 /* |
| 1079 * Print product notes if present. | 1090 * Print product notes if present. |
| 1080 */ | 1091 */ |
