Revize b0714d86

Re: #8854 - Graphs update

aswi2021vochomurka/view/main_view.py

@@ -53 +53 @@
 
     def onMessage(self, message: Message):
         self.newMessage.emit(message.topic)
-        self.window.plot()
+        self.window.plot(message)
 
     def onCloseTopic(self, topic: str):
         pass
 
 
-#class MainView(QMainWindow):
 class MainView(QDialog):
     worker: Worker = None
     workerThread: QThread = None
 
     def __init__(self):
-        #QMainWindow.__init__(self)
         super(MainView, self).__init__()
 
         self.chartsNum = 0
         self.arrayData = []
 
+        self.dataIndex = 0
+        self.dataDict = {}
+
         self.figure = plt.figure(figsize=([500,500]))
 
         self.canvas = FigureCanvas(self.figure)
@@ -79 +80 @@
         self.setMinimumSize(QSize(440, 240))
         self.setWindowTitle("MQTT demo")
 
-        # Add text field
         self.b = QPlainTextEdit(self)
         self.b.insertPlainText("App started...\n")
-        # self.b.move(10, 50)
-        # self.b.resize(200, 100)
 
         layout = QVBoxLayout()
         layout.addWidget(self.b)
@@ -92 +90 @@
 
         self.setLayout(layout)
 
-        # self.plot()
-
         self.initSubscriber()
 
-    # action called by thte push button
-    def plot(self):
-
-        self.chartsNum += 1
-        rows = math.ceil(self.chartsNum / 2)
-
+    def plot(self, message: Message):
         self.figure.clear()
 
-        data = [random.random() for i in range(10)]
-        self.arrayData.append(data)
+        if message.topic in self.dataDict:
+            self.dataDict[message.topic].append(message.value)
+        else:
+            self.dataDict[message.topic] = [message.value]
+            self.chartsNum += 1
+
+        rows = math.ceil(self.chartsNum / 2)
 
-        for x in range(self.chartsNum):
-            self.figure.add_subplot(rows,2,x+1)
-            plt.plot(self.arrayData[x])
+        b = 0
+        for a in self.dataDict.values():
+            self.figure.add_subplot(rows, 2, b + 1)
+            b += 1
+            plt.plot(a)
 
         self.canvas.draw()