Merge remote-tracking branch 'origin/main'

UI/ProjectManages/ProjectModel.py

@@ -341,10 +341,19 @@ class ProjectButtonDelegate(QItemDelegate):
         sender = self.sender()
         model = self.parent().model
         name = str(model.datas[sender.index[0]][1])
+
+        if name == Globals.getValue('currentPro'):
+            QMessageBox.warning(None, '提示', '不能删除当前打开的工程')
+            return
+	
+
         ProjectManage.deleteProject(name = name)
         model.remove_row(sender.index[0])
         if name == Globals.getValue('currentPro'):
             Globals.setValue('currentPro', None)
+        
+        Globals.clearValue('forceVars')#清除颜色
+
 
 
 

UI/VarManages/VarTable.py

@@ -188,7 +188,7 @@ class TcRtdTableView(VarTableView):
     def setHeader(self):
         self.setItemDelegateForColumn(12, TcRtdButtonDelegate(self))
         self.setItemDelegateForColumn(11, TcRtdVarModelBox(self))
-        self.model = TcRtdModel(['    ID', '强制值', '当前值', '变量名', '通道序号', '变量描述', '变量类型', '工程量下限', '工程量上限', '单位', '补偿值', '值类型', '操作', ], [], table=self)
+        self.model = TcRtdModel(['    ID', '强制值', '当前值', '变量名', '通道序号', '变量描述', '变量类型', '工程量下限', '工程量上限', '单位', '补偿值', '值类型', '操作'], [], table=self)
 
 class AnalogTableView(VarTableView):
     def __init__(self, parent=None):

model/ProjectModel/VarManage.py

@@ -510,7 +510,7 @@ class AnalogManage(object):
             return
         l = []
         for var in vars:
-            l.append([var.id, var.initialValue, var.varName, var.channelNumber, var.description, var.varType, var.min, var.max, var.varModel, var.unit])
+            l.append([var.id, var.initialValue, var.varName, var.channelNumber, var.description, var.varType, var.min, var.max, var.unit, var.varModel])
         return l