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.
4 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <ui version="4.0"> | |
3 | <class>AboutDialog</class> | |
4 | <widget class="QDialog" name="AboutDialog"> | |
5 | <property name="geometry"> | |
6 | <rect> | |
7 | <x>0</x> | |
8 | <y>0</y> | |
9 | <width>684</width> | |
14
8a304c898a75
Added QDarkStyle stylesheet and images. Updated About window. Some minor layout improvements.
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
10 | <height>390</height> |
4 | 11 | </rect> |
12 | </property> | |
13 | <property name="windowTitle"> | |
14 | <string>Dialog</string> | |
15 | </property> | |
16 | <layout class="QVBoxLayout" name="verticalLayout"> | |
17 | <item> | |
18 | <widget class="QLabel" name="label"> | |
19 | <property name="enabled"> | |
20 | <bool>true</bool> | |
21 | </property> | |
22 | <property name="font"> | |
23 | <font> | |
24 | <family>Liberation Sans</family> | |
25 | <pointsize>28</pointsize> | |
26 | <weight>75</weight> | |
27 | <bold>true</bold> | |
28 | </font> | |
29 | </property> | |
30 | <property name="text"> | |
31 | <string>Brewery Management System app</string> | |
32 | </property> | |
33 | <property name="alignment"> | |
34 | <set>Qt::AlignCenter</set> | |
35 | </property> | |
36 | <property name="margin"> | |
37 | <number>30</number> | |
38 | </property> | |
39 | </widget> | |
40 | </item> | |
41 | <item> | |
42 | <widget class="QPlainTextEdit" name="plainTextEdit"> | |
43 | <property name="plainText"> | |
330 | 44 | <string notr="true">Code: |
4 | 45 | Author: Michiel Broek |
46 | Source: https://hg.mbse.eu/bmsapp/ | |
47 | License: GPL v3 | |
48 | ||
14
8a304c898a75
Added QDarkStyle stylesheet and images. Updated About window. Some minor layout improvements.
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
49 | Theme: QDarkStyleSheet |
8a304c898a75
Added QDarkStyle stylesheet and images. Updated About window. Some minor layout improvements.
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
50 | Author: Colin Duquesnoy, Daniel Pizetta, Gonzalo Peña-Castellanos, Carlos Cordoba |
8a304c898a75
Added QDarkStyle stylesheet and images. Updated About window. Some minor layout improvements.
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
51 | Source: https://github.com/ColinDuquesnoy/QDarkStyleSheet |
8a304c898a75
Added QDarkStyle stylesheet and images. Updated About window. Some minor layout improvements.
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
52 | License: MIT |
8a304c898a75
Added QDarkStyle stylesheet and images. Updated About window. Some minor layout improvements.
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
53 | |
4 | 54 | Icons: Silk |
55 | Author: Mark James | |
56 | Source: http://www.famfamfam.com/lab/icons/silk/ | |
314 | 57 | License: Creative Commons Attribution 2.5 License |
58 | ||
327 | 59 | Plugins: AnalogWidgets |
60 | Author: Tomasz Ziobrowski | |
61 | License: GPL v2</string> | |
4 | 62 | </property> |
63 | </widget> | |
64 | </item> | |
65 | <item> | |
66 | <widget class="QDialogButtonBox" name="buttonBox"> | |
67 | <property name="orientation"> | |
68 | <enum>Qt::Horizontal</enum> | |
69 | </property> | |
70 | <property name="standardButtons"> | |
71 | <set>QDialogButtonBox::Ok</set> | |
72 | </property> | |
14
8a304c898a75
Added QDarkStyle stylesheet and images. Updated About window. Some minor layout improvements.
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
73 | <property name="centerButtons"> |
8a304c898a75
Added QDarkStyle stylesheet and images. Updated About window. Some minor layout improvements.
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
74 | <bool>true</bool> |
8a304c898a75
Added QDarkStyle stylesheet and images. Updated About window. Some minor layout improvements.
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
75 | </property> |
4 | 76 | </widget> |
77 | </item> | |
78 | </layout> | |
79 | </widget> | |
80 | <resources/> | |
81 | <connections> | |
82 | <connection> | |
83 | <sender>buttonBox</sender> | |
84 | <signal>accepted()</signal> | |
85 | <receiver>AboutDialog</receiver> | |
86 | <slot>accept()</slot> | |
87 | <hints> | |
88 | <hint type="sourcelabel"> | |
89 | <x>248</x> | |
90 | <y>254</y> | |
91 | </hint> | |
92 | <hint type="destinationlabel"> | |
93 | <x>157</x> | |
94 | <y>274</y> | |
95 | </hint> | |
96 | </hints> | |
97 | </connection> | |
98 | <connection> | |
99 | <sender>buttonBox</sender> | |
100 | <signal>rejected()</signal> | |
101 | <receiver>AboutDialog</receiver> | |
102 | <slot>reject()</slot> | |
103 | <hints> | |
104 | <hint type="sourcelabel"> | |
105 | <x>316</x> | |
106 | <y>260</y> | |
107 | </hint> | |
108 | <hint type="destinationlabel"> | |
109 | <x>286</x> | |
110 | <y>274</y> | |
111 | </hint> | |
112 | </hints> | |
113 | </connection> | |
114 | </connections> | |
115 | </ui> |