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.
234
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1 | #ifndef _PRODONDATE_H |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2 | #define _PRODONDATE_H |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
3 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | #include <QDialog> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
5 | #include <QtWidgets/QGridLayout> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6 | #include <QtWidgets/QGroupBox> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
7 | #include <QtWidgets/QPushButton> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
8 | #include <QtWidgets/QListView> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
9 | #include <QtWidgets/QTreeWidget> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
10 | #include <QtWidgets/QDialog> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | #include <QtWidgets/QHeaderView> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | #include <QtWidgets/QLabel> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | #include <QtWidgets/QLineEdit> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
14 | #include <QtWidgets/QPlainTextEdit> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | #include <QtWidgets/QDoubleSpinBox> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
16 | #include <QtWidgets/QSpinBox> |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
17 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
18 | namespace Ui { |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
19 | class ProdOnDate; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
20 | } |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
22 | class ProdOnDate : public QDialog |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
23 | { |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
24 | Q_OBJECT |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
25 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
26 | public: |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
27 | explicit ProdOnDate(QWidget *parent = nullptr); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
28 | ~ProdOnDate(); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
29 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
30 | signals: |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
31 | void setStatus(QString); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
32 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
33 | private slots: |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
34 | void on_openButton_clicked(); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
35 | void on_item_clicked(QTreeWidgetItem *, int); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
36 | void on_item_doubleclicked(QTreeWidgetItem *, int); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
37 | void refreshTable(void); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
38 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
39 | private: |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
40 | QGridLayout *gridLayout; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
41 | QTreeWidget *treeWidget; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
42 | QGroupBox *groupBox, *recipeBox; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
43 | QHBoxLayout *horizontalLayout; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
44 | QPushButton *quitButton, *openButton; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
45 | QLabel *volumeLabel, *efficiencyLabel, *boilvolumeLabel; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
46 | QLabel *boiltimeLabel, *ogLabel, *fgLabel; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
47 | QLabel *abvLabel, *co2Label, *colorLabel; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
48 | QLabel *colormethodLabel, *ibuLabel, *ibumethodLabel; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
49 | QLabel *remarksLabel; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
50 | QDoubleSpinBox *volumeEdit, *boilvolumeEdit; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
51 | QDoubleSpinBox *efficiencyEdit, *ogEdit, *fgEdit; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
52 | QDoubleSpinBox *abvEdit, *co2Edit; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
53 | QSpinBox *boiltimeEdit, *colorEdit, *ibuEdit; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
54 | QPlainTextEdit *remarksEdit; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
55 | QLineEdit *colormethodEdit, *ibumethodEdit; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
56 | int record; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
57 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
58 | void edit(int recno); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
59 | void showRecipe(); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
60 | }; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
61 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
62 | #endif |