Fri, 29 Jul 2022 13:12:26 +0200
First load of changes for hops. In EditHop load the dropdown buttons from the global table. Use named query fields. Added database utilisation and bu_factor fields for hop extracts. Added edit fields for these new fields. Added post boil SG, utilisation and bu_factor parameters to the toIBU function. Added hops form parameter to the hopFlavourContribution and hopAromaContribution display bars. In the hops inventory list dispay volumes instead of weight for hop extracts. Modified the TinsethIBU function to use utilisation and bu_factor parameters. Add calculations for co2 and iso hop extracts, this is work in progress. The toIBU function makes use of the preSG and postSG values to use the correct SG to caall the TinsethIBU function. This results in a bit lower IBU values mostly affecting the late additions. Added use hop at bottling for iso hop extracts like Tetra hops using the formula from BarthHaas.
29
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1 | #ifndef _INVENTORYWATERS_H |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2 | #define _INVENTORYWATERS_H |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
3 | |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | #include <QDialog> |
72
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
5 | #include <QtWidgets/QGridLayout> |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
6 | #include <QtWidgets/QGroupBox> |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
7 | #include <QtWidgets/QHBoxLayout> |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
8 | #include <QtWidgets/QHeaderView> |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
9 | #include <QtWidgets/QPushButton> |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
10 | #include <QtWidgets/QTableWidget> |
29
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | namespace Ui { |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | class InventoryWaters; |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
14 | } |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
16 | class InventoryWaters : public QDialog |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
17 | { |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
18 | Q_OBJECT |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
19 | |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
20 | public: |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | explicit InventoryWaters(QWidget *parent = nullptr); |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
22 | ~InventoryWaters(); |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
23 | |
79
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
24 | signals: |
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
25 | void setStatus(QString); |
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
26 | |
29
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
27 | private slots: |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
28 | void on_insertButton_clicked(); |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
29 | void on_editButton_clicked(); |
46 | 30 | void on_exportButton_clicked(); |
29
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
31 | void refreshTable(void); |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
32 | |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
33 | private: |
72
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
34 | QGridLayout *gridLayout; |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
35 | QTableWidget *tableWaters; |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
36 | QGroupBox *groupBox; |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
37 | QHBoxLayout *horizontalLayout; |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
38 | QPushButton *quitButton; |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
39 | QPushButton *exportButton; |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
40 | QPushButton *insertButton; |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
41 | |
29
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
42 | void edit(int recno); |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
43 | }; |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
44 | |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
45 | #endif |