v2.0.7 通威彭山分支

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)
                                     {

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,

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));
                                 }

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)