--- a/src/PrinterDialog.cpp Sun Jun 12 20:06:39 2022 +0200
+++ b/src/PrinterDialog.cpp Mon Jun 13 10:54:23 2022 +0200
@@ -63,7 +63,7 @@
const QColor mf_line( 95, 180, 25, 255);
const QColor ms_line( 240, 250, 65, 255);
const QColor mo_line( 210, 245, 255, 255);
- const QColor m_line( 175, 175, 255, 255); // also y_line
+ const QColor line( 175, 175, 255, 255); // also y_line
const QColor w_line( 120, 255, 250, 255);
const QStringList y_unit({tr("pkg"), tr("gr"), tr("ml"), tr("ml"), tr("ml"), tr("ml"), tr("gr")});
@@ -524,27 +524,27 @@
painter.setFont(QFont("Helvetica", 9, QFont::Normal));
double cost_miscs = 0;
for (int i = 0; i < recipe->miscs.size(); i++) {
- double cost = recipe->miscs.at(i).m_amount * recipe->miscs.at(i).m_cost;
+ double cost = recipe->miscs.at(i).amount * recipe->miscs.at(i).cost;
cost_miscs += cost;
- if (recipe->miscs.at(i).m_use_use == 2)
- use = misc_uses[recipe->miscs.at(i).m_use_use] + QString(" %1 min").arg(recipe->miscs.at(i).m_time);
+ if (recipe->miscs.at(i).use_use == 2)
+ use = misc_uses[recipe->miscs.at(i).use_use] + QString(" %1 min").arg(recipe->miscs.at(i).time);
else
- use = misc_uses[recipe->miscs.at(i).m_use_use];
+ use = misc_uses[recipe->miscs.at(i).use_use];
- if (recipe->miscs.at(i).m_type == 4) // Water agent
+ if (recipe->miscs.at(i).type == 4) // Water agent
painter.fillRect( 20, y, 715, 20, mw_line);
- else if (recipe->miscs.at(i).m_type == 3) // Fining
+ else if (recipe->miscs.at(i).type == 3) // Fining
painter.fillRect( 20, y, 715, 20, mf_line);
- else if (recipe->miscs.at(i).m_type < 3 || recipe->miscs.at(i).m_type == 5) // Spice, Herb, Flavour, Yeast nutrient
+ else if (recipe->miscs.at(i).type < 3 || recipe->miscs.at(i).type == 5) // Spice, Herb, Flavour, Yeast nutrient
painter.fillRect( 20, y, 715, 20, ms_line);
else
painter.fillRect( 20, y, 715, 20, mo_line);
- painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft, recipe->miscs.at(i).m_name);
- painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, misc_types[recipe->miscs.at(i).m_type]);
+ painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft, recipe->miscs.at(i).name);
+ painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, misc_types[recipe->miscs.at(i).type]);
painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, use);
painter.drawText(605, y+4, 60, 20, Qt::AlignRight,
- QString("%1 %2").arg(recipe->miscs.at(i).m_amount * 1000.0, 1, 'f', 1).arg(recipe->miscs.at(i).m_amount_is_weight ? "gr":"ml"));
+ QString("%1 %2").arg(recipe->miscs.at(i).amount * 1000.0, 1, 'f', 1).arg(recipe->miscs.at(i).amount_is_weight ? "gr":"ml"));
painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3));
y += 20;
}
@@ -574,7 +574,7 @@
y += 20;
painter.setFont(QFont("Helvetica", 9, QFont::Normal));
for (int i = 0; i < recipe->mashs.size(); i++) {
- painter.fillRect( 20, y, 715, 20, m_line);
+ painter.fillRect( 20, y, 715, 20, line);
painter.drawText( 20, y+4, 160, 20, Qt::AlignLeft, recipe->mashs.at(i).step_name);
painter.drawText(180, y+4, 80, 20, Qt::AlignLeft, step_types[recipe->mashs.at(i).step_type]);
painter.drawText(260, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(recipe->mashs.at(i).step_temp, 1, 'f', 1));
@@ -940,27 +940,27 @@
painter.setFont(QFont("Helvetica", 9, QFont::Normal));
double cost_miscs = 0;
for (int i = 0; i < product->miscs.size(); i++) {
- double cost = product->miscs.at(i).m_amount * product->miscs.at(i).m_cost;
+ double cost = product->miscs.at(i).amount * product->miscs.at(i).cost;
cost_miscs += cost;
- if (product->miscs.at(i).m_use_use == 2)
- use = misc_uses[product->miscs.at(i).m_use_use] + QString(" %1 min").arg(product->miscs.at(i).m_time);
+ if (product->miscs.at(i).use_use == 2)
+ use = misc_uses[product->miscs.at(i).use_use] + QString(" %1 min").arg(product->miscs.at(i).time);
else
- use = misc_uses[product->miscs.at(i).m_use_use];
+ use = misc_uses[product->miscs.at(i).use_use];
- if (product->miscs.at(i).m_type == 4) // Water agent
+ if (product->miscs.at(i).type == 4) // Water agent
painter.fillRect( 20, y, 715, 20, mw_line);
- else if (product->miscs.at(i).m_type == 3) // Fining
+ else if (product->miscs.at(i).type == 3) // Fining
painter.fillRect( 20, y, 715, 20, mf_line);
- else if (product->miscs.at(i).m_type < 3 || product->miscs.at(i).m_type == 5) // Spice, Herb, Flavour, Yeast nutrient
+ else if (product->miscs.at(i).type < 3 || product->miscs.at(i).type == 5) // Spice, Herb, Flavour, Yeast nutrient
painter.fillRect( 20, y, 715, 20, ms_line);
else
painter.fillRect( 20, y, 715, 20, mo_line);
- painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft, product->miscs.at(i).m_name);
- painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, misc_types[product->miscs.at(i).m_type]);
+ painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft, product->miscs.at(i).name);
+ painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, misc_types[product->miscs.at(i).type]);
painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, use);
painter.drawText(605, y+4, 60, 20, Qt::AlignRight,
- QString("%1 %2").arg(product->miscs.at(i).m_amount * 1000.0, 1, 'f', 1).arg(product->miscs.at(i).m_amount_is_weight ? "gr":"ml"));
+ QString("%1 %2").arg(product->miscs.at(i).amount * 1000.0, 1, 'f', 1).arg(product->miscs.at(i).amount_is_weight ? "gr":"ml"));
painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3));
y += 20;
}
@@ -990,7 +990,7 @@
y += 20;
painter.setFont(QFont("Helvetica", 9, QFont::Normal));
for (int i = 0; i < product->mashs.size(); i++) {
- painter.fillRect( 20, y, 715, 20, m_line);
+ painter.fillRect( 20, y, 715, 20, line);
painter.drawText( 20, y+4, 160, 20, Qt::AlignLeft, product->mashs.at(i).step_name);
painter.drawText(180, y+4, 80, 20, Qt::AlignLeft, step_types[product->mashs.at(i).step_type]);
painter.drawText(260, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(product->mashs.at(i).step_temp, 1, 'f', 1));
@@ -1136,7 +1136,7 @@
y += 40;
}
painter.setFont(QFont("Helvetica", 9, QFont::Bold));
- painter.fillRect( 20, y, 715, 20, m_line);
+ painter.fillRect( 20, y, 715, 20, line);
painter.drawText( 40, y+4, 250, 20, Qt::AlignLeft, tr("Mash step"));
painter.drawText(290, y+4, 120, 20, Qt::AlignLeft, tr("Step type"));
painter.drawText(400, y+4, 110, 20, Qt::AlignLeft, tr("Temperature"));
@@ -1167,7 +1167,7 @@
y += 20;
}
painter.setFont(QFont("Helvetica", 9, QFont::Bold));
- painter.fillRect( 20, y, 715, 20, m_line);
+ painter.fillRect( 20, y, 715, 20, line);
painter.drawText( 20, y+4, 230, 20, Qt::AlignLeft, tr("Brew item"));
painter.drawText(250, y+4, 200, 20, Qt::AlignLeft, tr("Expected"));
painter.drawText(450, y+4, 200, 20, Qt::AlignLeft, tr("Reached"));
@@ -1391,9 +1391,9 @@
}
y += 5;
painter.setFont(QFont("Helvetica", 9, QFont::Bold));
- painter.fillRect( 20, y, 330, 20, m_line);
+ painter.fillRect( 20, y, 330, 20, line);
painter.drawText( 20, y+2, 330, 20, Qt::AlignCenter, tr("Bottles"));
- painter.fillRect(405, y, 330, 20, m_line);
+ painter.fillRect(405, y, 330, 20, line);
painter.drawText(405, y+2, 330, 20, Qt::AlignCenter, tr("Kegs"));
y += 20;
painter.setFont(QFont("Helvetica", 9, QFont::Normal));
@@ -1602,9 +1602,9 @@
mashwater += product->w2_amount * factor;
}
for (int i = 0; i < product->miscs.size(); i++) {
- if (product->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) {
- QString unit = (product->miscs.at(i).m_amount_is_weight) ? "gr":"ml";
- checkLine(&painter, &y, QString("%1 %2 %3").arg(product->miscs.at(i).m_amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(i).m_name));
+ if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
+ QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml";
+ 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));
numsalts++;
}
}
@@ -1644,10 +1644,10 @@
}
}
for (int j = 0; j < product->miscs.size(); j++) {
- if ((product->miscs.at(j).m_use_use == MISC_USES_MASH) && (product->miscs.at(j).m_type != MISC_TYPES_WATER_AGENT)) {
- QString unit = (product->miscs.at(j).m_amount_is_weight) ? "gr":"ml";
- checkLine(&painter, &y, QString(tr("Add %1 %2 `%3`")).arg(product->miscs.at(j).m_amount * 1000 * factor, 1, 'f', 2)
- .arg(unit).arg(product->miscs.at(j).m_name));
+ if ((product->miscs.at(j).use_use == MISC_USES_MASH) && (product->miscs.at(j).type != MISC_TYPES_WATER_AGENT)) {
+ QString unit = (product->miscs.at(j).amount_is_weight) ? "gr":"ml";
+ checkLine(&painter, &y, QString(tr("Add %1 %2 `%3`")).arg(product->miscs.at(j).amount * 1000 * factor, 1, 'f', 2)
+ .arg(unit).arg(product->miscs.at(j).name));
}
}
} else { // loop > 0
@@ -1733,7 +1733,7 @@
lines++;
}
for (int i = 0; i < product->miscs.size(); i++) {
- if (product->miscs.at(i).m_use_use == MISC_USES_BOIL)
+ if (product->miscs.at(i).use_use == MISC_USES_BOIL)
lines++;
}
}
@@ -1770,14 +1770,14 @@
}
}
for (int j = 0; j < product->miscs.size(); j++) {
- if (product->miscs.at(j).m_use_use == MISC_USES_BOIL && product->miscs.at(j).m_time == i) {
- QString unit = (product->miscs.at(j).m_amount_is_weight) ? "gr":"ml";
+ if (product->miscs.at(j).use_use == MISC_USES_BOIL && product->miscs.at(j).time == i) {
+ QString unit = (product->miscs.at(j).amount_is_weight) ? "gr":"ml";
if (i == 0)
checkLine(&painter, &y, QString(tr("%1 %2 `%3` at flameout"))
- .arg(product->miscs.at(j).m_amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(j).m_name));
+ .arg(product->miscs.at(j).amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(j).name));
else
checkLine(&painter, &y, QString(tr("%1 %2 `%3` at %4 minutes before end of boil"))
- .arg(product->miscs.at(j).m_amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(j).m_name).arg(i));
+ .arg(product->miscs.at(j).amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(j).name).arg(i));
}
}
}
@@ -1906,7 +1906,7 @@
if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_FERMENTATION)
lines++;
for (int i = 0; i < product->miscs.size(); i++)
- if (product->miscs.at(i).m_use_use == MISC_USES_PRIMARY)
+ if (product->miscs.at(i).use_use == MISC_USES_PRIMARY)
lines++;
if (lines) {
if ((y + 20 + (lines * 20)) > painter.device()->height()) {
@@ -1923,10 +1923,10 @@
.arg(product->fermentables.at(i).f_name));
}
for (int i = 0; i < product->miscs.size(); i++) {
- if (product->miscs.at(i).m_use_use == MISC_USES_PRIMARY) {
- QString unit = (product->miscs.at(i).m_amount_is_weight) ? "gr":"ml";
- checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` on day 3 or 4")).arg(product->miscs.at(i).m_amount * 1000 * factor, 1, 'f', 3)
- .arg(unit).arg(product->miscs.at(i).m_name));
+ if (product->miscs.at(i).use_use == MISC_USES_PRIMARY) {
+ QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml";
+ checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` on day 3 or 4")).arg(product->miscs.at(i).amount * 1000 * factor, 1, 'f', 3)
+ .arg(unit).arg(product->miscs.at(i).name));
}
}
}
@@ -1982,7 +1982,7 @@
if (product->hops.at(i).h_useat == HOP_USEAT_DRY_HOP)
lines++;
for (int i = 0; i < product->miscs.size(); i++)
- if (product->miscs.at(i).m_use_use == MISC_USES_SECONDARY)
+ if (product->miscs.at(i).use_use == MISC_USES_SECONDARY)
lines++;
for (int i = 0; i < product->yeasts.size(); i++) {
if (product->yeasts.at(i).y_use == YEAST_USE_TERTIARY)
@@ -2024,10 +2024,10 @@
}
}
for (int i = 0; i < product->miscs.size(); i++) {
- if (product->miscs.at(i).m_use_use == MISC_USES_SECONDARY) {
- QString unit = (product->miscs.at(i).m_amount_is_weight) ? "gr":"ml";
- checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` for %4 days")).arg(product->miscs.at(i).m_amount * 1000.0 * factor, 1, 'f', 2)
- .arg(unit).arg(product->miscs.at(i).m_name).arg(product->miscs.at(i).m_time / 1440));
+ if (product->miscs.at(i).use_use == MISC_USES_SECONDARY) {
+ QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml";
+ checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` for %4 days")).arg(product->miscs.at(i).amount * 1000.0 * factor, 1, 'f', 2)
+ .arg(unit).arg(product->miscs.at(i).name).arg(product->miscs.at(i).time / 1440));
}
}
}
@@ -2040,7 +2040,7 @@
if (product->fermentables.at(i).f_added >= FERMENTABLE_ADDED_BOTTLE)
lines++;
for (int i = 0; i < product->miscs.size(); i++)
- if (product->miscs.at(i).m_use_use == MISC_USES_BOTTLING)
+ if (product->miscs.at(i).use_use == MISC_USES_BOTTLING)
lines++;
for (int i = 0; i < product->yeasts.size(); i++)
if (product->yeasts.at(i).y_use == YEAST_USE_BOTTLE)
@@ -2081,10 +2081,10 @@
}
}
for (int i = 0; i < product->miscs.size(); i++) {
- if (product->miscs.at(i).m_use_use == MISC_USES_BOTTLING) {
- QString unit = (product->miscs.at(i).m_amount_is_weight) ? "gr":"ml";
- checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` during bottling")).arg(product->miscs.at(i).m_amount * 1000 * factor, 1, 'f', 2)
- .arg(unit).arg(product->miscs.at(i).m_name));
+ if (product->miscs.at(i).use_use == MISC_USES_BOTTLING) {
+ QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml";
+ checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` during bottling")).arg(product->miscs.at(i).amount * 1000 * factor, 1, 'f', 2)
+ .arg(unit).arg(product->miscs.at(i).name));
}
}
}