1

URSolderingClient/FrmBoardInfo.cs

@@ -723,39 +723,7 @@ namespace URSoldering.Client
         private void button1_Click(object sender, EventArgs e)
         private void button1_Click(object sender, EventArgs e)
         {
         {
             this.Close();
             this.Close();
-        }
-
-        private void btnChange_Click(object sender, EventArgs e)
-        {
-            //if (isAuto)
-            //{
-            //    URRobotControl.FreeAxis();
-            //    isAuto = false;
-            //    btnChange.Text = "切换到自动模式(&M)（当前手动）";
-            //    //timer1.Enabled = true;
-            //}
-            //else
-            //{
-            //    DialogResult result = MessageBox.Show("确定修改为自动模式？", "提示", MessageBoxButtons.YesNo);
-            //    if (result.Equals(DialogResult.Yes))
-            //    {
-            //        result = MessageBox.Show("切换为自动模式之前，请确保所有人员远离机器人！", "提示", MessageBoxButtons.OKCancel);
-            //        if (result.Equals(DialogResult.OK))
-            //        {
-            //            URRobotControl.LockAxis();
-            //            isAuto = true;
-            //            btnChange.Text = "切换到手动模式(&M)（当前自动）";
-            //            //timer1.Enabled = false;
-            //        }
-            //    }
-            //}
-        }
-
-        private void btnRead_Click(object sender, EventArgs e)
-        {
-            //URRobotControl.GetPosition(AfterGet);
-        }
-         
+        } 
         protected override void OnVisibleChanged(EventArgs e)
         protected override void OnVisibleChanged(EventArgs e)
         {
         {
             base.OnVisibleChanged(e);
             base.OnVisibleChanged(e);
@@ -763,12 +731,7 @@ namespace URSoldering.Client
             {
             {
                 this.Close();
                 this.Close();
             }
             }
-        } 
-        /// <summary>
-        /// 打开文件夹，选取图片
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        }  
         private void btnOpenFile_Click(object sender, EventArgs e)
         private void btnOpenFile_Click(object sender, EventArgs e)
         {
         {
             string filePath = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.BOARD_IMAGE_PATH);
             string filePath = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.BOARD_IMAGE_PATH);
@@ -788,8 +751,8 @@ namespace URSoldering.Client
             }
             }
 
 
         }
         }
-        private int pointHight = 10;
-        private float imageXiShu = 1;
+        //private int pointHight = 10;
+        //private float imageXiShu = 1;
         private void loadPictureBoxSize()
         private void loadPictureBoxSize()
         {
         {
             picBoard.SizeMode = PictureBoxSizeMode.StretchImage;
             picBoard.SizeMode = PictureBoxSizeMode.StretchImage;
@@ -896,12 +859,7 @@ namespace URSoldering.Client
             //g.Dispose();
             //g.Dispose();
 
 
         }
         }
- 
-        /// <summary>
-        /// 单元格数据改变时
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+  
         private void dgvList_CellValueChanged(object sender, DataGridViewCellEventArgs e)
         private void dgvList_CellValueChanged(object sender, DataGridViewCellEventArgs e)
         { 
         { 
             if (this.txtBoardWidth.Text.Trim() != "" && this.txtBoardLength.Text.Trim() != "")
             if (this.txtBoardWidth.Text.Trim() != "" && this.txtBoardLength.Text.Trim() != "")