From d67ef50168f1bac49ac7c3458edc4231ea81b261 Mon Sep 17 00:00:00 2001 From: CPL <1179393954@qq.com> Date: Sat, 14 Sep 2024 13:39:00 +0800 Subject: [PATCH] =?UTF-8?q?v2.0.7=20=E9=80=9A=E5=A8=81=E5=BD=AD=E5=B1=B1?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BanBoShi/ImageProcessing/SizeLib.cs | 2 ++ halftoneproject-master/BanBoShi/SysCtrl/SysEnum.cs | 3 +++ halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs | 8 ++++---- .../BanBoShi/SysUI/ProductAndStep/ProductInfoFrm.cs | 13 +++++++------ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/halftoneproject-master/BanBoShi/ImageProcessing/SizeLib.cs b/halftoneproject-master/BanBoShi/ImageProcessing/SizeLib.cs index e3bc7ffb..771de3e4 100644 --- a/halftoneproject-master/BanBoShi/ImageProcessing/SizeLib.cs +++ b/halftoneproject-master/BanBoShi/ImageProcessing/SizeLib.cs @@ -223,7 +223,9 @@ namespace MaiMuAOI.ImageProcessing // $"Defects_Type={Defects_Type},Defects_Index={Defects_Index},Defects_X={Defects_X},Defects_Y={Defects_Y}," + // $"defectInfor2RestorationDesk={JsonConvert.SerializeObject(task.defectInfor2RestorationDesk)}"); step = 13; +#if YS4 task.Zoom_Image_mat = yolo5.ResizesMat_4(task.Zoom_Image_mat); +#endif if (ConfMgr.Instance.SysConfigParams.OpenFlawDistribution) { diff --git a/halftoneproject-master/BanBoShi/SysCtrl/SysEnum.cs b/halftoneproject-master/BanBoShi/SysCtrl/SysEnum.cs index 5c26c9ee..ea69639a 100644 --- a/halftoneproject-master/BanBoShi/SysCtrl/SysEnum.cs +++ b/halftoneproject-master/BanBoShi/SysCtrl/SysEnum.cs @@ -137,6 +137,8 @@ namespace MaiMuAOI.SysCtrl gsdl, [Description("残胶堵孔")] cjdk, + [Description("错位")] + cw, [Description("正常1")] na, [Description("正常2")] @@ -160,6 +162,7 @@ namespace MaiMuAOI.SysCtrl 断栅, 钢丝断裂, 残胶堵孔, + 错位, 正常1, 正常2, 正常3, diff --git a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs index 2b2b6421..913bd04c 100644 --- a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs +++ b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs @@ -9019,7 +9019,7 @@ namespace MaiMuAOI.SysCtrl path += $"Size_SN{order.SN}_I{compBmpIndex}_X{res.posX}_Y{res.posY}_C0_{picName}"; lock (ImageSaveObj) { - bmpCompareFailZoomImage.Save(path + ".bmp", ImageFormat.Bmp); + bmpCompareFailZoomImage.Save(path + ".jpg", ImageFormat.Jpeg); if (res.defectInfor2RestorationDesk != null && res.defectInfor2RestorationDesk.Count > 0) File.WriteAllText(path + ".json", JsonConvert.SerializeObject(res.defectInfor2RestorationDesk)); } @@ -9219,9 +9219,9 @@ namespace MaiMuAOI.SysCtrl lock (ImageSaveObj) { if (res.bmps_tag.Count() != indexList.Count) - res.bmps_tag[i].Save(path + $"_i{i}_{i}.bmp", ImageFormat.Bmp); + res.bmps_tag[i].Save(path + $"_i{i}_{i}.jpg", ImageFormat.Jpeg); else - res.bmps_tag[i].Save(path + $"_i{i}_{indexList[i]}.bmp", ImageFormat.Bmp); + res.bmps_tag[i].Save(path + $"_i{i}_{indexList[i]}.jpg", ImageFormat.Jpeg); } //res.bmps_tag[i].Save(path + $"_i{i}.bmp", ImageFormat.Bmp); //res.bmps_tag[i].Save(path + $"{indexList[i]}.bmp", ImageFormat.Bmp); @@ -9235,7 +9235,7 @@ namespace MaiMuAOI.SysCtrl path += $"Defect_SN{order.SN}_I{res.index}_X{res.Xmm}_Y{res.Ymm}_C{res.defectCount}_{picName}"; lock (ImageSaveObj) { - res.bmpCompress.ImWrite(path + ".bmp"); + res.bmpCompress.ImWrite(path + ".jpg"); //OpenCvSharp.Extensions.BitmapConverter.ToBitmap(res.bmpCompress).Save(path + ".bmp", ImageFormat.Bmp); File.WriteAllText(path + ".json", JsonConvert.SerializeObject(res.defectInfor2RestorationDesk)); } diff --git a/halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductInfoFrm.cs b/halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductInfoFrm.cs index 1e1b1cab..435691ff 100644 --- a/halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductInfoFrm.cs +++ b/halftoneproject-master/BanBoShi/SysUI/ProductAndStep/ProductInfoFrm.cs @@ -319,19 +319,20 @@ namespace MaiMuAOI.SysUI.ProductAndStep lstDefect.RemoveAt(13); lstDefect.RemoveAt(13); lstDefect.RemoveAt(13); + lstDefect.RemoveAt(13); } else { - lstDefect.RemoveAt(14); - lstDefect.RemoveAt(14); - lstDefect.RemoveAt(14); + lstDefect.RemoveAt(15); + lstDefect.RemoveAt(15); + lstDefect.RemoveAt(15); } } else { - lstDefect.RemoveAt(14); - lstDefect.RemoveAt(14); - lstDefect.RemoveAt(14); + lstDefect.RemoveAt(15); + lstDefect.RemoveAt(15); + lstDefect.RemoveAt(15); } this.flpQualifiedPannel.Controls.Clear(); foreach (DictionaryEntry item in lstDefect)