diff --git a/Rs.DeweyTester/FormMain.cs b/Rs.DeweyTester/FormMain.cs index a4fe5af..50e1970 100644 --- a/Rs.DeweyTester/FormMain.cs +++ b/Rs.DeweyTester/FormMain.cs @@ -838,18 +838,31 @@ namespace Rs.MotionPlat private void txtLotName_KeyUp(object sender, KeyEventArgs e) { StringBuilder msg = new StringBuilder(); - string reg = "[\\w,&,\\.]"; + //string reg = "[\\w,&,\\.]"; + //string reg = "([a-z 0-9 A-Z]*_{0,1})"; + string reg = "\\w"; TextBox textBox = (TextBox)sender; - string text=textBox.Text; - foreach(char c in text.ToCharArray()) + string text = textBox.Text; + char[] charData = text.ToCharArray(); + for (int i=0;i< charData.Length;i++) { - if(Regex.IsMatch(c.ToString(), reg)) + if (Regex.IsMatch(charData[i].ToString(), reg)) { - msg.Append(c); + if(i>0 && charData[i]=='_') + { + if (charData[i] != charData[i-1]) + { + msg.Append(charData[i].ToString()); + } + } + else + { + msg.Append(charData[i].ToString()); + } } } textBox.Text = msg.ToString(); - //textBox.Select(msg.Length, 0); + textBox.Select(msg.Length, 0); } private void timer3_Tick_1(object sender, EventArgs e) diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs index 42d27c9..efe2604 100644 --- a/Rs.DeweyTester/Properties/AssemblyInfo.cs +++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //通过使用 "*",如下所示: - [assembly: AssemblyVersion("20.25.27.2")] + [assembly: AssemblyVersion("20.25.28.1")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]