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

Merge branch 'dev_lilili' of https://gitea.star-rising.cn/xiaohuimin/DHDHSoftware into dev_lilili

Browse Source
This commit is contained in:
TD 2025-03-27 15:31:37 +08:00
commit 8d32269ee0
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
DHSoftware/MainWindow.cs
View File

@ -16,6 +16,7 @@ using DVPCameraType;
using HalconDotNet; using HalconDotNet;
using Microsoft.Win32; using Microsoft.Win32;
using OpenCvSharp; using OpenCvSharp;
using SqlSugar;
using System; using System;
using System.CodeDom; using System.CodeDom;
using System.Collections.Concurrent; using System.Collections.Concurrent;
@ -887,8 +888,9 @@ namespace DHSoftware
{ {
return; return;
} }
ProductNum_Total++; UpdateResult(DateTime.Now, null, product.ProductResult.GetEnumDescription());
CalculateOEE(); // ProductNum_Total++;
// 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;
@ -992,20 +994,18 @@ namespace DHSoftware
}); });
} }
public void SetResult() public async Task UpdateResult(DateTime dt, object objData, string resultStr)
{ {
//// detectResult.IsPreTreatDone = detectResult.VisionImageSet.PreTreatedFlag // CurrentState = RunState.Running;
////2024-02-29 目标检测不能全是NG
//if (IsPreTreatNG || IsObjectDetectNG)
//{
// return;
//}
//if (IsPreTreatDone && IsMLDetectDone && IsAfterTreatDone) ProductNum_Total++;
//{ //AddOKProduct(resultStr);
// ResultState = ResultState.OK;
// ResultLabel = ResultState.OK.GetEnumDescription();
//}
CalculateOEE();
} }
private void HandleStopButton() private void HandleStopButton()