0905B

UI/MainWindow.py

@@ -35,6 +35,7 @@ class MainWindow(QMainWindow):
         self.areaLabel = [] #存储通道信息文本
         self.arealist = {}
         self.widgetList= []
+        self.arealists = []
         self.initUI()
         self.initAreaWidget()
 
@@ -142,13 +143,14 @@ class MainWindow(QMainWindow):
                     channelNums = area["nums"]
                     channelBytes = area["bytes"]
                     areaID = area['id']
-
+                    print(masterSlaveModel)
                     if masterSlaveModel == '主站':
                         self.addChannelWidget(deviceName, number, channelNums, channelBytes, varType, layout, areaID)
                     else:
                         self.addChannelWidget(deviceName, number, channelNums, channelBytes, varType, layout, areaID)
                     number = number + int(channelNums)
-
+        self.nowValue.append(self.arealist)
+        print(self.nowValue, 'aaaaaa')
 
 
     def createDeciveWidget(self):
@@ -179,8 +181,11 @@ class MainWindow(QMainWindow):
             return
         layout = sub_window.widget().widget().layout().itemAt(1).widget().layout() #获取sub_window的widgetArea的areaLayout2
         self.addChannelWidget(deviceName, number, channelNums, channelBytes, varType, layout, areaId)
+
         number += int(channelNums)
 
+        # self.nowValue.append(self.arealist)
+
 
 
 
@@ -194,7 +199,7 @@ class MainWindow(QMainWindow):
         layout = layouts
         ID = ID
         widgetList = []
-        arealists = []
+
 
         for i in range(int(channelNum)):
             if (i + number) % 2 == 0:
@@ -229,14 +234,15 @@ class MainWindow(QMainWindow):
 
                 editbtn.clicked.connect(lambda checked, btn=editbtn: self.forceEdit(btn))
                 widgetList.append([layout, ID, editbtn, areaLabel, areaLabel2, areaLineEdit])
-        arealists.append(widgetList)
-        self.arealist[deviceName] = arealists
+
+        self.arealists.append(widgetList)
+        self.arealist[deviceName] = self.arealists
 
 
                 # self.nowValue.append([deviceName, layout, ID, editbtn, areaLabel, areaLabel2, areaLineEdit, (i + number) // 2, (i + number) % 2 + 4])
 
-        self.nowValue.append(self.arealist)
-        print(self.nowValue,'aaaaaa')
+
+
 
 
     def forceEdit(self, btn):
@@ -267,14 +273,17 @@ class MainWindow(QMainWindow):
         subwindow = sub_window
         areaLayout = subwindow.widget().widget().layout().itemAt(1).widget().layout()
         deviceName = subwindow.windowTitle()
+        print(self.nowValue,'old')
         for areaId in rowAndColumn:
             for devicelist in self.nowValue:
                 areas = devicelist[deviceName]
-                print(areas,'sssss')
                 area = areas[areaId - 1]
-                index = areas.index(area)
-                print(index,'index')
-                print(area,'ssss')
+                for are in area:
+                    for widget in range(2, 6):
+                        areaLayout.removeWidget(are[widget])
+                        are[widget].deleteLater()
+                areas.remove(area)
+        print(self.nowValue, 'now')
 
                     # for area in areas:
                     #     for widget in range(2, 6):