1

AOI/AoiProject.cs

@@ -41,18 +41,19 @@ namespace AOI
         public List<ResultBean> CheckAll(Image scr, out Image resultImg)
         public List<ResultBean> CheckAll(Image scr, out Image resultImg)
         {
         {
             //    GC.Collect();
             //    GC.Collect();
-            Image image =Eyemlib.DeepClone(scr);
+            Image image =ProcessBaseImage((Bitmap)scr,"auro");
             //如果设置了校准方法,先校准图片
             //如果设置了校准方法,先校准图片
-            var markMethodMap = methodMap.Where(kv=>kv.Value is AoiMarkMethod);
-            foreach (var item in markMethodMap)
-            {
-                ResultBean resultBean = item.Value.Check(standardImage, image);
-                if (resultBean.result)
-                {
-                    //校准成功
-                    image = resultBean.currentRoiImage;
-                }
-            }
+            //var markMethodMap = methodMap.Where(kv => kv.Value is AoiEyemMarkMethod);
+            //foreach (var item in markMethodMap)
+            //{
+            //    ResultBean resultBean = item.Value.Check(standardImage, image);
+            //    if (resultBean.result)
+            //    {
+            //        //校准成功
+            //        image = resultBean.currentRoiImage;
+            //    }
+            //}
+
             List<ResultBean> resultBeans = new List<ResultBean>();
             List<ResultBean> resultBeans = new List<ResultBean>();
             foreach(var item in methodMap)
             foreach(var item in methodMap)
             {
             {

AccAOI/FrmAoiSetting.cs

@@ -553,7 +553,7 @@ namespace AccAOI
             }
             }
             lblTestResult.Text = "";
             lblTestResult.Text = "";
             Image outImage = null;
             Image outImage = null;
-            List<ResultBean> result = Project.CheckAll(TestImage, out outImage);
+            List<ResultBean> result = Project.CheckAll(OrgTestImage, out outImage);
             if (outImage != null)
             if (outImage != null)
             {
             {
                 if (!this.panTest.Visible)
                 if (!this.panTest.Visible)