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

11
DH.Devices.Vision/SimboVisionDriver.cs
View File

@ -58,7 +58,7 @@ namespace DH.Devices.Vision
//{
// LogAsync(new LogMsg(dt, LogLevel.Error, msg));
//}
public override DetectStationResult RunInference(Mat originImgSet, string detectionId = null)
public override DetectStationResult RunInference(MatSet originImgSet, string detectionId = null)
{
DetectStationResult detectResult = new DetectStationResult();
DetectionConfig detectConfig = null;
@ -78,19 +78,20 @@ namespace DH.Devices.Vision
//未能获得检测配置
return detectResult;
}
detectResult.Id = originImgSet.Id;
detectResult.DetectName = detectConfig.Name;
detectResult.ImageSaveDirectory=detectConfig.ImageSaveDirectory;
detectResult.SaveNGDetect=detectConfig.SaveNGDetect;
detectResult.SaveNGOriginal=detectConfig.SaveNGOriginal;
detectResult.SaveOKDetect=detectConfig.SaveOKDetect;
detectResult.SaveOKOriginal=detectConfig.SaveOKOriginal;
Mat OriginImage = originImgSet.Clone();
Mat OriginImage = originImgSet._mat.Clone();
detectResult.DetectionOriginImage = CopyBitmapWithLockBits(OriginImage.ToBitmap());
//detectResult.DetectionOriginImage = originImgSet.Clone().ToBitmap();
Stopwatch sw = new Stopwatch();
#region 1.预处理
sw.Start();
using (Mat PreTMat = originImgSet.Clone())
using (Mat PreTMat = originImgSet._mat.Clone())
{
PreTreated(detectConfig, detectResult, PreTMat);
PreTreated2(detectConfig, detectResult, PreTMat);
@ -142,7 +143,7 @@ namespace DH.Devices.Vision
req.ResizeHeight = (int)detectConfig.ModelHeight;
// req.LabelNames = detectConfig.GetLabelNames();
// req.Score = IIConfig.Score;
req.mImage = originImgSet.Clone();
req.mImage = originImgSet._mat.Clone();
req.in_lable_path = detectConfig.In_lable_path;
@ -308,7 +309,7 @@ namespace DH.Devices.Vision
DisplayDetectionResult(detectResult, originImgSet.Clone(), detectionId);
DisplayDetectionResult(detectResult, originImgSet._mat.Clone(), detectionId);