diff --git a/README.md b/README.md index 8a636fd..c0d78d2 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # Train_Identify +支持单摄像头识别,支持集装箱号识别 \ No newline at end of file diff --git a/config/matrix.yaml b/config/matrix.yaml index eb26854..c0bd337 100644 --- a/config/matrix.yaml +++ b/config/matrix.yaml @@ -32,21 +32,11 @@ connects: MoveEngine_0_1: "SaveMoveInfoEngine_0_0 1024" SaveMoveImageEngine_0_0: "TrainStep1DataReadEngine_0_0 1024" TrainStep1DataReadEngine_0_0: "TrainStep1InferenceEngine_0_0 1024" -# TrainStep1DataReadEngine_0_1: "ContainerStep1InferenceEngine_0_0 1024" -# TrainStep1InferenceEngine_0_0: "Step1MergeEngine_0_0 1024" -# ContainerStep1InferenceEngine_0_0: "Step1MergeEngine_0_1 1024" -# Step1MergeEngine_0_0: "TrainStep1FilterEngine_0_0 1024" TrainStep1InferenceEngine_0_0: "TrainStep1FilterEngine_0_0 1024" TrainStep1FilterEngine_0_0: "TrainDivideEngine_0_0 1024" TrainDivideEngine_0_0: "TrainStep2DataReadEngine_0_0 1024" TrainStep2DataReadEngine_0_0: "TrainStep2InferenceEngine_0_0 1024" -# TrainStep2DataReadEngine_0_1: "ContainerStep2InferenceEngine_0_0 1024" TrainStep2InferenceEngine_0_0: "TrainCharacterConversionEngine_0_0 1024" -# ContainerStep2InferenceEngine_0_0: "ContainerCharacterConversionEngine_0_0 1024" -# TrainCharacterConversionEngine_0_0: "Step2MergeEngine_0_0 1024" -# ContainerCharacterConversionEngine_0_0: "Step2MergeEngine_0_1 1024" -# Step2MergeEngine_0_0: "SelectBestEngine_0_0 1024" -# Step2MergeEngine_0_1: "SaveDebugImageEngine_0_0 1024" TrainCharacterConversionEngine_0_0: "SelectBestEngine_0_0 1024" TrainCharacterConversionEngine_0_1: "SaveDebugImageEngine_0_0 1024" SelectBestEngine_0_0: "SaveResultCSVEngine_0_0 1024" diff --git a/engine/Step2DataReadEngine/TrainStep2DataReadEngine.cpp b/engine/Step2DataReadEngine/TrainStep2DataReadEngine.cpp index 22e14d2..a79d0ad 100644 --- a/engine/Step2DataReadEngine/TrainStep2DataReadEngine.cpp +++ b/engine/Step2DataReadEngine/TrainStep2DataReadEngine.cpp @@ -165,7 +165,7 @@ APP_ERROR TrainStep2DataReadEngine::Process() pVStep2InputData->vecSingleData = vecSingleData; pVStep2InputData->iFrameId = iFrameId; pVStep2InputData->cvImage = cv::imread(strImagePath); - pVStep2InputData->bIsEnd = jvFrameInfo.isMember("isEnd") ? jvFrameInfo["isEnd"].asBool() : true; + pVStep2InputData->bIsEnd = !jvFrameInfo.isMember("isEnd") || jvFrameInfo["isEnd"].asBool(); outputQueMap_[strPort0_]->push(std::static_pointer_cast(pVStep2InputData), true); // outputQueMap_[strPort1_]->push(std::static_pointer_cast(pVStep2InputData), true);