# HG changeset patch # User Michiel Broek # Date 1651266591 -7200 # Node ID bbf0f06a5e729b7cc133019b833926d594b226a4 # Parent 512f492358e3e778aa10939dc920f06426e2947c Show total mash volume. diff -r 512f492358e3 -r bbf0f06a5e72 src/EditProductTab7.cpp --- a/src/EditProductTab7.cpp Fri Apr 29 22:49:32 2022 +0200 +++ b/src/EditProductTab7.cpp Fri Apr 29 23:09:51 2022 +0200 @@ -238,6 +238,7 @@ } } + ui->mash_volEdit->setValue(product->mashs_kg * MaltVolume + infused); /* Show the calculated total mash time. */ ui->mash_timeEdit->setText(QString("%1:%2").arg(product->mashs_time / 60).arg(product->mashs_time % 60, 2, 'f', 0, '0')); } diff -r 512f492358e3 -r bbf0f06a5e72 src/global.h --- a/src/global.h Fri Apr 29 22:49:32 2022 +0200 +++ b/src/global.h Fri Apr 29 23:09:51 2022 +0200 @@ -32,7 +32,7 @@ #define SlakingHeat 10.318 //cal/g.°C #define equip_tun_weight 2.0 // 2 Kg pot #define equip_tun_specific_heat 0.110 - +#define MaltVolume 0.87 // l/kg 0.688 volgens internetbronnen, gemeten 0.874 l/kg, na enige tijd maischen 0,715 l/kg (A3 Otten). struct Acid { diff -r 512f492358e3 -r bbf0f06a5e72 ui/EditProduct.ui --- a/ui/EditProduct.ui Fri Apr 29 22:49:32 2022 +0200 +++ b/ui/EditProduct.ui Fri Apr 29 23:09:51 2022 +0200 @@ -3436,9 +3436,9 @@ 10 - 110 + 120 1101 - 351 + 341 @@ -3446,7 +3446,7 @@ 140 - 40 + 80 80 23 @@ -3540,6 +3540,53 @@ true + + + + 0 + 40 + 131 + 20 + + + + Mash total volume: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 140 + 40 + 80 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + false + + + L + + + 1 + + + 100000.000000000000000 + +