Revize e89316f6

Re: #8968 - second function delete feature implemented.

aswi2021vochomurka/view/main_view.py

@@ -170 +170 @@
             self.dataDict[message.topic] = [message.value]
 
             figure = plt.figure(figsize=[500, 500])
+
             canvas = FigureCanvas(figure)
             self.layout = QHBoxLayout()
 
             plt.plot(self.dataDict[message.topic])
+
             figure.suptitle(message.topic)
 
             self.canvasDict[message.topic] = canvas
@@ -187 +189 @@
             button.clicked.connect(lambda: self.getFile(message.topic))
             button.setFixedSize(QSize(40, 40))
 
+            button2 = QPushButton('Del')
+            button2.clicked.connect(lambda: self.deleteSecond(message.topic))
+            button2.setFixedSize(QSize(40, 40))
+
             self.layout.addWidget(canvas)
-            self.layout.addWidget(button)
-            self.layout.setAlignment(button, QtCore.Qt.AlignTop)
+
+            boxLayout = QVBoxLayout()
+            boxLayout.addWidget(button)
+            boxLayout.addWidget(button2)
+            boxLayout.setAlignment(button, QtCore.Qt.AlignTop)
+            boxLayout.setAlignment(button2, QtCore.Qt.AlignTop)
+            self.layout.addLayout(boxLayout)
             widget.setMinimumSize(QSize(500, 500))
 
             self.grid.addWidget(widget, int(self.chartsNum / 2), self.chartsNum % 2)
@@ -224 +235 @@
         except:
             logging.error("Error while loading and displaying data file")
 
+    def deleteSecond(self, topic: str):
+        if topic in self.dataDict2:
+            del self.dataDict2[topic]
+
+            figure = self.figureDict[topic]
+            figure.clear()
+
+            figure = plt.figure(figure.number)
+            figure.suptitle(topic)
+            plt.plot(self.dataDict[topic])
+
+            self.canvasDict[topic].draw()
+
     def deletePlot(self, topic: str):
         """
         Deletes plot
@@ -237 +261 @@
         del self.canvasDict[topic]
         del self.figureDict[topic]
         del self.dataDict[topic]
+        if topic in self.dataDict2:
+            del self.dataDict2[topic]
 
         self.reorganizePlots()
 
@@ -274 +300 @@
         """
         Reconnect
         """
+        for widget in self.widgetDict.values():
+            widget.setParent(None)
+
+        self.widgetDict.clear()
+        self.widgetList.clear()
+        self.canvasDict.clear()
+        self.figureDict.clear()
+        self.dataDict.clear()
+        self.dataDict2.clear()
+
         self.disconnect()
         self.worker.params = self.getConfigParams()
         self.workerThread.start()