合并

TeamAAS-VM/Core/ImageHelper.cs

@@ -68,11 +68,15 @@ namespace TeamAAS_VP.Core
         public static ICogImage MatConvertICogImage(Mat image, bool color = false)
         {
             var im = OpenCvSharp.Extensions.BitmapConverter.ToBitmap(image);
-            ICogImage cogImage = new CogImage8Grey(im);
+            ICogImage cogImage = null;
             if (color)
             {
                 cogImage = new CogImage24PlanarColor(im);
             }
+            else
+            {
+                cogImage = new CogImage8Grey(im);
+            }
             im.Dispose();
             return cogImage;
         }

TeamAAS-VM/Core/Management.cs

@@ -2406,13 +2406,17 @@ namespace TeamAAS_VP.Core
                                     if (targetPoint.AiVision == 1)
                                     {
                                         var targetPoint2 = currentProduct.AoiPoints?.FirstOrDefault(p => p.Number == targetPoint.AiVision);
-                                        await ExecuteProcedureAsync(targetPoint.AiVision, targetPoint2.CameraProcedureId1, tt.imges, Is3dPhoto,currentProduct);
+                                        await ExecuteProcedureAsync(targetPoint.AiVision, targetPoint2.CameraProcedureId1, tt.imges, Is3dPhoto, currentProduct);
                                     }
                                 }
                                 else
                                 {
                                     bool Is3dPhoto = Is3D(prcId);
                                     _ImageTaskList.Add(GrabImageEx(cameraIndex, prcId, Is3dPhoto, currentProduct, sysConfig));
+                                    if (targetPoint.AiVision == 1)
+                                    {
+                                        break;
+                                    }
                                 }
 
                                 if (sysConfig.TurnOnAllLightUse == false)
@@ -2440,8 +2444,8 @@ namespace TeamAAS_VP.Core
                                             bool Is3d = Is3D(item.procedureId);
                                             if (targetPoint.AiVision == 1)
                                             {
-                                                var targetPoint2 = currentProduct.AoiPoints?.FirstOrDefault(p => p.Number == targetPoint.AiVision);
-                                                await ExecuteProcedureAsync(targetPoint.AiVision, targetPoint2.CameraProcedureId1, item.Images, Is3d, currentProduct);
+                                                var targetPoint2 = currentProduct.AoiPoints?.FirstOrDefault(p => p.Number == cameraIndex);
+                                                await ExecuteProcedureAsync(targetPoint.AiVision, targetPoint2.CameraProcedureId2, item.Images, Is3d, currentProduct);
                                             }
                                             await ExecuteProcedureAsync(item.cameraIndex, item.procedureId, item.Images, Is3d, currentProduct);
                                         }

TeamAAS-VM/Services/RemoteCommandService.cs

@@ -2029,11 +2029,11 @@ namespace TeamAAS_VP.Services
                                 // 定义颜色映射
                                 var colors = new[]
                                 {
-                            Scalar.Red,      // NG1 - 红色
-                            Scalar.Green,    // NG2 - 绿色
-                            Scalar.Blue,     // NG3 - 蓝色
-                            Scalar.Yellow    // NG4 - 黄色
-                        };
+                                    Scalar.Red,      // NG1 - 红色
+                                    Scalar.Green,    // NG2 - 绿色
+                                    Scalar.Blue,     // NG3 - 蓝色
+                                    Scalar.Yellow    // NG4 - 黄色
+                                };
 
                                 foreach (var det in results)
                                 {
@@ -2133,7 +2133,8 @@ namespace TeamAAS_VP.Services
                                     Id = procedure.DisplayId,
                                     DisplayName = procedure.DisplayName,
 
-                                    Image = OriginyoloColorCogImage,
+                                    // 显示和保存用 YOLO 彩色图
+                                    Image = yoloColorCogImage,
 
                                     Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
                                     Record = record,
@@ -2154,8 +2155,7 @@ namespace TeamAAS_VP.Services
                                     Id = procedure.DisplayId,
                                     DisplayName = procedure.DisplayName,
 
-                                    // 显示和保存用 YOLO 彩色图
-                                    Image = yoloColorCogImage,
+                                    Image = OriginyoloColorCogImage,
 
                                     Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
                                     Record = record,
@@ -2171,6 +2171,7 @@ namespace TeamAAS_VP.Services
                                     Is3DModel = is3dmodel,
                                 });
 
+
                             }
 
                         }