Mercurial > bmsapp / changeset

--- a/src/PrinterDialog.cpp	Fri Jul 29 20:15:40 2022 +0200
+++ b/src/PrinterDialog.cpp	Fri Jul 29 20:59:21 2022 +0200
@@ -543,7 +543,7 @@
 	    painter.drawText(435, y+4,  80, 20, Qt::AlignLeft,	QCoreApplication::translate("MiscType", g_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).amount * 1000.0, 1, 'f', 1).arg(recipe->miscs.at(i).amount_is_weight ? "gr":"ml"));
+			    QString("%1 %2").arg(recipe->miscs.at(i).amount * 1000.0, 1, 'f', 2).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;
 	}
@@ -971,7 +971,7 @@
             painter.drawText(435, y+4,  80, 20, Qt::AlignLeft,  QCoreApplication::translate("MiscType", g_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).amount * 1000.0, 1, 'f', 1).arg(product->miscs.at(i).amount_is_weight ? "gr":"ml"));
+                            QString("%1 %2").arg(product->miscs.at(i).amount * 1000.0, 1, 'f', 2).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;
         }
@@ -2083,6 +2083,9 @@
 	for (int i = 0; i < product->fermentables.size(); i++)
             if (product->fermentables.at(i).added >= FERMENTABLE_ADDED_BOTTLE)
                 lines++;
+	for (int i = 0; i < product->hops.size(); i++)
+	    if (product->hops.at(i).useat == HOP_USEAT_BOTTLING)
+		lines++;
         for (int i = 0; i < product->miscs.size(); i++)
             if (product->miscs.at(i).use_use == MISC_USES_BOTTLING)
                 lines++;
@@ -2131,6 +2134,12 @@
                         .arg(unit).arg(product->miscs.at(i).name));
                 }
             }
+	    for (int i = 0; i < product->hops.size(); i++) {
+		if (product->hops.at(i).useat == HOP_USEAT_BOTTLING) {
+		    checkLine(&painter, &y, QString(tr("Add %1 gr `%2`")).arg(product->hops.at(i).amount * 1000 * factor, 1, 'f', 2)
+				    .arg(product->hops.at(i).name));
+		}
+	    }
 	}
     }