diff --git a/AIEngineModule/include_base/AI_Factory.h b/AIEngineModule/include_base/AI_Factory.h index de005b8..9ac9243 100644 --- a/AIEngineModule/include_base/AI_Factory.h +++ b/AIEngineModule/include_base/AI_Factory.h @@ -174,7 +174,8 @@ public: std::shared_ptr AI_defect_zf; // L127 L255 - std::shared_ptr AI_defect_bq; // L127 L255 + std::shared_ptr AI_defect_bq; + std::shared_ptr AI_defect_Tag; std::shared_ptr AI_defect_127Cell; // L127 L255 diff --git a/AIEngineModule/src/AI_Factory.cpp b/AIEngineModule/src/AI_Factory.cpp index dfdbbe5..3d79bcb 100644 --- a/AIEngineModule/src/AI_Factory.cpp +++ b/AIEngineModule/src/AI_Factory.cpp @@ -143,7 +143,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) boe_config.inputType = AIModel_Base::Input_CHW; AI_defect_zf->Init(boe_config); } - // 标签 检测 + // 标签 定位 if (!AI_defect_bq) { AI_defect_bq = AIModel_Base::GetInstance(); @@ -154,6 +154,17 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) boe_config.inputType = AIModel_Base::Input_CHW; AI_defect_bq->Init(boe_config); } + // 标签 检测 + if (!AI_defect_Tag) + { + AI_defect_Tag = AIModel_Base::GetInstance(); + AIModel_Base::AIModelRun_Config boe_config; + boe_config.gpuconfig.copy(gupconfig); + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/defect_L127.engine"; + boe_config.strName = "tag"; + boe_config.inputType = AIModel_Base::Input_CHW; + AI_defect_Tag->Init(boe_config); + } // 字符 127cell if (!AI_defect_127Cell) { diff --git a/AlgorithmModule/src/ImgCheckAnalysisy.cpp b/AlgorithmModule/src/ImgCheckAnalysisy.cpp index 543cf1d..10a58b1 100644 --- a/AlgorithmModule/src/ImgCheckAnalysisy.cpp +++ b/AlgorithmModule/src/ImgCheckAnalysisy.cpp @@ -2182,7 +2182,7 @@ int ImgCheckAnalysisy::AI_Detect_BQ() std::shared_ptr pDetAIResult = m_pImageAllResult->bq_DetAIResult; // 使用与主检测相同的AI模型(后续更改为BQ AI模型) - std::shared_ptr pAI_Model = AI_Factory->AI_defect_NF; + std::shared_ptr pAI_Model = AI_Factory->AI_defect_Tag; int AIInputImg_width = pAI_Model->input_0.width; int AIInputImg_height = pAI_Model->input_0.height;