diff --git a/brewpi.py b/brewpi.py index 0f9086a..f1b2a9d 100644 --- a/brewpi.py +++ b/brewpi.py @@ -210,7 +210,7 @@ if __name__ == '__main__': "theta" : 20, "C" : 4190, "M" : 20, - "L" : 0.02, + "L" : 0.05, "Td" : 12, "kn" : 0.2 } diff --git a/brewpi.ui b/brewpi.ui index 1b8f9fe..3c7701a 100644 --- a/brewpi.ui +++ b/brewpi.ui @@ -519,9 +519,9 @@ - 370 + 380 70 - 111 + 131 401 @@ -531,9 +531,9 @@ - 10 + 22 40 - 63 + 81 311 @@ -556,7 +556,7 @@ - 20 + 30 370 81 23 @@ -567,7 +567,7 @@ - + 700 @@ -1980,7 +1980,7 @@ - 500 + 540 70 111 401 diff --git a/brewpi_gui.py b/brewpi_gui.py index f65aca2..a1f875c 100644 --- a/brewpi_gui.py +++ b/brewpi_gui.py @@ -73,6 +73,9 @@ class Window(QtWidgets.QMainWindow, Ui_MainWindow): print("on_tempctrl_changed {}".format(msg)) if "Soll" in msg: 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): print("on_heater_changed {}".format(msg)) diff --git a/brewpi_win.py b/brewpi_win.py index 6f4707c..d11b8cf 100644 --- a/brewpi_win.py +++ b/brewpi_win.py @@ -192,10 +192,10 @@ class Ui_MainWindow(object): self.tab_2.setObjectName("tab_2") self.horizontalTabWidget.addTab(self.tab_2, "") 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.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.setUpperBound(100.0) 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.setObjectName("Slider_pwr_soll") 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.widget = QtWidgets.QWidget(self.centralwidget) - self.widget.setGeometry(QtCore.QRect(700, 70, 328, 422)) - self.widget.setObjectName("widget") - self.verticalLayout = QtWidgets.QVBoxLayout(self.widget) + self.layoutWidget = QtWidgets.QWidget(self.centralwidget) + self.layoutWidget.setGeometry(QtCore.QRect(700, 70, 328, 422)) + self.layoutWidget.setObjectName("layoutWidget") + self.verticalLayout = QtWidgets.QVBoxLayout(self.layoutWidget) self.verticalLayout.setContentsMargins(0, 0, 0, 0) 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)) palette = QtGui.QPalette() 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.setObjectName("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)) palette = QtGui.QPalette() brush = QtGui.QBrush(QtGui.QColor(0, 0, 0)) @@ -521,7 +521,7 @@ class Ui_MainWindow(object): self.lcdNumber.setProperty("value", 2037.0) self.lcdNumber.setObjectName("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)) palette = QtGui.QPalette() brush = QtGui.QBrush(QtGui.QColor(0, 0, 0)) @@ -676,7 +676,7 @@ class Ui_MainWindow(object): self.lcdNumber_2.setObjectName("lcdNumber_2") self.verticalLayout.addWidget(self.lcdNumber_2) 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.Slider_temp_soll = QwtSlider(self.groupBox_2) self.Slider_temp_soll.setGeometry(QtCore.QRect(10, 40, 63, 311))