修复stargazer算法

This commit is contained in:
2024-08-12 01:37:53 +08:00
parent eeed6a9f82
commit 9ef9f515ea
17 changed files with 15 additions and 3 deletions
@@ -327,7 +327,14 @@ void ALGO_Inspection(std::shared_ptr <detData> data, handleAiModelManager* _hand
case 5://STARGAZER
halconImgResult.push_back(stargazerHalconAlgo(data, src(BboxToRect(connector))));
data->handleAiEndTime = std::chrono::high_resolution_clock::now();
aiImgResult.push_back(stargazerHandleAiAlgo(data, _handleAiModelManager));
aiImgResult.push_back(stargazerHandleAiAlgo(data, src(BboxToRect(connector)), _handleAiModelManager));
data->halconEndTime = std::chrono::high_resolution_clock::now();
tempCompared = true;
break;
case 6://STARGAZER HUGE
halconImgResult.push_back(stargazerHalconAlgo(data, src(BboxToRect(connector))));
data->handleAiEndTime = std::chrono::high_resolution_clock::now();
aiImgResult.push_back(stargazerHandleAiAlgo(data, src(BboxToRect(connector)), _handleAiModelManager));
data->halconEndTime = std::chrono::high_resolution_clock::now();
tempCompared = true;
break;
@@ -90,10 +90,10 @@ static cv::Mat stargazerHalconAlgo(std::shared_ptr<detData>data, cv::Mat& src)
}
//输入det切出的连接器图片
static cv::Mat stargazerHandleAiAlgo(std::shared_ptr<detData>data, handleAiModelManager* _handleAiModelManager)
static cv::Mat stargazerHandleAiAlgo(std::shared_ptr<detData>data, cv::Mat& src, handleAiModelManager* _handleAiModelManager)
{
handleAiModelSeg* segPtr = _handleAiModelManager->getSegModel("APEX-Seg");
handleAiModelCls* clsPtr = _handleAiModelManager->getClsModel("APEX-Cls");
return cv::Mat();
return src;
}
#pragma once
@@ -710,6 +710,11 @@ static cv::Mat tiledImages(std::vector<cv::Mat>& imgs)
return cv::imread("./noimg.png",-1);
if (imgs.size() == 1)
return imgs[0];
for (auto& img : imgs)
{
if (img.channels() == 1)
cv::cvtColor(img, img, cv::COLOR_GRAY2BGR);
}
//总图像大小 平铺显示
int matWidth = 0, matHeight = 0;
for (auto& mat : imgs)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.