Merge branch 'dev_lilili' of https://gitea.star-rising.cn/xiaohuimin/DHDHSoftware into dev_lilili
This commit is contained in:
commit
8d32269ee0
@ -16,6 +16,7 @@ using DVPCameraType;
|
||||
using HalconDotNet;
|
||||
using Microsoft.Win32;
|
||||
using OpenCvSharp;
|
||||
using SqlSugar;
|
||||
using System;
|
||||
using System.CodeDom;
|
||||
using System.Collections.Concurrent;
|
||||
@ -887,8 +888,9 @@ namespace DHSoftware
|
||||
{
|
||||
return;
|
||||
}
|
||||
ProductNum_Total++;
|
||||
CalculateOEE();
|
||||
UpdateResult(DateTime.Now, null, product.ProductResult.GetEnumDescription());
|
||||
// ProductNum_Total++;
|
||||
// CalculateOEE();
|
||||
this.BeginInvoke(new MethodInvoker(delegate ()
|
||||
{
|
||||
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
|
||||
////2024-02-29 目标检测不能全是NG
|
||||
//if (IsPreTreatNG || IsObjectDetectNG)
|
||||
//{
|
||||
// return;
|
||||
//}
|
||||
// CurrentState = RunState.Running;
|
||||
|
||||
//if (IsPreTreatDone && IsMLDetectDone && IsAfterTreatDone)
|
||||
//{
|
||||
// ResultState = ResultState.OK;
|
||||
// ResultLabel = ResultState.OK.GetEnumDescription();
|
||||
//}
|
||||
ProductNum_Total++;
|
||||
//AddOKProduct(resultStr);
|
||||
|
||||
|
||||
|
||||
CalculateOEE();
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void HandleStopButton()
|
||||
|
Loading…
x
Reference in New Issue
Block a user