jens/brewpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed power slider

Browse Source
This commit is contained in:
jens
2020-12-01 20:26:34 +01:00
parent 463c2415d2
commit 5a8409eec5
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
brewpi.py
+1 -1
View File
@@ -210,7 +210,7 @@ if __name__ == '__main__':
"theta" : 20, "theta" : 20,
"C" : 4190, "C" : 4190,
"M" : 20, "M" : 20,
"L" : 0.02, "L" : 0.05,
"Td" : 12, "Td" : 12,
"kn" : 0.2 "kn" : 0.2
} }
brewpi.ui
+7 -7
View File
@@ -519,9 +519,9 @@
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>370</x> <x>380</x>
<y>70</y> <y>70</y>
<width>111</width> <width>131</width>
<height>401</height> <height>401</height>
</rect> </rect>
</property> </property>
@@ -531,9 +531,9 @@
<widget class="QwtSlider" name="Slider_pwr_soll"> <widget class="QwtSlider" name="Slider_pwr_soll">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>22</x>
<y>40</y> <y>40</y>
<width>63</width> <width>81</width>
<height>311</height> <height>311</height>
</rect> </rect>
</property> </property>
@@ -556,7 +556,7 @@
<widget class="QCheckBox" name="checkbox_heater_activate"> <widget class="QCheckBox" name="checkbox_heater_activate">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>30</x>
<y>370</y> <y>370</y>
<width>81</width> <width>81</width>
<height>23</height> <height>23</height>
@@ -567,7 +567,7 @@
</property> </property>
</widget> </widget>
</widget> </widget>
<widget class="QWidget" name=""> <widget class="QWidget" name="layoutWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>700</x> <x>700</x>
@@ -1980,7 +1980,7 @@
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>500</x> <x>540</x>
<y>70</y> <y>70</y>
<width>111</width> <width>111</width>
<height>401</height> <height>401</height>
brewpi_gui.py
+3
View File
@@ -73,6 +73,9 @@ class Window(QtWidgets.QMainWindow, Ui_MainWindow):
print("on_tempctrl_changed {}".format(msg)) print("on_tempctrl_changed {}".format(msg))
if "Soll" in msg: if "Soll" in msg:
self.lcdNumber.display(str(msg['Soll'])) self.lcdNumber.display(str(msg['Soll']))
if self.slider_temp_soll_initial_update:
self.Slider_temp_soll.setValue(msg['Soll'])
self.slider_temp_soll_initial_update = False
def on_heater_changed(self, msg): def on_heater_changed(self, msg):
print("on_heater_changed {}".format(msg)) print("on_heater_changed {}".format(msg))
brewpi_win.py
+11 -11
View File
@@ -192,10 +192,10 @@ class Ui_MainWindow(object):
self.tab_2.setObjectName("tab_2") self.tab_2.setObjectName("tab_2")
self.horizontalTabWidget.addTab(self.tab_2, "") self.horizontalTabWidget.addTab(self.tab_2, "")
self.groupBox = QtWidgets.QGroupBox(self.centralwidget) self.groupBox = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox.setGeometry(QtCore.QRect(370, 70, 111, 401)) self.groupBox.setGeometry(QtCore.QRect(380, 70, 131, 401))
self.groupBox.setObjectName("groupBox") self.groupBox.setObjectName("groupBox")
self.Slider_pwr_soll = QwtSlider(self.groupBox) self.Slider_pwr_soll = QwtSlider(self.groupBox)
self.Slider_pwr_soll.setGeometry(QtCore.QRect(10, 40, 63, 311)) self.Slider_pwr_soll.setGeometry(QtCore.QRect(22, 40, 81, 311))
self.Slider_pwr_soll.setLowerBound(0.0) self.Slider_pwr_soll.setLowerBound(0.0)
self.Slider_pwr_soll.setUpperBound(100.0) self.Slider_pwr_soll.setUpperBound(100.0)
self.Slider_pwr_soll.setScaleMaxMajor(7) self.Slider_pwr_soll.setScaleMaxMajor(7)
@@ -203,15 +203,15 @@ class Ui_MainWindow(object):
self.Slider_pwr_soll.setScaleStepSize(0.0) self.Slider_pwr_soll.setScaleStepSize(0.0)
self.Slider_pwr_soll.setObjectName("Slider_pwr_soll") self.Slider_pwr_soll.setObjectName("Slider_pwr_soll")
self.checkbox_heater_activate = QtWidgets.QCheckBox(self.groupBox) self.checkbox_heater_activate = QtWidgets.QCheckBox(self.groupBox)
self.checkbox_heater_activate.setGeometry(QtCore.QRect(20, 370, 81, 23)) self.checkbox_heater_activate.setGeometry(QtCore.QRect(30, 370, 81, 23))
self.checkbox_heater_activate.setObjectName("checkbox_heater_activate") self.checkbox_heater_activate.setObjectName("checkbox_heater_activate")
self.widget = QtWidgets.QWidget(self.centralwidget) self.layoutWidget = QtWidgets.QWidget(self.centralwidget)
self.widget.setGeometry(QtCore.QRect(700, 70, 328, 422)) self.layoutWidget.setGeometry(QtCore.QRect(700, 70, 328, 422))
self.widget.setObjectName("widget") self.layoutWidget.setObjectName("layoutWidget")
self.verticalLayout = QtWidgets.QVBoxLayout(self.widget) self.verticalLayout = QtWidgets.QVBoxLayout(self.layoutWidget)
self.verticalLayout.setContentsMargins(0, 0, 0, 0) self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.verticalLayout.setObjectName("verticalLayout") self.verticalLayout.setObjectName("verticalLayout")
self.lcdNumber_3 = QtWidgets.QLCDNumber(self.widget) self.lcdNumber_3 = QtWidgets.QLCDNumber(self.layoutWidget)
self.lcdNumber_3.setMinimumSize(QtCore.QSize(0, 120)) self.lcdNumber_3.setMinimumSize(QtCore.QSize(0, 120))
palette = QtGui.QPalette() palette = QtGui.QPalette()
brush = QtGui.QBrush(QtGui.QColor(0, 0, 0)) brush = QtGui.QBrush(QtGui.QColor(0, 0, 0))
@@ -367,7 +367,7 @@ class Ui_MainWindow(object):
self.lcdNumber_3.setProperty("value", 2037.0) self.lcdNumber_3.setProperty("value", 2037.0)
self.lcdNumber_3.setObjectName("lcdNumber_3") self.lcdNumber_3.setObjectName("lcdNumber_3")
self.verticalLayout.addWidget(self.lcdNumber_3) self.verticalLayout.addWidget(self.lcdNumber_3)
self.lcdNumber = QtWidgets.QLCDNumber(self.widget) self.lcdNumber = QtWidgets.QLCDNumber(self.layoutWidget)
self.lcdNumber.setMinimumSize(QtCore.QSize(0, 120)) self.lcdNumber.setMinimumSize(QtCore.QSize(0, 120))
palette = QtGui.QPalette() palette = QtGui.QPalette()
brush = QtGui.QBrush(QtGui.QColor(0, 0, 0)) brush = QtGui.QBrush(QtGui.QColor(0, 0, 0))
@@ -521,7 +521,7 @@ class Ui_MainWindow(object):
self.lcdNumber.setProperty("value", 2037.0) self.lcdNumber.setProperty("value", 2037.0)
self.lcdNumber.setObjectName("lcdNumber") self.lcdNumber.setObjectName("lcdNumber")
self.verticalLayout.addWidget(self.lcdNumber) self.verticalLayout.addWidget(self.lcdNumber)
self.lcdNumber_2 = QtWidgets.QLCDNumber(self.widget) self.lcdNumber_2 = QtWidgets.QLCDNumber(self.layoutWidget)
self.lcdNumber_2.setMinimumSize(QtCore.QSize(0, 120)) self.lcdNumber_2.setMinimumSize(QtCore.QSize(0, 120))
palette = QtGui.QPalette() palette = QtGui.QPalette()
brush = QtGui.QBrush(QtGui.QColor(0, 0, 0)) brush = QtGui.QBrush(QtGui.QColor(0, 0, 0))
@@ -676,7 +676,7 @@ class Ui_MainWindow(object):
self.lcdNumber_2.setObjectName("lcdNumber_2") self.lcdNumber_2.setObjectName("lcdNumber_2")
self.verticalLayout.addWidget(self.lcdNumber_2) self.verticalLayout.addWidget(self.lcdNumber_2)
self.groupBox_2 = QtWidgets.QGroupBox(self.centralwidget) self.groupBox_2 = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox_2.setGeometry(QtCore.QRect(500, 70, 111, 401)) self.groupBox_2.setGeometry(QtCore.QRect(540, 70, 111, 401))
self.groupBox_2.setObjectName("groupBox_2") self.groupBox_2.setObjectName("groupBox_2")
self.Slider_temp_soll = QwtSlider(self.groupBox_2) self.Slider_temp_soll = QwtSlider(self.groupBox_2)
self.Slider_temp_soll.setGeometry(QtCore.QRect(10, 40, 63, 311)) self.Slider_temp_soll.setGeometry(QtCore.QRect(10, 40, 63, 311))