# HG changeset patch # User Michiel Broek # Date 1651502441 -7200 # Node ID 91af2c69734537673379472aeb28a212eaa3b3e8 # Parent 96e239584db5f0e8a02a997e97fb6ac50546c53a Completed the design of the package and taste tabs. diff -r 96e239584db5 -r 91af2c697345 src/EditProduct.cpp --- a/src/EditProduct.cpp Mon May 02 11:48:12 2022 +0200 +++ b/src/EditProduct.cpp Mon May 02 16:40:41 2022 +0200 @@ -99,6 +99,15 @@ ui->brew_aerwithEdit->addItem(tr("Air")); ui->brew_aerwithEdit->addItem(tr("Oxygen")); + ui->bottle_sugarEdit->addItem(""); + ui->keg_sugarEdit->addItem(""); + query.prepare("SELECT name FROM inventory_fermentables WHERE type = '1' OR type = '3' ORDER BY name"); // Sugars or dry extract + query.exec(); + while (query.next()) { + ui->bottle_sugarEdit->addItem(query.value(0).toString()); + ui->keg_sugarEdit->addItem(query.value(0).toString()); + } + if (id >= 0) { query.prepare("SELECT * FROM products WHERE record = :recno"); query.bindValue(":recno", id); @@ -974,8 +983,33 @@ ui->tert_abvShow->setValue(Utils::abvol(product->brew_fermenter_sg, product->fg)); // Tab packaging. + ui->pack_dateEdit->setText(product->package_date.toString("dd MMM yyyy")); + ui->pack_carbloShow->setValue(product->st_carb_min); + ui->pack_carbhiShow->setValue(product->st_carb_max); + ui->pack_volumeEdit->setValue(product->package_volume); + ui->pack_addvolEdit->setValue(product->package_infuse_amount); + ui->pack_addabvEdit->setValue(product->package_infuse_abv); + ui->pack_notesEdit->setText(product->package_infuse_notes); + ui->pack_abvShow->setValue(product->package_abv); + ui->pack_phEdit->setValue(product->package_ph); + + ui->bottle_volumeEdit->setValue(product->bottle_amount); + ui->bottle_carbEdit->setValue(product->bottle_carbonation); + ui->bottle_sug_amountShow->setValue(product->bottle_priming_amount); + ui->bottle_sug_waterEdit->setValue(product->bottle_priming_water); + ui->bottle_tempEdit->setValue(product->bottle_carbonation_temp); // Tab taste. + ui->taste_dateEdit->setText(product->taste_date.toString("dd MMM yyyy")); + ui->taste_rateEdit->setValue(product->taste_rate); + ui->taste_notesEdit->setPlainText(product->taste_notes); + ui->taste_colorEdit->setText(product->taste_color); + ui->taste_transparencyEdit->setText(product->taste_transparency); + ui->taste_headEdit->setText(product->taste_head); + ui->taste_aromaEdit->setText(product->taste_aroma); + ui->taste_tasteEdit->setText(product->taste_taste); + ui->taste_mouthfeelEdit->setText(product->taste_mouthfeel); + ui->taste_aftertasteEdit->setText(product->taste_aftertaste); // All signals from tab "Generic" connect(ui->lockedEdit, &QCheckBox::stateChanged, this, &EditProduct::is_changed); diff -r 96e239584db5 -r 91af2c697345 src/EditProductTab3.cpp --- a/src/EditProductTab3.cpp Mon May 02 11:48:12 2022 +0200 +++ b/src/EditProductTab3.cpp Mon May 02 16:40:41 2022 +0200 @@ -257,6 +257,13 @@ colorh += product->fermentables.at(i).f_amount * product->fermentables.at(i).f_color * Utils::get_kt(product->fermentables.at(i).f_color); colorn += (product->fermentables.at(i).f_percentage / 100) * product->fermentables.at(i).f_color; // For 8.6 Pt wort. } + if (product->fermentables.at(i).f_added == 4) { // Bottle priming + ui->bottle_sug_weightShow->setValue(product->fermentables.at(i).f_amount * 1000); + // product->fermentables.at(i).f_name select in dropdown + } + if (product->fermentables.at(i).f_added == 5) { // Keg priming + + } } qDebug() << " colort" << colort << "colorh" << colorh << "colorn" << colorn; qDebug() << " psugar" << psugar << "pcara" << pcara << "mvol" << mvol; diff -r 96e239584db5 -r 91af2c697345 ui/EditProduct.ui --- a/ui/EditProduct.ui Mon May 02 11:48:12 2022 +0200 +++ b/ui/EditProduct.ui Mon May 02 16:40:41 2022 +0200 @@ -400,7 +400,7 @@ 0.500000000000000 - + 10 @@ -8439,11 +8439,1473 @@ Package + + + + 30 + 10 + 161 + 20 + + + + Package date: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 200 + 10 + 101 + 23 + + + + End of fermentation. Optional transfer to lagertank. + + + true + + + + + + 310 + 10 + 28 + 22 + + + + Set or clear date + + + ... + + + + :/icons/silk/date.png:/icons/silk/date.png + + + + + + 690 + 10 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + false + + + % + + + 1 + + + 0.000000000000000 + + + 80.000000000000000 + + + 0.100000000000000 + + + + + + 550 + 10 + 131 + 20 + + + + Carbonation range: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 770 + 10 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + false + + + % + + + 1 + + + 0.000000000000000 + + + 80.000000000000000 + + + 0.100000000000000 + + + + + + 40 + 40 + 1041 + 151 + + + + Infusion or Dilution + + + + + 10 + 20 + 141 + 20 + + + + Package volume: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 50 + 141 + 20 + + + + Package add volume: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 80 + 141 + 20 + + + + Package remarks: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 110 + 141 + 20 + + + + Package ABV %: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 500 + 50 + 141 + 20 + + + + Package add ABV %: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 500 + 110 + 141 + 20 + + + + pH from fermenter: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 160 + 20 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 1 + + + 100000.000000000000000 + + + 1.000000000000000 + + + + + + 160 + 50 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 3 + + + 100000.000000000000000 + + + 0.010000000000000 + + + + + + 160 + 110 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + % + + + 1 + + + 100.000000000000000 + + + + + + 650 + 50 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + QAbstractSpinBox::UpDownArrows + + + true + + + % + + + 1 + + + 100.000000000000000 + + + 0.100000000000000 + + + + + + 650 + 110 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 14.000000000000000 + + + 0.100000000000000 + + + + + + 160 + 80 + 821 + 23 + + + + + + + + 40 + 200 + 511 + 211 + + + + Bottles + + + + + 10 + 20 + 141 + 20 + + + + Bottles volume: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 260 + 20 + 141 + 20 + + + + Desired volume CO2: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 50 + 141 + 20 + + + + Priming sugar: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 80 + 141 + 20 + + + + Sugar amount: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 280 + 50 + 121 + 20 + + + + Priming gr/L: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 260 + 80 + 141 + 20 + + + + Water amount: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 170 + 141 + 20 + + + + Bottle fermentation °C: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 160 + 20 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 1 + + + 100000.000000000000000 + + + 0.500000000000000 + + + + + + 410 + 20 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 2 + + + 30.000000000000000 + + + 0.010000000000000 + + + + + + 160 + 50 + 101 + 23 + + + + + + + 160 + 80 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 2000.000000000000000 + + + + + + 410 + 50 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 20.000000000000000 + + + + + + 410 + 80 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 3 + + + 100000.000000000000000 + + + 0.010000000000000 + + + + + + 250 + 140 + 151 + 20 + + + + Expected pressure in bar: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 140 + 141 + 20 + + + + Bottles ABV %: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 160 + 170 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 1 + + + 40.000000000000000 + + + 0.500000000000000 + + + + + + 160 + 140 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + % + + + 2 + + + 100.000000000000000 + + + + + + 410 + 140 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 20.000000000000000 + + + + + + + 570 + 200 + 511 + 211 + + + + Kegs + + + + + 10 + 140 + 141 + 20 + + + + Kegs ABV %: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 250 + 140 + 151 + 20 + + + + Kegs pressure in bar: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 80 + 141 + 20 + + + + Sugar amount: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 260 + 20 + 141 + 20 + + + + Desired volume CO2: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 260 + 80 + 141 + 20 + + + + Water amount: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 280 + 50 + 121 + 20 + + + + Priming gr/L: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 170 + 141 + 20 + + + + Kegs temperature °C: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 50 + 141 + 20 + + + + Priming sugar: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 160 + 80 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 2000.000000000000000 + + + + + + 160 + 140 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + % + + + 2 + + + 100.000000000000000 + + + + + + 10 + 20 + 141 + 20 + + + + Kegs volume: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 410 + 80 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 3 + + + 100000.000000000000000 + + + 0.010000000000000 + + + + + + 410 + 50 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 20.000000000000000 + + + + + + 410 + 140 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 20.000000000000000 + + + + + + 160 + 20 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 1 + + + 100000.000000000000000 + + + 0.500000000000000 + + + + + + 160 + 50 + 101 + 23 + + + + + + + 410 + 20 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 2 + + + 30.000000000000000 + + + 0.010000000000000 + + + + + + 160 + 170 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 1 + + + 40.000000000000000 + + + 0.500000000000000 + + + + + + 10 + 110 + 141 + 20 + + + + Forced carbonation: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 160 + 110 + 85 + 21 + + + + Tasting + + + + 10 + 20 + 161 + 20 + + + + Taste date: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 180 + 20 + 101 + 23 + + + + End of fermentation. Optional transfer to lagertank. + + + true + + + + + + 290 + 20 + 28 + 22 + + + + Set or clear date + + + ... + + + + :/icons/silk/date.png:/icons/silk/date.png + + + + + + 490 + 20 + 161 + 20 + + + + Taste rate: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 660 + 20 + 81 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + 1 + + + 10.000000000000000 + + + 0.100000000000000 + + + + + + 10 + 50 + 161 + 20 + + + + Color: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 490 + 50 + 161 + 20 + + + + Transparency: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 80 + 161 + 20 + + + + Head: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 180 + 50 + 311 + 23 + + + + + + + 180 + 80 + 311 + 23 + + + + + + + 660 + 50 + 311 + 23 + + + + + + + 10 + 110 + 161 + 20 + + + + Aroma: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 180 + 110 + 791 + 23 + + + + + + + 10 + 140 + 161 + 20 + + + + Taste: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 180 + 140 + 791 + 23 + + + + + + + 10 + 170 + 161 + 20 + + + + Aftertaste: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 180 + 170 + 791 + 23 + + + + + + + 10 + 200 + 161 + 20 + + + + Mouthfeel: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 180 + 200 + 791 + 23 + + + + + + + 10 + 230 + 161 + 20 + + + + Notes: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 180 + 230 + 791 + 101 + + +