From ae87bf6bbddb781ff7316d032f8dc2302fb608ec Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 19 十二月 2018 19:44:42 +0800
Subject: [PATCH] Merge QiaojiaoSystem Code (svn version is r3345)

---
 QiaoJiaSystem/StructureApp/FaceRpcElement.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp b/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
index ccee428..6f2cdd1 100644
--- a/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
+++ b/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
@@ -32,7 +32,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()));

--
Gitblit v1.8.0