点顺序可更改

DeviceLibrary/bean/ConfigIO.cs

@@ -45,20 +45,23 @@ namespace TSA_V.DeviceLibrary
         /// 设备名称
         /// </summary> 
         public string DeviceName { get; set; }
-        public string DisplayUSStr
+        public string DisplayStr
         {
+            
             get
             {
-                return Explain.Substring(0, 3) + "_" + ProName;
-            }
-        }
-        public string DisplayCnStr
+                if (ResourceControl.GetLanguage().Equals(ResourceControl.China))
                 {
-            get
+                    return Explain + "_" + ProName;
+                }
+                else
                 {
-                return    Explain + "_" + ProName  ;
+
+                    return Explain.Substring(0, 3) + "_" + ProName;
                 }
             }
+        }
+     
         public override string ToString()
         {
             return "ConfigIO。" + ProType + "," + Explain + "," + ProName + "，属性值：" + IOIndex   ;

DeviceLibrary/manager/ResourceControl.cs

@@ -13,11 +13,17 @@ namespace TSA_V
 {
     public class ResourceControl
     {
+        public static string China = "zh-CN";
+        public static string English = "en-US";
         public delegate string GetStrDelegate(string id, string defaultStr );
         public static event GetStrDelegate GetStrEvent;
 
         public delegate string GetStringDelegate(string id, string defaultStr, params object[] param);
         public static event GetStringDelegate GetStringEvent;
+
+
+        public delegate string GetLanDelegate();
+        public static event GetLanDelegate GetLanEvent;
         public static string GetString(string id,string defaultStr)
         {
             string result = GetStrEvent?.Invoke(id, defaultStr);
@@ -28,7 +34,11 @@ namespace TSA_V
             string result = GetStringEvent?.Invoke(id, defaultStr,param);
             return result;
         }
-         
+        public static string GetLanguage( )
+        {
+            string result = GetLanEvent?.Invoke();
+            return result;
+        }
         /// <summary>
         ///  宽度
         /// </summary>

DeviceLibrary/manager/TSAVStatus.cs

@@ -93,7 +93,8 @@ namespace TSA_V.DeviceLibrary
             }
             else if (WaitType.Equals(WaitTypeEnum.IOSingle_6))
             {
-                return "IO等待[" + IoType + "]=[" + IoValue + "]";
+                ConfigIO io = IOManager.getWaitIO(IoType);
+                return "IO等待[" + io.DisplayStr + "]=[" + IoValue + "]";
             }
             else if (WaitType.Equals(WaitTypeEnum.Time_3))
             {

TSA-V/FrmBoardInfo.cs

@@ -67,7 +67,7 @@ namespace TSA_V
 
             if (isNew == false)
             {
-                AOIManager.LoadAOIFile(cmbAOIFile,updateBoardInfo.AOIProName);
+                AOIManager.LoadAOIFile(cmbAOIFile, updateBoardInfo.AOIProName);
                 LoadBoardInfo();
             }
             else
@@ -94,6 +94,11 @@ namespace TSA_V
             timer1.Start();
 
             isFinishLoad = true;
+            if (dgvList.Rows.Count > 0)
+            {
+                int index = dgvList.Rows.Count - 1;
+                dgvList.Rows[0].Selected = true; 
+            }
         }
         private void LanguagePro()
         {
@@ -129,8 +134,12 @@ namespace TSA_V
             this.Column_Del.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
             this.Column_Del.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
 
-            this.Column_Up.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升"); 
-            this.Column_Down.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
+            //this.Column_Up.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升"); 
+            //this.Column_Up.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
+            //this.Column_Up.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
+            //this.Column_Down.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
+            //this.Column_Down.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
+            //this.Column_Down.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
             this.Column_CheckOK.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Check, "校准点");
             this.Column_disable.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用");
         }
@@ -377,15 +386,12 @@ namespace TSA_V
         {
             try
             {
-                if (rowIndex >= dgvList.Rows.Count - 1)
+                isFinishLoad = false;
+                if (  rowIndex >= dgvList.Rows.Count - 1)
                 {
                     return;
                 }
                 DataGridViewRow row = dgvList.Rows[rowIndex]; 
-                if (rowIndex < 0)
-                {
-                    return;
-                }
                 dgvList.Rows.Remove(dgvList.Rows[rowIndex]);
 
                 if (rowIndex >= dgvList.Rows.Count - 1)
@@ -395,30 +401,41 @@ namespace TSA_V
                 else
                 {
                     dgvList.Rows.Insert(rowIndex + 1, row);
-                }
+                };
+                dgvList.Rows[rowIndex + 1].Selected = true;
             }
             catch (Exception ex)
             {
                 LogUtil.error("行下降出错：" + ex.ToString());
             }
+            finally
+            {
+                isFinishLoad = true;
+            }
         }
 
         private void RowUp(int rowIndex)
         {
             try
             {
-                DataGridViewRow row = dgvList.Rows[rowIndex];
+                isFinishLoad = false;
                 if (rowIndex <= 0)
                 {
                     return;
                 }
+                DataGridViewRow row = dgvList.Rows[rowIndex]; 
                 dgvList.Rows.Remove(dgvList.Rows[rowIndex]);
                 dgvList.Rows.Insert(rowIndex - 1, row);
+                dgvList.Rows[rowIndex - 1].Selected = true;
             }
             catch (Exception ex)
             {
                 LogUtil.error("行上升出错：" + ex.ToString());
             }
+            finally
+            { 
+                isFinishLoad = true;
+            }
         }
 
 
