--- a/src/PrinterDialog.cpp Mon Jun 13 15:47:16 2022 +0200
+++ b/src/PrinterDialog.cpp Mon Jun 13 16:47:52 2022 +0200
@@ -388,30 +388,30 @@
double cost_fermentables = 0;
QString soort, amount, use;
for (int i = 0; i < recipe->fermentables.size(); i++) {
- double cost = recipe->fermentables.at(i).f_amount * recipe->fermentables.at(i).f_cost;
+ double cost = recipe->fermentables.at(i).amount * recipe->fermentables.at(i).cost;
cost_fermentables += cost;
- if (recipe->fermentables.at(i).f_type == 0)
- soort = fermentable_graintypes[recipe->fermentables.at(i).f_graintype];
+ if (recipe->fermentables.at(i).type == 0)
+ soort = fermentable_graintypes[recipe->fermentables.at(i).graintype];
else
- soort = fermentable_types[recipe->fermentables.at(i).f_type];
+ soort = fermentable_types[recipe->fermentables.at(i).type];
- if (recipe->fermentables.at(i).f_amount > 100)
- amount = QString("%1 kg").arg(recipe->fermentables.at(i).f_amount, 1, 'f', 1);
- else if (recipe->fermentables.at(i).f_amount > 10)
- amount = QString("%1 kg").arg(recipe->fermentables.at(i).f_amount, 1, 'f', 2);
+ if (recipe->fermentables.at(i).amount > 100)
+ amount = QString("%1 kg").arg(recipe->fermentables.at(i).amount, 1, 'f', 1);
+ else if (recipe->fermentables.at(i).amount > 10)
+ amount = QString("%1 kg").arg(recipe->fermentables.at(i).amount, 1, 'f', 2);
else
- amount = QString("%1 gr").arg(recipe->fermentables.at(i).f_amount * 1000, 1, 'f', 0);
+ amount = QString("%1 gr").arg(recipe->fermentables.at(i).amount * 1000, 1, 'f', 0);
painter.fillRect( 20, y, 715, 20, f_line);
- painter.drawText( 20, y+4, 260, 20, Qt::AlignLeft, recipe->fermentables.at(i).f_name +
- QString(", %1 EBC (").arg(recipe->fermentables.at(i).f_color, 1, 'f', 0) +
- recipe->fermentables.at(i).f_supplier + ")");
- painter.drawText(285, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->fermentables.at(i).f_percentage, 1, 'f', 1));
- painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->fermentables.at(i).f_yield, 1, 'f', 1));
+ painter.drawText( 20, y+4, 260, 20, Qt::AlignLeft, recipe->fermentables.at(i).name +
+ QString(", %1 EBC (").arg(recipe->fermentables.at(i).color, 1, 'f', 0) +
+ recipe->fermentables.at(i).supplier + ")");
+ painter.drawText(285, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->fermentables.at(i).percentage, 1, 'f', 1));
+ painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->fermentables.at(i).yield, 1, 'f', 1));
painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, soort);
- painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, fermentable_added[recipe->fermentables.at(i).f_added]);
+ painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, fermentable_added[recipe->fermentables.at(i).added]);
painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount);
painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3));
y += 20;
@@ -785,33 +785,33 @@
double cost_fermentables = 0;
QString soort, amount, use;
for (int i = 0; i < product->fermentables.size(); i++) {
- double cost = product->fermentables.at(i).f_amount * product->fermentables.at(i).f_cost;
+ double cost = product->fermentables.at(i).amount * product->fermentables.at(i).cost;
cost_fermentables += cost;
- if (product->fermentables.at(i).f_type == 0)
- soort = fermentable_graintypes[product->fermentables.at(i).f_graintype];
+ if (product->fermentables.at(i).type == 0)
+ soort = fermentable_graintypes[product->fermentables.at(i).graintype];
else
- soort = fermentable_types[product->fermentables.at(i).f_type];
+ soort = fermentable_types[product->fermentables.at(i).type];
- if (product->fermentables.at(i).f_amount > 100)
- amount = QString("%1 kg").arg(product->fermentables.at(i).f_amount, 1, 'f', 1);
- else if (product->fermentables.at(i).f_amount > 10)
- amount = QString("%1 kg").arg(product->fermentables.at(i).f_amount, 1, 'f', 2);
+ if (product->fermentables.at(i).amount > 100)
+ amount = QString("%1 kg").arg(product->fermentables.at(i).amount, 1, 'f', 1);
+ else if (product->fermentables.at(i).amount > 10)
+ amount = QString("%1 kg").arg(product->fermentables.at(i).amount, 1, 'f', 2);
else
- amount = QString("%1 gr").arg(product->fermentables.at(i).f_amount * 1000, 1, 'f', 0);
+ amount = QString("%1 gr").arg(product->fermentables.at(i).amount * 1000, 1, 'f', 0);
painter.fillRect( 20, y, 715, 20, f_line);
- painter.drawText( 20, y+4, 260, 20, Qt::AlignLeft, product->fermentables.at(i).f_name +
- QString(", %1 EBC (").arg(product->fermentables.at(i).f_color, 1, 'f', 0) +
- product->fermentables.at(i).f_supplier + ")");
- if (product->fermentables.at(i).f_added < FERMENTABLE_ADDED_BOTTLE)
- painter.drawText(285, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(product->fermentables.at(i).f_percentage, 1, 'f', 1));
+ painter.drawText( 20, y+4, 260, 20, Qt::AlignLeft, product->fermentables.at(i).name +
+ QString(", %1 EBC (").arg(product->fermentables.at(i).color, 1, 'f', 0) +
+ product->fermentables.at(i).supplier + ")");
+ if (product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE)
+ painter.drawText(285, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(product->fermentables.at(i).percentage, 1, 'f', 1));
else
painter.drawText(285, y+4, 70, 20, Qt::AlignRight, "");
- painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(product->fermentables.at(i).f_yield, 1, 'f', 1));
+ painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(product->fermentables.at(i).yield, 1, 'f', 1));
painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, soort);
- painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, fermentable_added[product->fermentables.at(i).f_added]);
+ painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, fermentable_added[product->fermentables.at(i).added]);
painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount);
painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3));
y += 20;
@@ -1414,13 +1414,13 @@
QString bsugar = "", ksugar = "";
double bamount = 0, kamount = 0;
for (int i = 0; i < product->fermentables.size(); i++) {
- if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_BOTTLE) {
- bsugar = product->fermentables.at(i).f_name;
- bamount = product->fermentables.at(i).f_amount;
+ if (product->fermentables.at(i).added == FERMENTABLE_ADDED_BOTTLE) {
+ bsugar = product->fermentables.at(i).name;
+ bamount = product->fermentables.at(i).amount;
}
- if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_KEGS) {
- ksugar = product->fermentables.at(i).f_name;
- kamount = product->fermentables.at(i).f_amount;
+ if (product->fermentables.at(i).added == FERMENTABLE_ADDED_KEGS) {
+ ksugar = product->fermentables.at(i).name;
+ kamount = product->fermentables.at(i).amount;
}
}
painter.fillRect( 20, y, 330, 20, c_line1);
@@ -1612,9 +1612,9 @@
checkHeader(&painter, &y, tr("Weight and mill the malts"));
for (int i = 0; i < product->fermentables.size(); i++) {
- if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_MASH) {
- checkLine(&painter, &y, QString("%1 kg `%2` (%3)").arg(product->fermentables.at(i).f_amount * factor, 1, 'f', 3).
- arg(product->fermentables.at(i).f_name).arg(product->fermentables.at(i).f_supplier));
+ if (product->fermentables.at(i).added == FERMENTABLE_ADDED_MASH) {
+ checkLine(&painter, &y, QString("%1 kg `%2` (%3)").arg(product->fermentables.at(i).amount * factor, 1, 'f', 3).
+ arg(product->fermentables.at(i).name).arg(product->fermentables.at(i).supplier));
}
}
checkLine(&painter, &y, QString(tr("Mill the malts")));
@@ -1674,11 +1674,11 @@
}
double est_masg_sg = 0, sugardensity = 1.611, grainabsorbtion = 0;
for (int i = 0; i < product->fermentables.size(); i++) {
- if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_MASH) {
- double d = product->fermentables.at(i).f_amount * factor * (product->fermentables.at(i).f_yield / 100) *
- (1 - product->fermentables.at(i).f_moisture / 100);
- mvol += product->fermentables.at(i).f_amount * factor * (product->fermentables.at(i).f_moisture / 100);
- grainabsorbtion += my_grain_absorbtion * product->fermentables.at(i).f_amount * factor;
+ if (product->fermentables.at(i).added == FERMENTABLE_ADDED_MASH) {
+ double d = product->fermentables.at(i).amount * factor * (product->fermentables.at(i).yield / 100) *
+ (1 - product->fermentables.at(i).moisture / 100);
+ mvol += product->fermentables.at(i).amount * factor * (product->fermentables.at(i).moisture / 100);
+ grainabsorbtion += my_grain_absorbtion * product->fermentables.at(i).amount * factor;
msugars += d;
}
}
@@ -1725,7 +1725,7 @@
if (product->brew_cooling_method == 1)
lines++;
for (int i = 0; i < product->fermentables.size(); i++) {
- if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_BOIL)
+ if (product->fermentables.at(i).added == FERMENTABLE_ADDED_BOIL)
lines++;
}
for (int i = 0; i < product->hops.size(); i++) {
@@ -1751,10 +1751,10 @@
for (int i = product->boil_time; i >= 0; i--) {
if (i == 10) {
for (int j = 0; j < product->fermentables.size(); j++) {
- if (product->fermentables.at(j).f_added == FERMENTABLE_ADDED_BOIL)
+ if (product->fermentables.at(j).added == FERMENTABLE_ADDED_BOIL)
checkLine(&painter, &y, QString(tr("%1 kg `%2` at 10 minutes before end of boil"))
- .arg(product->fermentables.at(j).f_amount * factor, 1, 'f', 3)
- .arg(product->fermentables.at(j).f_name));
+ .arg(product->fermentables.at(j).amount * factor, 1, 'f', 3)
+ .arg(product->fermentables.at(j).name));
}
if (product->brew_cooling_method == 1)
checkLine(&painter, &y, QString(tr("Place emersion chiller at 10 minutes before end of boil")));
@@ -1903,7 +1903,7 @@
/* During primary fermentation */
lines = 0;
for (int i = 0; i < product->fermentables.size(); i++)
- if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_FERMENTATION)
+ if (product->fermentables.at(i).added == FERMENTABLE_ADDED_FERMENTATION)
lines++;
for (int i = 0; i < product->miscs.size(); i++)
if (product->miscs.at(i).use_use == MISC_USES_PRIMARY)
@@ -1918,9 +1918,9 @@
}
checkHeader(&painter, &y, tr("Primary fermentation"));
for (int i = 0; i < product->fermentables.size(); i++) {
- if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_FERMENTATION)
- checkLine(&painter, &y, QString(tr("Add %1 kg `%2` on day 3 or 4")).arg(product->fermentables.at(i).f_amount * factor, 1, 'f', 3)
- .arg(product->fermentables.at(i).f_name));
+ if (product->fermentables.at(i).added == FERMENTABLE_ADDED_FERMENTATION)
+ checkLine(&painter, &y, QString(tr("Add %1 kg `%2` on day 3 or 4")).arg(product->fermentables.at(i).amount * factor, 1, 'f', 3)
+ .arg(product->fermentables.at(i).name));
}
for (int i = 0; i < product->miscs.size(); i++) {
if (product->miscs.at(i).use_use == MISC_USES_PRIMARY) {
@@ -1976,7 +1976,7 @@
/* During tertiary fermentation */
lines = 0;
for (int i = 0; i < product->fermentables.size(); i++)
- if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_LAGERING)
+ if (product->fermentables.at(i).added == FERMENTABLE_ADDED_LAGERING)
lines++;
for (int i = 0; i < product->hops.size(); i++)
if (product->hops.at(i).useat == HOP_USEAT_DRY_HOP)
@@ -1998,9 +1998,9 @@
}
checkHeader(&painter, &y, tr("Tertiary fermentation"));
for (int i = 0; i < product->fermentables.size(); i++) {
- if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_LAGERING)
- checkLine(&painter, &y, QString(tr("Add %1 kg `%2`")).arg(product->fermentables.at(i).f_amount * factor, 1, 'f', 3)
- .arg(product->fermentables.at(i).f_name));
+ if (product->fermentables.at(i).added == FERMENTABLE_ADDED_LAGERING)
+ checkLine(&painter, &y, QString(tr("Add %1 kg `%2`")).arg(product->fermentables.at(i).amount * factor, 1, 'f', 3)
+ .arg(product->fermentables.at(i).name));
}
for (int i = 0; i < product->hops.size(); i++) {
if (product->hops.at(i).useat == HOP_USEAT_DRY_HOP) {
@@ -2037,7 +2037,7 @@
/* During packaging */
lines = 0;
for (int i = 0; i < product->fermentables.size(); i++)
- if (product->fermentables.at(i).f_added >= FERMENTABLE_ADDED_BOTTLE)
+ if (product->fermentables.at(i).added >= FERMENTABLE_ADDED_BOTTLE)
lines++;
for (int i = 0; i < product->miscs.size(); i++)
if (product->miscs.at(i).use_use == MISC_USES_BOTTLING)
@@ -2055,14 +2055,14 @@
}
checkHeader(&painter, &y, tr("Packaging"));
for (int i = 0; i < product->fermentables.size(); i++) {
- if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_BOTTLE)
+ if (product->fermentables.at(i).added == FERMENTABLE_ADDED_BOTTLE)
checkLine(&painter, &y, QString(tr("Bottling add %1 kg `%2` with %3 liter water"))
- .arg(product->fermentables.at(i).f_amount * factor, 1, 'f', 3)
- .arg(product->fermentables.at(i).f_name).arg(product->bottle_priming_water * factor, 1, 'f', 3));
- if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_KEGS)
+ .arg(product->fermentables.at(i).amount * factor, 1, 'f', 3)
+ .arg(product->fermentables.at(i).name).arg(product->bottle_priming_water * factor, 1, 'f', 3));
+ if (product->fermentables.at(i).added == FERMENTABLE_ADDED_KEGS)
checkLine(&painter, &y, QString(tr("Kegging add %1 kg `%2` with %3 liter water"))
- .arg(product->fermentables.at(i).f_amount * factor, 1, 'f', 3)
- .arg(product->fermentables.at(i).f_name).arg(product->keg_priming_water * factor, 1, 'f', 3));
+ .arg(product->fermentables.at(i).amount * factor, 1, 'f', 3)
+ .arg(product->fermentables.at(i).name).arg(product->keg_priming_water * factor, 1, 'f', 3));
}
for (int i = 0; i < product->yeasts.size(); i++) {
if (product->yeasts.at(i).y_use == YEAST_USE_BOTTLE) {