From 31d16b9380fb2194bc10dc60ba59cd38f1ce0b79 Mon Sep 17 00:00:00 2001 From: zhangxuxutm <951937200@qq.com> Date: Thu, 25 May 2023 19:24:12 +0800 Subject: [PATCH] =?UTF-8?q?0525d-=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UI/VarManages/ModbusModel.py | 11 +++++++---- UI/VarManages/VarTable.py | 1 + UI/VarManages/VarWidget.py | 7 ++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/UI/VarManages/ModbusModel.py b/UI/VarManages/ModbusModel.py index 4be62f5..9c28fcf 100644 --- a/UI/VarManages/ModbusModel.py +++ b/UI/VarManages/ModbusModel.py @@ -58,6 +58,8 @@ class VarTableModel(QAbstractTableModel): def initTable(self): self.datas = [] + + self.table.parent.initIcon() proType = Globals.getValue('currentProType') if proType in ['1', '2', '3', '0']: @@ -409,11 +411,12 @@ class VarButtonDelegate(QItemDelegate): model.remove_row(sender.index[0]) def trend_action(self): - sender = self.sender() model = self.parent().model - name = str(model.datas[sender.index[0]][3]) - trend = ActualTrend(varName = name) - trend.show() + if model.table.parent._isPopenOpen: + sender = self.sender() + name = str(model.datas[sender.index[0]][3]) + trend = ActualTrend(varName = name) + trend.show() class ModbusTypeBox(VarButtonDelegate): def __init__(self, parent=None): diff --git a/UI/VarManages/VarTable.py b/UI/VarManages/VarTable.py index e84455f..47028c6 100644 --- a/UI/VarManages/VarTable.py +++ b/UI/VarManages/VarTable.py @@ -76,6 +76,7 @@ class CheckBoxHeader(QHeaderView): class VarTableView(QTableView): def __init__(self, parent=None): super(VarTableView, self).__init__(parent) + self.parent = parent self.setHeader() self.setupUi() diff --git a/UI/VarManages/VarWidget.py b/UI/VarManages/VarWidget.py index e818535..c47b4a6 100644 --- a/UI/VarManages/VarWidget.py +++ b/UI/VarManages/VarWidget.py @@ -64,7 +64,7 @@ class VarWidgets(QtWidgets.QWidget): self.startProtocolBtn.setIconSize(QSize(22, 22)) self.startProtocolBtn.clicked.connect(self.startProtocol) - self.varView = VarTableView() + self.varView = VarTableView(self) self.varView.setObjectName('varView') self.proxy = QtCore.QSortFilterProxyModel(self) self.proxy.setSourceModel(self.varView.model) @@ -293,6 +293,11 @@ class VarWidgets(QtWidgets.QWidget): self.startProtocolBtn.setText('开始通讯') self.startProtocolBtn.setIcon(QIcon('static/startProtocol.png')) + def initIcon(self): + self._isPopenOpen = False + self.startProtocolBtn.setText('开始通讯') + self.startProtocolBtn.setIcon(QIcon('static/startProtocol.png')) + class HartWidgets(VarWidgets): def __init__(self, parent=None):