diff --git a/brewpi.ui b/brewpi.ui index 50109ef..2ad099e 100644 --- a/brewpi.ui +++ b/brewpi.ui @@ -3552,7 +3552,7 @@ 110 500 - 231 + 81 31 @@ -3566,6 +3566,35 @@ Qt::AlignCenter + + + + 270 + 500 + 161 + 31 + + + + ws://brewpi:8765 + + + + + + 200 + 500 + 67 + 31 + + + + Host + + + Qt::AlignCenter + + diff --git a/brewpi_gui.py b/brewpi_gui.py index ef754ea..05e16c7 100644 --- a/brewpi_gui.py +++ b/brewpi_gui.py @@ -45,7 +45,7 @@ class Window(QtWidgets.QMainWindow, Ui_MainWindow): self.slider_temp_soll_initial_update = True self.checkbox_heater_activate_initial_update = True self.heatrate_soll_initial_update = True - self.ws_client.connect(uri="ws://localhost:8765") + self.ws_client.connect(uri=self.plainTextUri.toPlainText()) def disconnect(self): self.ws_client.disconnect() @@ -75,8 +75,6 @@ class Window(QtWidgets.QMainWindow, Ui_MainWindow): def on_sensor_changed(self, msg): print("on_sensor_changed {}".format(msg)) - if "Temp" in msg: - self.lcdNumber_temp_ist.display(str(msg['Temp'])) def on_tempctrl_changed(self, msg): print("on_tempctrl_changed {}".format(msg)) diff --git a/brewpi_win.py b/brewpi_win.py index 7320513..9cfb29d 100644 --- a/brewpi_win.py +++ b/brewpi_win.py @@ -1190,10 +1190,17 @@ class Ui_MainWindow(object): self.label_7.setAlignment(QtCore.Qt.AlignCenter) self.label_7.setObjectName("label_7") self.label_state = QtWidgets.QLabel(self.centralwidget) - self.label_state.setGeometry(QtCore.QRect(110, 500, 231, 31)) + self.label_state.setGeometry(QtCore.QRect(110, 500, 81, 31)) self.label_state.setAutoFillBackground(True) self.label_state.setAlignment(QtCore.Qt.AlignCenter) self.label_state.setObjectName("label_state") + self.plainTextUri = QtWidgets.QPlainTextEdit(self.centralwidget) + self.plainTextUri.setGeometry(QtCore.QRect(270, 500, 161, 31)) + self.plainTextUri.setObjectName("plainTextUri") + self.label_8 = QtWidgets.QLabel(self.centralwidget) + self.label_8.setGeometry(QtCore.QRect(200, 500, 67, 31)) + self.label_8.setAlignment(QtCore.Qt.AlignCenter) + self.label_8.setObjectName("label_8") MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) self.menubar.setGeometry(QtCore.QRect(0, 0, 1091, 22)) @@ -1242,6 +1249,8 @@ class Ui_MainWindow(object): self.label_5.setText(_translate("MainWindow", "Leistung [W]")) self.label_7.setText(_translate("MainWindow", "State")) self.label_state.setText(_translate("MainWindow", "State")) + self.plainTextUri.setPlainText(_translate("MainWindow", "ws://brewpi:8765")) + self.label_8.setText(_translate("MainWindow", "Host")) self.menu_File.setTitle(_translate("MainWindow", "&File")) self.menu_Help.setTitle(_translate("MainWindow", "&Help")) self.toolBar.setWindowTitle(_translate("MainWindow", "toolBar"))