Compare commits

..

No commits in common. "24a6703ea6bf62618dab1eddd0d7dc012ab3a9d8" and "7f48282f7da16d05243ce7a629cda6e91e54b07d" have entirely different histories.

3 changed files with 5 additions and 4 deletions

View File

@ -38,7 +38,7 @@ connects:
ControlEngine_0_1: "ContainerStep1InferenceEngine_0_0 1024"
ControlEngine_0_2: "CornerInferenceEngine_0_0 1024"
ControlEngine_0_3: "SaveMoveInfoEngine_0_0 1024"
ControlEngine_0_4: "SaveMoveImageEngine_0_0 1024"
ControlEngine_0_4: "SaveMoveImageEngine_0_0 1024"
ContainerStep1InferenceEngine_0_0: "Step1MergeEngine_0_0 1024"
CornerInferenceEngine_0_0: "Step1MergeEngine_0_1 1024"
Step1MergeEngine_0_0: "ContainerStep2InferenceEngine_0_0 1024"

View File

@ -51,6 +51,8 @@ private:
std::vector<VSelectBestData> vecContainerFail_;
// 存储识别到的满足校验规则的箱号数据
std::vector<VSelectBestData> vecContainer_;
bool bLastIsEnd = true;
};
ENGINE_REGIST(ContainerDivideEngine)

View File

@ -50,7 +50,8 @@ void SelectBestEngine::sendWSServer(DetectResultData &detectResultData)
Json::Value jsonData;
for (int i = 0; i < detectResultData.vecImage.size(); ++i)
{
strImage += (detectResultData.strDetectDate + "/" + ai_matrix::StringUtil::getins()->replace_all_distinct(detectResultData.strDetectTime, ":", "-") + "/" + detectResultData.vecImage[i]);
jsonData["bestImgSid" + std::to_string(i)] = detectResultData.vecImage[i];
strImage += detectResultData.vecImage[i];
if (i < detectResultData.vecImage.size() - 1)
{
strImage += ",";
@ -67,8 +68,6 @@ void SelectBestEngine::sendWSServer(DetectResultData &detectResultData)
strContainerNo += ",";
}
}
jsonData["detectDate"] = detectResultData.strDetectDate;
jsonData["detectTime"] = detectResultData.strDetectTime;
jsonData["containerNo"] = strContainerNo;
jsonData["images"] = strImage;
jsonData["status"] = "normal";