--- a/ui/EditEquipment.ui Fri Oct 21 17:01:20 2022 +0200
+++ b/ui/EditEquipment.ui Mon Oct 24 15:25:50 2022 +0200
@@ -172,10 +172,10 @@
<widget class="QGroupBox" name="mashGroup">
<property name="geometry">
<rect>
- <x>70</x>
+ <x>10</x>
<y>110</y>
- <width>401</width>
- <height>251</height>
+ <width>321</width>
+ <height>241</height>
</rect>
</property>
<property name="title">
@@ -190,9 +190,9 @@
<widget class="QDoubleSpinBox" name="tun_volumeEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>30</y>
- <width>121</width>
+ <x>190</x>
+ <y>20</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -219,8 +219,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>30</y>
- <width>181</width>
+ <y>20</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -235,8 +235,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>60</y>
- <width>181</width>
+ <y>50</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -251,8 +251,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>90</y>
- <width>181</width>
+ <y>80</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -267,8 +267,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>120</y>
- <width>181</width>
+ <y>110</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -283,8 +283,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>150</y>
- <width>181</width>
+ <y>140</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -299,8 +299,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>180</y>
- <width>181</width>
+ <y>170</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -315,8 +315,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>210</y>
- <width>181</width>
+ <y>200</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -330,9 +330,9 @@
<widget class="QDoubleSpinBox" name="tun_heightEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>60</y>
- <width>121</width>
+ <x>190</x>
+ <y>50</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -358,9 +358,9 @@
<widget class="QDoubleSpinBox" name="tun_weightEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>90</y>
- <width>121</width>
+ <x>190</x>
+ <y>80</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -386,8 +386,8 @@
<widget class="QDoubleSpinBox" name="tun_specific_heatEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>150</y>
+ <x>190</x>
+ <y>140</y>
<width>71</width>
<height>24</height>
</rect>
@@ -423,9 +423,9 @@
<widget class="QDoubleSpinBox" name="mash_volumeEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>180</y>
- <width>121</width>
+ <x>190</x>
+ <y>170</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -451,9 +451,9 @@
<widget class="QDoubleSpinBox" name="mash_maxEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>210</y>
- <width>121</width>
+ <x>190</x>
+ <y>200</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -479,8 +479,8 @@
<widget class="QComboBox" name="tun_materialEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>120</y>
+ <x>190</x>
+ <y>110</y>
<width>121</width>
<height>23</height>
</rect>
@@ -490,10 +490,10 @@
<widget class="QGroupBox" name="lauterGroup">
<property name="geometry">
<rect>
- <x>70</x>
- <y>370</y>
- <width>401</width>
- <height>161</height>
+ <x>10</x>
+ <y>380</y>
+ <width>321</width>
+ <height>91</height>
</rect>
</property>
<property name="title">
@@ -502,44 +502,12 @@
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <widget class="QLabel" name="lauter_volumeLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>30</y>
- <width>181</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Lauter volume L:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- <widget class="QLabel" name="lauter_heightLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>60</y>
- <width>181</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Lauter height cm:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
<widget class="QLabel" name="lauter_deadspaceLabel">
<property name="geometry">
<rect>
<x>10</x>
- <y>90</y>
- <width>181</width>
+ <y>20</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -554,8 +522,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>120</y>
- <width>181</width>
+ <y>50</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -566,68 +534,12 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
- <widget class="QDoubleSpinBox" name="lauter_volumeEdit">
- <property name="geometry">
- <rect>
- <x>200</x>
- <y>30</y>
- <width>121</width>
- <height>24</height>
- </rect>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="accelerated">
- <bool>true</bool>
- </property>
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="maximum">
- <double>100000.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.500000000000000</double>
- </property>
- <property name="stepType">
- <enum>QAbstractSpinBox::DefaultStepType</enum>
- </property>
- </widget>
- <widget class="QDoubleSpinBox" name="lauter_heightEdit">
- <property name="geometry">
- <rect>
- <x>200</x>
- <y>60</y>
- <width>121</width>
- <height>24</height>
- </rect>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="accelerated">
- <bool>true</bool>
- </property>
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="maximum">
- <double>100000.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.500000000000000</double>
- </property>
- <property name="stepType">
- <enum>QAbstractSpinBox::DefaultStepType</enum>
- </property>
- </widget>
<widget class="QDoubleSpinBox" name="lauter_deadspaceEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>90</y>
- <width>121</width>
+ <x>190</x>
+ <y>20</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -653,9 +565,9 @@
<widget class="QDoubleSpinBox" name="efficiencyEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>120</y>
- <width>121</width>
+ <x>190</x>
+ <y>50</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -682,10 +594,10 @@
<widget class="QGroupBox" name="boilGroup">
<property name="geometry">
<rect>
- <x>530</x>
+ <x>340</x>
<y>110</y>
- <width>401</width>
- <height>281</height>
+ <width>321</width>
+ <height>271</height>
</rect>
</property>
<property name="title">
@@ -695,8 +607,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>30</y>
- <width>181</width>
+ <y>20</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -710,9 +622,9 @@
<widget class="QDoubleSpinBox" name="kettle_volumeEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>30</y>
- <width>121</width>
+ <x>190</x>
+ <y>20</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -739,13 +651,13 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>60</y>
- <width>181</width>
+ <y>50</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
<property name="text">
- <string>Kettle heigh cmt:</string>
+ <string>Kettle height cm:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -754,9 +666,9 @@
<widget class="QDoubleSpinBox" name="kettle_heightEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>60</y>
- <width>121</width>
+ <x>190</x>
+ <y>50</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -783,8 +695,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>90</y>
- <width>181</width>
+ <y>110</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -798,9 +710,9 @@
<widget class="QDoubleSpinBox" name="boil_sizeEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>90</y>
- <width>121</width>
+ <x>190</x>
+ <y>110</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -827,8 +739,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>120</y>
- <width>181</width>
+ <y>140</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -843,8 +755,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>150</y>
- <width>181</width>
+ <y>170</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -859,8 +771,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>180</y>
- <width>181</width>
+ <y>200</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -871,28 +783,12 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
- <widget class="QLabel" name="hopfactorLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>210</y>
- <width>181</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="QLabel" name="batch_sizeLabel">
<property name="geometry">
<rect>
<x>10</x>
- <y>240</y>
- <width>181</width>
+ <y>230</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -906,9 +802,9 @@
<widget class="QDoubleSpinBox" name="evap_rateEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>120</y>
- <width>121</width>
+ <x>190</x>
+ <y>140</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -934,9 +830,9 @@
<widget class="QDoubleSpinBox" name="boil_timeEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>150</y>
- <width>121</width>
+ <x>190</x>
+ <y>170</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -962,9 +858,9 @@
<widget class="QDoubleSpinBox" name="top_up_kettleEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>180</y>
- <width>121</width>
+ <x>190</x>
+ <y>200</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -987,43 +883,12 @@
<enum>QAbstractSpinBox::DefaultStepType</enum>
</property>
</widget>
- <widget class="QDoubleSpinBox" name="hopfactorEdit">
- <property name="geometry">
- <rect>
- <x>200</x>
- <y>210</y>
- <width>121</width>
- <height>24</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>100% for small breweries, higher for large breweries.</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="accelerated">
- <bool>true</bool>
- </property>
- <property name="decimals">
- <number>0</number>
- </property>
- <property name="maximum">
- <double>200.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>1.000000000000000</double>
- </property>
- <property name="stepType">
- <enum>QAbstractSpinBox::DefaultStepType</enum>
- </property>
- </widget>
<widget class="QDoubleSpinBox" name="batch_sizeEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>240</y>
- <width>107</width>
+ <x>190</x>
+ <y>230</y>
+ <width>86</width>
<height>24</height>
</rect>
</property>
@@ -1052,44 +917,28 @@
<enum>QAbstractSpinBox::DefaultStepType</enum>
</property>
</widget>
- </widget>
- <widget class="QGroupBox" name="chillGroup">
- <property name="geometry">
- <rect>
- <x>530</x>
- <y>400</y>
- <width>401</width>
- <height>131</height>
- </rect>
- </property>
- <property name="title">
- <string>Chilling</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <widget class="QLabel" name="chiller_lossLabel">
+ <widget class="QLabel" name="trub_lossLabel">
<property name="geometry">
<rect>
<x>10</x>
- <y>30</y>
- <width>181</width>
+ <y>80</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
<property name="text">
- <string>Trub chiller loss L:</string>
+ <string>Kettle trub loss L:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
- <widget class="QDoubleSpinBox" name="chiller_lossEdit">
+ <widget class="QDoubleSpinBox" name="trub_lossEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>30</y>
- <width>121</width>
+ <x>190</x>
+ <y>80</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -1112,12 +961,28 @@
<enum>QAbstractSpinBox::DefaultStepType</enum>
</property>
</widget>
+ </widget>
+ <widget class="QGroupBox" name="transferGroup">
+ <property name="geometry">
+ <rect>
+ <x>670</x>
+ <y>380</y>
+ <width>321</width>
+ <height>91</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>Transfer</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
<widget class="QLabel" name="top_up_waterLabel">
<property name="geometry">
<rect>
<x>10</x>
- <y>60</y>
- <width>181</width>
+ <y>20</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -1132,8 +997,8 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>90</y>
- <width>181</width>
+ <y>50</y>
+ <width>171</width>
<height>20</height>
</rect>
</property>
@@ -1147,9 +1012,9 @@
<widget class="QDoubleSpinBox" name="top_up_waterEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>60</y>
- <width>121</width>
+ <x>190</x>
+ <y>20</y>
+ <width>101</width>
<height>24</height>
</rect>
</property>
@@ -1175,9 +1040,9 @@
<widget class="QDoubleSpinBox" name="vol_fermenterEdit">
<property name="geometry">
<rect>
- <x>200</x>
- <y>90</y>
- <width>107</width>
+ <x>190</x>
+ <y>50</y>
+ <width>86</width>
<height>24</height>
</rect>
</property>
@@ -1224,6 +1089,244 @@
<normaloff>:/icons/silk/disk_multiple.png</normaloff>:/icons/silk/disk_multiple.png</iconset>
</property>
</widget>
+ <widget class="QGroupBox" name="chillerGroup">
+ <property name="geometry">
+ <rect>
+ <x>670</x>
+ <y>110</y>
+ <width>321</width>
+ <height>181</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>Chilling</string>
+ </property>
+ <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="QComboBox" name="chiller_typeEdit">
+ <property name="geometry">
+ <rect>
+ <x>190</x>
+ <y>20</y>
+ <width>121</width>
+ <height>23</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QDoubleSpinBox" name="chiller_to79Edit">
+ <property name="geometry">
+ <rect>
+ <x>190</x>
+ <y>50</y>
+ <width>101</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="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="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_lossEdit">
+ <property name="geometry">
+ <rect>
+ <x>190</x>
+ <y>110</y>
+ <width>101</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="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="QDoubleSpinBox" name="chiller_volumeEdit">
+ <property name="geometry">
+ <rect>
+ <x>190</x>
+ <y>80</y>
+ <width>101</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="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="QDoubleSpinBox" name="chiller_lpmEdit">
+ <property name="geometry">
+ <rect>
+ <x>190</x>
+ <y>140</y>
+ <width>101</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="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>
</widget>
</item>
</layout>