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.
30
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1 | #ifndef _INVENTORYEQUIPS_H |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2 | #define _INVENTORYEQUIPS_H |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
3 | |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | #include <QDialog> |
73
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
5 | #include <QtWidgets/QGridLayout> |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
6 | #include <QtWidgets/QGroupBox> |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
7 | #include <QtWidgets/QHBoxLayout> |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
8 | #include <QtWidgets/QHeaderView> |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
9 | #include <QtWidgets/QPushButton> |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
10 | #include <QtWidgets/QTableWidget> |
30
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | namespace Ui { |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | class InventoryEquipments; |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
14 | } |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
16 | class InventoryEquipments : public QDialog |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
17 | { |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
18 | Q_OBJECT |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
19 | |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
20 | public: |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | explicit InventoryEquipments(QWidget *parent = nullptr); |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
22 | ~InventoryEquipments(); |
0fec6a1abd13
Added inventory equipment table and editor.
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:
73
diff
changeset
|
24 | signals: |
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
73
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:
73
diff
changeset
|
26 | |
30
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
27 | private slots: |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
28 | void on_insertButton_clicked(); |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
29 | void on_editButton_clicked(); |
47 | 30 | void on_exportButton_clicked(); |
30
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
31 | void refreshTable(void); |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
32 | |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
33 | private: |
73
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
34 | QGridLayout *gridLayout; |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
35 | QTableWidget *tableEquipments; |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
36 | QGroupBox *groupBox; |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
37 | QHBoxLayout *horizontalLayout; |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
38 | QPushButton *quitButton; |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
39 | QPushButton *exportButton; |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
40 | QPushButton *insertButton; |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
41 | |
30
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
42 | void edit(int recno); |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
43 | }; |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
44 | |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
45 | #endif |