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.
249
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1 | #ifndef _DB_RECIPE_H |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2 | #define _DB_RECIPE_H |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
3 | |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | #include <QDebug> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
5 | #include <QMessageBox> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6 | #include <QUuid> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
7 | #include <QJsonArray> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
8 | #include <QJsonDocument> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
9 | #include <QJsonObject> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
10 | #include <QTranslator> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | #include <QSqlQuery> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | #include <QSqlError> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | #include <QSqlRecord> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
14 | #include <QObject> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | #include <math.h> |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
16 | |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
17 | |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
18 | /** |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
19 | * @namespace db_recipe |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
20 | * |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | * @brief Global database recipe functions.. |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
22 | */ |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
23 | namespace DB_recipe { |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
24 | |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
25 | bool load(Recipe *reci, QDialog *dialog, int recno); |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
26 | bool save(Recipe *reci, QDialog *dialog); |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
27 | bool dele(QDialog *dialog, int recno); |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
28 | } |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
29 | |
3c28dc8dd51d
Moved recipe load, save and delete to it's own file.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
30 | #endif |