merge Dev into Current

pansen

2018-12-19 753128ce82ff3ce8c9617768b88378f785a6088b

 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());