From d4ab88adf119b4dbb8a684b7465d6527ba60c111 Mon Sep 17 00:00:00 2001 From: zcwBit Date: Tue, 12 Sep 2023 19:37:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/ProjectModel/DeviceManage.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/model/ProjectModel/DeviceManage.py b/model/ProjectModel/DeviceManage.py index 6b677a7..fb5623e 100644 --- a/model/ProjectModel/DeviceManage.py +++ b/model/ProjectModel/DeviceManage.py @@ -85,8 +85,11 @@ class Device(): # self.recalculateAddress() - def getArea(self, index): - return self.areas[index] + def getAreaValues(self, index): + if self.masterOrSlave == "主站" + return self.outputAreas[index].currentValue + else: + return self.inputAreas[index].currentValue def getLength(self, nums, bytes): length = int(nums) * int(bytes)