From 11f4f5a05c498ceee6d4c7d8c293356b5f63b843 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Sun, 1 Oct 2023 08:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A3=9E=E6=8B=8D=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=BD=93=E9=A3=9E=E6=8B=8D=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E7=AD=89=E4=BA=8E0=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=A3=9E=E6=8B=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/WorkFlow.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Rs.SkyLine/Flow/WorkFlow.cs b/Rs.SkyLine/Flow/WorkFlow.cs index 4fb52bc..1cac2f9 100644 --- a/Rs.SkyLine/Flow/WorkFlow.cs +++ b/Rs.SkyLine/Flow/WorkFlow.cs @@ -522,7 +522,7 @@ namespace Rs.MotionPlat.Flow break; case EWorkFlowStep.等待视觉处理结果: mrs = VisionProcess.Instance.MatchDownCam(imgs); - if (mrs != null && mrs.Count == imgs.Length && mrs.Where(m=>m.IsOK==true).Count()==imgs.Length) + if (mrs != null && mrs.Count == imgs.Length && (mrs.Where(m=>m.IsOK==true).Count()==imgs.Length || GlobalVar.DownCameraFlyRegrabNum==0)) { //foreach (Nozzle nozzle in NozzleManager.GetNozzles()) //{ @@ -535,6 +535,8 @@ namespace Rs.MotionPlat.Flow //File.AppendAllText("D://OFFSET.TXT",$"SN:{item.SN},X:{item.OffsetRow},Y:{item.OffsetCol},R:{AngleTool.Rad2Deg(item.Angle)}\r\n"); ni++; } + + //CameraOkEvent?.Invoke(imgs, mrs); OnMatchResult?.Invoke(mrs); //TestCenter.Instance.EndInput();