From 68d882e4c74976903209c4240d07cbe8f279e109 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Fri, 28 Jun 2024 09:37:38 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=AD=98=E5=9B=BE?= =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E5=A4=8D=E6=B2=BB=E5=85=B7=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E8=B7=B3=E8=BF=87=E5=90=8E=E5=91=A8=E8=BD=AC=E5=90=B8?= =?UTF-8?q?=E5=98=B4=E7=8A=B6=E6=80=81=E6=9C=AA=E6=B8=85=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Commom/VisionProcess.cs | 3 ++- Rs.SkyLine/Flow/Camera/VisionManager.cs | 13 ++++++++----- Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs | 15 +++++++++++---- Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 1 + Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Rs.SkyLine/Commom/VisionProcess.cs b/Rs.SkyLine/Commom/VisionProcess.cs index 037ed15..54a7cdd 100644 --- a/Rs.SkyLine/Commom/VisionProcess.cs +++ b/Rs.SkyLine/Commom/VisionProcess.cs @@ -206,7 +206,8 @@ namespace Rs.MotionPlat.Commom { FindCode(hImage, ref mr); } - string dirname = $"d://images/{DateTime.Now.ToString("yyyyMMdd")}"; + + string dirname = $"{GlobalVar.ImageSavePath}/{DateTime.Now.ToString("yyyyMMdd")}"; if (!Directory.Exists(dirname)) { Directory.CreateDirectory(dirname); diff --git a/Rs.SkyLine/Flow/Camera/VisionManager.cs b/Rs.SkyLine/Flow/Camera/VisionManager.cs index 767f0be..04b4bc2 100644 --- a/Rs.SkyLine/Flow/Camera/VisionManager.cs +++ b/Rs.SkyLine/Flow/Camera/VisionManager.cs @@ -222,12 +222,15 @@ namespace Rs.MotionPlat.Flow.Camera } else { - string dirname = $"d://images/{DateTime.Now.ToString("yyyyMMdd")}/scanbarcode"; - if (!Directory.Exists(dirname)) + if(GlobalVar.ImageSaveDays>0) { - Directory.CreateDirectory(dirname); + string dirname = $"{GlobalVar.ImageSavePath}/{DateTime.Now.ToString("yyyyMMdd")}/scanbarcode"; + if (!Directory.Exists(dirname)) + { + Directory.CreateDirectory(dirname); + } + HOperatorSet.WriteImage(image, "bmp", 0, $"{dirname}//{sn}_{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{slotIndex}"); } - HOperatorSet.WriteImage(image, "bmp", 0, $"{dirname}//{sn}_{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{slotIndex}"); vr.ScanBarCodeOK = true; vr.SN = sn; } @@ -305,7 +308,7 @@ namespace Rs.MotionPlat.Flow.Camera } if (mode == "maximum_recognition") { - string saveDir = $"d://images//{DateTime.Now.ToString("yyyyMMdd")}//Ng"; + string saveDir = $"{GlobalVar.ImageSavePath}//{DateTime.Now.ToString("yyyyMMdd")}//Ng"; if(!Directory.Exists(saveDir)) { Directory.CreateDirectory(saveDir); diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index 559f8a0..711db5f 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs @@ -1341,20 +1341,24 @@ namespace Rs.MotionPlat.Flow if (curNozzle.ToType == TurnoverType.Turnover) { //判断文件夹是否存在 - string dirname = $"d://images/{DateTime.Now.ToString("yyyyMMdd")}/load"; + string dirname = $"{GlobalVar.ImageSavePath}/{DateTime.Now.ToString("yyyyMMdd")}/load"; if (!Directory.Exists(dirname)) { Directory.CreateDirectory(dirname); } if (mrs != null && mrs.Count > 0 && mrs.Count >= curNozzle.NozzleIndex && mrs[curNozzle.NozzleIndex - 1].Himage != null) { - HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{curNozzle.ToIndex + 1}"); + if (GlobalVar.ImageSaveDays > 0) + { + HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{curNozzle.ToIndex + 1}"); + } + } } else { //判断文件夹是否存在 - string dirname = $"d://images/{DateTime.Now.ToString("yyyyMMdd")}/unload"; + string dirname = $"{GlobalVar.ImageSavePath}/{DateTime.Now.ToString("yyyyMMdd")}/unload"; if (!Directory.Exists(dirname)) { Directory.CreateDirectory(dirname); @@ -1364,7 +1368,10 @@ namespace Rs.MotionPlat.Flow //HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{curNozzle.FromIndex + 1}"); if (!string.IsNullOrEmpty(curNozzle.SN)) { - HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{curNozzle.SN}_{curNozzle.FromIndex + 1}"); + if (GlobalVar.ImageSaveDays > 0) + { + HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{curNozzle.SN}_{curNozzle.FromIndex + 1}"); + } } else { diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index b52dacd..2dbb7b9 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -1413,6 +1413,7 @@ namespace Rs.MotionPlat.Flow if (!heightResult.HasProduct) { nozzle.Clear(); + GlobalTray.TurnoverNozzle.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.NotHave); exit = true; } break; diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index 23e7476..7710757 100644 --- a/Rs.SkyLine/Properties/AssemblyInfo.cs +++ b/Rs.SkyLine/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("3.20.24.24")] + [assembly: AssemblyVersion("3.20.24.25")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]