From dad25d2735da7a04ccf111d1ae14da4d4bc4955b Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期六, 08 六月 2019 10:35:59 +0800
Subject: [PATCH] 轮询
---
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index 7276844..e7b70ef 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -130,7 +130,16 @@
break;
case PerHubSdk:
- state = num > m_sdkRule.nAlarmNumLowerLimit && num < m_sdkRule.nAlarmNumUpperLimit && num !=mRealNum;
+ DBG("nAlarmNumLowerLimit:" << m_sdkRule.nAlarmNumLowerLimit
+ << " nAlarmNumUpperLimit:" << m_sdkRule.nAlarmNumUpperLimit
+ << " mRealNum:" << mRealNum);
+ if(m_sdkRule.nAlarmNumUpperLimit == -1){
+ state = num >= m_sdkRule.nAlarmNumLowerLimit && num !=mRealNum;
+ }else if(m_sdkRule.nAlarmNumLowerLimit == -1){
+ state = num <= m_sdkRule.nAlarmNumUpperLimit && num !=mRealNum;
+ } else {
+ state = num >= m_sdkRule.nAlarmNumLowerLimit && num <= m_sdkRule.nAlarmNumUpperLimit && num != mRealNum;
+ }
// INFO("SDK Type: PerHubSdk");
// if(m_sdkRule.nAlarmNumLowerLimit>=0)
--
Gitblit v1.8.0