Mercurial > bmsapp / file comparison

comparison: src/PrinterDialog.cpp

src/PrinterDialog.cpp

changeset 366
43bf6cccc4ab
parent 364
1efe29f64551
child 367
60c493e08800
equal deleted inserted replaced
365:4bc746c65650 366:43bf6cccc4ab
585 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->mashs.at(i).step_infuse_temp, 1, 'f', 1)); 585 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->mashs.at(i).step_infuse_temp, 1, 'f', 1));
586 } 586 }
587 y += 20; 587 y += 20;
588 } 588 }
589 589
590 if ((y + 80 + ((recipe->w2_amount > 0) ? 40:0)) > painter.device()->height()) { /* waters + header + blank */ 590 if ((y + 100 + ((recipe->w2_amount > 0) ? 40:0)) > painter.device()->height()) { /* waters + header + blank */
591 printer->newPage(); 591 printer->newPage();
592 printHeader(&painter); 592 printHeader(&painter);
593 y = 120; 593 y = 120;
594 } else { 594 } else {
595 y += 40; 595 y += 40;
646 painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wg_sulfate, 1, 'f', 1)); 646 painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wg_sulfate, 1, 'f', 1));
647 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wg_ph, 1, 'f', 2)); 647 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wg_ph, 1, 'f', 2));
648 y += 20; 648 y += 20;
649 } 649 }
650 painter.fillRect( 20, y, 715, 20, w_line); 650 painter.fillRect( 20, y, 715, 20, w_line);
651 painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Treated water")); 651 painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Treated mash water"));
652 painter.drawText(240, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_calcium, 1, 'f', 1)); 652 painter.drawText(240, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_calcium, 1, 'f', 1));
653 painter.drawText(310, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_magnesium, 1, 'f', 1)); 653 painter.drawText(310, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_magnesium, 1, 'f', 1));
654 painter.drawText(380, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_total_alkalinity, 1, 'f', 1)); 654 painter.drawText(380, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_total_alkalinity, 1, 'f', 1));
655 painter.drawText(450, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_sodium, 1, 'f', 1)); 655 painter.drawText(450, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_sodium, 1, 'f', 1));
656 painter.drawText(520, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_chloride, 1, 'f', 1)); 656 painter.drawText(520, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_chloride, 1, 'f', 1));
657 painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_sulfate, 1, 'f', 1)); 657 painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_sulfate, 1, 'f', 1));
658 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_ph, 1, 'f', 2)); 658 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->wb_ph, 1, 'f', 2));
659 y += 20; 659 y += 20;
660 painter.fillRect( 20, y, 715, 20, w_line);
661 painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Treated sparge water"));
662 painter.drawText(170, y+4, 70, 20, Qt::AlignRight, QString("%1 L").arg(recipe->sparge_volume, 1, 'f', 1));
663 painter.drawText(240, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_calcium, 1, 'f', 1));
664 painter.drawText(310, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_magnesium, 1, 'f', 1));
665 painter.drawText(380, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_total_alkalinity, 1, 'f', 1));
666 painter.drawText(450, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_sodium, 1, 'f', 1));
667 painter.drawText(520, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_chloride, 1, 'f', 1));
668 painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->ws_sulfate, 1, 'f', 1));
669 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(recipe->sparge_ph, 1, 'f', 2));
670 y += 20;
660 671
661 /* 672 /*
662 * Print recipe notes if present. 673 * Print recipe notes if present.
663 */ 674 */
664 if (recipe->notes.length()) { 675 if (recipe->notes.length()) {
1075 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_ph, 1, 'f', 2)); 1086 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->wb_ph, 1, 'f', 2));
1076 y += 20; 1087 y += 20;
1077 painter.fillRect( 20, y, 715, 20, w_line); 1088 painter.fillRect( 20, y, 715, 20, w_line);
1078 painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Treated sparge water")); 1089 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)); 1090 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)); 1091 painter.drawText(240, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->ws_calcium, 1, 'f', 1));
1081 //painter.drawText(310, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sp_magnesium, 1, 'f', 1)); 1092 painter.drawText(310, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->ws_magnesium, 1, 'f', 1));
1082 //painter.drawText(380, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sp_total_alkalinity, 1, 'f', 1)); 1093 painter.drawText(380, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->ws_total_alkalinity, 1, 'f', 1));
1083 //painter.drawText(450, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sp_sodium, 1, 'f', 1)); 1094 painter.drawText(450, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->ws_sodium, 1, 'f', 1));
1084 //painter.drawText(520, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sp_chloride, 1, 'f', 1)); 1095 painter.drawText(520, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->ws_chloride, 1, 'f', 1));
1085 //painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sp_sulfate, 1, 'f', 1)); 1096 painter.drawText(590, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->ws_sulfate, 1, 'f', 1));
1086 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sparge_ph, 1, 'f', 2)); 1097 painter.drawText(660, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(product->sparge_ph, 1, 'f', 2));
1087 y += 20; 1098 y += 20;
1088 1099
1089 /* 1100 /*
1090 * Print product notes if present. 1101 * Print product notes if present.

Mercurial Repository: bmsapp

mercurial