修复存图

This commit is contained in:
2024-06-14 00:27:58 +08:00
parent db0a968e99
commit 260b532aea
18 changed files with 14 additions and 7 deletions
@@ -127,26 +127,34 @@ void handleAiEvaluate(std::shared_ptr <detData> data, handleAiModelManager* _han
for (auto box : connectorPos)
{
cv::Mat handleAiMat;
switch (data->productType)
bool processed = false;
switch (box.classes)
{
case 0://AFront
handleAiMat = pinHandleAiEvaluate(data, src(BboxToRect(box)),
_handleAiModelManager->largeSeg, _handleAiModelManager->largeCls);
aiImgResult.push_back(handleAiMat);//AI检测结果
break;
case 1://ABack
handleAiMat = pinHandleAiEvaluate(data, src(BboxToRect(box)),
_handleAiModelManager->largeSeg, _handleAiModelManager->largeCls);
aiImgResult.push_back(handleAiMat);//AI检测结果
break;
case 2://B
handleAiMat = pinHandleAiEvaluate(data, src(BboxToRect(box)),
_handleAiModelManager->midSeg, _handleAiModelManager->midCls);
aiImgResult.push_back(handleAiMat);//AI检测结果
break;
case 3://C
handleAiMat = pinHandleAiEvaluate(data, src(BboxToRect(box)),
_handleAiModelManager->smallSeg, _handleAiModelManager->smallCls);
aiImgResult.push_back(handleAiMat);//AI检测结果
break;
default:
data->segOriginImgs.push_back(src(BboxToRect(box)));//AI检测结果
aiImgResult.push_back(src(BboxToRect(box)));//AI检测结果
break;
}
aiImgResult.push_back(handleAiMat);//AI检测结果
}
}
cv::Mat pinHandleAiEvaluate(std::shared_ptr <detData> data, cv::Mat& src,
@@ -237,9 +245,7 @@ void ALGO_Inspection(std::shared_ptr <detData> data, handleAiModelManager* _hand
std::vector<handdleAI::Bbox> pinPos = getpinHandleAiEvaluateRect(data,src, detResult);
//HANDLEAI
std::vector<cv::Mat>aiImgResult;
#if enableHandleAiAlgo
handleAiEvaluate(data, _handleAiModelManager, pinPos, aiImgResult);
#endif
data->handleAiEndTime = std::chrono::high_resolution_clock::now();
//HALCON
std::vector<cv::Mat>halconImgResult;
@@ -101,6 +101,7 @@ cameraManager::~cameraManager()
}
void cameraManager::initialization(backEndManager* input)
{
return;
_backEndManager = input;
#pragma region 加载相机dll
for (auto val = 0; val < input->_jsonConfiguration->camera.cameraList.size(); val++)
@@ -100,6 +100,7 @@ public:
for (int i = 0; i < data->resultImgs.size(); i++)
resultFileNames.push_back(fileName + getCurrentDateTime() + "_Count" + std::to_string(i) + ".jpg");
//保存seg原图和cls原图
break;
case segImg:
for (int i = 0; i < data->segOriginImgs.size(); i++)
resultFileNames.push_back(fileName + "SEG_Count_" + getCurrentDateTime() + "_" + std::to_string(i) + ".bmp");
@@ -133,7 +134,7 @@ public:
saveThread.addData(fileSavePath + resFileNames[index], data->resultImgs[index]);
//seg
std::vector<std::string>segFileNames = genFileNmaes(data, clsImg);
std::vector<std::string>segFileNames = genFileNmaes(data, segImg);
for (int index = 0; index < segFileNames.size(); index++)
saveThread.addData(segAndClsPath + segFileNames[index], data->segOriginImgs[index]);
+1 -2
View File
@@ -20,8 +20,7 @@
#define enableHandleAiModel 1
#define disableBackEndCheck 1
#define disableeAlgo 0
#define enableHalconAlgo 1
#define enableHandleAiAlgo 0
#define enableHalconAlgo 0
//窗口设置
#define windowMoveFreshRate 100//窗口移动每秒的刷新率
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.