YOLO修改，行为算法优化，视频编辑接口修改

zhangjixing

2019-01-12 963090c963b367333cd4f1b173cb51ae227551a5

 QiaoJiaSystem/StructureApp/YoloRpcElement.cpp

@@ -54,7 +54,7 @@


std::vector<ScoredRect> YoloRpcElement::getLastScoreRects() const {
    return triggerScoredRects;
    return trackingTrigger->getLastScoreRects();
}

 cv::Mat YoloRpcElement::getImage() const
@@ -64,6 +64,7 @@

void YoloRpcElement::threadFunc()
{
 //   ClockTimer ct("YoloRpcElement::threadFunc");
        triggerScoredRects.clear();
    try {
            auto server = rpcClient.getServer();
@@ -103,19 +104,21 @@
            int h = (obj.rcObj.bottom - obj.rcObj.top) * image.rows;
            scoredRect.rect = cv::Rect(x, y, w, h);
            scoredRect.score = scoredRect.rect.area() > 0 ? obj.prob : 0;
            scoredRect.properties["time"] = getProperty("time");
            if (trackingTrigger->triggerOnce(scoredRect))
            {
                trackingTrigger->getLastRect().properties["id"] = to_string(scoredRect.id);
                trackingTrigger->getLastRect().properties["type"] = cocoData[obj.type];
                trackingTrigger->getLastRect().properties["time"] = getProperty("time");
              //  DBG("time)"<<getProperty("time"));
                triggerScoredRects.push_back(trackingTrigger->getLastRect());
            }
        }
        trackingTrigger->triggerLine();
        if(trackingTrigger->getLastScoreRects().size()>20)
        {
            DBG("");
        }
//        if(trackingTrigger->getLastScoreRects().size()>20)
//        {
//            DBG("");
//        }
        fireConnectors();
}