--- a/ui/EditProduct.ui Mon Oct 24 16:06:14 2022 +0200 +++ b/ui/EditProduct.ui Mon Oct 24 19:59:08 2022 +0200 @@ -1528,7 +1528,7 @@ <rect> <x>10</x> <y>160</y> - <width>311</width> + <width>321</width> <height>151</height> </rect> </property> @@ -1540,7 +1540,7 @@ <rect> <x>10</x> <y>80</y> - <width>141</width> + <width>171</width> <height>20</height> </rect> </property> @@ -1554,7 +1554,7 @@ <widget class="QDoubleSpinBox" name="mash_volumeEdit"> <property name="geometry"> <rect> - <x>160</x> + <x>190</x> <y>80</y> <width>87</width> <height>24</height> @@ -1588,7 +1588,7 @@ <widget class="QDoubleSpinBox" name="mash_maxEdit"> <property name="geometry"> <rect> - <x>160</x> + <x>190</x> <y>110</y> <width>87</width> <height>24</height> @@ -1624,7 +1624,7 @@ <rect> <x>10</x> <y>110</y> - <width>141</width> + <width>171</width> <height>20</height> </rect> </property> @@ -1638,7 +1638,7 @@ <widget class="QDoubleSpinBox" name="tun_volumeEdit"> <property name="geometry"> <rect> - <x>160</x> + <x>190</x> <y>20</y> <width>87</width> <height>24</height> @@ -1674,7 +1674,7 @@ <rect> <x>10</x> <y>20</y> - <width>141</width> + <width>171</width> <height>20</height> </rect> </property> @@ -1690,7 +1690,7 @@ <rect> <x>10</x> <y>50</y> - <width>141</width> + <width>171</width> <height>20</height> </rect> </property> @@ -1704,9 +1704,9 @@ <widget class="QLineEdit" name="tun_materialEdit"> <property name="geometry"> <rect> - <x>160</x> + <x>190</x> <y>50</y> - <width>141</width> + <width>121</width> <height>23</height> </rect> </property> @@ -1720,7 +1720,7 @@ <rect> <x>10</x> <y>320</y> - <width>311</width> + <width>321</width> <height>91</height> </rect> </property> @@ -1730,8 +1730,8 @@ <widget class="QDoubleSpinBox" name="lauter_deadspaceEdit"> <property name="geometry"> <rect> - <x>160</x> - <y>50</y> + <x>190</x> + <y>20</y> <width>87</width> <height>24</height> </rect> @@ -1765,8 +1765,8 @@ <property name="geometry"> <rect> <x>10</x> - <y>50</y> - <width>141</width> + <y>20</y> + <width>171</width> <height>20</height> </rect> </property> @@ -1777,139 +1777,10 @@ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> - <widget class="QLabel" name="lauter_volumeLabel"> - <property name="geometry"> - <rect> - <x>10</x> - <y>20</y> - <width>141</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Lauter volume:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QDoubleSpinBox" name="lauter_volumeEdit"> - <property name="geometry"> - <rect> - <x>160</x> - <y>20</y> - <width>87</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="accelerated"> - <bool>false</bool> - </property> - <property name="suffix"> - <string> L</string> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>100000.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.500000000000000</double> - </property> - </widget> - </widget> - <widget class="QGroupBox" name="chilleqBox"> - <property name="geometry"> - <rect> - <x>800</x> - <y>160</y> - <width>311</width> - <height>91</height> - </rect> - </property> - <property name="title"> - <string>Chilling</string> - </property> - <widget class="QLabel" name="trub_chillerlossLabel"> - <property name="geometry"> - <rect> - <x>10</x> - <y>20</y> - <width>141</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Trub chiller loss:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QDoubleSpinBox" name="trub_chillerlossEdit"> - <property name="geometry"> - <rect> - <x>160</x> - <y>20</y> - <width>87</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="accelerated"> - <bool>false</bool> - </property> - <property name="suffix"> - <string> L</string> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>100000.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.500000000000000</double> - </property> - </widget> - <widget class="QLabel" name="topup_waterLabel"> - <property name="geometry"> - <rect> - <x>10</x> - <y>50</y> - <width>141</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Top up water:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QDoubleSpinBox" name="topup_waterEdit"> - <property name="geometry"> - <rect> - <x>160</x> + <widget class="QDoubleSpinBox" name="eq_efficiencyEdit"> + <property name="geometry"> + <rect> + <x>190</x> <y>50</y> <width>87</width> <height>24</height> @@ -1928,7 +1799,7 @@ <bool>false</bool> </property> <property name="suffix"> - <string> L</string> + <string> %</string> </property> <property name="decimals"> <number>1</number> @@ -1940,14 +1811,289 @@ <double>0.500000000000000</double> </property> </widget> + <widget class="QLabel" name="eq_efficiencyLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>50</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Brewhouse efficiency:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + </widget> + <widget class="QGroupBox" name="chilleqBox"> + <property name="geometry"> + <rect> + <x>790</x> + <y>160</y> + <width>321</width> + <height>181</height> + </rect> + </property> + <property name="title"> + <string>Chilling</string> + </property> + <widget class="QDoubleSpinBox" name="chiller_lpmEdit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>140</y> + <width>86</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>Liters per minute to pump trough the chiller. +Used to calculate the time needed to transfer the wort.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>100.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.050000000000000</double> + </property> + <property name="stepType"> + <enum>QAbstractSpinBox::DefaultStepType</enum> + </property> + </widget> + <widget class="QLabel" name="chiller_lpmLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>140</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Transfer liters/minute:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="chiller_to79Edit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>50</y> + <width>86</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>Minutes elapsed to cool to 79 °C</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="decimals"> + <number>0</number> + </property> + <property name="maximum"> + <double>100000.000000000000000</double> + </property> + <property name="singleStep"> + <double>1.000000000000000</double> + </property> + <property name="stepType"> + <enum>QAbstractSpinBox::DefaultStepType</enum> + </property> + </widget> + <widget class="QDoubleSpinBox" name="chiller_lossEdit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>110</y> + <width>86</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>Volume lost in hoses, pump ...</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>100.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.050000000000000</double> + </property> + <property name="stepType"> + <enum>QAbstractSpinBox::DefaultStepType</enum> + </property> + </widget> + <widget class="QLabel" name="chiller_lossLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>110</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="font"> + <font> + <weight>50</weight> + <bold>false</bold> + <underline>false</underline> + <strikeout>false</strikeout> + <kerning>true</kerning> + </font> + </property> + <property name="text"> + <string>Transfer loss L:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QLabel" name="chiller_volumeLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>80</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Immersion chiller L:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QLabel" name="chiller_typeLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>20</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Wort chiller type:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QLabel" name="chiller_to79Label"> + <property name="geometry"> + <rect> + <x>10</x> + <y>50</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Minutes to cool to 79 °C:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="chiller_volumeEdit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>80</y> + <width>86</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>Temporary extra volume of the immersion chiller in the kettle. +Used to correct the after boil volume.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>100.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.050000000000000</double> + </property> + <property name="stepType"> + <enum>QAbstractSpinBox::DefaultStepType</enum> + </property> + </widget> + <widget class="QLineEdit" name="chiller_typeEdit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>20</y> + <width>121</width> + <height>23</height> + </rect> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> </widget> <widget class="QGroupBox" name="boilBox"> <property name="geometry"> <rect> - <x>410</x> + <x>400</x> <y>160</y> - <width>311</width> - <height>271</height> + <width>321</width> + <height>241</height> </rect> </property> <property name="title"> @@ -1958,7 +2104,7 @@ <rect> <x>10</x> <y>20</y> - <width>141</width> + <width>171</width> <height>20</height> </rect> </property> @@ -1972,7 +2118,7 @@ <widget class="QDoubleSpinBox" name="kettle_volumeEdit"> <property name="geometry"> <rect> - <x>160</x> + <x>190</x> <y>20</y> <width>87</width> <height>24</height> @@ -2007,8 +2153,8 @@ <property name="geometry"> <rect> <x>10</x> - <y>50</y> - <width>141</width> + <y>80</y> + <width>171</width> <height>20</height> </rect> </property> @@ -2022,8 +2168,8 @@ <widget class="QDoubleSpinBox" name="eqboil_sizeEdit"> <property name="geometry"> <rect> - <x>160</x> - <y>50</y> + <x>190</x> + <y>80</y> <width>87</width> <height>24</height> </rect> @@ -2057,8 +2203,8 @@ <property name="geometry"> <rect> <x>10</x> - <y>80</y> - <width>141</width> + <y>110</y> + <width>171</width> <height>20</height> </rect> </property> @@ -2072,8 +2218,8 @@ <widget class="QDoubleSpinBox" name="evap_rateEdit"> <property name="geometry"> <rect> - <x>160</x> - <y>80</y> + <x>190</x> + <y>110</y> <width>87</width> <height>24</height> </rect> @@ -2107,8 +2253,8 @@ <property name="geometry"> <rect> <x>10</x> - <y>110</y> - <width>141</width> + <y>140</y> + <width>171</width> <height>20</height> </rect> </property> @@ -2122,8 +2268,8 @@ <widget class="QDoubleSpinBox" name="eqboil_timeEdit"> <property name="geometry"> <rect> - <x>160</x> - <y>110</y> + <x>190</x> + <y>140</y> <width>87</width> <height>24</height> </rect> @@ -2157,8 +2303,8 @@ <property name="geometry"> <rect> <x>10</x> - <y>140</y> - <width>141</width> + <y>170</y> + <width>171</width> <height>20</height> </rect> </property> @@ -2172,8 +2318,8 @@ <widget class="QDoubleSpinBox" name="topup_kettleEdit"> <property name="geometry"> <rect> - <x>160</x> - <y>140</y> + <x>190</x> + <y>170</y> <width>87</width> <height>24</height> </rect> @@ -2203,62 +2349,12 @@ <double>0.500000000000000</double> </property> </widget> - <widget class="QLabel" name="hop_utilizationLabel"> - <property name="geometry"> - <rect> - <x>10</x> - <y>170</y> - <width>141</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Hop utilization:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QDoubleSpinBox" name="hop_utilizationEdit"> - <property name="geometry"> - <rect> - <x>160</x> - <y>170</y> - <width>87</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="accelerated"> - <bool>false</bool> - </property> - <property name="suffix"> - <string> %</string> - </property> - <property name="decimals"> - <number>0</number> - </property> - <property name="maximum"> - <double>100000.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.500000000000000</double> - </property> - </widget> <widget class="QLabel" name="eqbatch_sizeLabel"> <property name="geometry"> <rect> <x>10</x> <y>200</y> - <width>141</width> + <width>171</width> <height>20</height> </rect> </property> @@ -2272,7 +2368,7 @@ <widget class="QDoubleSpinBox" name="eqbatch_sizeEdit"> <property name="geometry"> <rect> - <x>160</x> + <x>190</x> <y>200</y> <width>87</width> <height>24</height> @@ -2303,27 +2399,27 @@ <double>0.500000000000000</double> </property> </widget> - <widget class="QLabel" name="eq_efficiencyLabel"> - <property name="geometry"> - <rect> - <x>10</x> - <y>230</y> - <width>141</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Efficiency:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QDoubleSpinBox" name="eq_efficiencyEdit"> - <property name="geometry"> - <rect> - <x>160</x> - <y>230</y> + <widget class="QLabel" name="kettle_lossLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>50</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Kettle trub loss:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="kettle_lossEdit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>50</y> <width>87</width> <height>24</height> </rect> @@ -2341,7 +2437,54 @@ <bool>false</bool> </property> <property name="suffix"> - <string> %</string> + <string> L</string> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>100000.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.500000000000000</double> + </property> + </widget> + </widget> + <widget class="QGroupBox" name="transferBox"> + <property name="geometry"> + <rect> + <x>790</x> + <y>350</y> + <width>321</width> + <height>91</height> + </rect> + </property> + <property name="title"> + <string>Transfer</string> + </property> + <widget class="QDoubleSpinBox" name="topup_waterEdit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>20</y> + <width>86</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="accelerated"> + <bool>false</bool> + </property> + <property name="suffix"> + <string> L</string> </property> <property name="decimals"> <number>1</number> @@ -2353,6 +2496,72 @@ <double>0.500000000000000</double> </property> </widget> + <widget class="QLabel" name="topup_waterLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>20</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Extra water in fermenter:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="vol_fermenterEdit"> + <property name="geometry"> + <rect> + <x>190</x> + <y>50</y> + <width>86</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>100000.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.010000000000000</double> + </property> + <property name="stepType"> + <enum>QAbstractSpinBox::DefaultStepType</enum> + </property> + </widget> + <widget class="QLabel" name="vol_fermenterLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>50</y> + <width>171</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Volume in fermenter L:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> </widget> </widget> <widget class="QWidget" name="fermentables"> @@ -11757,18 +11966,13 @@ <tabstop>tun_materialEdit</tabstop> <tabstop>mash_volumeEdit</tabstop> <tabstop>mash_maxEdit</tabstop> - <tabstop>lauter_volumeEdit</tabstop> <tabstop>lauter_deadspaceEdit</tabstop> <tabstop>kettle_volumeEdit</tabstop> <tabstop>eqboil_sizeEdit</tabstop> <tabstop>evap_rateEdit</tabstop> <tabstop>eqboil_timeEdit</tabstop> <tabstop>topup_kettleEdit</tabstop> - <tabstop>hop_utilizationEdit</tabstop> <tabstop>eqbatch_sizeEdit</tabstop> - <tabstop>eq_efficiencyEdit</tabstop> - <tabstop>trub_chillerlossEdit</tabstop> - <tabstop>topup_waterEdit</tabstop> <tabstop>est_color2Edit</tabstop> <tabstop>est_og2Edit</tabstop> <tabstop>mash_kgEdit</tabstop>