1

AOI/eyemlib/AoiEyemTemplateMethod.cs

@@ -85,6 +85,8 @@ namespace AOI
             tpRoiTemplate.iHeight = (int)rect.Height;
             tpRoiTemplate.iHeight = (int)rect.Height;
             //var search = eyemCvtToEyemImage((Bitmap)imageToCheck);
             //var search = eyemCvtToEyemImage((Bitmap)imageToCheck);
             Eyemlib.eyemCopyRegion(search, tpRoiTemplate, out Eyemlib.EyemImage templ);
             Eyemlib.eyemCopyRegion(search, tpRoiTemplate, out Eyemlib.EyemImage templ);
+            if(templ.iWidth==0)
+                return (0, 0);
             cutImg = eyemCvtToBitmap(templ);
             cutImg = eyemCvtToBitmap(templ);
             //可以用来调试查看图像
             //可以用来调试查看图像
             //Eyemlib.eyemNamedWindow("templ");
             //Eyemlib.eyemNamedWindow("templ");

AccAOI/FrmAoiSetting.cs

@@ -139,6 +139,8 @@ namespace AccAOI
             var b = new Bitmap(fileName);
             var b = new Bitmap(fileName);
             OrgBaseImg = Eyemlib.DeepClone(b);
             OrgBaseImg = Eyemlib.DeepClone(b);
             b.Dispose();
             b.Dispose();
+            if (Project != null)
+                Project.OrgImage = OrgBaseImg;
             BaseImg = ProcessBaseImage((Bitmap)OrgBaseImg);
             BaseImg = ProcessBaseImage((Bitmap)OrgBaseImg);
 
 
             //(BaseImg, EyemBaseImg) = Eyemlib.ExtractPCB((Bitmap)OrgBaseImg);
             //(BaseImg, EyemBaseImg) = Eyemlib.ExtractPCB((Bitmap)OrgBaseImg);
@@ -187,9 +189,12 @@ namespace AccAOI
                 //Image file = (Image)Image.FromFile(filePath + fileName);
                 //Image file = (Image)Image.FromFile(filePath + fileName);
                 //BaseImg = new Bitmap(file);
                 //BaseImg = new Bitmap(file);
                 //file.Dispose();
                 //file.Dispose();
-                var b = new Bitmap(filePath + fileName);
+                var b = new Bitmap(filePath + fileName);                
                 OrgBaseImg = Eyemlib.DeepClone(b);
                 OrgBaseImg = Eyemlib.DeepClone(b);
                 b.Dispose();
                 b.Dispose();
+                if (Project != null)
+                    Project.OrgImage = OrgBaseImg;
+
                 BaseImg = ProcessBaseImage((Bitmap)OrgBaseImg);
                 BaseImg = ProcessBaseImage((Bitmap)OrgBaseImg);
                 //   BaseImg = (Image)Image.FromFile(filePath+ file).Clone();
                 //   BaseImg = (Image)Image.FromFile(filePath+ file).Clone();
                 //读取图片内容
                 //读取图片内容
@@ -900,14 +905,14 @@ namespace AccAOI
                 Project = new AoiProject(BaseImg, OrgBaseImg);
                 Project = new AoiProject(BaseImg, OrgBaseImg);
             }
             }
             if (aoiControl != null && aoiControl.TitleName.Equals(Project.BaseROI.MethodName))
             if (aoiControl != null && aoiControl.TitleName.Equals(Project.BaseROI.MethodName))
-                {
-                    return;
-                }
-                else
-                {
-                    CloseCurrAoi();
-                    ShowAoi(Project?.BaseROI);
-                }
+            {
+                return;
+            }
+            else
+            {
+                CloseCurrAoi();
+                ShowAoi(Project?.BaseROI);
+            }
             
             
             //if (imageBox1.Visible.Equals(false))
             //if (imageBox1.Visible.Equals(false))
             {
             {

AccAOI/control/AioEyemMarkControl.cs

@@ -84,7 +84,7 @@ namespace AccAOI.control
                 lblResult.ForeColor = Color.Green;
                 lblResult.ForeColor = Color.Green;
                 lblResult.Text = "OK";// + "(" + Math.Round(sameValue*100) + "%)";
                 lblResult.Text = "OK";// + "(" + Math.Round(sameValue*100) + "%)";
                 this.aoiImage.Image = FrmAoiSetting.BaseImg;
                 this.aoiImage.Image = FrmAoiSetting.BaseImg;
-
+                FrmAoiSetting.Project.OrgImage = FrmAoiSetting.OrgBaseImg;
                 //lblTime.Text = "times ：" + Math.Round(span.TotalSeconds, 1) + "s";
                 //lblTime.Text = "times ：" + Math.Round(span.TotalSeconds, 1) + "s";
             }
             }
         }
         }

ImageBox/AccImageBox.cs

@@ -706,7 +706,7 @@ namespace Acc.ImageBox
                     this.DragOrigin = cursorPosition;
                     this.DragOrigin = cursorPosition;
                     this.SelectionRegion = path;
                     this.SelectionRegion = path;
                 }
                 }
-                else {
+                else if (this.SelectionRegion.PointCount>0) {
                     //自由变形
                     //自由变形
                     Point endPoint = this.PointToImage(cursorPosition, true);
                     Point endPoint = this.PointToImage(cursorPosition, true);
                     PointF[] pathPoints = this.SelectionRegion.PathPoints;
                     PointF[] pathPoints = this.SelectionRegion.PathPoints;
@@ -719,7 +719,7 @@ namespace Acc.ImageBox
                         if (xdiff && ydiff)
                         if (xdiff && ydiff)
                         {   if (i<1)
                         {   if (i<1)
                                 startPoint = pathPoints[i+2];
                                 startPoint = pathPoints[i+2];
-                            else
+                            else if (i>1)
                                 startPoint = pathPoints[i - 2];
                                 startPoint = pathPoints[i - 2];
                             pathPoints[i] = endPoint;
                             pathPoints[i] = endPoint;
                             this.ResizePoint = endPoint;
                             this.ResizePoint = endPoint;