From c92d4b0d5a4f57cfc1795f29971abd7f0f31570c Mon Sep 17 00:00:00 2001 From: "ZHANGXUXU\\95193" <951937200@qq.com> Date: Tue, 24 Jun 2025 17:30:48 +0800 Subject: [PATCH] =?UTF-8?q?0624=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UI/Main/Main.py | 13 +++++++++++++ UI/VarManages/VarWidget.py | 20 ++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/UI/Main/Main.py b/UI/Main/Main.py index 2a6e65d..f01a4e9 100644 --- a/UI/Main/Main.py +++ b/UI/Main/Main.py @@ -120,6 +120,16 @@ class MainWindow(QMainWindow): self.varManageTabWidget.addTab(self.hartsimulateWidget,'HART模拟') self.varManageTabWidget.addTab(self.profibusWidget,'PROFIBUS') + #添加导入变量按钮 + self.importVarButton = QPushButton(QIcon(':/static/import.png'), '导入变量') + self.importVarButton.setObjectName('importBtn') + self.importVarButton.setIconSize(QSize(22, 22)) + self.importVarButton.setFlat(True) + self.importVarButton.clicked.connect(self.loadVar) + self.varManageTabWidget.setCornerWidget(self.importVarButton) + + + self.rightWidget.addWidget(self.varManageTabWidget) self.rightWidget.addWidget(self.trendWidget) self.rightWidget.addWidget(self.userWidget) @@ -193,6 +203,9 @@ class MainWindow(QMainWindow): self.procedureManagerWidget.initUI() self.exButtonClicked(5) + def loadVar(self): + pass + def enum(self,**enums): return type('Enum', (), enums) diff --git a/UI/VarManages/VarWidget.py b/UI/VarManages/VarWidget.py index e159903..de8486d 100644 --- a/UI/VarManages/VarWidget.py +++ b/UI/VarManages/VarWidget.py @@ -43,15 +43,15 @@ class VarWidgets(QtWidgets.QWidget): self.clearBtn.setIconSize(QSize(22, 22)) self.clearBtn.clicked.connect(self.clearColour) - self.importBtn = QPushButton(QIcon(':/static/import.png'), '导入变量') - self.importBtn.setObjectName('importBtn') - self.importBtn.setIconSize(QSize(22, 22)) - self.importBtn.clicked.connect(self.importVar) + # self.importBtn = QPushButton(QIcon(':/static/import.png'), '导入变量') + # self.importBtn.setObjectName('importBtn') + # self.importBtn.setIconSize(QSize(22, 22)) + # self.importBtn.clicked.connect(self.importVar) - self.exportBtn = QPushButton(QIcon(':/static/export.png'), '导出变量') - self.exportBtn.setObjectName('exportBtn') - self.exportBtn.setIconSize(QSize(22, 22)) - self.exportBtn.clicked.connect(self.exportVar) + # self.exportBtn = QPushButton(QIcon(':/static/export.png'), '导出变量') + # self.exportBtn.setObjectName('exportBtn') + # self.exportBtn.setIconSize(QSize(22, 22)) + # self.exportBtn.clicked.connect(self.exportVar) self.messageBtn = QPushButton(QIcon(':/static/message.png'), '查看报文') self.messageBtn.setObjectName('messageBtn') @@ -86,8 +86,8 @@ class VarWidgets(QtWidgets.QWidget): self.gridLayout.addWidget(QSplitter(), 0, 4, 1, 20) self.gridLayout.addWidget(self.clearBtn, 0, 4, 1, 1) - self.gridLayout.addWidget(self.importBtn, 0, 24, 1, 1) - self.gridLayout.addWidget(self.exportBtn, 0, 25, 1, 1) + # self.gridLayout.addWidget(self.importBtn, 0, 24, 1, 1) + # self.gridLayout.addWidget(self.exportBtn, 0, 25, 1, 1) self.gridLayout.addWidget(self.varView, 1, 0, 10, 26) self.gridLayout.setSpacing(20) self.gridLayout.setContentsMargins(20, 30, 20, 20)