From e39323f694bf0ed8d4a581858e9a0ec79d6523fc Mon Sep 17 00:00:00 2001
From: jens <jens.ahrensfeld@gmx.de>
Date: Sun, 6 Dec 2020 16:27:02 +0100
Subject: [PATCH] - added State display

---
 brewpi.py     |  2 +-
 brewpi.ui     | 37 ++++++++++++++++++++++++++++++++++++-
 brewpi_gui.py |  4 +++-
 brewpi_win.py | 13 ++++++++++++-
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/brewpi.py b/brewpi.py
index ac14e34..6816d1c 100644
--- a/brewpi.py
+++ b/brewpi.py
@@ -127,7 +127,7 @@ class TcTask(ATask):
 
 	def on_state_changed(self, value):
 		print ("State change to {}".format(value))
-		asyncio.create_task(self.send({'State': value.value}))
+		asyncio.create_task(self.send({'State': str(value)}))
 
 	def on_temp_soll_changed(self, value):
 		print ("Temp soll change to {}".format(value))
diff --git a/brewpi.ui b/brewpi.ui
index 8c2e622..50109ef 100644
--- a/brewpi.ui
+++ b/brewpi.ui
@@ -489,7 +489,7 @@
       <x>10</x>
       <y>0</y>
       <width>341</width>
-      <height>481</height>
+      <height>471</height>
      </rect>
     </property>
     <property name="currentIndex">
@@ -3531,6 +3531,41 @@
      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
     </property>
    </widget>
+   <widget class="QLabel" name="label_7">
+    <property name="geometry">
+     <rect>
+      <x>30</x>
+      <y>500</y>
+      <width>67</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>State</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_state">
+    <property name="geometry">
+     <rect>
+      <x>110</x>
+      <y>500</y>
+      <width>231</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="autoFillBackground">
+     <bool>true</bool>
+    </property>
+    <property name="text">
+     <string>State</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menubar">
    <property name="geometry">
diff --git a/brewpi_gui.py b/brewpi_gui.py
index e665439..e6f23b7 100644
--- a/brewpi_gui.py
+++ b/brewpi_gui.py
@@ -80,7 +80,9 @@ class Window(QtWidgets.QMainWindow, Ui_MainWindow):
 	def on_tempctrl_changed(self, msg):
 		print("on_tempctrl_changed {}".format(msg))
 		for key in msg:
-			if "Soll" in key:
+			if 'State' in key:
+				self.label_state.setText(msg['State'])
+			elif "Soll" in key:
 				submsg = msg['Soll']
 				if 'Temp' in submsg:
 					self.lcdNumber_temp_soll.display(str(submsg['Temp']))
diff --git a/brewpi_win.py b/brewpi_win.py
index 3ec0fc9..7320513 100644
--- a/brewpi_win.py
+++ b/brewpi_win.py
@@ -175,7 +175,7 @@ class Ui_MainWindow(object):
         self.centralwidget.setObjectName("centralwidget")
         self.horizontalTabWidget = QtWidgets.QTabWidget(self.centralwidget)
         self.horizontalTabWidget.setEnabled(True)
-        self.horizontalTabWidget.setGeometry(QtCore.QRect(10, 0, 341, 481))
+        self.horizontalTabWidget.setGeometry(QtCore.QRect(10, 0, 341, 471))
         self.horizontalTabWidget.setObjectName("horizontalTabWidget")
         self.horizontalTabWidgetPage1 = QtWidgets.QWidget()
         self.horizontalTabWidgetPage1.setObjectName("horizontalTabWidgetPage1")
@@ -1185,6 +1185,15 @@ class Ui_MainWindow(object):
         self.label_5.setGeometry(QtCore.QRect(430, 360, 101, 20))
         self.label_5.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_5.setObjectName("label_5")
+        self.label_7 = QtWidgets.QLabel(self.centralwidget)
+        self.label_7.setGeometry(QtCore.QRect(30, 500, 67, 31))
+        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.setAutoFillBackground(True)
+        self.label_state.setAlignment(QtCore.Qt.AlignCenter)
+        self.label_state.setObjectName("label_state")
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtWidgets.QMenuBar(MainWindow)
         self.menubar.setGeometry(QtCore.QRect(0, 0, 1091, 22))
@@ -1231,6 +1240,8 @@ class Ui_MainWindow(object):
         self.label_3.setText(_translate("MainWindow", "Temperatur [°C]"))
         self.label_4.setText(_translate("MainWindow", "Heizrate [°C/min]"))
         self.label_5.setText(_translate("MainWindow", "Leistung [W]"))
+        self.label_7.setText(_translate("MainWindow", "State"))
+        self.label_state.setText(_translate("MainWindow", "State"))
         self.menu_File.setTitle(_translate("MainWindow", "&File"))
         self.menu_Help.setTitle(_translate("MainWindow", "&Help"))
         self.toolBar.setWindowTitle(_translate("MainWindow", "toolBar"))