comparison: src/PrinterDialog.cpp
src/PrinterDialog.cpp
- changeset 367
- 60c493e08800
- parent 366
- 43bf6cccc4ab
- child 373
- b02aca4e926c
equal
deleted
inserted
replaced
| 366:43bf6cccc4ab | 367:60c493e08800 |
|---|---|
| 1614 } | 1614 } |
| 1615 y += 20; | 1615 y += 20; |
| 1616 } | 1616 } |
| 1617 | 1617 |
| 1618 checkHeader(&painter, &y, tr("Mash water and treatment")); | 1618 checkHeader(&painter, &y, tr("Mash water and treatment")); |
| 1619 checkLine(&painter, &y, QString("%1 liter water %2").arg(product->w1_amount * factor, 1, 'f', 1).arg(product->w1_name)); | 1619 checkLine(&painter, &y, QString("%1 liter water `%2`").arg(product->w1_amount * factor, 1, 'f', 1).arg(product->w1_name)); |
| 1620 mashwater += product->w1_amount * factor; | 1620 mashwater += product->w1_amount * factor; |
| 1621 if (product->w2_name != "" && product->w2_amount > 0) { | 1621 if (product->w2_name != "" && product->w2_amount > 0) { |
| 1622 checkLine(&painter, &y, QString("%1 liter water %2").arg(product->w2_amount * factor, 1, 'f', 1).arg(product->w2_name)); | 1622 checkLine(&painter, &y, QString("%1 liter water `%2`").arg(product->w2_amount * factor, 1, 'f', 1).arg(product->w2_name)); |
| 1623 mashwater += product->w2_amount * factor; | 1623 mashwater += product->w2_amount * factor; |
| 1624 } | 1624 } |
| 1625 for (int i = 0; i < product->miscs.size(); i++) { | 1625 for (int i = 0; i < product->miscs.size(); i++) { |
| 1626 if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT) { | 1626 if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT && product->miscs.at(i).use_use == MISC_USES_MASH) { |
| 1627 QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml"; | 1627 QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml"; |
| 1628 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)); | 1628 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)); |
| 1629 numsalts++; | 1629 numsalts++; |
| 1630 } | 1630 } |
| 1631 } | 1631 } |
| 1632 y += 20; | |
| 1633 | |
| 1634 checkHeader(&painter, &y, tr("Sparge water and treatment")); | |
| 1635 QString sw = ""; | |
| 1636 if (product->sparge_source == 0) { | |
| 1637 checkLine(&painter, &y, QString("%1 liter water `%2`").arg(product->sparge_volume * factor, 1, 'f', 1).arg(product->w1_name)); | |
| 1638 } else if (product->sparge_source == 1) { | |
| 1639 checkLine(&painter, &y, QString("%1 liter water `%2`").arg(product->sparge_volume * factor, 1, 'f', 1).arg(product->w2_name)); | |
| 1640 } else if (product->sparge_source == 2) { | |
| 1641 checkLine(&painter, &y, QString("%1 liter water `%2`") | |
| 1642 .arg(product->sparge_volume * (product->w1_amount / (product->w1_amount+product->w2_amount)) * factor, 1, 'f', 1) | |
| 1643 .arg(product->w1_name)); | |
| 1644 checkLine(&painter, &y, QString("%1 liter water `%2`") | |
| 1645 .arg(product->sparge_volume * (product->w2_amount / (product->w1_amount+product->w2_amount)) * factor, 1, 'f', 1) | |
| 1646 .arg(product->w2_name)); | |
| 1647 } | |
| 1648 for (int i = 0; i < product->miscs.size(); i++) { | |
| 1649 if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT && product->miscs.at(i).use_use == MISC_USES_SPARGE) { | |
| 1650 QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml"; | |
| 1651 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)); | |
| 1652 numsalts++; | |
| 1653 } | |
| 1654 } | |
| 1632 y += 20; | 1655 y += 20; |
| 1633 | 1656 |
| 1634 checkHeader(&painter, &y, tr("Weight and mill the malts")); | 1657 checkHeader(&painter, &y, tr("Weight and mill the malts")); |
| 1635 for (int i = 0; i < product->fermentables.size(); i++) { | 1658 for (int i = 0; i < product->fermentables.size(); i++) { |
| 1636 if (product->fermentables.at(i).added == FERMENTABLE_ADDED_MASH) { | 1659 if (product->fermentables.at(i).added == FERMENTABLE_ADDED_MASH) { |
| 1714 } else { | 1737 } else { |
| 1715 y += 20; | 1738 y += 20; |
| 1716 } | 1739 } |
| 1717 | 1740 |
| 1718 checkHeader(&painter, &y, tr("Lauter and Sparge")); | 1741 checkHeader(&painter, &y, tr("Lauter and Sparge")); |
| 1719 checkLine(&painter, &y, QString(tr("Heat %1 liter sparge water to %2°C")).arg(product->sparge_volume * factor, 1, 'f', 1) | 1742 checkLine(&painter, &y, QString(tr("Heat sparge water to %1°C")).arg(product->sparge_temp, 1, 'f', 1)); |
| 1720 .arg(product->sparge_temp, 1, 'f', 1)); | 1743 checkInput(&painter, &y, QString(tr("Bring water to %1 pH with %2 ml. `%3`")).arg(product->sparge_ph, 1, 'f', 2) |
| 1721 checkInput(&painter, &y, QString(tr("Bring to %1 pH with %2 ml. `%3`")).arg(product->sparge_ph, 1, 'f', 2) | |
| 1722 .arg(product->sparge_acid_amount * 1000 * factor, 1, 'f', 2).arg(my_acids.at(product->sparge_acid_type).name_en), QString(tr("pH"))); | 1744 .arg(product->sparge_acid_amount * 1000 * factor, 1, 'f', 2).arg(my_acids.at(product->sparge_acid_type).name_en), QString(tr("pH"))); |
| 1723 checkLine(&painter, &y, QString(tr("Sparge with close to %1 liter water")) | 1745 checkLine(&painter, &y, QString(tr("Sparge with close to %1 liter water")) |
| 1724 .arg(((product->boil_size * factor) - mashwater + grainabsorbtion + product->eq_lauter_deadspace) * 1.03, 1, 'f', 1)); | 1746 .arg(((product->boil_size * factor) - mashwater + grainabsorbtion + product->eq_lauter_deadspace) * 1.03, 1, 'f', 1)); |
| 1725 checkInput(&painter, &y, QString(tr("Target volume in boil kettle: %1 liter (%2 cm below kettle top)")) | 1747 checkInput(&painter, &y, QString(tr("Target volume in boil kettle: %1 liter (%2 cm below kettle top)")) |
| 1726 .arg(product->boil_size * factor * 1.04, 1, 'f', 1) | 1748 .arg(product->boil_size * factor * 1.04, 1, 'f', 1) |