@@ -940,6 +957,7 @@ namespace TSA_V
 
         private int GetRowFromPoint(int x, int y)
         {
+            y = y + VerticalScrollIndex;
             for (int i = 0; i < dgvList.RowCount; i++)
             {
                 Rectangle rec = dgvList.GetRowDisplayRectangle(i, false);
@@ -949,16 +967,41 @@ namespace TSA_V
             }
             return -1;
         }
+        int VerticalScrollIndex = 0, HorizontalOffset = 0;
+
+        private void dgvList_Scroll(object sender, ScrollEventArgs e)
+        {
+            try
+            {
+                if (e.ScrollOrientation == ScrollOrientation.VerticalScroll)
+                {
+                    VerticalScrollIndex = e.NewValue;
+                }
+                else if (e.ScrollOrientation == ScrollOrientation.HorizontalScroll)
+                {
+                    HorizontalOffset = e.NewValue;
+                }
+
+            }
+            catch { }
 
+        }
         private void dgvList_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e)
         {
-            if (selectionIdx > -1)
+            try
+            {
+                if (selectionIdx > -1 && selectIndex <= (dgvList.Rows.Count - 1))
                 {
                     dgvList.Rows[selectionIdx].Selected = true;
                     dgvList.CurrentCell = dgvList.Rows[selectionIdx].Cells[0];
                     selectionIdx = -1;
                 } 
             }
+            catch (Exception ex)
+            {
+
+            }
+        }
 
         private void dgvList_CellMouseDown(object sender, DataGridViewCellMouseEventArgs e)
         {
@@ -1107,6 +1150,8 @@ namespace TSA_V
 
         private void dgvList_SelectionChanged(object sender, EventArgs e)
         {
+            if (isFinishLoad)
+            {
                 if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0)
                 {
                     int rowIndex = dgvList.SelectedRows[0].Index;
@@ -1114,10 +1159,10 @@ namespace TSA_V
                     string name = dgvList.Rows[rowIndex].Cells[this.Column_Name.Name].Value.ToString();
                     记录为组装坐标ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemTextUpdateP, "更新为【{0}-{1}】的位置", partNum, name);
                      
-
                     UpdateSelPoint(rowIndex);
                 }
             }
+        } 
 
         private int preIndex = -1;
         private void 更新为组装坐标ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1323,5 +1368,6 @@ namespace TSA_V
                 dgvList.Rows[i].Cells[this.Column_disable.Name].Value = true ;  
             } 
         }
+       
     }
 }

TSA-V/FrmBoardInfo.resx

@@ -225,29 +225,9 @@
   <metadata name="Column_Up.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <data name="Column_Up.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAANRJREFUSEvtk8ENhSAMQBnAgHplD/c/w8UN1Dkg4adESJWKlsM/8ZIm0FIekCDC
-        n+iiZtgia20MLizRvu9BCBEDxhw+i7CkRfZJdBxHIUkBtS+8irZty5tqrckxrHmjKsLPNc9zzKU5ME1T
-        nr8946MIS5RSZ/YqAqCWcjUZKcISODUm5THjOOb8k6wQGWNyE75JItXuSClzDfa4U3TAZ4TF0EjxJAKG
-        YYg16kOTHeu6Bu/9ObtSEznnYi8F3VGhJqrRRV2UYXcsyxKDC/9ojXRRIyH8ACKfopRlVag2AAAAAElF
-        TkSuQmCC
-</value>
-  </data>
   <metadata name="Column_Down.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <data name="Column_Down.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAONJREFUSEvtk00OhCAMRlkb49/We3j/tS70BuI1TAwzH8FOVQTrYla8pIkttg9I
-        UOZPJNFrxKKu62xIEYuUUjakJFESEd6OcRzNuq4uOxISbdtmpmly2ZFLR9/3dlCWZa5yJCQqy9KuYcaZ
-        S8cwDDQsz3NX/XEnqqqK1jDjjHdrWmtqwi45e51T1zXV0evDfwdfuKwoCle9ivhJ7iTgVgS4DLsGew6a
-        pqE8JAFBEZjnmYa1bev9xj8xoiKwLAsNPQfWnvBIBPg17hG7Ls5jEeAyiQSIRABvxPdOYohFb0milxjz
-        AeLDoohrNFdzAAAAAElFTkSuQmCC
-</value>
-  </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>82</value>
   </metadata>

TSA-V/ResourceCulture.cs

@@ -26,6 +26,7 @@ namespace TSA_V
         {
             ResourceControl.GetStrEvent += GetString;
             ResourceControl.GetStringEvent += GetString; 
+            ResourceControl.GetLanEvent += GetLanguage;
 
             UserFromControl.UserControlResource.GetStrEvent += GetString;
             UserFromControl.UserControlResource.GetStringEvent += GetString;
@@ -36,7 +37,10 @@ namespace TSA_V
             CurrLanguage = name;
             Thread.CurrentThread.CurrentCulture = new CultureInfo(name);
         }
-         
+         public static string GetLanguage()
+        {
+            return CurrLanguage;
+        }
         public static string GetString(string id, params object[] param)
         {
             return GetString(id, id,param);