From 1c622cd0d7d95709ab224224af18a22630aede75 Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期一, 28 一月 2019 20:02:04 +0800
Subject: [PATCH] 画框根据概率缩放坐标
---
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index c081c6b..bdb066f 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -22,6 +22,7 @@
m_triggerElement(rule.nTriggerDelay*8,0),
pManagerEsDB(nullptr),
m_bIsMask(true),
+ m_bSetWH(false),
pointArray(nullptr)
{
@@ -42,7 +43,7 @@
void PerimeterElement::threadInitial() {
- setMask(m_sdkRule.strAreas.toStdString());
+// setMask(m_sdkRule.strAreas.toStdString());
}
@@ -56,7 +57,7 @@
bool state = false;
m_recVec.clear();
- // DBG("Objs="<<mObjs.size()<<" fSensitivity="<<m_sdkRule.fSensitivity<<" nThreshold"<<m_sdkRule.nThreshold);
+// DBG("Objs="<<mObjs.size()<<" fSensitivity="<<m_sdkRule.fSensitivity<<" nThreshold"<<m_sdkRule.nThreshold);
for (auto obj:mObjs) {
@@ -111,6 +112,7 @@
}
+
switch (m_sdkRule.nSdkType) {
case PerimeterSdk:
//state = num > 0 ;
@@ -163,9 +165,6 @@
if (m_triggerElement.getTriggerState() )
{
if(num > 0) {
-
-
-
if(pointArray!=nullptr)
{
const cv::Point2i* ppt[1] = { pointArray };
@@ -257,22 +256,16 @@
}
int size = arrayAreas.size();
npts = size;
-// pointArray=new cv::Point2i*[1];
-// pointArray[0]=new cv::Point2i[size];
-
- pointArray=new cv::Point2i[npts];
-
-
+ float sizeW=(float)appPref.getIntData(m_sdkRule.strCamId.toStdString()+"width")/480;
+ float sizeH=(float)appPref.getIntData(m_sdkRule.strCamId.toStdString()+"height")/270;
+ pointArray=new cv::Point2i[npts];
for (int i = 0; i < size; ++i) {
QJsonValue jsonValue = arrayAreas[i];
QJsonObject obj = jsonValue.toObject();
- int x = obj.value("x").toDouble() * 4;
- int y = obj.value("y").toDouble() * 4;
-
+ int x = obj.value("x").toDouble() *sizeW;
+ int y = obj.value("y").toDouble() *sizeH;
pointArray[i]={x,y};
-
-
if(m_sdkRule.nSdkType == PerimeterSdk)
{
poly1.push_back(Point(x,y));
@@ -281,7 +274,8 @@
{
mPolygon << (QPoint(x, y));
}
-
+ DBG("width="<<sizeW);
+ DBG("height="<<sizeH);
}
@@ -302,6 +296,12 @@
// image = cv::Mat(value.rows, value.cols, CV_8UC3, sharedMemory->data());
// }
value.copyTo(image);
+ if(!m_bSetWH)
+ {
+ setMask(m_sdkRule.strAreas.toStdString());
+ m_bSetWH=true;
+ }
+
}
bool PerimeterElement::getTriggerState() const {
--
Gitblit v1.8.0