1

AccAOI/FrmAoiSetting.Designer.cs

@@ -166,7 +166,7 @@ namespace AccAOI
             this.imageBox1.DragHandleSize = 9;
             this.imageBox1.Location = new System.Drawing.Point(625, 40);
             this.imageBox1.Name = "imageBox1";
-            this.imageBox1.SelectionMode = Acc.ImageBox.ImageBoxSelectionMode.Eclipse;
+            this.imageBox1.SelectionMode = Acc.ImageBox.ImageBoxSelectionMode.Rectangle;
             this.imageBox1.Size = new System.Drawing.Size(637, 592);
             this.imageBox1.TabIndex = 4;
             this.imageBox1.SelectionRegionChanged += new System.EventHandler(this.imageBox1_SelectionRegionChanged);

AccAOI/control/ABaseControl.Designer.cs

@@ -37,10 +37,10 @@ namespace AccAOI.control
             this.panResult = new Asa.Theme.FlatPanel();
             this.panParam = new Asa.Theme.FlatPanel();
             this.panAreaSet = new Asa.Theme.FlatPanel();
+            this.btnImgType = new Asa.Theme.FlatButton();
             this.panAreaImage = new Asa.Theme.FlatPanel();
             this.panControl = new Asa.Theme.FlatPanel();
-            this.btnImgType = new Asa.Theme.FlatButton();
-            this.aoiImage = new ImageBox();
+            this.aoiImage = new Acc.ImageBox.ImageBox();
             this.panAreaSet.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -53,7 +53,7 @@ namespace AccAOI.control
             this.btnSetArea.Size = new System.Drawing.Size(90, 30);
             this.btnSetArea.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
             this.btnSetArea.TabIndex = 7;
-            this.btnSetArea.Text = "矩形";
+            this.btnSetArea.Text = "椭圆";
             this.btnSetArea.Click += new System.EventHandler(this.btnSetArea_Click);
             // 
             // btnClearArea
@@ -107,6 +107,18 @@ namespace AccAOI.control
             this.panAreaSet.TabIndex = 3;
             this.panAreaSet.Text = "区域设置-矩形";
             // 
+            // btnImgType
+            // 
+            this.btnImgType.ImageSize = new System.Drawing.Size(0, 0);
+            this.btnImgType.Inside = false;
+            this.btnImgType.Location = new System.Drawing.Point(9, 30);
+            this.btnImgType.Name = "btnImgType";
+            this.btnImgType.Size = new System.Drawing.Size(90, 30);
+            this.btnImgType.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
+            this.btnImgType.TabIndex = 8;
+            this.btnImgType.Text = "原图";
+            this.btnImgType.Click += new System.EventHandler(this.btnImgType_Click);
+            // 
             // panAreaImage
             // 
             this.panAreaImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -132,18 +144,6 @@ namespace AccAOI.control
             this.panControl.TabIndex = 0;
             this.panControl.Text = "斑点分析";
             // 
-            // btnImgType
-            // 
-            this.btnImgType.ImageSize = new System.Drawing.Size(0, 0);
-            this.btnImgType.Inside = false;
-            this.btnImgType.Location = new System.Drawing.Point(9, 30);
-            this.btnImgType.Name = "btnImgType";
-            this.btnImgType.Size = new System.Drawing.Size(90, 30);
-            this.btnImgType.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
-            this.btnImgType.TabIndex = 8;
-            this.btnImgType.Text = "原图";
-            this.btnImgType.Click += new System.EventHandler(this.btnImgType_Click);
-            // 
             // aoiImage
             // 
             this.aoiImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

AccAOI/control/ABaseControl.cs

@@ -44,7 +44,7 @@ namespace AccAOI.control
         /// </summary>
         protected GraphicsPath currPath = null;
       
-        public ImageBox BImageBox; 
+        public AccImageBox BImageBox; 
         public AoiMethod AoiInfo;
         /// <summary>
         /// 未处理的小图
@@ -75,15 +75,22 @@ namespace AccAOI.control
 
         private void btnSetArea_Click(object sender, EventArgs e)
         {
-            AreaType = 1;
-            panAreaSet.Text = "区域设置 - 矩形";
-        }
-
-        private void btnYuan_Click(object sender, EventArgs e)
-        {
-            AreaType = 2;
-            panAreaSet.Text = "区域设置 - 椭圆";
+            if (AreaType.Equals(1))
+            {
+                AreaType = 2;
+                panAreaSet.Text = "区域设置 - 椭圆";
+                btnSetArea.Text = "矩形";
+                BImageBox.SelectionMode = ImageBoxSelectionMode.Eclipse;
+            }
+            else
+            {
+                AreaType = 1;
+                panAreaSet.Text = "区域设置 - 矩形";
+                btnSetArea.Text = "椭圆";
+                BImageBox.SelectionMode = ImageBoxSelectionMode.Rectangle;
+            }
         }
+         
 
         private void btnClearArea_Click(object sender, EventArgs e)
         {