From cdfb8eb2a956d25d688033be735f4741b2ab58bd Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 15 三月 2019 09:48:42 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index 778b8d4..a88ed9f 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -13,7 +13,7 @@
#include <uuid/uuid.h>
#include <jsoncpp/json/json.h>
-#define ALARM_PERCENT (10) //10%
+#define ALARM_PERCENT (25) //25%
PerimeterElement::PerimeterElement(const SdkRule &rule) :
m_sdkRule(rule),
PipeElement(true),
@@ -169,7 +169,7 @@
INFO("State:"<<state<<" Num:"<<num<<" mRealNum:"<<mRealNum<<" LowerLimit :"<<m_sdkRule.nAlarmNumLowerLimit<<" HightLimit: "<<m_sdkRule.nAlarmNumUpperLimit);
m_triggerElement.setState(state);
m_triggerElement.triggerOnce();
- if (m_triggerElement.getTriggerState() )
+ if (m_triggerElement.getTriggerState())
{
if(num > 0) {
if(pointArray!=nullptr)
@@ -178,7 +178,7 @@
int npt[]={npts};
- cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0));
+ cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0), 2);
}
for(auto rect:m_recVec)
@@ -196,6 +196,10 @@
}
DBG("num=" << num << " lastnum=" << mRealNum);
mRealNum = num;
+
+ //todo 閲嶇疆鎶ヨtrigger
+ m_triggerElement.setState(false);
+ m_triggerElement.triggerOnce();
}
// if (m_triggerElement.getTriggerState() && num!=mRealNum)
--
Gitblit v1.8.0