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-03-10 13:41:12 +08:00
parent 4df6b668bf
commit 0314f4d403
3 changed files with 467 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DH.Devices.PLC/XinJEPLCTcpNet.cs
View File

@ -49,7 +49,7 @@ namespace DH.Devices.PLC
{ {
connected = true; connected = true;
MonitorPieces(); MonitorPieces();
TurntableOpen(18000,true); TurntableOpen(2000,true);
return true; return true;
} }

25
DH.Devices.Vision/SimboObjectDetection.cs
View File

@ -12,6 +12,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.Xml;
namespace DH.Devices.Vision namespace DH.Devices.Vision
@ -171,7 +172,7 @@ namespace DH.Devices.Vision
{ {
MLResult mlResult = new MLResult(); MLResult mlResult = new MLResult();
Mat originMat=new Mat() ; Mat originMat=new Mat() ;
Mat detectMat; Mat detectMat= new Mat();
try try
{ {
if (req.mImage == null) if (req.mImage == null)
@ -182,7 +183,7 @@ namespace DH.Devices.Vision
} }
// resize // resize
detectMat = req.mImage;//1ms detectMat = req.mImage.Clone();//1ms
@ -201,8 +202,9 @@ namespace DH.Devices.Vision
{ {
// 如果已经是三通道（BGR），则直接转换为RGB // 如果已经是三通道（BGR），则直接转换为RGB
Cv2.CvtColor( detectMat,originMat, ColorConversionCodes.BGR2RGB); // Cv2.CvtColor( detectMat,originMat, ColorConversionCodes.BGR2RGB);
// 直接使用原始图像
originMat = detectMat.Clone();
} }
//输入数据转化为字节 //输入数据转化为字节
@ -225,7 +227,7 @@ namespace DH.Devices.Vision
req.confThreshold, req.iouThreshold, req.confThreshold, req.iouThreshold,
ref outputByte[0], ref outputByte[0],
ref labellist[0]); ref labellist[0]);
//mlResult.IsSuccess = true; // mlResult.IsSuccess = true;
} }
sw.Stop(); sw.Stop();
@ -257,10 +259,19 @@ namespace DH.Devices.Vision
} }
finally finally
{ {
req.mImage?.Dispose(); // 释放 Mat 资源
req.mImage = null; if (detectMat != null)
{
detectMat.Dispose();
detectMat = null;
}
if (originMat != null)
{
originMat.Dispose();
originMat = null; originMat = null;
}
// GC.Collect(); // GC.Collect();

102
DHSoftware/MainWindow.cs
View File

@ -317,22 +317,22 @@ namespace DHSoftware
det2.CameraCollects = CameraCollects2; det2.CameraCollects = CameraCollects2;
det1.ModelconfThreshold = Conf; det2.ModelconfThreshold = Conf;
det1.ModelWidth = 640; det2.ModelWidth = 640;
det1.ModelHeight = 640; det2.ModelHeight = 640;
det1.in_lable_path = " D:\\PROJECTS\\MaodingTest1\\Vision\\cam2.txt"; det2.in_lable_path = " D:\\PROJECTS\\MaodingTest1\\Vision\\cam2.txt";
det3.CameraCollects = CameraCollects3; det3.CameraCollects = CameraCollects3;
det1.ModelconfThreshold = Conf; det3.ModelconfThreshold = Conf;
det1.ModelWidth = 640; det3.ModelWidth = 640;
det1.ModelHeight = 640; det3.ModelHeight = 640;
det1.in_lable_path = " D:\\PROJECTS\\MaodingTest1\\Vision\\cam3.txt"; det3.in_lable_path = " D:\\PROJECTS\\MaodingTest1\\Vision\\cam3.txt";
det4.CameraCollects = CameraCollects4; det4.CameraCollects = CameraCollects4;
det1.ModelconfThreshold = Conf; det4.ModelconfThreshold = Conf;
det1.ModelWidth = 640; det4.ModelWidth = 640;
det1.ModelHeight = 640; det4.ModelHeight = 640;
det1.in_lable_path = " D:\\PROJECTS\\MaodingTest1\\Vision\\cam4.txt"; det4.in_lable_path = " D:\\PROJECTS\\MaodingTest1\\Vision\\cam4.txt";
detectionList.Add(det1); detectionList.Add(det1);
detectionList.Add(det2); detectionList.Add(det2);
@ -401,11 +401,8 @@ namespace DHSoftware
simbo2.Load(mLInit2); simbo2.Load(mLInit2);
for(int i = 0;i<Dectection.Count;i++)
{
} Dectection.Add(det2.Id, simbo2);
Dectection.Add(det1.Id, simbo2);
PLC.IP = "192.168.6.6"; PLC.IP = "192.168.6.6";
PLC.Port = 502; PLC.Port = 502;
@ -479,6 +476,8 @@ namespace DHSoftware
uint productNumber = (uint)camera.SnapshotCount; uint productNumber = (uint)camera.SnapshotCount;
Task.Run(async () => Task.Run(async () =>
{
using (Mat localImageSet = imageSet.Clone()) // 复制 Mat 避免并发问题
{ {
// 拍照计数与物件编号一致，查找对应的产品 // 拍照计数与物件编号一致，查找对应的产品
ProductData product = null; ProductData product = null;
@ -515,7 +514,7 @@ namespace DHSoftware
} }
//LogAsync(DateTime.Now, LogLevel.Error, $"{camera.Name} 未找到产品，编号：{productNumber}，队列{index}数量：{tmpDic.Count}，列表：{pnStr}"); //LogAsync(DateTime.Now, LogLevel.Error, $"{camera.Name} 未找到产品，编号：{productNumber}，队列{index}数量：{tmpDic.Count}，列表：{pnStr}");
imageSet.Dispose(); localImageSet.Dispose();
return; return;
} }
@ -523,12 +522,8 @@ namespace DHSoftware
if (!_cameraRelatedDetectionDict.ContainsKey(camera.CameraName)) if (!_cameraRelatedDetectionDict.ContainsKey(camera.CameraName))
{ {
if (imageSet != null)
{ localImageSet.Dispose();
imageSet?.Dispose();
imageSet = null;
}
imageSet.Dispose();
// LogAsync(DateTime.Now, LogLevel.Warning, $"{camera.Name} 找到产品{productNumber}，但是没有推理1"); // LogAsync(DateTime.Now, LogLevel.Warning, $"{camera.Name} 找到产品{productNumber}，但是没有推理1");
return; return;
@ -538,10 +533,7 @@ namespace DHSoftware
double totalTime = 0.0; double totalTime = 0.0;
List<ResultState> resultStates = new List<ResultState>(); List<ResultState> resultStates = new List<ResultState>();
List<string>? detectionDict = _cameraRelatedDetectionDict[camera.CameraName]; List<string>? detectionDict = _cameraRelatedDetectionDict[camera.CameraName];
if (detectionDict.Count == 0)
{
//LogAsync(DateTime.Now, LogLevel.Warning, $"{camera.Name} 找到产品{productNumber}，但是没有推理3");
}
for (int i = 0; i < detectionDict.Count; i++) for (int i = 0; i < detectionDict.Count; i++)
{ {
@ -563,7 +555,7 @@ namespace DHSoftware
{ {
//未能获得检测配置 //未能获得检测配置
return ; return;
} }
@ -572,13 +564,19 @@ namespace DHSoftware
#region 2.深度学习推理 #region 2.深度学习推理
var req = new MLRequest(); var req = new MLRequest();
req.mImage = imageSet.Clone(); req.mImage = localImageSet.Clone();
req.ResizeWidth = detectConfig.ModelWidth; //req.ResizeWidth = detectConfig.ModelWidth;
req.ResizeHeight = detectConfig.ModelHeight; //req.ResizeHeight = detectConfig.ModelHeight;
req.confThreshold = detectConfig.ModelconfThreshold; //req.confThreshold = detectConfig.ModelconfThreshold;
//req.iouThreshold = 0.3f;
//req.out_node_name = detectConfig.ModeloutNodeName;
//req.in_lable_path = detectConfig.in_lable_path;
req.ResizeWidth = 640;
req.ResizeHeight = 640;
req.confThreshold = 0.5f;
req.iouThreshold = 0.3f; req.iouThreshold = 0.3f;
req.out_node_name = detectConfig.ModeloutNodeName; req.out_node_name = "output0";
req.in_lable_path = detectConfig.in_lable_path; req.in_lable_path = "D:\\PROJECTS\\MaodingTest1\\Vision\\cam1.txt";
//req.LabelNames = dc.GetLabelNames(); //req.LabelNames = dc.GetLabelNames();
//HOperatorSet.WriteImage(req.HImage, "png", 0, @"D:\\666.png"); //HOperatorSet.WriteImage(req.HImage, "png", 0, @"D:\\666.png");
@ -591,6 +589,18 @@ namespace DHSoftware
sw.Stop(); sw.Stop();
//LogAsync(DateTime.Now, LogLevel.Information, $"{camera.Name} 推理进度1.1，产品{productNumber}，耗时{sw.ElapsedMilliseconds}ms"); //LogAsync(DateTime.Now, LogLevel.Information, $"{camera.Name} 推理进度1.1，产品{productNumber}，耗时{sw.ElapsedMilliseconds}ms");
#endregion #endregion
this.BeginInvoke(new MethodInvoker(delegate ()
{
if (pictureBox1.Image != null)
{
pictureBox1.Image.Dispose(); // 释放旧图像
}
pictureBox1.Image = result.ResultMap;
richTextBox1.AppendText($"推理成功 {productNumber}, {result.IsSuccess} 耗时 {sw.ElapsedMilliseconds}ms\n");
}));
req.mImage.Dispose();
#if true
#region 3.后处理 #region 3.后处理
DetectStationResult detectResult = new DetectStationResult(); DetectStationResult detectResult = new DetectStationResult();
if (result == null || (result != null && !result.IsSuccess)) if (result == null || (result != null && !result.IsSuccess))
@ -608,6 +618,7 @@ namespace DHSoftware
detectResult.IsMLDetectDone = false; detectResult.IsMLDetectDone = false;
} }
} }
#endregion #endregion
#region 3.后处理 #region 3.后处理
#endregion #endregion
@ -702,16 +713,16 @@ namespace DHSoftware
return; return;
} }
#endregion #endregion
resultStates.Add(detectResult.ResultState); resultStates.Add(detectResult.ResultState);
product.ResultCollection.Add(detectResult); product.ResultCollection.Add(detectResult);
this.BeginInvoke(new MethodInvoker(delegate ()
{
pictureBox1.Image = result.ResultMap; richTextBox1.AppendText($"推理成功{productNumber}，{result.IsSuccess} 推理耗时{sw.ElapsedMilliseconds}ms，总推理耗时\n");
}));
#endif
//DetectStationResult temp; //DetectStationResult temp;
////LogAsync(DateTime.Now, LogLevel.Information, $"{camera.Name} 推理进度1.4，产品{productNumber}"); ////LogAsync(DateTime.Now, LogLevel.Information, $"{camera.Name} 推理进度1.4，产品{productNumber}");
//// 检测结果 //// 检测结果
@ -730,7 +741,7 @@ namespace DHSoftware
// //LogAsync(DateTime.Now, LogLevel.Information, $"{camera.Name} 检测失败，物料编号：{productNumber}，检测项：{d}"); // //LogAsync(DateTime.Now, LogLevel.Information, $"{camera.Name} 检测失败，物料编号：{productNumber}，检测项：{d}");
//} //}
imageSet.Dispose(); // imageSet.Dispose();
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -764,7 +775,8 @@ namespace DHSoftware
} }
ProductNum_Total++; ProductNum_Total++;
CalculateOEE(); CalculateOEE();
this.BeginInvoke(new MethodInvoker(delegate () { this.BeginInvoke(new MethodInvoker(delegate ()
{
int currentScrollPosition = richTextBox1.GetPositionFromCharIndex(richTextBox1.TextLength).Y; int currentScrollPosition = richTextBox1.GetPositionFromCharIndex(richTextBox1.TextLength).Y;
@ -900,10 +912,11 @@ namespace DHSoftware
if (isSuccess) if (isSuccess)
{ {
string logStr =$"{DateTime.Now}产品{productNumber}出列成功：{isSuccess}，" + string logStr = $"{DateTime.Now}产品{productNumber}出列成功：{isSuccess}，" +
$"产品结果：{temp.ProductResult.GetEnumDescription()}，" + $"产品结果：{temp.ProductResult.GetEnumDescription()}，" +
$"当前队列产品数量：{tmpDic.Count}"; $"当前队列产品数量：{tmpDic.Count}";
this.BeginInvoke(new MethodInvoker(delegate () { this.BeginInvoke(new MethodInvoker(delegate ()
{
int currentScrollPosition = richTextBox1.GetPositionFromCharIndex(richTextBox1.TextLength).Y; int currentScrollPosition = richTextBox1.GetPositionFromCharIndex(richTextBox1.TextLength).Y;
@ -950,6 +963,7 @@ namespace DHSoftware
//LogAsync(DateTime.Now, LogLevel.Error, $"流程检测未捕获的异常：{ex.GetExceptionMessage()}"); //LogAsync(DateTime.Now, LogLevel.Error, $"流程检测未捕获的异常：{ex.GetExceptionMessage()}");
product?.Dispose(); product?.Dispose();
} }
}
}); });
} }
public void SetResult() public void SetResult()