1

TSA-V/workForm/FrmAOICheckN.Designer.cs

@@ -121,7 +121,7 @@ namespace TSA_V
             this.lblResult.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.lblResult.Font = new System.Drawing.Font("宋体", 60F, System.Drawing.FontStyle.Bold);
             this.lblResult.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.lblResult.Location = new System.Drawing.Point(3, 141);
+            this.lblResult.Location = new System.Drawing.Point(5, 141);
             this.lblResult.Name = "lblResult";
             this.lblResult.Size = new System.Drawing.Size(124, 85);
             this.lblResult.TabIndex = 8;
@@ -130,7 +130,7 @@ namespace TSA_V
             // 
             // btnUpdateImg
             // 
-            this.btnUpdateImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnUpdateImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnUpdateImg.BackColor = System.Drawing.Color.Transparent;
             this.btnUpdateImg.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnUpdateImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -160,7 +160,7 @@ namespace TSA_V
             // 
             // btnExit
             // 
-            this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnExit.BackColor = System.Drawing.Color.Transparent;
             this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnExit.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -174,7 +174,7 @@ namespace TSA_V
             // 
             // btnRun
             // 
-            this.btnRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnRun.BackColor = System.Drawing.Color.Transparent;
             this.btnRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -211,7 +211,7 @@ namespace TSA_V
             this.picResult.ImageBorderColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.picResult.Location = new System.Drawing.Point(0, 0);
             this.picResult.Name = "picResult";
-            this.picResult.Size = new System.Drawing.Size(644, 758);
+            this.picResult.Size = new System.Drawing.Size(644, 763);
             this.picResult.TabIndex = 297;
             this.picResult.Paint += new System.Windows.Forms.PaintEventHandler(this.picResult_Paint);
             this.picResult.DoubleClick += new System.EventHandler(this.picResult_DoubleClick);

TSA-V/workForm/FrmAOICheckN.cs

@@ -55,11 +55,11 @@ namespace TSA_V
             }
             else
             {
-                string currProjectName = BoardManager.CurrBoard.GetAoiFileName();
-                //string filePath = Application.StartupPath + @"\config\\AOIConfig" + currProjectName + "bmp";
-                string extension = Path.GetExtension(currProjectName);
-                string filename = currProjectName.Replace(extension, ".bmp");
-                ShowBaseImg(filename,"Base"); 
+                //string currProjectName = BoardManager.CurrBoard.GetAoiFileName();
+                ////string filePath = Application.StartupPath + @"\config\\AOIConfig" + currProjectName + "bmp";
+                //string extension = Path.GetExtension(currProjectName);
+                //string filename = currProjectName.Replace(extension, ".bmp");
+                //ShowBaseImg(filename,"Base"); 
             }
             ShowMsg(ResourceCulture.GetString("{0}秒后自动检测", "{0}秒后自动检测", waitSeconds.ToString()));
             修正ToolStripMenuItem.Text = ResourceCulture.GetString("FrmAOICheck_btnUpdateImg_Text", "修正");
@@ -91,7 +91,7 @@ namespace TSA_V
             if (File.Exists(filePath))
             {
                 var bmp = new Bitmap(filePath);
-                this.picResult.Image= Eyemlib.DeepClone(bmp);
+                this.picResult.Image= Eyemlib.DeepClone(bmp); 
                 bmp.Dispose();
             }
           
@@ -350,6 +350,19 @@ namespace TSA_V
         private void FrmCameraAOI_Shown(object sender, EventArgs e)
         {
             showTime = DateTime.Now;
+            if (CurrProject == null)
+            {
+                this.Close();
+                return;
+            }
+            else
+            {
+                string currProjectName = BoardManager.CurrBoard.GetAoiFileName();
+                //string filePath = Application.StartupPath + @"\config\\AOIConfig" + currProjectName + "bmp";
+                string extension = Path.GetExtension(currProjectName);
+                string filename = currProjectName.Replace(extension, ".bmp");
+                ShowBaseImg(filename, "Base");
+            }
         }
 
         private void btnExit_Click_1(object sender, EventArgs e)