xiaohuimin/DHDHSoftware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改保存相机原图和保存结果图命名一致

Browse Source
This commit is contained in:
xhm\HP
2025-04-11 11:09:55 +08:00
parent f9d472295b
commit 428896dbf8
6 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DHSoftware/MainWindow.cs
View File

@ -610,7 +610,7 @@ namespace DHSoftware
cam.IsEnabled = cameraBase.IsEnabled;
HKCameras.Add(cam);
// cam.CameraConnect();
cam.OnHImageOutput += OnCameraHImageOutput;
//cam.OnHImageOutput += OnCameraHImageOutput;
}
}
}
@ -1199,7 +1199,7 @@ namespace DHSoftware
/// <param name="dt"></param>
/// <param name="camera"></param>
/// <param name="imageSet"></param>
private void OnCameraHImageOutput(DateTime dt, CameraBase camera, Mat imageSet)
private void OnCameraHImageOutput(DateTime dt, CameraBase camera, MatSet imageSet)
{
//if (camera.CameraName.Equals("cam1", StringComparison.OrdinalIgnoreCase))
//{
@ -1215,7 +1215,7 @@ namespace DHSoftware
Task.Run(async () =>
{
using (Mat localImageSet = imageSet.Clone()) // 复制 Mat 避免并发问题
//using (Mat localImageSet = imageSet._mat.Clone()) // 复制 Mat 避免并发问题
{
// imageSet?.Dispose();
// 拍照计数与物件编号一致，查找对应的产品
@ -1254,7 +1254,7 @@ namespace DHSoftware
}
//LogAsync(DateTime.Now, LogLevel.Error, $"{camera.Name} 未找到产品，编号：{productNumber}，队列{index}数量：{tmpDic.Count}，列表：{pnStr}");
localImageSet.Dispose();
imageSet.Dispose();
return;
}
@ -1263,7 +1263,7 @@ namespace DHSoftware
if (!_cameraRelatedDetectionDict.ContainsKey(camera.CameraName))
{
localImageSet.Dispose();
imageSet.Dispose();
@ -1280,11 +1280,11 @@ namespace DHSoftware
for (int i = 0; i < detectionDict.Count; i++)
{
string detectionId = detectionDict[i];
using (Mat inferenceImage = localImageSet.Clone()) // 仅在此处克隆，确保推理过程中 Mat 有独立副本
var tmpImgSet = camera.CopyImageSet(imageSet as MatSet);
//imageSet
// using (Mat inferenceImage = localImageSet.Clone()) // 仅在此处克隆，确保推理过程中 Mat 有独立副本
{
DetectStationResult temp1 = _visionEngine.RunInference(inferenceImage, detectionId);
DetectStationResult temp1 = _visionEngine.RunInference(tmpImgSet, detectionId);
resultStates.Add(temp1.ResultState);