Revize 847100d1

Re: #8923 - add scroll, button to graph

aswi2021vochomurka/view/main_view.py

@@ -1 +1 @@
 import logging
-import math
 
+import matplotlib.pyplot as plt
+from PyQt5 import QtCore
 from PyQt5.QtCore import QSize, QThread, QObject, pyqtSignal
-from PyQt5.QtWidgets import QMainWindow, QPlainTextEdit, QDialog, QHBoxLayout, QGridLayout
+from PyQt5.QtWidgets import QDialog, QPushButton, QVBoxLayout
+from PyQt5.QtWidgets import QHBoxLayout, QGridLayout, QScrollArea, QWidget
+from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
 
 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 aswi2021vochomurka.service.subscriber_params import SubscriberParams, ConnectionParams
-
-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
-
 from aswi2021vochomurka.view.logger_view import LoggerView
 
 
@@ -47 +44 @@
 
     def onMessage(self, message: Message):
         self.newMessage.emit(message)
-        #self.window.plot(message)
+        # self.window.plot(message)
 
     def onCloseTopic(self, topic: str):
         pass
@@ -69 +66 @@
         self.canvasDict = {}
         self.figureDict = {}
 
-        #self.toolbar = NavigationToolbar(self.canvas, self)
+        # self.toolbar = NavigationToolbar(self.canvas, self)
 
-        #self.setMinimumSize(QSize(440, 240))
+        # self.setMinimumSize(QSize(440, 240))
         self.setMinimumSize(QSize(1200, 800))
         self.setWindowTitle("MQTT demo")
 
@@ -84 +81 @@
 
         layout = QVBoxLayout()
         layout.addWidget(logger.widget)
-        #layout.addWidget(self.toolbar)
+        # layout.addWidget(self.toolbar)
 
         self.setLayout(layout)
 
-        self.grid = QGridLayout()
-
-        layout.addLayout(self.grid)
+        scrollArea = QScrollArea(self)
+        scrollArea.setWidgetResizable(True)
+        scrollContent = QWidget()
+        self.grid = QGridLayout(scrollContent)
+        scrollArea.setWidget(scrollContent)
+        layout.addWidget(scrollArea)
 
         self.init_subscriber()
 
@@ -110 +110 @@
 
             figure = plt.figure(figsize=[500, 500])
             canvas = FigureCanvas(figure)
+            layout = QHBoxLayout()
 
             plt.plot(self.dataDict[message.topic])
 
             self.canvasDict[message.topic] = canvas
             self.figureDict[message.topic] = figure
 
-            self.grid.addWidget(canvas, int(self.chartsNum / 2), self.chartsNum % 2)
+            widget = QWidget()
+            widget.setLayout(layout)
+            button = QPushButton(':')
+            button.setFixedSize(QSize(40, 40))
+            layout.addWidget(canvas)
+            layout.addWidget(button)
+            layout.setAlignment(button, QtCore.Qt.AlignTop)
+            widget.setMinimumSize(QSize(500, 500))
+
+            self.grid.addWidget(widget, int(self.chartsNum / 2), self.chartsNum % 2)
 
             self.chartsNum += 1
 
@@ -130 +140 @@
         )
         self.worker.window = self
         self.workerThread.start()
-        #lambda message: self.b.insertPlainText(message + "\n")