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/AppPipeController.cpp |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index c8e3733..e323265 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
@@ -80,7 +80,9 @@
     leftJudgment(ruleMap[KeepRightSdk]),
     rightJudgment(ruleMap[KeepRightSdk]),
     bRecordVideoEnable(RecordVideoEnable),
-    m_sdkRuleMap(ruleMap) {
+    m_sdkRuleMap(ruleMap),
+    m_bSetWH(false)
+{
     DBG("camId" << camId);
     init();
     initPerimeter();
@@ -192,12 +194,17 @@
     //  int max=appPref.getIntData("n_cut_max_duration");
     // recordInit(40,100);
     videoCaptureElement.registerConnector([&] {
-//        mutex.lock();
 
 
-//        std::string tmp="camId="+m_camId+"videoCaptureElement";
-//        ClockTimer cl(tmp);
         cv::Mat imageTemp = videoCaptureElement.getImage();
+
+        if(!m_bSetWH)
+        {
+            appPref.setIntData(m_camId+"width",imageTemp.cols);
+            appPref.setIntData(m_camId+"height",imageTemp.rows);
+            m_bSetWH=true;
+        }
+
         std::string  strNewTime = AppUtil::getTimeUSecString();;
 
         //DBG("m_camId="<<m_camId<<"  strNewTime="<<strNewTime);
@@ -233,7 +240,7 @@
             strNewTime = newDt.toString("yyyy-MM-dd hh:mm:ss").toStdString();
 
         }
-//  mutex.unlock();
+
 //        DBG(strNewTime);
 //        std::string tmp1="camId="+m_camId+"strNewTime"+strNewTime;
 //        ClockTimer cl1(tmp1);
@@ -254,10 +261,10 @@
             yoloRpcElement.submit();
         }
 
-        if (!imageDrawElement.isBusy()) {
-            imageDrawElement.setImage(imageTemp);
-            imageDrawElement.submit();
-        }
+//        if (!imageDrawElement.isBusy()) {
+//            imageDrawElement.setImage(imageTemp);
+//            imageDrawElement.submit();
+//        }
 
 //        if (bRecordVideoEnable) {
 //            registerElement(triggerElement);
@@ -266,7 +273,7 @@
 
 
     yoloRpcElement.registerConnector([&] {
-        imageDrawElement.setYoloObjects(personElement.getLastScoreRects());
+//        imageDrawElement.setYoloObjects(personElement.getLastScoreRects());
         if (!personElement.isBusy()) {
 
             personElement.setObjsResults(yoloRpcElement.getLastScoreRects());
@@ -275,7 +282,7 @@
     });
 
     faceRpcElement.registerConnector([&] {
-        imageDrawElement.setFaces(faceRpcElement.getLastScoreRects());
+//        imageDrawElement.setFaces(faceRpcElement.getLastScoreRects());
     });
 
     yoloRpcElement.registerConnector("YoloTrigger", [&] {
@@ -294,7 +301,7 @@
 
     imageDrawElement.registerConnector([&] {
         if (appPref.getIntData("show.image") == 1) {
-            ImageShowElement::showImage(to_string(this->m_index), *imageDrawElement.getImage());
+           ImageShowElement::showImage(to_string(this->m_index), *imageDrawElement.getImage());
         }
     });
 
@@ -307,7 +314,7 @@
         registerElement(faceRpcElement);
         registerElement(faceExtractElement);
     }
-    registerElement(imageDrawElement);
+//    registerElement(imageDrawElement);
    // registerElement(newRecordVideoElement);
     videoCaptureElement.setOutPutInterval(3);
     faceExtractElement.setProperty("index", to_string(m_index));

--
Gitblit v1.8.0