From 753128ce82ff3ce8c9617768b88378f785a6088b Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 19 十二月 2018 21:19:14 +0800
Subject: [PATCH] merge Dev into Current
---
QiaoJiaSystem/StructureApp/FaceRpcElement.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp b/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
index 87f282f..d1ed983 100644
--- a/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
+++ b/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
@@ -33,7 +33,7 @@
FaceRpcElement::FaceRpcElement(string shareMemoryName) :
//#todo
rpcClient(appPref.getStringData("faceDete.proxy"), appPref.getStringData("faceDete.ip"),
- appPref.getIntData("faceDete.port"), "tcp"), m_triggerElement(0, 50),
+ appPref.getIntData("faceDete.port"), "tcp"), m_triggerElement(0, 0),
// rpcClient("faceServer","",10002,"tcp"),
sharedMemory(nullptr), trackingTrigger(nullptr) {
sharedMemory = new QSharedMemory(QString(shareMemoryName.c_str()));
@@ -67,6 +67,8 @@
trackingTrigger = new TrackingTrigger(t_score);
m_trackingRet = appPref.getIntData("FaceTrackingRet");
+//#todo get key
+// m_channel = g_channelCache.find()
}
FaceRpcElement::~FaceRpcElement() {
@@ -93,7 +95,6 @@
if (!server) ERR("server is null");
if (m_trackingRet) {
-// #todo xxxx.detectFace
faces = faceTrackingFunc(m_channel, image);
} else {
faces = server->faceDetect(image.cols, image.rows, sharedMemory->key().toStdString());
--
Gitblit v1.8.0