src/EditProductTab6.cpp

Sat, 28 Jan 2023 10:36:59 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Sat, 28 Jan 2023 10:36:59 +0100
changeset 478
a3653722b0d6
parent 476
29487eac1183
child 482
e13763ec829f
permissions
-rw-r--r--

Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.

175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1 /**
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
2 * EditProduct.cpp is part of bmsapp.
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
3 *
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
4 * tab 6, yeasts.
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
5 *
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
6 * bmsapp is free software: you can redistribute it and/or modify
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
7 * it under the terms of the GNU General Public License as published by
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
8 * the Free Software Foundation, either version 3 of the License, or
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
9 * (at your option) any later version.
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
10 *
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
11 * bmsapp is distributed in the yeaste that it will be useful,
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
14 * GNU General Public License for more details.
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
15 *
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
16 * You should have received a copy of the GNU General Public License
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
18 */
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
19
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
20
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
21 bool EditProduct::yeast_sort_test(const Yeasts &D1, const Yeasts &D2)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
22 {
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
23 if (D1.use > D2.use)
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
24 return false;
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
25 if (D1.use < D2.use)
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
26 return true;
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
27 return (D1.amount > D2.amount);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
28 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
29
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
30
305
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
31 bool EditProduct::block_yeast(int stage, int use)
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
32 {
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
33 if (stage > PROD_STAGE_PRIMARY && use < YEAST_USE_SECONDARY)
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
34 return true;
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
35 if (stage > PROD_STAGE_SECONDARY && use < YEAST_USE_TERTIARY)
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
36 return true;
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
37 if (stage > PROD_STAGE_TERTIARY && use < YEAST_USE_BOTTLE)
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
38 return true;
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
39 if (stage > PROD_STAGE_PACKAGE)
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
40 return true;
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
41 return false;
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
42 }
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
43
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
44
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
45 void EditProduct::refreshYeasts()
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
46 {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
47 QString w;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
48 QWidget* pWidget;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
49 QHBoxLayout* pLayout;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
50 QTableWidgetItem *item;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
51
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
52 std::sort(product->yeasts.begin(), product->yeasts.end(), yeast_sort_test);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
53
179
512f492358e3 Miscs updates the current inventory during recipe load. Yeasts updates the current inventory during recipe load and does a better job for the fields to upgrade.
Michiel Broek <mbroek@mbse.eu>
parents: 175
diff changeset
54 const QStringList labels({tr("Yeast"), tr("Laboratory"), tr("Code"), tr("Type"), tr("Use for"), tr("Min."), tr("Max."),
464
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
55 tr("Tol."), tr("Attn."), tr("STA"), tr("Amount"), tr("Stock"), tr("Delete"), tr("Edit") });
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
56
464
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
57 ui->yeastsTable->setColumnCount(14);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
58 ui->yeastsTable->setColumnWidth(0, 200); /* Yeast */
179
512f492358e3 Miscs updates the current inventory during recipe load. Yeasts updates the current inventory during recipe load and does a better job for the fields to upgrade.
Michiel Broek <mbroek@mbse.eu>
parents: 175
diff changeset
59 ui->yeastsTable->setColumnWidth(1, 115); /* Laboratory */
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
60 ui->yeastsTable->setColumnWidth(2, 80); /* Code */
464
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
61 ui->yeastsTable->setColumnWidth(3, 75); /* Type */
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
62 ui->yeastsTable->setColumnWidth(4, 75); /* Usage */
179
512f492358e3 Miscs updates the current inventory during recipe load. Yeasts updates the current inventory during recipe load and does a better job for the fields to upgrade.
Michiel Broek <mbroek@mbse.eu>
parents: 175
diff changeset
63 ui->yeastsTable->setColumnWidth(5, 50); /* Min. */
512f492358e3 Miscs updates the current inventory during recipe load. Yeasts updates the current inventory during recipe load and does a better job for the fields to upgrade.
Michiel Broek <mbroek@mbse.eu>
parents: 175
diff changeset
64 ui->yeastsTable->setColumnWidth(6, 50); /* Max. */
512f492358e3 Miscs updates the current inventory during recipe load. Yeasts updates the current inventory during recipe load and does a better job for the fields to upgrade.
Michiel Broek <mbroek@mbse.eu>
parents: 175
diff changeset
65 ui->yeastsTable->setColumnWidth(7, 50); /* Tolerance */
512f492358e3 Miscs updates the current inventory during recipe load. Yeasts updates the current inventory during recipe load and does a better job for the fields to upgrade.
Michiel Broek <mbroek@mbse.eu>
parents: 175
diff changeset
66 ui->yeastsTable->setColumnWidth(8, 50); /* Attenuation */
464
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
67 ui->yeastsTable->setColumnWidth(9, 40); /* STA1 gen */
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
68 ui->yeastsTable->setColumnWidth(10, 80); /* Amount */
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
69 ui->yeastsTable->setColumnWidth(11, 80); /* Stock */
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
70 ui->yeastsTable->setColumnWidth(12, 80); /* Delete */
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
71 ui->yeastsTable->setColumnWidth(13, 80); /* Edit */
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
72 ui->yeastsTable->setHorizontalHeaderLabels(labels);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
73 ui->yeastsTable->verticalHeader()->hide();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
74 ui->yeastsTable->setRowCount(product->yeasts.size());
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
75
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
76 for (int i = 0; i < product->yeasts.size(); i++) {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
77
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
78 ui->yeastsTable->setItem(i, 0, new QTableWidgetItem(product->yeasts.at(i).name));
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
79 ui->yeastsTable->setItem(i, 1, new QTableWidgetItem(product->yeasts.at(i).laboratory));
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
80 ui->yeastsTable->setItem(i, 2, new QTableWidgetItem(product->yeasts.at(i).product_id));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
81
301
fe6346211b5b Finally the translation of string arrays is working.
Michiel Broek <mbroek@mbse.eu>
parents: 299
diff changeset
82 item = new QTableWidgetItem(QCoreApplication::translate("YeastForm", g_yeast_forms[product->yeasts.at(i).form]));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
83 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
84 ui->yeastsTable->setItem(i, 3, item);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
85
301
fe6346211b5b Finally the translation of string arrays is working.
Michiel Broek <mbroek@mbse.eu>
parents: 299
diff changeset
86 item = new QTableWidgetItem(QCoreApplication::translate("YeastUse", g_yeast_use[product->yeasts.at(i).use]));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
87 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
88 ui->yeastsTable->setItem(i, 4, item);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
89
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
90 item = new QTableWidgetItem(QString("%1°C").arg(product->yeasts.at(i).min_temperature, 2, 'f', 1, '0'));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
91 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
92 ui->yeastsTable->setItem(i, 5, item);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
93
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
94 item = new QTableWidgetItem(QString("%1°C").arg(product->yeasts.at(i).max_temperature, 2, 'f', 1, '0'));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
95 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
96 ui->yeastsTable->setItem(i, 6, item);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
97
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
98 item = new QTableWidgetItem(QString("%1%").arg(product->yeasts.at(i).tolerance, 2, 'f', 1, '0'));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
99 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
100 ui->yeastsTable->setItem(i, 7, item);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
101
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
102 item = new QTableWidgetItem(QString("%1%").arg(product->yeasts.at(i).attenuation, 2, 'f', 1, '0'));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
103 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
104 ui->yeastsTable->setItem(i, 8, item);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
105
464
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
106 if (product->yeasts.at(i).use != YEAST_USE_BOTTLE && product->yeasts.at(i).sta1) {
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
107 QWidget *pWidget = new QWidget();
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
108 QLabel *label = new QLabel;
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
109 label->setPixmap(QPixmap(":icons/silk/tick.png"));
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
110 QHBoxLayout *pLayout = new QHBoxLayout(pWidget);
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
111 pLayout->addWidget(label);
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
112 pLayout->setAlignment(Qt::AlignCenter);
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
113 pLayout->setContentsMargins(0, 0, 0, 0);
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
114 pWidget->setLayout(pLayout);
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
115 ui->yeastsTable->setCellWidget(i, 9, pWidget);
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
116 } else {
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
117 ui->yeastsTable->removeCellWidget(i, 9);
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
118 }
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
119
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
120
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
121 if (product->yeasts.at(i).form == YEAST_FORMS_LIQUID)
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
122 item = new QTableWidgetItem(QString("%1 pack").arg(product->yeasts.at(i).amount, 1, 'f', 0, '0'));
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
123 else if (product->yeasts.at(i).form == YEAST_FORMS_DRY || product->yeasts.at(i).form == YEAST_FORMS_DRIED)
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
124 item = new QTableWidgetItem(QString("%1 gr").arg(product->yeasts.at(i).amount * 1000.0, 3, 'f', 2, '0'));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
125 else
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
126 item = new QTableWidgetItem(QString("%1 ml").arg(product->yeasts.at(i).amount * 1000.0, 3, 'f', 2, '0'));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
127 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
464
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
128 ui->yeastsTable->setItem(i, 10, item);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
129
305
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
130 if (block_yeast(product->stage, product->yeasts.at(i).use)) {
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
131 item = new QTableWidgetItem(QString(""));
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
132 } else {
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
133 if (product->yeasts.at(i).form == YEAST_FORMS_LIQUID)
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
134 item = new QTableWidgetItem(QString("%1 pack").arg(product->yeasts.at(i).inventory, 1, 'f', 0, '0'));
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
135 else if (product->yeasts.at(i).form == YEAST_FORMS_DRY || product->yeasts.at(i).form == YEAST_FORMS_DRIED)
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
136 item = new QTableWidgetItem(QString("%1 gr").arg(product->yeasts.at(i).inventory * 1000.0, 3, 'f', 2, '0'));
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
137 else
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
138 item = new QTableWidgetItem(QString("%1 ml").arg(product->yeasts.at(i).inventory * 1000.0, 3, 'f', 2, '0'));
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
139 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
140 if (product->yeasts.at(i).inventory < product->yeasts.at(i).amount)
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
141 item->setForeground(QBrush(QColor(Qt::red)));
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
142 }
464
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
143 ui->yeastsTable->setItem(i, 11, item);
179
512f492358e3 Miscs updates the current inventory during recipe load. Yeasts updates the current inventory during recipe load and does a better job for the fields to upgrade.
Michiel Broek <mbroek@mbse.eu>
parents: 175
diff changeset
144
305
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
145 if (block_yeast(product->stage, product->yeasts.at(i).use)) {
464
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
146 ui->yeastsTable->removeCellWidget(i, 12); /* to remove the unneeded button */
305
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
147 item = new QTableWidgetItem("");
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
148 item->setToolTip(tr("Yeast already used"));
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
149 ui->yeastsTable->setItem(i, 12, item);
464
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
150 ui->yeastsTable->removeCellWidget(i, 13);
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
151 item = new QTableWidgetItem("");
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
152 item->setToolTip(tr("Yeast already used"));
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
153 ui->yeastsTable->setItem(i, 13, item);
305
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
154 } else {
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
155 pWidget = new QWidget();
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
156 QPushButton* btn_dele = new QPushButton();
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
157 btn_dele->setObjectName(QString("%1").arg(i)); /* Send row with the button */
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
158 btn_dele->setText(tr("Delete"));
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
159 connect(btn_dele, SIGNAL(clicked()), this, SLOT(deleteYeastRow_clicked()));
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
160 pLayout = new QHBoxLayout(pWidget);
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
161 pLayout->addWidget(btn_dele);
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
162 pLayout->setContentsMargins(5, 0, 5, 0);
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
163 pWidget->setLayout(pLayout);
464
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
164 ui->yeastsTable->setCellWidget(i, 12, pWidget);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
165
305
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
166 pWidget = new QWidget();
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
167 QPushButton* btn_edit = new QPushButton();
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
168 btn_edit->setObjectName(QString("%1").arg(i)); /* Send row with the button */
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
169 btn_edit->setText(tr("Edit"));
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
170 connect(btn_edit, SIGNAL(clicked()), this, SLOT(editYeastRow_clicked()));
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
171 pLayout = new QHBoxLayout(pWidget);
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
172 pLayout->addWidget(btn_edit);
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
173 pLayout->setContentsMargins(5, 0, 5, 0);
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
174 pWidget->setLayout(pLayout);
464
1fed3ff9a64e Show 0 if afterboil volume is invalid instead of the chiller volume. Added product tab 13. Here the images (beerlabels, brew pictures) for a product will be shown. Resized all product tabs. Added STA1 tickmark in the yeasts table.
Michiel Broek <mbroek@mbse.eu>
parents: 458
diff changeset
175 ui->yeastsTable->setCellWidget(i, 13, pWidget);
305
35ce719998e1 Added reduce inventory for all process stages. Added block fermentable to block buttons and inventory when the fermentable has been reduced. Added block hop to block buttons and inventory when the fermentable has been reduced. Added block misc to block buttons and inventory when the fermentable has been reduced. Added block yeast to block buttons and inventory when the fermentable has been reduced.
Michiel Broek <mbroek@mbse.eu>
parents: 301
diff changeset
176 }
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
177 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
178 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
179
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
180
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
181 void EditProduct::initYeast()
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
182 {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
183 ui->est_og4Edit->setValue(product->est_og);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
184 ui->est_fg3Edit->setValue(product->est_fg);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
185 ui->est_abv2Edit->setValue(product->est_abv);
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
186 ui->productionEdit->setDate(product->yeast_prod_date);
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
187 ui->conditionShow->setValue(product->starter_viability);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
188 ui->startersgEdit->setValue(product->starter_sg);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
189 ui->pitchrateEdit->setValue(product->yeast_pitchrate);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
190
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
191 ui->yeastsTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
192
301
fe6346211b5b Finally the translation of string arrays is working.
Michiel Broek <mbroek@mbse.eu>
parents: 299
diff changeset
193 for (int i = 0; i < 3; i++) {
fe6346211b5b Finally the translation of string arrays is working.
Michiel Broek <mbroek@mbse.eu>
parents: 299
diff changeset
194 ui->stmethodEdit->addItem(QCoreApplication::translate("YeastStarter", g_yeast_starter[i]));
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
195 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
196 ui->stmethodEdit->setCurrentIndex(product->starter_type);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
197 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
198
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
199
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
200 /*
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
201 * Calculate the needed yeast for this batch.
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
202 */
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
203 void EditProduct::calcYeast()
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
204 {
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
205 double sg = product->brew_fermenter_sg;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
206 double use_cells;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
207 double needed = 0;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
208 double initcells = 0;
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
209 bool maybe_starter = false;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
210
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
211 qDebug() << "calcYeast()";
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
212 ui->yeastProcedure->setCurrentIndex(0);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
213
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
214 if (sg <= 1.0001 && product->fg > 1.000)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
215 sg = product->fg;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
216 else if (sg <= 1.0001)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
217 sg = product->est_og;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
218 double plato = Utils::sg_to_plato(sg);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
219
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
220 double volume = product->brew_fermenter_volume;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
221 if (volume > 0) {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
222 if (product->brew_fermenter_extrawater > 0)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
223 volume += product->brew_fermenter_extrawater;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
224 } else {
458
ac216a75ca9b Renamed trub_chiller_loss fields to trub_loss
Michiel Broek <mbroek@mbse.eu>
parents: 457
diff changeset
225 volume = product->batch_size - product->eq_trub_loss;
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
226 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
227
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
228 if (product->yeasts.size() == 0)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
229 return; // No yeast in product.
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
230
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
231 calcViability();
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
232 double dry_amount = 0;
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
233 for (int i = 0; i < product->yeasts.size(); i++) {
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
234 if (product->yeasts.at(i).use == YEAST_USE_PRIMARY && product->yeasts.at(i).form == YEAST_FORMS_DRY) {
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
235 dry_amount += product->yeasts.at(i).amount;
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
236 }
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
237 }
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
238
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
239 for (int i = 0; i < product->yeasts.size(); i++) {
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
240 if (product->yeasts.at(i).use == YEAST_USE_PRIMARY) { // Primary
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
241 if (product->yeasts.at(i).form == YEAST_FORMS_DRY) {
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
242 /*
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
243 * Dry yeast, build the formule with the yeast parameters.
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
244 * Based on https://www.lallemandbrewing.com/en/canada/brewers-corner/brewing-tools/pitching-rate-calculator/
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
245 */
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
246 ui->yeastProcedure->setCurrentIndex(2);
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
247 ui->lo_gr_hlEdit->setValue(product->yeasts.at(i).gr_hl_lo);
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
248 ui->hi_gr_hlEdit->setValue(product->yeasts.at(i).gr_hl_hi);
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
249 ui->lo_sgEdit->setValue(product->yeasts.at(i).sg_lo);
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
250 ui->hi_sgEdit->setValue(product->yeasts.at(i).sg_hi);
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
251 double og = product->yeasts.at(i).sg_lo;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
252 double f1 = product->yeasts.at(i).gr_hl_lo / 100.0;
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
253 double f2 = round(f1 / 5 * 1000000.0) / 1000000.0;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
254 double multiplier = (sg <= og) ? f1 : (f1 + f2 * (sg - og) / 0.008);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
255 qDebug() << " sg:" << sg << "og:" << og << "f1:" << f1 << "f2:" << f2 << "multiplier:" << multiplier;
200
bbab7d37d12f Dry yeast use yeast viability. Finished calculate dry yeast. Finished using enum values.
Michiel Broek <mbroek@mbse.eu>
parents: 199
diff changeset
256 double yeast_grams = round(volume * multiplier * 100.0) / product->starter_viability;
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
257 double yeast_gr_hl = round((yeast_grams / (volume * 0.01)) * 100.0) / 100.0;
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
258 double pitch_gr_hl = round(((dry_amount * 1000.0) / (volume * 0.01)) * 100.0) / 100.0;
200
bbab7d37d12f Dry yeast use yeast viability. Finished calculate dry yeast. Finished using enum values.
Michiel Broek <mbroek@mbse.eu>
parents: 199
diff changeset
259 ui->dry_needShow->setValue(yeast_grams);
bbab7d37d12f Dry yeast use yeast viability. Finished calculate dry yeast. Finished using enum values.
Michiel Broek <mbroek@mbse.eu>
parents: 199
diff changeset
260 ui->dry_pitchrateShow->setValue(yeast_gr_hl);
bbab7d37d12f Dry yeast use yeast viability. Finished calculate dry yeast. Finished using enum values.
Michiel Broek <mbroek@mbse.eu>
parents: 199
diff changeset
261 ui->pitch_grShow->setValue(pitch_gr_hl);
bbab7d37d12f Dry yeast use yeast viability. Finished calculate dry yeast. Finished using enum values.
Michiel Broek <mbroek@mbse.eu>
parents: 199
diff changeset
262 ui->pitch_grShow->setStyleSheet((pitch_gr_hl < yeast_gr_hl) ? "background-color: red":"");
bbab7d37d12f Dry yeast use yeast viability. Finished calculate dry yeast. Finished using enum values.
Michiel Broek <mbroek@mbse.eu>
parents: 199
diff changeset
263
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
264 #ifdef DEBUG_YEAST
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
265 qDebug() << " Need" << yeast_grams << "grams, gr/hl:" << yeast_gr_hl << "pitch:" << pitch_gr_hl;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
266 #endif
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
267 calcBU();
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
268 return;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
269 } else {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
270 /*
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
271 * Liquid, slant, culture etc.
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
272 * pitchrate see https://www.brewersfriend.com/yeast-pitch-rate-and-starter-calculator/
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
273 * and http://braukaiser.com/blog/blog/2012/11/03/estimating-yeast-growth/
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
274 */
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
275 ui->yeastProcedure->setCurrentIndex(1);
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
276 if (product->yeast_pitchrate == 0) {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
277 /*
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
278 * No pitchrate yet, do a educated guess ..
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
279 */
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
280 if (product->yeasts.at(i).type == YEAST_TYPES_LAGER) {
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
281 product->yeast_pitchrate = 1.5;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
282 if (sg > 1.060)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
283 product->yeast_pitchrate = 2.0;
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
284 } else if (product->yeasts.at(i).type == YEAST_TYPES_KVEIK) { // Real Kveik
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
285 product->yeast_pitchrate = 0.075;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
286 } else {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
287 product->yeast_pitchrate = 0.75;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
288 if (sg > 1.060)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
289 product->yeast_pitchrate = 1.0;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
290 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
291 is_changed();
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
292 ui->pitchrateEdit->setValue(product->yeast_pitchrate);
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
293 #ifdef DEBUG_YEAST
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
294 qDebug() << " Guessed pitchrate" << product->yeast_pitchrate;
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
295 #endif
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
296 }
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
297
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
298 initcells = (product->yeasts.at(i).cells / 1000000) * product->yeasts.at(i).amount * (product->starter_viability / 100.0);
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
299 if (product->yeasts.at(i).form == YEAST_FORMS_LIQUID)
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
300 initcells = (product->yeasts.at(i).cells / 1000000000) * product->yeasts.at(i).amount * (product->starter_viability / 100.0);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
301
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
302 needed = round(product->yeast_pitchrate * volume * plato * 10.0) / 10.0;
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
303 ui->neededShow->setValue(needed);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
304 if (needed > initcells) {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
305 maybe_starter = true;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
306 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
307
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
308 #ifdef DEBUG_YEAST
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
309 qDebug() << " Pitchrate:" << product->yeast_pitchrate << "needed:" << needed << "initcells:" << initcells << "starter" << maybe_starter;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
310 #endif
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
311 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
312 break;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
313 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
314 }
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
315
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
316 if (maybe_starter != product->starter_enable) {
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
317 if (product->starter_enable && !maybe_starter) {
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
318 #ifdef DEBUG_YEAST
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
319 qDebug() << " Clear obsolete starter";
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
320 #endif
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
321 for (int i = 0; i < 4; i++) {
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
322 product->prop_volume[i] = 0;
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
323 product->prop_type[i] = 0;
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
324 }
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
325 }
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
326 product->starter_enable = maybe_starter;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
327 #ifdef DEBUG_YEAST
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
328 qDebug() << " Set starter enable" << maybe_starter;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
329 #endif
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
330 is_changed();
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
331 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
332
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
333 if (product->starter_enable) {
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
334 #ifdef DEBUG_YEAST
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
335 qDebug() << " Starter calculate..";
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
336 #endif
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
337
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
338 const QStringList labels({tr("Method"), tr("Volume"), tr("Inj. factor"), tr("New cells"), tr("Total cells"), tr("Grow factor"), "" });
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
339 ui->starterTable->show();
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
340 ui->starterTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
341 ui->starterTable->clear();
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
342 ui->starterTable->setColumnCount(7);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
343 ui->starterTable->setRowCount(0);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
344 ui->starterTable->setColumnWidth(0, 130); /* Method */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
345 ui->starterTable->setColumnWidth(1, 90); /* Volume */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
346 ui->starterTable->setColumnWidth(2, 90); /* Inj. factor */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
347 ui->starterTable->setColumnWidth(3, 90); /* New cells */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
348 ui->starterTable->setColumnWidth(4, 90); /* Total cells */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
349 ui->starterTable->setColumnWidth(5, 90); /* Grow factor */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
350 ui->starterTable->setColumnWidth(6, 30); /* Edit button */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
351 ui->starterTable->setHorizontalHeaderLabels(labels);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
352 calcSteps(product->starter_type, initcells, needed);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
353 } else {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
354 ui->starterTable->hide();
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
355 }
395
7212b980a527 Added Bitterness Unit to Real Extract unit calculation and display. In product use final values if possible for the BU:GU and BU:RE calculations depending on the product stage.
Michiel Broek <mbroek@mbse.eu>
parents: 305
diff changeset
356 calcBU();
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
357 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
358
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
359
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
360 /*
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
361 * http://braukaiser.com/blog/blog/2012/11/03/estimating-yeast-growth/
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
362 *
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
363 * stype: 0=stirred, 1=shaken, 2=simple
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
364 * totcells: initial cells
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
365 * egrams: gram extract
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
366 */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
367 double EditProduct::getGrowthRate(int stype, double totcells, double egrams)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
368 {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
369 /* Cells per grams extract (B/g) */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
370 double cpe = totcells / egrams;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
371
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
372 if (cpe > 3.5)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
373 return 0; // no growth
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
374 if (stype == STARTERS_SIMPLE)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
375 return 0.4; // simple starter
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
376 if (stype == STARTERS_SHAKEN)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
377 return 0.62; // shaken starter
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
378 if (cpe <= 1.4) // stirred starter
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
379 return 1.4;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
380 return 2.33 - (.67 * cpe);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
381 };
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
382
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
383
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
384 StepResult EditProduct::calcStep(double svol, int stype, double start)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
385 {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
386 StepResult res;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
387 double gperpoint = 2.72715; //number of grams of extract per point of starter gravity per liter
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
388 double irate = round(start / svol * 10000.0) / 10.0;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
389 double egrams = (product->starter_sg - 1) * svol * gperpoint;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
390 double grate = getGrowthRate(stype, start, egrams);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
391 double ncells = round(egrams * grate * 10.0) / 10.0;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
392 double totcells = ncells + start;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
393
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
394 res.svol = svol;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
395 res.irate = irate;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
396 res.ncells = ncells;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
397 res.totcells = totcells;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
398 res.growf = round((ncells / start) * 100.0) / 100.0;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
399 #ifdef DEBUG_YEAST
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
400 qDebug() << " calcStep(" << svol << "," << stype << "," << start << ") irate" << irate
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
401 << "ncells" << res.ncells << "totcells" << res.totcells << "growf" << res.growf;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
402 #endif
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
403 return res;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
404 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
405
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
406
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
407 /*
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
408 * Calculate all starter steps.
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
409 * stype: final starter type: 0 = stirred, 1 = shaked, 2 = simple.
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
410 * start: initial cells in billions
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
411 * needed: needed cells in billions
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
412 *
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
413 * result: all values updated.
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
414 */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
415 void EditProduct::calcSteps(int stype, double start, double needed)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
416 {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
417 int i, step, svol;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
418 int lasti = 0;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
419 /* Erlenmeyer sizes */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
420 const int uvols[] { 20, 40, 60, 80, 100, 150, 200, 250, 375, 500, 625, 750, 875, 1000, 1250, 1500, 2000, 2500, 3000, 4000, 5000 };
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
421 int mvols = sizeof(uvols);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
422 StepResult result;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
423 QTableWidgetItem *item;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
424 QWidget* pWidget;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
425 QHBoxLayout* pLayout;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
426 double tcells = start;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
427 QIcon iconT;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
428
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
429 iconT.addFile(QString::fromUtf8(":/icons/silk/pencil.png"), QSize(), QIcon::Normal, QIcon::Off);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
430
196
f7954f2d4451 Internal product record stores the starter steps in array format.
Michiel Broek <mbroek@mbse.eu>
parents: 195
diff changeset
431 if ((product->prop_volume[0] + product->prop_volume[1] + product->prop_volume[2] + product->prop_volume[3]) == 0) {
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
432 /*
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
433 * Auto calculate the starter.
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
434 */
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
435 #ifdef DEBUG_YEAST
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
436 qDebug() << " calcSteps() auto";
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
437 #endif
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
438
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
439 if (start > needed)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
440 return;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
441
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
442 for (step = 1; step < 5; step++) {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
443 for (i = lasti; i <= mvols; i++) {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
444 lasti = i;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
445 svol = uvols[lasti];
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
446 result = calcStep(svol, stype, tcells);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
447 if (result.irate < 25) {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
448 // inocculation rate too low, backup one step and break out.
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
449 lasti = i - 1;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
450 svol = uvols[lasti];
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
451 result = calcStep(svol, stype, tcells);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
452 break;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
453 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
454 if (result.totcells > needed || i == mvols) { // hit the target or loops done
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
455 break;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
456 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
457 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
458 ui->starterTable->setRowCount(step);
301
fe6346211b5b Finally the translation of string arrays is working.
Michiel Broek <mbroek@mbse.eu>
parents: 299
diff changeset
459 item = new QTableWidgetItem(QCoreApplication::translate("YeastStarter", g_yeast_starter[stype]));
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
460 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
461 ui->starterTable->setItem(step -1, 0, item);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
462
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
463 item = new QTableWidgetItem(QString("%1").arg(result.svol / 1000.0, 4, 'f', 3, '0')); // To liters
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
464 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
465 ui->starterTable->setItem(step -1, 1, item);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
466
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
467 item = new QTableWidgetItem(QString("%1").arg(result.irate, 2, 'f', 1, '0'));
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
468 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
469 if ((result.irate < 25) || (result.irate > 100))
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
470 item->setForeground(QBrush(QColor(Qt::red)));
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
471 ui->starterTable->setItem(step -1, 2, item);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
472
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
473 item = new QTableWidgetItem(QString("%1").arg(result.ncells, 2, 'f', 1, '0'));
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
474 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
475 ui->starterTable->setItem(step -1, 3, item);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
476
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
477 item = new QTableWidgetItem(QString("%1").arg(result.totcells, 2, 'f', 1, '0'));
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
478 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
479 item->setForeground(QBrush(QColor((result.totcells > needed) ? Qt::green:Qt::red)));
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
480 ui->starterTable->setItem(step -1, 4, item);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
481
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
482 item = new QTableWidgetItem(QString("%1").arg(result.growf, 3, 'f', 2, '0'));
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
483 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
484 if (result.growf < 1)
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
485 item->setForeground(QBrush(QColor(Qt::red)));
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
486 if ((stype > 0) && (result.growf > 3))
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
487 item->setForeground(QBrush(QColor(Qt::red)));
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
488 ui->starterTable->setItem(step -1, 5, item);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
489
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
490 pWidget = new QWidget();
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
491 QToolButton* btn_edit = new QToolButton();
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
492 btn_edit->setObjectName(QString("%1").arg(step - 1)); /* Send row with the button */
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
493 btn_edit->setIcon(iconT);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
494 connect(btn_edit, SIGNAL(clicked()), this, SLOT(yeast_starter_edit_clicked()));
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
495 pLayout = new QHBoxLayout(pWidget);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
496 pLayout->addWidget(btn_edit);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
497 pLayout->setContentsMargins(5, 0, 5, 0);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
498 pWidget->setLayout(pLayout);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
499 ui->starterTable->setCellWidget(step -1, 6, pWidget);
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
500
196
f7954f2d4451 Internal product record stores the starter steps in array format.
Michiel Broek <mbroek@mbse.eu>
parents: 195
diff changeset
501 product->prop_type[step -1] = product->starter_type;
f7954f2d4451 Internal product record stores the starter steps in array format.
Michiel Broek <mbroek@mbse.eu>
parents: 195
diff changeset
502 product->prop_volume[step -1] = result.svol / 1000.0;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
503 #ifdef DEBUG_YEAST
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
504 qDebug() << " step" << step << "type" << product->prop_type[step -1] << "vol" << product->prop_volume[step -1];
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
505 #endif
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
506
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
507 tcells = result.totcells;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
508 if (result.totcells > needed) // Hit the target
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
509 return;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
510 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
511
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
512 } else {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
513 /*
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
514 * Recalculate the starter.
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
515 */
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
516 #ifdef DEBUG_YEAST
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
517 qDebug() << " calcSteps() recalculate";
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
518 #endif
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
519
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
520 for (step = 0; step < 4; step++) {
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
521 if (product->prop_volume[step] > 0) {
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
522 result = calcStep(product->prop_volume[step] * 1000, product->prop_type[step], tcells);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
523 ui->starterTable->setRowCount(step + 1);
301
fe6346211b5b Finally the translation of string arrays is working.
Michiel Broek <mbroek@mbse.eu>
parents: 299
diff changeset
524 item = new QTableWidgetItem(QCoreApplication::translate("YeastStarter", g_yeast_starter[product->prop_type[step]]));
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
525 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
526 ui->starterTable->setItem(step, 0, item);
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
527
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
528 item = new QTableWidgetItem(QString("%1").arg(result.svol / 1000.0, 4, 'f', 3, '0')); // To liters
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
529 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
530 ui->starterTable->setItem(step, 1, item);
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
531
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
532 item = new QTableWidgetItem(QString("%1").arg(result.irate, 2, 'f', 1, '0'));
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
533 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
534 if ((result.irate < 25) || (result.irate > 100))
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
535 item->setForeground(QBrush(QColor(Qt::red)));
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
536 ui->starterTable->setItem(step, 2, item);
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
537
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
538 item = new QTableWidgetItem(QString("%1").arg(result.ncells, 2, 'f', 1, '0'));
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
539 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
540 ui->starterTable->setItem(step, 3, item);
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
541
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
542 item = new QTableWidgetItem(QString("%1").arg(result.totcells, 2, 'f', 1, '0'));
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
543 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
544 item->setForeground(QBrush(QColor((result.totcells > needed) ? Qt::green:Qt::red)));
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
545 ui->starterTable->setItem(step, 4, item);
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
546
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
547 item = new QTableWidgetItem(QString("%1").arg(result.growf, 3, 'f', 2, '0'));
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
548 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
549 if (result.growf < 1)
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
550 item->setForeground(QBrush(QColor(Qt::red)));
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
551 if ((stype > 0) && (result.growf > 3))
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
552 item->setForeground(QBrush(QColor(Qt::red)));
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
553 ui->starterTable->setItem(step, 5, item);
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
554
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
555 pWidget = new QWidget();
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
556 QToolButton* btn_edit = new QToolButton();
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
557 btn_edit->setObjectName(QString("%1").arg(step)); /* Send row with the button */
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
558 btn_edit->setIcon(iconT);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
559 connect(btn_edit, SIGNAL(clicked()), this, SLOT(yeast_starter_edit_clicked()));
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
560 pLayout = new QHBoxLayout(pWidget);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
561 pLayout->addWidget(btn_edit);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
562 pLayout->setContentsMargins(5, 0, 5, 0);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
563 pWidget->setLayout(pLayout);
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
564 ui->starterTable->setCellWidget(step, 6, pWidget);
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
565
199
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
566 tcells = result.totcells;
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
567 if (result.totcells > needed) { // Hit the target
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
568 for (int i = step + 1; i < 4; i++) {
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
569 product->prop_volume[i] = 0;
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
570 product->prop_type[i] = 0;
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
571 }
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
572 return;
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
573 } else if ((step < 3) && (product->prop_volume[step + 1] == 0)) { // Extra step needed, start with the same size.
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
574 product->prop_volume[step + 1] = product->prop_volume[step];
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
575 product->prop_type[step + 1] = product->prop_type[step];
59b0bdbb2f9f Added field to show the needed cells. Colors in the starter table for good and error results.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
576 }
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
577 #ifdef DEBUG_YEAST
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
578 qDebug() << " step" << step << "type" << product->prop_type[step] << "vol" << product->prop_volume[step];
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
579 #endif
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
580 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
581 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
582 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
583 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
584
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
585
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
586 void EditProduct::calcViability()
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
587 {
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
588 double vpm = 1.00;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
589 double max = 100;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
590
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
591 for (int i = 0; i < product->yeasts.size(); i++) {
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
592 if (product->yeasts.at(i).use == YEAST_USE_PRIMARY) {
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
593 if (product->yeasts.at(i).form == YEAST_FORMS_LIQUID) {
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
594 vpm = 0.80;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
595 max = 97;
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
596 if (product->yeasts.at(i).laboratory == "White Labs") { // PurePitch
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
597 /*
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
598 * Purepitch 6th month viability point 80,8%.
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
599 * Purepitch Next Generation 6th month viability point 94,9%.
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
600 */
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
601 vpm = 0.9648; // Purepitch
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
602 //vpm = 0.9914; // Purepitch Next Generation
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
603 max = 100;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
604 }
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
605 } else if (product->yeasts.at(i).form == YEAST_FORMS_DRY) {
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
606 vpm = 0.998;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
607 max = 100;
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
608 } else if (product->yeasts.at(i).form == YEAST_FORMS_DRIED) { // dried kveik
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
609 vpm = 0.92;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
610 max = 100;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
611 } else { // Slant, Culture, Frozen, Bottle
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
612 vpm = 0.99;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
613 max = 97;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
614 }
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
615 }
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
616 }
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
617 #ifdef DEBUG_YEAST
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
618 qDebug() << "calcViability vpm:" << vpm << "max:" << max;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
619 #endif
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
620
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
621 double base = max;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
622
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
623 /*
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
624 * Calculate time days before today. If the date is cleared,
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
625 * the result is 0 days. Dates in the future are ignored.
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
626 */
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
627 int timeDiff = product->yeast_prod_date.daysTo(QDate::currentDate());
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
628 if (timeDiff < 0)
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
629 timeDiff == 0;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
630
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
631 double degrade = 1 - ((1 - vpm) / 30.41); // viability degradation per day.
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
632 for (int i = 0; i < timeDiff; i++) {
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
633 base = base * degrade;
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
634 }
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
635 if (base > max)
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
636 base = max;
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
637 product->starter_viability = round(base * 10) / 10;
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
638 ui->conditionShow->setValue(product->starter_viability);
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
639 #ifdef DEBUG_YEAST
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
640 qDebug() << "age" << timeDiff << "degrade" << degrade << "viability" << product->starter_viability;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
641 #endif
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
642 }
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
643
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
644
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
645 void EditProduct::yeast_prod_date_changed(QDate val)
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
646 {
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
647 product->yeast_prod_date = ui->productionEdit->nullDate();
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
648 calcViability();
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
649 calcYeast();
202
49ec4fdee5a6 Added mash steps pH and SG values.
Michiel Broek <mbroek@mbse.eu>
parents: 201
diff changeset
650 is_changed();
198
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
651 }
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
652
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
653
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
654 void EditProduct::yeast_prod_date_clear()
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
655 {
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
656 product->yeast_prod_date = QDate();
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
657 ui->productionEdit->setDate(QDate());
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
658 }
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
659
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
660
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
661 void EditProduct::yeast_prod_date_today()
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
662 {
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
663 product->yeast_prod_date = QDate::currentDate();
904591820c3d Added yeast viability calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 197
diff changeset
664 ui->productionEdit->setDate(QDate::currentDate());
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
665 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
666
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
667
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
668 void EditProduct::yeast_method_changed(int val)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
669 {
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
670 #ifdef DEBUG_YEAST
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
671 qDebug() << "yeast_method_changed" << val;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
672 #endif
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
673 product->starter_type = val;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
674 calcYeast();
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
675 is_changed();
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
676 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
677
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
678
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
679 void EditProduct::yeast_starter_sg_changed(double val)
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
680 {
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
681 #ifdef DEBUG_YEAST
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
682 qDebug() << "yeast_starter_sg_changed" << val;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
683 #endif
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
684 product->starter_sg = val;
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
685 calcYeast();
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
686 is_changed();
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
687 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
688
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
689
457
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
690 void EditProduct::pitchindex_changed(int val)
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
691 {
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
692 #ifdef DEBUG_YEAST
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
693 qDebug() << "pitchindex_changed" << val;
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
694 #endif
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
695 product->pitch_pitchindex = val;
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
696 }
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
697
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
698
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
699 void EditProduct::pitchrate_changed(double val)
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
700 {
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
701 #ifdef DEBUG_YEAST
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
702 qDebug() << "pitchrate_changed" << val;
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
703 #endif
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
704 product->yeast_pitchrate = val;
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
705 calcYeast();
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
706 is_changed();
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
707 }
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
708
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
709
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
710 void EditProduct::yeast_pitchrate_button_clicked()
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
711 {
456
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
712 #ifdef DEBUG_YEAST
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
713 qDebug() << "yeast_pitchrate_button_clicked";
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
714 #endif
457
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
715 product->pitch_pitchindex = 1;
456
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
716
457
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
717 QDialog* dialog = new QDialog(this);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
718 dialog->resize(420, 110);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
719 dialog->setWindowTitle(tr("BMSapp - Pitchrate"));
456
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
720
457
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
721 QDialogButtonBox *buttonBox = new QDialogButtonBox(dialog);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
722 buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
723 buttonBox->setGeometry(QRect(30, 60, 360, 32));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
724 buttonBox->setLayoutDirection(Qt::LeftToRight);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
725 buttonBox->setOrientation(Qt::Horizontal);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
726 buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
727 buttonBox->setCenterButtons(true);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
728
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
729 QLabel *typeLabel = new QLabel(dialog);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
730 typeLabel->setObjectName(QString::fromUtf8("typeLabel"));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
731 typeLabel->setText(tr("Beer pitch type:"));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
732 typeLabel->setGeometry(QRect(10, 20, 195, 20));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
733 typeLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
734
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
735 QComboBox *typeEdit = new QComboBox(dialog);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
736 typeEdit->setObjectName(QString::fromUtf8("typeEdit"));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
737 typeEdit->setGeometry(QRect(215, 20, 185, 23));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
738 typeEdit->setIconSize(QSize(0, 0));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
739 typeEdit->addItem(tr("0.075 Real Kveik"));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
740 typeEdit->addItem(tr("0.75 Ale, upto 1.060"));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
741 typeEdit->addItem(tr("1.0 Ale, above 1.060"));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
742 typeEdit->addItem(tr("1.5 Lager, upto 1.060"));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
743 typeEdit->addItem(tr("2.0 Lager, above 1.060"));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
744 typeEdit->setCurrentIndex(product->pitch_pitchindex);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
745
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
746 connect(typeEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::pitchindex_changed);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
747 connect(buttonBox, SIGNAL(rejected()), dialog, SLOT(reject()));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
748 connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept()));
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
749
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
750 dialog->setModal(true);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
751 dialog->exec();
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
752 if (dialog->result() != QDialog::Rejected) {
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
753 switch (product->pitch_pitchindex) {
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
754 case 0: product->yeast_pitchrate = 0.075; break;
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
755 case 1: product->yeast_pitchrate = 0.75; break;
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
756 case 2: product->yeast_pitchrate = 1.0; break;
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
757 case 3: product->yeast_pitchrate = 1.5; break;
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
758 case 4: product->yeast_pitchrate = 2.0; break;
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
759 }
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
760 ui->pitchrateEdit->setValue(product->yeast_pitchrate); /* Will automatic call calcYeast() and is_changed() */
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
761 }
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
762
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
763 disconnect(typeEdit, nullptr, nullptr, nullptr);
5028c1c4c526 Changed pitchrate field for liquid yeasts to read/write. Added pitchrate select using a QComboBox and added a popup window for that.
Michiel Broek <mbroek@mbse.eu>
parents: 456
diff changeset
764 disconnect(buttonBox, nullptr, nullptr, nullptr);
456
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
765 }
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
766
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
767
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
768 void EditProduct::yeast_retry_button_clicked()
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
769 {
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
770 #ifdef DEBUG_YEAST
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
771 qDebug() << "yeast_retry_button_clicked";
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
772 #endif
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
773
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
774 int rc = QMessageBox::warning(this, tr("Retry starter"), tr("Retry to automatic create starter steps"),
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
775 QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
776 if (rc == QMessageBox::No)
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
777 return;
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
778
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
779 for (int i = 0; i < 4; i++) {
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
780 product->prop_volume[i] = 0;
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
781 product->prop_type[i] = product->starter_type;
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
782 }
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
783 calcYeast();
6b10c34f74f5 Added a button to automatic recreate the yeast starter steps. Some code cleanup
Michiel Broek <mbroek@mbse.eu>
parents: 455
diff changeset
784 is_changed();
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
785 }
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
786
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
787
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
788 void EditProduct::yeast_starter_edit_clicked()
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
789 {
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
790 QToolButton *pb = qobject_cast<QToolButton *>(QObject::sender());
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
791 int row = pb->objectName().toInt();
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
792 #ifdef DEBUG_YEAST
195
9887278c4fbe The framework to calculate yeast starters added.
Michiel Broek <mbroek@mbse.eu>
parents: 179
diff changeset
793 qDebug() << "yeast_starter_edit_clicked" << row;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
794 #endif
196
f7954f2d4451 Internal product record stores the starter steps in array format.
Michiel Broek <mbroek@mbse.eu>
parents: 195
diff changeset
795
197
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
796 QDialog* dialog = new QDialog(this);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
797 dialog->resize(338, 140);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
798 QDialogButtonBox *buttonBox = new QDialogButtonBox(dialog);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
799 buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
800 buttonBox->setGeometry(QRect(30, 90, 271, 32));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
801 buttonBox->setLayoutDirection(Qt::LeftToRight);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
802 buttonBox->setOrientation(Qt::Horizontal);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
803 buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
804 buttonBox->setCenterButtons(true);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
805
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
806 QLabel *typeLabel = new QLabel(dialog);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
807 typeLabel->setObjectName(QString::fromUtf8("typeLabel"));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
808 typeLabel->setText(tr("Start step type:"));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
809 typeLabel->setGeometry(QRect(10, 10, 141, 20));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
810 typeLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
811 QLabel *volLabel = new QLabel(dialog);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
812 volLabel->setObjectName(QString::fromUtf8("volLabel"));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
813 volLabel->setText(tr("Starter step volume:"));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
814 volLabel->setGeometry(QRect(10, 40, 141, 20));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
815 volLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
816
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
817 QComboBox *typeEdit = new QComboBox(dialog);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
818 typeEdit->setObjectName(QString::fromUtf8("typeEdit"));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
819 typeEdit->setGeometry(QRect(160, 10, 121, 23));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
820 typeEdit->addItem(tr("Stirred"));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
821 typeEdit->addItem(tr("Shaken"));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
822 typeEdit->addItem(tr("Simple"));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
823 typeEdit->setCurrentIndex(product->prop_type[row]);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
824
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
825 QDoubleSpinBox *volEdit = new QDoubleSpinBox(dialog);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
826 volEdit->setObjectName(QString::fromUtf8("volEdit"));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
827 volEdit->setGeometry(QRect(160, 40, 121, 24));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
828 volEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
829 volEdit->setAccelerated(true);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
830 volEdit->setDecimals(3);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
831 volEdit->setSingleStep(0.01);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
832 volEdit->setValue(product->prop_volume[row]);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
833 volEdit->setMaximum(5);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
834
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
835 connect(buttonBox, SIGNAL(rejected()), dialog, SLOT(reject()));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
836 connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept()));
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
837
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
838 dialog->setModal(true);
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
839 dialog->exec();
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
840 if (dialog->result() != QDialog::Rejected) {
197
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
841 product->prop_type[row] = typeEdit->currentIndex();
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
842 product->prop_volume[row] = volEdit->value();
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
843 calcYeast();
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
844 is_changed();
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
845 }
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
846
6a5e5b3d0fcd Completed the starter step popup editor
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
847 disconnect(buttonBox, nullptr, nullptr, nullptr);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
848 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
849
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
850
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
851 void EditProduct::addYeastRow_clicked()
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
852 {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
853 Yeasts newy;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
854
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
855 #ifdef DEBUG_YEAST
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
856 qDebug() << "Add yeast row";
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
857 #endif
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
858
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
859 for (int i = 0; i < product->yeasts.size(); i++) {
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
860 if (product->yeasts.at(i).amount == 0)
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
861 return; // Add only one at a time.
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
862 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
863
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
864 newy.name = "Select one";
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
865 newy.laboratory = "";
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
866 newy.product_id = "";
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
867 newy.amount = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
868 newy.type = YEAST_TYPES_ALE;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
869 newy.form = YEAST_FORMS_LIQUID;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
870 newy.min_temperature = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
871 newy.max_temperature = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
872 newy.flocculation = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
873 newy.attenuation = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
874 newy.cells = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
875 newy.tolerance = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
876 newy.inventory = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
877 newy.use = YEAST_USE_PRIMARY;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
878 newy.sta1 = false;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
879 newy.bacteria = false;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
880 newy.harvest_top = false;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
881 newy.harvest_time = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
882 newy.pitch_temperature = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
883 newy.pofpos = false;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
884 newy.zymocide = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
885 newy.gr_hl_lo = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
886 newy.sg_lo = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
887 newy.gr_hl_hi = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
888 newy.sg_hi = 0;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
889 newy.cost = 0;
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
890
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
891 product->yeasts.append(newy);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
892 emit refreshAll();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
893 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
894
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
895
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
896 void EditProduct::deleteYeastRow_clicked()
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
897 {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
898 if (product->locked || product->yeasts.size() < 1)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
899 return;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
900
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
901 QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender());
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
902 int row = pb->objectName().toInt();
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
903 #ifdef DEBUG_YEAST
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
904 qDebug() << "Delete yeast row" << row << product->yeasts.size();
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
905 #endif
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
906
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
907 int rc = QMessageBox::warning(this, tr("Delete yeast"), tr("Delete %1").arg(product->yeasts.at(row).name),
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
908 QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
909 if (rc == QMessageBox::No)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
910 return;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
911
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
912 product->yeasts.removeAt(row);
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
913 bool primary = false; /* Check if any primary yeast is left */
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
914 for (int i = 0; i < product->yeasts.size(); i++) {
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
915 if (product->yeasts.at(i).use == YEAST_USE_PRIMARY)
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
916 primary = true;
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
917 }
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
918 if (! primary) {
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
919 #ifdef DEBUG_YEAST
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
920 qDebug() << " Clear starter (if any)";
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
921 #endif
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
922 for (int i = 0; i < 4; i++)
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
923 product->prop_volume[i] = 0;
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
924 }
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
925 is_changed();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
926 emit refreshAll();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
927 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
928
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
929
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
930 void EditProduct::yeast_amount_changed(double val)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
931 {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
932 QTableWidgetItem *item;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
933
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
934 #ifdef DEBUG_YEAST
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
935 qDebug() << "yeast_amount_changed()" << product->yeasts_row << val;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
936 #endif
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
937
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
938 if (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_LIQUID) {
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
939 product->yeasts[product->yeasts_row].amount = val;
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
940 item = new QTableWidgetItem(QString("%1 pack").arg(val, 1, 'f', 0, '0'));
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
941 } else if ((product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRY) ||
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
942 (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRIED)) {
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
943 product->yeasts[product->yeasts_row].amount = val / 1000.0;
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
944 item = new QTableWidgetItem(QString("%1 gr").arg(val, 3, 'f', 2, '0'));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
945 } else {
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
946 product->yeasts[product->yeasts_row].amount = val / 1000.0;
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
947 item = new QTableWidgetItem(QString("%1 ml").arg(val, 3, 'f', 2, '0'));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
948 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
949 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
950 ui->yeastsTable->setItem(product->yeasts_row, 10, item);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
951
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
952 calcYeast();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
953 is_changed();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
954 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
955
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
956
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
957 void EditProduct::yeast_select_changed(int val)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
958 {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
959 QSqlQuery query;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
960 bool instock = yinstockEdit->isChecked();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
961 QString w;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
962 QTableWidgetItem *item;
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
963 int oldform = product->yeasts.at(product->yeasts_row).form;
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
964
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
965 if (val < 1)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
966 return;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
967
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
968 #ifdef DEBUG_YEAST
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
969 qDebug() << "yeast_select_changed()" << product->yeasts_row << val << instock;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
970 #endif
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
971
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
972 /*
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
973 * Search the yeast pointed by the index and instock flag.
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
974 */
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
975 QString sql = "SELECT name,laboratory,product_id,type,form,min_temperature,max_temperature,flocculation,attenuation,"
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
976 "cells,tolerance,sta1,bacteria,harvest_top,harvest_time,pitch_temperature,pofpos,zymocide,"
299
8021e09ab6a3 Fixed select yeasts in recipes and poducts.
Michiel Broek <mbroek@mbse.eu>
parents: 284
diff changeset
977 "gr_hl_lo,sg_lo,gr_hl_hi,sg_hi,cost,inventory FROM inventory_yeasts ";
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
978 if (instock)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
979 sql.append("WHERE inventory > 0 ");
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
980 sql.append("ORDER BY laboratory,product_id,name");
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
981 query.prepare(sql);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
982 query.exec();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
983 query.first();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
984 for (int i = 0; i < (val - 1); i++) {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
985 query.next();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
986 }
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
987 #ifdef DEBUG_YEAST
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
988 qDebug() << "found" << query.value("name").toString() << query.value("product_id").toString();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
989 #endif
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
990
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
991 /*
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
992 * Replace the yeast record contents
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
993 */
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
994 product->yeasts[product->yeasts_row].name = query.value("name").toString();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
995 product->yeasts[product->yeasts_row].laboratory = query.value("laboratory").toString();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
996 product->yeasts[product->yeasts_row].product_id = query.value("product_id").toString();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
997 product->yeasts[product->yeasts_row].type = query.value("type").toInt();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
998 product->yeasts[product->yeasts_row].form = query.value("form").toInt();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
999 product->yeasts[product->yeasts_row].min_temperature = query.value("min_temperature").toDouble();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1000 product->yeasts[product->yeasts_row].max_temperature = query.value("max_temperature").toDouble();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1001 product->yeasts[product->yeasts_row].flocculation = query.value("flocculation").toInt();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1002 product->yeasts[product->yeasts_row].attenuation = query.value("attenuation").toDouble();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1003 product->yeasts[product->yeasts_row].cells = query.value("cells").toDouble();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1004 product->yeasts[product->yeasts_row].tolerance = query.value("tolerance").toDouble();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1005 product->yeasts[product->yeasts_row].sta1 = query.value("sta1").toInt() ? true:false;
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1006 product->yeasts[product->yeasts_row].bacteria = query.value("bacteria").toInt() ? true:false;
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1007 product->yeasts[product->yeasts_row].harvest_top = query.value("harvest_top").toInt() ? true:false;
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1008 product->yeasts[product->yeasts_row].harvest_time = query.value("harvest_time").toInt();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1009 product->yeasts[product->yeasts_row].pitch_temperature = query.value("pitch_temperature").toDouble();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1010 product->yeasts[product->yeasts_row].pofpos = query.value("pofpos").toInt() ? true:false;
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1011 product->yeasts[product->yeasts_row].zymocide = query.value("zymocide").toInt();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1012 product->yeasts[product->yeasts_row].gr_hl_lo = query.value("gr_hl_lo").toInt();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1013 product->yeasts[product->yeasts_row].sg_lo = query.value("sg_lo").toDouble();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1014 product->yeasts[product->yeasts_row].gr_hl_hi = query.value("gr_hl_hi").toInt();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1015 product->yeasts[product->yeasts_row].sg_hi = query.value("sg_hi").toDouble();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1016 product->yeasts[product->yeasts_row].cost = query.value("cost").toDouble();
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1017 product->yeasts[product->yeasts_row].inventory = query.value("inventory").toDouble();
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1018
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1019 /*
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1020 * Update the visible fields
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1021 */
201
b8232133a12d Fixes for select another yeast.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
1022 const QSignalBlocker blocker1(yamountEdit);
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1023 ynameEdit->setText(product->yeasts.at(product->yeasts_row).name);
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1024 ylaboratoryEdit->setText(product->yeasts.at(product->yeasts_row).laboratory);
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1025 yproduct_idEdit->setText(product->yeasts.at(product->yeasts_row).product_id);
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1026 if (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_LIQUID) {
201
b8232133a12d Fixes for select another yeast.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
1027 if (oldform != YEAST_FORMS_LIQUID)
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1028 product->yeasts[product->yeasts_row].amount = 1;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1029 yamountEdit->setValue(product->yeasts[product->yeasts_row].amount);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1030 yamountEdit->setDecimals(0);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1031 yamountEdit->setSingleStep(1.0);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1032 yamountLabel->setText(tr("Total packs:"));
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
1033 product->yeast_pitchrate = 0;
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1034 } else if ((product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRY) || (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRIED)) {
201
b8232133a12d Fixes for select another yeast.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
1035 if (oldform == YEAST_FORMS_LIQUID)
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1036 product->yeasts[product->yeasts_row].amount = 0.01;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1037 yamountEdit->setValue(product->yeasts[product->yeasts_row].amount * 1000.0);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1038 yamountEdit->setDecimals(1);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1039 yamountEdit->setSingleStep(0.5);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1040 yamountLabel->setText(tr("Amount in gr:"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1041 } else {
201
b8232133a12d Fixes for select another yeast.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
1042 if (oldform == YEAST_FORMS_LIQUID)
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1043 product->yeasts[product->yeasts_row].amount = 0.01;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1044 yamountEdit->setValue(product->yeasts[product->yeasts_row].amount * 1000.0);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1045 yamountEdit->setDecimals(1);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1046 yamountEdit->setSingleStep(0.5);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1047 yamountLabel->setText(tr("Amount in ml:"));
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
1048 product->yeast_pitchrate = 0;
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1049 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1050
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1051 ui->yeastsTable->setItem(product->yeasts_row, 0, new QTableWidgetItem(product->yeasts.at(product->yeasts_row).name));
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1052 ui->yeastsTable->setItem(product->yeasts_row, 1, new QTableWidgetItem(product->yeasts.at(product->yeasts_row).laboratory));
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1053 ui->yeastsTable->setItem(product->yeasts_row, 2, new QTableWidgetItem(product->yeasts.at(product->yeasts_row).product_id));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1054
301
fe6346211b5b Finally the translation of string arrays is working.
Michiel Broek <mbroek@mbse.eu>
parents: 299
diff changeset
1055 item = new QTableWidgetItem(QCoreApplication::translate("YeastForm", g_yeast_forms[product->yeasts.at(product->yeasts_row).form]));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1056 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1057 ui->yeastsTable->setItem(product->yeasts_row, 3, item);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1058
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1059 item = new QTableWidgetItem(QString("%1").arg(product->yeasts.at(product->yeasts_row).min_temperature, 2, 'f', 1, '0'));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1060 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1061 ui->yeastsTable->setItem(product->yeasts_row, 5, item);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1062
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1063 item = new QTableWidgetItem(QString("%1").arg(product->yeasts.at(product->yeasts_row).max_temperature, 2, 'f', 1, '0'));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1064 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1065 ui->yeastsTable->setItem(product->yeasts_row, 6, item);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1066
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1067 item = new QTableWidgetItem(QString("%1").arg(product->yeasts.at(product->yeasts_row).tolerance, 2, 'f', 1, '0'));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1068 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1069 ui->yeastsTable->setItem(product->yeasts_row, 7, item);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1070
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1071 item = new QTableWidgetItem(QString("%1").arg(product->yeasts.at(product->yeasts_row).attenuation, 2, 'f', 1, '0'));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1072 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1073 ui->yeastsTable->setItem(product->yeasts_row, 8, item);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1074
476
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1075 if (product->yeasts.at(product->yeasts_row).use != YEAST_USE_BOTTLE && product->yeasts.at(product->yeasts_row).sta1) {
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1076 QWidget *pWidget = new QWidget();
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1077 QLabel *label = new QLabel;
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1078 label->setPixmap(QPixmap(":icons/silk/tick.png"));
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1079 QHBoxLayout *pLayout = new QHBoxLayout(pWidget);
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1080 pLayout->addWidget(label);
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1081 pLayout->setAlignment(Qt::AlignCenter);
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1082 pLayout->setContentsMargins(0, 0, 0, 0);
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1083 pWidget->setLayout(pLayout);
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1084 ui->yeastsTable->setCellWidget(product->yeasts_row, 9, pWidget);
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1085 } else {
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1086 ui->yeastsTable->removeCellWidget(product->yeasts_row, 9);
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1087 }
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1088
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1089 if (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_LIQUID)
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1090 item = new QTableWidgetItem(QString("%1 pack").arg(product->yeasts.at(product->yeasts_row).amount, 1, 'f', 0, '0'));
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1091 else if (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRY || product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRIED)
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1092 item = new QTableWidgetItem(QString("%1 gr").arg(product->yeasts.at(product->yeasts_row).amount * 1000.0, 3, 'f', 2, '0'));
201
b8232133a12d Fixes for select another yeast.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
1093 else
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1094 item = new QTableWidgetItem(QString("%1 ml").arg(product->yeasts.at(product->yeasts_row).amount * 1000.0, 3, 'f', 2, '0'));
201
b8232133a12d Fixes for select another yeast.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
1095 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
476
29487eac1183 Fixed replace a yeast field offsets.
Michiel Broek <mbroek@mbse.eu>
parents: 464
diff changeset
1096 ui->yeastsTable->setItem(product->yeasts_row, 10, item);
201
b8232133a12d Fixes for select another yeast.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
1097
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1098 /*
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1099 * If there is no need for a starter, wipe it.
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1100 */
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1101 bool maybe_starter = false;
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1102 for (int i = 0; i < product->yeasts.size(); i++) {
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1103 if (product->yeasts.at(i).use == YEAST_USE_PRIMARY &&
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1104 ! ((product->yeasts.at(i).form == YEAST_FORMS_DRY) || (product->yeasts.at(i).form == YEAST_FORMS_DRIED)))
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1105 maybe_starter = true;
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1106 }
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1107 if (! maybe_starter) {
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1108 #ifdef DEBUG_YEAST
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1109 qDebug() << " Clear starter (if any)";
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1110 #endif
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1111 for (int i = 0; i < 4; i++)
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1112 product->prop_volume[i] = 0;
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1113 }
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1114
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1115 is_changed();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1116 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1117
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1118
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1119 void EditProduct::yeast_instock_changed(bool val)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1120 {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1121 QSqlQuery query;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1122
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1123 #ifdef DEBUG_YEAST
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1124 qDebug() << "yeast_instock_changed()" << product->yeasts_row << val;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1125 #endif
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1126
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1127 this->yselectEdit->setCurrentIndex(-1);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1128 this->yselectEdit->clear();
299
8021e09ab6a3 Fixed select yeasts in recipes and poducts.
Michiel Broek <mbroek@mbse.eu>
parents: 284
diff changeset
1129 QString sql = "SELECT name,laboratory,product_id,inventory FROM inventory_yeasts ";
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1130 if (val)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1131 sql.append("WHERE inventory > 0 ");
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1132 sql.append("ORDER BY laboratory,product_id,name");
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1133 query.prepare(sql);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1134 query.exec();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1135 query.first();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1136 this->yselectEdit->addItem(""); // Start with empty value
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1137 for (int i = 0; i < query.size(); i++) {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1138 this->yselectEdit->addItem(query.value(1).toString()+" - "+query.value(2).toString()+" "+query.value(0).toString() +
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1139 QString(" (%1 gr)").arg(query.value(3).toDouble() * 1000.0, 2, 'f', 1, '0'));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1140 query.next();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1141 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1142 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1143
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1144
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1145 void EditProduct::yeast_useat_changed(int val)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1146 {
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1147 #ifdef DEBUG_YEAST
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1148 qDebug() << "yeast_useat_changed()" << product->yeasts_row << val;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1149 #endif
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1150
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1151 product->yeasts[product->yeasts_row].use = val;
301
fe6346211b5b Finally the translation of string arrays is working.
Michiel Broek <mbroek@mbse.eu>
parents: 299
diff changeset
1152 QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("YeastUse", g_yeast_use[val]));
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1153 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
478
a3653722b0d6 Add dry primary yeasts weights to get a mixed total. Use the parameters from the first and mmost used yeast. Changed in products and recipes. Recalculated WLP purepitch viability and planned next generation purepitch. We need a better way to set these parameters like a packages table. Fixed several yeast edit values due to adding a STA1 column. Removed several unneeded refresh_all() calls as they screwed the sorting of the yeasts during edit. Added STA1 display to recipes. Changed products database starter_viability from integer to float.
Michiel Broek <mbroek@mbse.eu>
parents: 476
diff changeset
1154 ui->yeastsTable->setItem(product->yeasts_row, 4, item);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1155 is_changed();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1156 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1157
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1158
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1159 void EditProduct::editYeastRow_clicked()
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1160 {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1161 QSqlQuery query;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1162
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1163 if (product->locked)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1164 return;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1165
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1166 QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender());
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1167 product->yeasts_row = pb->objectName().toInt();
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1168 #ifdef DEBUG_YEAST
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1169 qDebug() << "Edit yeast row" << product->yeasts_row;
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1170 #endif
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1171 Yeasts backup = product->yeasts.at(product->yeasts_row);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1172
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1173 QDialog* dialog = new QDialog(this);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1174 dialog->resize(738, 260);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1175 QDialogButtonBox *buttonBox = new QDialogButtonBox(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1176 buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1177 buttonBox->setGeometry(QRect(30, 210, 671, 32));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1178 buttonBox->setLayoutDirection(Qt::LeftToRight);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1179 buttonBox->setOrientation(Qt::Horizontal);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1180 buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1181 buttonBox->setCenterButtons(true);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1182
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1183 QLabel *nameLabel = new QLabel(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1184 nameLabel->setObjectName(QString::fromUtf8("nameLabel"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1185 nameLabel->setText(tr("Yeast name:"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1186 nameLabel->setGeometry(QRect(10, 10, 141, 20));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1187 nameLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1188 QLabel *laboratoryLabel = new QLabel(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1189 laboratoryLabel->setObjectName(QString::fromUtf8("laboratoryLabel"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1190 laboratoryLabel->setText(tr("Laboratory:"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1191 laboratoryLabel->setGeometry(QRect(10, 40, 141, 20));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1192 laboratoryLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1193 QLabel *product_idLabel = new QLabel(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1194 product_idLabel->setObjectName(QString::fromUtf8("product_idLabel"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1195 product_idLabel->setText(tr("Laboratory:"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1196 product_idLabel->setGeometry(QRect(10, 70, 141, 20));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1197 product_idLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1198 QLabel *selectLabel = new QLabel(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1199 selectLabel->setObjectName(QString::fromUtf8("selectLabel"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1200 selectLabel->setText(tr("Select yeast:"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1201 selectLabel->setGeometry(QRect(10,100, 141, 20));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1202 selectLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1203 QLabel *instockLabel = new QLabel(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1204 instockLabel->setObjectName(QString::fromUtf8("instockLabel"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1205 instockLabel->setText(tr("In stock:"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1206 instockLabel->setGeometry(QRect(525,100, 121, 20));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1207 instockLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1208 yamountLabel = new QLabel(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1209 yamountLabel->setObjectName(QString::fromUtf8("amountLabel"));
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1210 if (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_LIQUID)
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1211 yamountLabel->setText(tr("Total packs:"));
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1212 else if ((product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRY) || (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRIED))
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1213 yamountLabel->setText(tr("Amount in gr:"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1214 else
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1215 yamountLabel->setText(tr("Amount in ml:"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1216 yamountLabel->setGeometry(QRect(10, 130, 141, 20));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1217 yamountLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1218 QLabel *useatLabel = new QLabel(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1219 useatLabel->setObjectName(QString::fromUtf8("useatLabel"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1220 useatLabel->setText(tr("Use at:"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1221 useatLabel->setGeometry(QRect(10, 160, 141, 20));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1222 useatLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1223
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1224 ynameEdit = new QLineEdit(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1225 ynameEdit->setObjectName(QString::fromUtf8("ynameEdit"));
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1226 ynameEdit->setText(product->yeasts.at(product->yeasts_row).name);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1227 ynameEdit->setGeometry(QRect(160, 10, 511, 23));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1228 ynameEdit->setReadOnly(true);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1229 ylaboratoryEdit = new QLineEdit(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1230 ylaboratoryEdit->setObjectName(QString::fromUtf8("ylaboratoryEdit"));
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1231 ylaboratoryEdit->setText(product->yeasts.at(product->yeasts_row).laboratory);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1232 ylaboratoryEdit->setGeometry(QRect(160, 40, 511, 23));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1233 ylaboratoryEdit->setReadOnly(true);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1234 yproduct_idEdit = new QLineEdit(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1235 yproduct_idEdit->setObjectName(QString::fromUtf8("yproduct_idEdit"));
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1236 yproduct_idEdit->setText(product->yeasts.at(product->yeasts_row).product_id);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1237 yproduct_idEdit->setGeometry(QRect(160, 70, 511, 23));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1238 yproduct_idEdit->setReadOnly(true);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1239 yselectEdit = new QComboBox(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1240 yselectEdit->setObjectName(QString::fromUtf8("selectEdit"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1241 yselectEdit->setGeometry(QRect(160,100, 371, 23));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1242 yinstockEdit = new QCheckBox(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1243 yinstockEdit->setObjectName(QString::fromUtf8("yinstockEdit"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1244 yinstockEdit->setGeometry(QRect(655,100, 85, 21));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1245 yinstockEdit->setChecked(true);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1246 yamountEdit = new QDoubleSpinBox(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1247 yamountEdit->setObjectName(QString::fromUtf8("yamountEdit"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1248 yamountEdit->setGeometry(QRect(160, 130, 121, 24));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1249 yamountEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1250 yamountEdit->setAccelerated(true);
201
b8232133a12d Fixes for select another yeast.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
1251 yamountEdit->setMaximum(10000.0);
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1252 if (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_LIQUID) {
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1253 yamountEdit->setDecimals(0);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1254 yamountEdit->setSingleStep(1.0);
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1255 yamountEdit->setValue(product->yeasts.at(product->yeasts_row).amount);
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1256 } else if ((product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRY) || (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRIED)) {
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1257 yamountEdit->setDecimals(1);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1258 yamountEdit->setSingleStep(0.5);
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1259 yamountEdit->setValue(product->yeasts.at(product->yeasts_row).amount * 1000.0);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1260 } else {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1261 yamountEdit->setDecimals(1);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1262 yamountEdit->setSingleStep(0.5);
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1263 yamountEdit->setValue(product->yeasts.at(product->yeasts_row).amount * 1000.0);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1264 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1265 yamountEdit->setMaximum(1000000000.0);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1266 useatEdit = new QComboBox(dialog);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1267 useatEdit->setObjectName(QString::fromUtf8("useatEdit"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1268 useatEdit->setGeometry(QRect(160, 160, 161, 23));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1269 useatEdit->addItem(tr("Primary"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1270 useatEdit->addItem(tr("Secondary"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1271 useatEdit->addItem(tr("Tertiary"));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1272 useatEdit->addItem(tr("Bottle"));
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1273 useatEdit->setCurrentIndex(product->yeasts.at(product->yeasts_row).use);
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1274
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1275 yeast_instock_changed(true);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1276
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1277 connect(yselectEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::yeast_select_changed);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1278 connect(yamountEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::yeast_amount_changed);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1279 connect(useatEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::yeast_useat_changed);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1280 connect(yinstockEdit, &QCheckBox::stateChanged, this, &EditProduct::yeast_instock_changed);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1281 connect(buttonBox, SIGNAL(rejected()), dialog, SLOT(reject()));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1282 connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept()));
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1283
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1284 dialog->setModal(true);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1285 dialog->exec();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1286 if (dialog->result() == QDialog::Rejected) {
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1287 #ifdef DEBUG_YEAST
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1288 qDebug() << "reject and rollback";
455
deea5047be32 Fixed dangling old starter data. Added conditional yeast debug logging.
Michiel Broek <mbroek@mbse.eu>
parents: 454
diff changeset
1289 #endif
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1290 product->yeasts[product->yeasts_row] = backup;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1291 } else {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1292
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1293 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1294
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1295 disconnect(yselectEdit, nullptr, nullptr, nullptr);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1296 disconnect(yamountEdit, nullptr, nullptr, nullptr);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1297 disconnect(useatEdit, nullptr, nullptr, nullptr);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1298 disconnect(yinstockEdit, nullptr, nullptr, nullptr);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1299 disconnect(buttonBox, nullptr, nullptr, nullptr);
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1300
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1301 emit refreshAll();
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1302 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1303
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1304
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1305 void EditProduct::adjustYeasts(double factor)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1306 {
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1307 double amount;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1308
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1309 if (product->yeasts.size() == 0)
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1310 return;
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1311
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1312 for (int i = 0; i < product->yeasts.size(); i++) {
284
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1313 if (product->yeasts.at(i).form == YEAST_FORMS_DRY) { // Only adjust dry yeast
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1314 amount = product->yeasts.at(i).amount * factor;
33bb98c33e6a Member names for yeasts normalized.
Michiel Broek <mbroek@mbse.eu>
parents: 202
diff changeset
1315 product->yeasts[i].amount = amount;
175
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1316 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1317 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1318 }
f1ed3a2a94e9 Initial import of EditProduct, the part from EditRecipe is ported.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1319

mercurial