Merge branch 'ywv1.2' into ywv1.2_布控feature

pans

2019-01-28 53630c440d592792dcdd86f8d5b2c59da4f3c359

 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,14 +194,23 @@
    //  int max=appPref.getIntData("n_cut_max_duration");
    // recordInit(40,100);
    videoCaptureElement.registerConnector([&] {
        mutex.lock();


        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);
        cv::putText(imageTemp, strNewTime, cv::Point(408, 540), cv::HersheyFonts::FONT_HERSHEY_PLAIN, 5,
                    cv::Scalar(255, 255, 0), 2);

        if (m_camId.size() > 0) {


@@ -229,9 +240,10 @@
            strNewTime = newDt.toString("yyyy-MM-dd hh:mm:ss").toStdString();

        }
         mutex.unlock();
//        DBG(strNewTime);

//        DBG(strNewTime);
//        std::string tmp1="camId="+m_camId+"strNewTime"+strNewTime;
//        ClockTimer cl1(tmp1);
        if (!faceRpcElement.isBusy()) {
//            faceRpcElement.setProperty("uuid", uuid);
            //#todo
@@ -249,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);
@@ -261,7 +273,7 @@


    yoloRpcElement.registerConnector([&] {
        imageDrawElement.setYoloObjects(personElement.getLastScoreRects());
//        imageDrawElement.setYoloObjects(personElement.getLastScoreRects());
        if (!personElement.isBusy()) {

            personElement.setObjsResults(yoloRpcElement.getLastScoreRects());
@@ -270,7 +282,7 @@
    });

    faceRpcElement.registerConnector([&] {
        imageDrawElement.setFaces(faceRpcElement.getLastScoreRects());
//        imageDrawElement.setFaces(faceRpcElement.getLastScoreRects());
    });

    yoloRpcElement.registerConnector("YoloTrigger", [&] {
@@ -289,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());
        }
    });

@@ -302,7 +314,7 @@
        registerElement(faceRpcElement);
        registerElement(faceExtractElement);
    }
    registerElement(imageDrawElement);
//    registerElement(imageDrawElement);
   // registerElement(newRecordVideoElement);
    videoCaptureElement.setOutPutInterval(3);
    faceExtractElement.setProperty("index", to_string(m_index));