Revize 43dda840

frontend
- layout
- adding new random graph for every new message

aswi2021vochomurka/view/main_view.py

@@ +1 @@
+import math
+import random
+
 from PyQt5.QtCore import QSize, QThread, QObject, pyqtSignal
-from PyQt5.QtWidgets import QMainWindow, QPlainTextEdit
+from PyQt5.QtWidgets import QMainWindow, QPlainTextEdit, QDialog, QHBoxLayout
+from numpy import pi, sin, cos, tan, exp
+from matplotlib.pyplot import subplot
 
 from aswi2021vochomurka.model.Message import Message
 from aswi2021vochomurka.service.mqtt.mqtt_subscriber import MQTTSubscriber
 from aswi2021vochomurka.service.subscriber import Subscriber
 from aswi2021vochomurka.service.subscriber_callback import SubscriberCallback
 
+from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
+from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar
+import matplotlib.pyplot as plt
+
+import sys
+from PyQt5.QtWidgets import QDialog, QApplication, QPushButton, QVBoxLayout
+from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
+from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar
+import matplotlib.pyplot as plt
+import random
+
 
 class Worker(QObject, SubscriberCallback):
     connected = pyqtSignal()
@@ -29 +45 @@
 
     def onMessage(self, message: Message):
         self.newMessage.emit(message.topic)
+        self.window.plot()
 
 
-class MainView(QMainWindow):
+#class MainView(QMainWindow):
+class MainView(QDialog):
     worker: Worker = None
     workerThread: QThread = None
 
     def __init__(self):
-        QMainWindow.__init__(self)
+        #QMainWindow.__init__(self)
+        super(MainView, self).__init__()
+
+        self.chartsNum = 0
+        self.arrayData = []
+
+        self.figure = plt.figure(figsize=([500,500]))
+
+        self.canvas = FigureCanvas(self.figure)
+        self.toolbar = NavigationToolbar(self.canvas, self)
 
         self.setMinimumSize(QSize(440, 240))
         self.setWindowTitle("MQTT demo")
@@ -44 +71 @@
         # Add text field
         self.b = QPlainTextEdit(self)
         self.b.insertPlainText("App started...\n")
-        self.b.move(10, 10)
-        self.b.resize(400, 200)
+        # self.b.move(10, 50)
+        # self.b.resize(200, 100)
+
+        layout = QVBoxLayout()
+        layout.addWidget(self.b)
+        layout.addWidget(self.toolbar)
+        layout.addWidget(self.canvas)
+
+        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)
+
+        self.figure.clear()
+
+        data = [random.random() for i in range(10)]
+        self.arrayData.append(data)
+
+        for x in range(self.chartsNum):
+            self.figure.add_subplot(rows,2,x+1)
+            plt.plot(self.arrayData[x])
+
+        self.canvas.draw()
+
     def initSubscriber(self):
         self.workerThread = QThread()
         self.worker = Worker()
@@ -57 +110 @@
         self.worker.newMessage.connect(
             lambda message: self.b.insertPlainText(message + "\n")
         )
+        self.worker.window = self
         self.workerThread.start()