Skip to content

G
GC_Branch
Commit 3bbc4be4 authored by leon.huang's avatar leon.huang
Browse files
Options

version 1.7.3 增加输入限制的中译英

parent 163c51d5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 35012 additions and 957 deletions
GcDevicePc/AboutForm.cs
View file @ 3bbc4be4
...@@ -42,7 +42,7 @@ namespace GcDevicePc ...@@ -42,7 +42,7 @@ namespace GcDevicePc
this.fid1ver.Text = this.FID1version; this.fid1ver.Text = this.FID1version;
this.fid2ver.Text = this.FID2version; this.fid2ver.Text = this.FID2version;
this.tcdver.Text = this.TCD1version; this.tcdver.Text = this.TCD1version;
this.PCver.Text = this.Hmiversion + "/1.7.2"; this.PCver.Text = this.Hmiversion + "/1.7.3";
} }
} }
} }
GcDevicePc/ConfigMethod/ChromColumn.cs
View file @ 3bbc4be4
...@@ -95,7 +95,11 @@ namespace GcDevicePc.ConfigMethod ...@@ -95,7 +95,11 @@ namespace GcDevicePc.ConfigMethod
string strData = textBox.Text; string strData = textBox.Text;
textBox.Clear(); textBox.Clear();
textBox.AppendText(strData.Substring(0,strData.ToString().Length -1)); textBox.AppendText(strData.Substring(0,strData.ToString().Length -1));
ToolTip1.Show($"输入的字符长度不能大于{ucCharMaxLength}",textBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入的字符长度不能大于{ucCharMaxLength}",textBox,3000);
else
ToolTip1.Show($"Enter characters of length no greater than {ucCharMaxLength}",textBox,3000);
// ToolTip1.Show($"输入的字符长度不能大于{ucCharMaxLength}",textBox,3000);
} }
} }
private void vInput_Limit_MouseLeave(object sender, EventArgs e) private void vInput_Limit_MouseLeave(object sender, EventArgs e)
......
GcDevicePc/ConfigMethod/FID.cs
View file @ 3bbc4be4
...@@ -3,6 +3,7 @@ using System.Collections.Generic; ...@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;//.Tasks; using System.Threading;//.Tasks;
...@@ -33,7 +34,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -33,7 +34,7 @@ namespace GcDevicePc.ConfigMethod
} }
int configTemp; int configTemp;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
public void reflashContent(int index) public void reflashContent(int index)
{ {
...@@ -251,13 +252,19 @@ namespace GcDevicePc.ConfigMethod ...@@ -251,13 +252,19 @@ namespace GcDevicePc.ConfigMethod
{ {
if (usData > dMaxInpueValue) if (usData > dMaxInpueValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if( bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMaxInpueValue.ToString()); DeTextBox.AppendText(dMaxInpueValue.ToString());
} }
else if(usData < dMinInputValue) else if(usData < dMinInputValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if( bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMinInputValue.ToString()); DeTextBox.AppendText(dMinInputValue.ToString());
} }
...@@ -272,7 +279,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -272,7 +279,10 @@ namespace GcDevicePc.ConfigMethod
} }
else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1)) else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1))
{ {
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000);
else
ToolTip1.Show($"Exact {bRetainBit} places after decimal point",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1)); DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1));
} }
...@@ -284,7 +294,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -284,7 +294,10 @@ namespace GcDevicePc.ConfigMethod
else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0) else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0)
{ {
string str = DeTextBox.Text; string str = DeTextBox.Text;
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if( bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(str.Substring(0,str.Length -1)); DeTextBox.AppendText(str.Substring(0,str.Length -1));
} }
......
GcDevicePc/ConfigMethod/RealColTab.cs
View file @ 3bbc4be4
...@@ -3,8 +3,10 @@ using System.Collections.Generic; ...@@ -3,8 +3,10 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using GcDevicePc.Common; using GcDevicePc.Common;
using GcDevicePc.GCBuffer; using GcDevicePc.GCBuffer;
...@@ -15,7 +17,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -15,7 +17,7 @@ namespace GcDevicePc.ConfigMethod
{ {
HWConfig hwconfig; HWConfig hwconfig;
GCMethodConfig methodconfig; GCMethodConfig methodconfig;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
public RealColTab(HWConfig hwconfig, ref GCMethodConfig methodconfig) public RealColTab(HWConfig hwconfig, ref GCMethodConfig methodconfig)
{ {
InitializeComponent(); InitializeComponent();
...@@ -501,13 +503,19 @@ namespace GcDevicePc.ConfigMethod ...@@ -501,13 +503,19 @@ namespace GcDevicePc.ConfigMethod
} }
if (usData > dMaxInpueValue) if (usData > dMaxInpueValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMaxInpueValue.ToString()); DeTextBox.AppendText(dMaxInpueValue.ToString());
} }
else if(usData < dMinInputValue) else if(usData < dMinInputValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMinInputValue.ToString()); DeTextBox.AppendText(dMinInputValue.ToString());
} }
...@@ -522,7 +530,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -522,7 +530,10 @@ namespace GcDevicePc.ConfigMethod
} }
else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1)) else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1))
{ {
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000);
else
ToolTip1.Show($"Exact {bRetainBit} places after decimal point",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1)); DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1));
} }
...@@ -534,7 +545,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -534,7 +545,10 @@ namespace GcDevicePc.ConfigMethod
else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0) else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0)
{ {
string str = DeTextBox.Text; string str = DeTextBox.Text;
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(str.Substring(0,str.Length -1)); DeTextBox.AppendText(str.Substring(0,str.Length -1));
} }
......
GcDevicePc/ConfigMethod/SampleTab.cs
View file @ 3bbc4be4
...@@ -103,7 +103,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -103,7 +103,10 @@ namespace GcDevicePc.ConfigMethod
if(TempTextBox.Text.IndexOf(".") > -1) if(TempTextBox.Text.IndexOf(".") > -1)
{ {
string strData = TempTextBox.Text; string strData = TempTextBox.Text;
ToolTip1.Show("输入整数",TempTextBox,3000); if (bEnglishLanguage == false)
ToolTip1.Show("输入值为整数", TempTextBox, 3000);
else
ToolTip1.Show("The input value should be an integer", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(strData.Substring(0,strData.Length -1)); TempTextBox.AppendText(strData.Substring(0,strData.Length -1));
} }
...@@ -111,13 +114,20 @@ namespace GcDevicePc.ConfigMethod ...@@ -111,13 +114,20 @@ namespace GcDevicePc.ConfigMethod
{ {
if (usData > 1000) if (usData > 1000)
{ {
ToolTip1.Show("输入值为0-1000的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为0-1000的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is 0-1000",TempTextBox,3000);
//ToolTip1.Show("输入值为0-1000的区间内",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText("1000"); TempTextBox.AppendText("1000");
} }
else if(usData < 0) else if(usData < 0)
{ {
ToolTip1.Show("输入值为0-1000的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为0-1000的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is 0-1000",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText("0"); TempTextBox.AppendText("0");
} }
...@@ -130,7 +140,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -130,7 +140,10 @@ namespace GcDevicePc.ConfigMethod
else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0) else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0)
{ {
string str = TempTextBox.Text; string str = TempTextBox.Text;
ToolTip1.Show($"输入值为0-1000的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为0-1000的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is 0-1000",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(str.Substring(0,str.Length -1)); TempTextBox.AppendText(str.Substring(0,str.Length -1));
} }
......
GcDevicePc/ConfigMethod/SignalTab.cs
View file @ 3bbc4be4
...@@ -210,13 +210,19 @@ namespace GcDevicePc.ConfigMethod ...@@ -210,13 +210,19 @@ namespace GcDevicePc.ConfigMethod
{ {
if (usData > dMaxInpueValue) if (usData > dMaxInpueValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMaxInpueValue.ToString()); DeTextBox.AppendText(dMaxInpueValue.ToString());
} }
else if(usData < dMinInputValue) else if(usData < dMinInputValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMinInputValue.ToString()); DeTextBox.AppendText(dMinInputValue.ToString());
} }
...@@ -231,7 +237,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -231,7 +237,10 @@ namespace GcDevicePc.ConfigMethod
} }
else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1)) else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1))
{ {
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000);
else
ToolTip1.Show($"Exact {bRetainBit} places after decimal point",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1)); DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1));
} }
...@@ -243,7 +252,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -243,7 +252,10 @@ namespace GcDevicePc.ConfigMethod
else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0) else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0)
{ {
string str = DeTextBox.Text; string str = DeTextBox.Text;
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(str.Substring(0,str.Length -1)); DeTextBox.AppendText(str.Substring(0,str.Length -1));
} }
......
GcDevicePc/ConfigMethod/ValveTab.cs
View file @ 3bbc4be4
...@@ -64,13 +64,19 @@ namespace GcDevicePc.ConfigMethod ...@@ -64,13 +64,19 @@ namespace GcDevicePc.ConfigMethod
{ {
if (usData > dMaxInpueValue) if (usData > dMaxInpueValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if (bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内", DeTextBox, 3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}", DeTextBox, 3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMaxInpueValue.ToString()); DeTextBox.AppendText(dMaxInpueValue.ToString());
} }
else if(usData < dMinInputValue) else if(usData < dMinInputValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMinInputValue.ToString()); DeTextBox.AppendText(dMinInputValue.ToString());
} }
...@@ -85,7 +91,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -85,7 +91,10 @@ namespace GcDevicePc.ConfigMethod
} }
else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1)) else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1))
{ {
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000);
else
ToolTip1.Show($"Exact {bRetainBit} places after decimal point",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1)); DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1));
} }
...@@ -97,7 +106,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -97,7 +106,10 @@ namespace GcDevicePc.ConfigMethod
else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0) else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0)
{ {
string str = DeTextBox.Text; string str = DeTextBox.Text;
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(str.Substring(0,str.Length -1)); DeTextBox.AppendText(str.Substring(0,str.Length -1));
} }
...@@ -122,7 +134,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -122,7 +134,10 @@ namespace GcDevicePc.ConfigMethod
string strData = textBox.Text; string strData = textBox.Text;
textBox.Clear(); textBox.Clear();
textBox.AppendText(strData.Substring(0,strData.ToString().Length -1)); textBox.AppendText(strData.Substring(0,strData.ToString().Length -1));
ToolTip1.Show($"输入的字符长度大于{ucCharMaxLength}",textBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入的字符长度不能大于{ucCharMaxLength}",textBox,3000);
else
ToolTip1.Show($"Enter characters of length no greater than {ucCharMaxLength}",textBox,3000);
} }
if (textBox.Text != "" || textBox.Text != null) if (textBox.Text != "" || textBox.Text != null)
{ {
......
GcDevicePc/ConfigMethod/injectionport/IPPIP.cs
View file @ 3bbc4be4
...@@ -430,13 +430,19 @@ namespace GcDevicePc.ConfigMethod.injectionport ...@@ -430,13 +430,19 @@ namespace GcDevicePc.ConfigMethod.injectionport
{ {
if (usData > dMaxInpueValue) if (usData > dMaxInpueValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMaxInpueValue.ToString()); DeTextBox.AppendText(dMaxInpueValue.ToString());
} }
else if(usData < dMinInputValue) else if(usData < dMinInputValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMinInputValue.ToString()); DeTextBox.AppendText(dMinInputValue.ToString());
} }
...@@ -451,7 +457,10 @@ namespace GcDevicePc.ConfigMethod.injectionport ...@@ -451,7 +457,10 @@ namespace GcDevicePc.ConfigMethod.injectionport
} }
else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1)) else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1))
{ {
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000);
else
ToolTip1.Show($"Exact {bRetainBit} places after decimal point",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1)); DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1));
} }
...@@ -463,7 +472,10 @@ namespace GcDevicePc.ConfigMethod.injectionport ...@@ -463,7 +472,10 @@ namespace GcDevicePc.ConfigMethod.injectionport
else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0) else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0)
{ {
string str = DeTextBox.Text; string str = DeTextBox.Text;
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(str.Substring(0,str.Length -1)); DeTextBox.AppendText(str.Substring(0,str.Length -1));
} }
......
GcDevicePc/ConfigMethod/injectionport/IPSPL.cs
View file @ 3bbc4be4
...@@ -181,13 +181,19 @@ namespace GcDevicePc.ConfigMethod.injectionport ...@@ -181,13 +181,19 @@ namespace GcDevicePc.ConfigMethod.injectionport
{ {
if (usData > dMaxInpueValue) if (usData > dMaxInpueValue)
{ {
ToolTip1.Show($"输入值不在{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMaxInpueValue.ToString()); DeTextBox.AppendText(dMaxInpueValue.ToString());
} }
else if(usData < dMinInputValue) else if(usData < dMinInputValue)
{ {
ToolTip1.Show($"输入值不在{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMinInputValue.ToString()); DeTextBox.AppendText(dMinInputValue.ToString());
} }
...@@ -202,7 +208,10 @@ namespace GcDevicePc.ConfigMethod.injectionport ...@@ -202,7 +208,10 @@ namespace GcDevicePc.ConfigMethod.injectionport
} }
else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1)) else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1))
{ {
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000);
else
ToolTip1.Show($"Exact {bRetainBit} places after decimal point",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1)); DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1));
} }
...@@ -214,7 +223,10 @@ namespace GcDevicePc.ConfigMethod.injectionport ...@@ -214,7 +223,10 @@ namespace GcDevicePc.ConfigMethod.injectionport
else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0) else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0)
{ {
string str = DeTextBox.Text; string str = DeTextBox.Text;
ToolTip1.Show($"输入值不在{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(str.Substring(0,str.Length -1)); DeTextBox.AppendText(str.Substring(0,str.Length -1));
} }
......
GcDevicePc/DeviceConfigUI/Auxiliary.cs
View file @ 3bbc4be4
...@@ -3,8 +3,10 @@ using System.Collections.Generic; ...@@ -3,8 +3,10 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using GcDevicePc.GCBuffer; using GcDevicePc.GCBuffer;
...@@ -14,6 +16,7 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -14,6 +16,7 @@ namespace GcDevicePc.DeviceConfigUI
{ {
#region 私有变量 #region 私有变量
private HWConfig hWConfig; private HWConfig hWConfig;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
#endregion #endregion
#region 构造函数 #region 构造函数
...@@ -87,7 +90,10 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -87,7 +90,10 @@ namespace GcDevicePc.DeviceConfigUI
if(TempTextBox.Text.IndexOf(".") > -1) if(TempTextBox.Text.IndexOf(".") > -1)
{ {
string strData = TempTextBox.Text; string strData = TempTextBox.Text;
ToolTip1.Show("输入值为整数",TempTextBox,3000); if (bEnglishLanguage == false)
ToolTip1.Show("输入值应为整数", TempTextBox, 3000);
else
ToolTip1.Show("The input value should be an integer", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(strData.Substring(0,strData.Length -1)); TempTextBox.AppendText(strData.Substring(0,strData.Length -1));
} }
...@@ -95,13 +101,19 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -95,13 +101,19 @@ namespace GcDevicePc.DeviceConfigUI
{ {
if (usData > usMaxValue) if (usData > usMaxValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMaxValue.ToString()); TempTextBox.AppendText(usMaxValue.ToString());
} }
else if(usData < usMinValue) else if(usData < usMinValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMinValue.ToString()); TempTextBox.AppendText(usMinValue.ToString());
} }
...@@ -118,7 +130,10 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -118,7 +130,10 @@ namespace GcDevicePc.DeviceConfigUI
else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0) else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0)
{ {
string str = TempTextBox.Text; string str = TempTextBox.Text;
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(str.Substring(0,str.Length -1)); TempTextBox.AppendText(str.Substring(0,str.Length -1));
} }
......
GcDevicePc/DeviceConfigUI/ColumnBox.cs
View file @ 3bbc4be4
...@@ -3,8 +3,10 @@ using System.Collections.Generic; ...@@ -3,8 +3,10 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using GcDevicePc.GCBuffer; using GcDevicePc.GCBuffer;
...@@ -14,6 +16,7 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -14,6 +16,7 @@ namespace GcDevicePc.DeviceConfigUI
{ {
#region 私有变量 #region 私有变量
private HWConfig hWConfig; private HWConfig hWConfig;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
#endregion #endregion
#region 构造函数 #region 构造函数
...@@ -61,7 +64,10 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -61,7 +64,10 @@ namespace GcDevicePc.DeviceConfigUI
if(TempTextBox.Text.IndexOf(".") > -1) if(TempTextBox.Text.IndexOf(".") > -1)
{ {
string strData = TempTextBox.Text; string strData = TempTextBox.Text;
ToolTip1.Show("输入值为整数",TempTextBox,3000); if (bEnglishLanguage == false)
ToolTip1.Show("输入值应为整数", TempTextBox, 3000);
else
ToolTip1.Show("The input value should be an integer", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(strData.Substring(0,strData.Length -1)); TempTextBox.AppendText(strData.Substring(0,strData.Length -1));
} }
...@@ -69,13 +75,19 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -69,13 +75,19 @@ namespace GcDevicePc.DeviceConfigUI
{ {
if (usData > usMaxValue) if (usData > usMaxValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMaxValue.ToString()); TempTextBox.AppendText(usMaxValue.ToString());
} }
else if(usData < usMinValue) else if(usData < usMinValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMinValue.ToString()); TempTextBox.AppendText(usMinValue.ToString());
} }
...@@ -92,7 +104,10 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -92,7 +104,10 @@ namespace GcDevicePc.DeviceConfigUI
else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0) else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0)
{ {
string str = TempTextBox.Text; string str = TempTextBox.Text;
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(str.Substring(0,str.Length -1)); TempTextBox.AppendText(str.Substring(0,str.Length -1));
} }
......
GcDevicePc/DeviceConfigUI/Detection.cs
View file @ 3bbc4be4
...@@ -3,8 +3,10 @@ using System.Collections.Generic; ...@@ -3,8 +3,10 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using GcDevicePc.GCBuffer; using GcDevicePc.GCBuffer;
...@@ -15,6 +17,7 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -15,6 +17,7 @@ namespace GcDevicePc.DeviceConfigUI
#region 私有变量 #region 私有变量
private HWConfig hWConfig; private HWConfig hWConfig;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
#endregion #endregion
#region 构造函数 #region 构造函数
...@@ -73,7 +76,10 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -73,7 +76,10 @@ namespace GcDevicePc.DeviceConfigUI
if(TempTextBox.Text.IndexOf(".") > -1) if(TempTextBox.Text.IndexOf(".") > -1)
{ {
string strData = TempTextBox.Text; string strData = TempTextBox.Text;
ToolTip1.Show("输入值应为整数",TempTextBox,3000); if (bEnglishLanguage == false)
ToolTip1.Show("输入值应为整数", TempTextBox, 3000);
else
ToolTip1.Show("The input value should be an integer", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(strData.Substring(0,strData.Length -1)); TempTextBox.AppendText(strData.Substring(0,strData.Length -1));
} }
...@@ -81,13 +87,19 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -81,13 +87,19 @@ namespace GcDevicePc.DeviceConfigUI
{ {
if (usData > usMaxValue) if (usData > usMaxValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMaxValue.ToString()); TempTextBox.AppendText(usMaxValue.ToString());
} }
else if(usData < usMinValue) else if(usData < usMinValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMinValue.ToString()); TempTextBox.AppendText(usMinValue.ToString());
} }
...@@ -104,7 +116,10 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -104,7 +116,10 @@ namespace GcDevicePc.DeviceConfigUI
else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0) else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0)
{ {
string str = TempTextBox.Text; string str = TempTextBox.Text;
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(str.Substring(0,str.Length -1)); TempTextBox.AppendText(str.Substring(0,str.Length -1));
} }
......
GcDevicePc/DeviceConfigUI/Device.cs
View file @ 3bbc4be4
...@@ -3,8 +3,10 @@ using System.Collections.Generic; ...@@ -3,8 +3,10 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using GcDevicePc.GCBuffer; using GcDevicePc.GCBuffer;
...@@ -14,6 +16,7 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -14,6 +16,7 @@ namespace GcDevicePc.DeviceConfigUI
{ {
#region 私有变量 #region 私有变量
private HWConfig hWConfig; private HWConfig hWConfig;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
#endregion #endregion
#region 构造函数 #region 构造函数
...@@ -73,7 +76,10 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -73,7 +76,10 @@ namespace GcDevicePc.DeviceConfigUI
string strData = textBox.Text; string strData = textBox.Text;
textBox.Clear(); textBox.Clear();
textBox.AppendText(strData.Substring(0,strData.ToString().Length -1)); textBox.AppendText(strData.Substring(0,strData.ToString().Length -1));
ToolTip1.Show($"输入的字符长度大于{ucCharMaxLength}",textBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入的字符长度不能大于{ucCharMaxLength}",textBox,3000);
else
ToolTip1.Show($"Enter characters of length no greater than {ucCharMaxLength}",textBox,3000);
} }
} }
private void vInput_Limit_MouseLeave(object sender, EventArgs e) private void vInput_Limit_MouseLeave(object sender, EventArgs e)
......
GcDevicePc/DeviceConfigUI/Sampling.cs
View file @ 3bbc4be4
...@@ -3,8 +3,10 @@ using System.Collections.Generic; ...@@ -3,8 +3,10 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using GcDevicePc.GCBuffer; using GcDevicePc.GCBuffer;
...@@ -22,6 +24,7 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -22,6 +24,7 @@ namespace GcDevicePc.DeviceConfigUI
#region 私有变量 #region 私有变量
private HWConfig hWConfig; private HWConfig hWConfig;
private SamplingDevice sampling_type; private SamplingDevice sampling_type;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
#endregion #endregion
#region 构造函数 #region 构造函数
...@@ -203,13 +206,19 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -203,13 +206,19 @@ namespace GcDevicePc.DeviceConfigUI
{ {
if (usData > dMaxInpueValue) if (usData > dMaxInpueValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMaxInpueValue.ToString()); DeTextBox.AppendText(dMaxInpueValue.ToString());
} }
else if(usData < dMinInputValue) else if(usData < dMinInputValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMinInputValue.ToString()); DeTextBox.AppendText(dMinInputValue.ToString());
} }
...@@ -224,7 +233,10 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -224,7 +233,10 @@ namespace GcDevicePc.DeviceConfigUI
} }
else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1)) else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1))
{ {
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000);
else
ToolTip1.Show($"Exact {bRetainBit} places after decimal point",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1)); DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1));
} }
...@@ -236,7 +248,10 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -236,7 +248,10 @@ namespace GcDevicePc.DeviceConfigUI
else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0) else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0)
{ {
string str = DeTextBox.Text; string str = DeTextBox.Text;
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(str.Substring(0,str.Length -1)); DeTextBox.AppendText(str.Substring(0,str.Length -1));
} }
...@@ -260,7 +275,10 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -260,7 +275,10 @@ namespace GcDevicePc.DeviceConfigUI
if(TempTextBox.Text.IndexOf(".") > -1) if(TempTextBox.Text.IndexOf(".") > -1)
{ {
string strData = TempTextBox.Text; string strData = TempTextBox.Text;
ToolTip1.Show("输入值为整数",TempTextBox,3000); if (bEnglishLanguage == false)
ToolTip1.Show("输入值为整数", TempTextBox, 3000);
else
ToolTip1.Show("The input value should be an integer", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(strData.Substring(0,strData.Length -1)); TempTextBox.AppendText(strData.Substring(0,strData.Length -1));
} }
...@@ -273,13 +291,19 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -273,13 +291,19 @@ namespace GcDevicePc.DeviceConfigUI
{ {
if (usData > usMaxValue) if (usData > usMaxValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMaxValue.ToString()); TempTextBox.AppendText(usMaxValue.ToString());
} }
else if(usData < usMinValue) else if(usData < usMinValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMinValue.ToString()); TempTextBox.AppendText(usMinValue.ToString());
} }
...@@ -296,7 +320,10 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -296,7 +320,10 @@ namespace GcDevicePc.DeviceConfigUI
else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0) else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0)
{ {
string str = TempTextBox.Text; string str = TempTextBox.Text;
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(str.Substring(0,str.Length -1)); TempTextBox.AppendText(str.Substring(0,str.Length -1));
} }
......
GcDevicePc/MDIBase.Designer.cs
View file @ 3bbc4be4
This diff is collapsed.
GcDevicePc/MDIBase.cs
View file @ 3bbc4be4
...@@ -834,7 +834,7 @@ namespace GcDevicePc ...@@ -834,7 +834,7 @@ namespace GcDevicePc
/// 1.0.2.3 添加了周期完成后，重新绘图功能 /// 1.0.2.3 添加了周期完成后，重新绘图功能
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
this.Text = String.Format("{0}-1.7.2{1}", globaldata.AppName,Formstr); this.Text = String.Format("{0}-1.7.3{1}", globaldata.AppName,Formstr);
HmiStatus.Text = bEnglishLanguage == false ? String.Format("状态：{0}", statestr) : String.Format("State：{0}", statestr); HmiStatus.Text = bEnglishLanguage == false ? String.Format("状态：{0}", statestr) : String.Format("State：{0}", statestr);
......
GcDevicePc/MDIBase.resx
View file @ 3bbc4be4
This diff is collapsed.
GcDevicePc/ProThread/GcDataTh.cs
View file @ 3bbc4be4
...@@ -248,11 +248,11 @@ namespace GcDevicePc.ProThread ...@@ -248,11 +248,11 @@ namespace GcDevicePc.ProThread
#endif #endif
//j++; //j++;
//Get_Channel1_ValueNum++; //Get_Channel1_ValueNum++;
if (globaldata.m_signalbuffer.Draw_Port.Count < globaldata.m_signalbuffer.Draw_Port.Capacity) if (globaldata.m_signalbuffer.Draw_Port.Count < globaldata.MAX_ARRAY_LEN)
{ {
globaldata.m_signalbuffer.Draw_Port.Add(globaldata.m_signalbuffer.Channel1_Port); globaldata.m_signalbuffer.Draw_Port.Add(globaldata.m_signalbuffer.Channel1_Port);
} }
if(globaldata.m_signalbuffer.Save_Port.Count < globaldata.m_signalbuffer.Save_Port.Capacity) if(globaldata.m_signalbuffer.Save_Port.Count < globaldata.MAX_ARRAY_LEN)
{ {
globaldata.m_signalbuffer.Save_Port.Add(globaldata.m_signalbuffer.Channel1_Port); globaldata.m_signalbuffer.Save_Port.Add(globaldata.m_signalbuffer.Channel1_Port);
} }
...@@ -261,14 +261,14 @@ namespace GcDevicePc.ProThread ...@@ -261,14 +261,14 @@ namespace GcDevicePc.ProThread
lock (globaldata.channelA_A) lock (globaldata.channelA_A)
{ {
if (globaldata.channelA_A.Count < globaldata.channelA_A.Capacity) if (globaldata.channelA_A.Count < globaldata.MAX_ARRAY_LEN)
{ {
globaldata.channelA_A.Add((long)(fidv[i] * 1000000)); globaldata.channelA_A.Add((long)(fidv[i] * 1000000));
} }
} }
lock (globaldata.channelB_A) lock (globaldata.channelB_A)
{ {
if (globaldata.channelB_A.Count < globaldata.channelB_A.Capacity) if (globaldata.channelB_A.Count < globaldata.MAX_ARRAY_LEN)
{ {
globaldata.channelB_A.Add((long)(fidv[i] * 1000000)); globaldata.channelB_A.Add((long)(fidv[i] * 1000000));
} }
...@@ -278,14 +278,14 @@ namespace GcDevicePc.ProThread ...@@ -278,14 +278,14 @@ namespace GcDevicePc.ProThread
{ {
lock (globaldata.channelA_A) lock (globaldata.channelA_A)
{ {
if (globaldata.channelA_A.Count < globaldata.channelA_A.Capacity) if (globaldata.channelA_A.Count < globaldata.MAX_ARRAY_LEN)
{ {
globaldata.channelA_A.Add((long)(fidv[i] * 1000000)); globaldata.channelA_A.Add((long)(fidv[i] * 1000000));
} }
} }
lock (globaldata.channelB_A) lock (globaldata.channelB_A)
{ {
if (globaldata.channelB_A.Count < globaldata.channelB_A.Capacity) if (globaldata.channelB_A.Count < globaldata.MAX_ARRAY_LEN)
{ {
globaldata.channelB_A.Add((long)(fidv[i] * 1000000)); globaldata.channelB_A.Add((long)(fidv[i] * 1000000));
} }
...@@ -1187,7 +1187,7 @@ namespace GcDevicePc.ProThread ...@@ -1187,7 +1187,7 @@ namespace GcDevicePc.ProThread
{ {
//globaldata.m_hmibuffer.gcinfo.NowStartTime = Get_Method_StartTime(); //globaldata.m_hmibuffer.gcinfo.NowStartTime = Get_Method_StartTime();
UInt64 StartTime = Get_Method_StartTime(); UInt64 StartTime = Get_Method_StartTime();
if((HMIStartBeforeTime > 0xFFF00000 && StartTime < 0x000FFFFF) || (HMIStartOverTimes == 0 && StartTime < 0x000FFFFF)) if((HMIStartBeforeTime > 0xFFF00000 && StartTime < 0x000FFFFF))// || (HMIStartOverTimes == 0 && StartTime < 0x000FFFFF))
{ {
HMIStartOverTimes ++; HMIStartOverTimes ++;
} }
...@@ -1215,7 +1215,7 @@ namespace GcDevicePc.ProThread ...@@ -1215,7 +1215,7 @@ namespace GcDevicePc.ProThread
{ {
// globaldata.m_hmibuffer.gcinfo.NowEndTime = Get_Method_EndTime(); // globaldata.m_hmibuffer.gcinfo.NowEndTime = Get_Method_EndTime();
UInt64 EndTime = Get_Method_EndTime(); UInt64 EndTime = Get_Method_EndTime();
if ((HMIEndBeforeTime > 0xFFF00000 && EndTime < 0x000FFFFF) || (HMIEndOverTimes == 0 && EndTime < 0x000FFFFF)) if ((HMIEndBeforeTime > 0xFFF00000 && EndTime < 0x000FFFFF))// || (HMIEndOverTimes == 0 && EndTime < 0x000FFFFF))
{ {
HMIEndOverTimes ++; HMIEndOverTimes ++;
} }
......
GcDevicePc/RunTables.cs
View file @ 3bbc4be4
...@@ -466,7 +466,10 @@ namespace GcDevicePc ...@@ -466,7 +466,10 @@ namespace GcDevicePc
if(TempTextBox.Text.IndexOf(".") > -1) if(TempTextBox.Text.IndexOf(".") > -1)
{ {
string strData = TempTextBox.Text; string strData = TempTextBox.Text;
ToolTip1.Show("输入值为整数",TempTextBox,3000); if (bEnglishLanguage == false)
ToolTip1.Show("输入值为整数", TempTextBox, 3000);
else
ToolTip1.Show("The input value should be an integer", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(strData.Substring(0,strData.Length -1)); TempTextBox.AppendText(strData.Substring(0,strData.Length -1));
} }
...@@ -478,13 +481,19 @@ namespace GcDevicePc ...@@ -478,13 +481,19 @@ namespace GcDevicePc
{ {
if (usData > usMaxValue) if (usData > usMaxValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMaxValue.ToString()); TempTextBox.AppendText(usMaxValue.ToString());
} }
else if(usData < usMinValue) else if(usData < usMinValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMinValue.ToString()); TempTextBox.AppendText(usMinValue.ToString());
} }
...@@ -501,7 +510,10 @@ namespace GcDevicePc ...@@ -501,7 +510,10 @@ namespace GcDevicePc
else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0) else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0)
{ {
string str = TempTextBox.Text; string str = TempTextBox.Text;
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(str.Substring(0,str.Length -1)); TempTextBox.AppendText(str.Substring(0,str.Length -1));
} }
......
GcDevicePc/SysConfig.cs
View file @ 3bbc4be4
...@@ -7,6 +7,7 @@ using System.Collections.Generic; ...@@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
...@@ -27,6 +28,7 @@ namespace GcDevicePc ...@@ -27,6 +28,7 @@ namespace GcDevicePc
private ushort HmiPort = 911; private ushort HmiPort = 911;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
private ArrayList SearchRet = new ArrayList(); private ArrayList SearchRet = new ArrayList();
public SysConfig() public SysConfig()
...@@ -810,13 +812,19 @@ namespace GcDevicePc ...@@ -810,13 +812,19 @@ namespace GcDevicePc
{ {
if (usData > dMaxInpueValue) if (usData > dMaxInpueValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMaxInpueValue.ToString()); DeTextBox.AppendText(dMaxInpueValue.ToString());
} }
else if(usData < dMinInputValue) else if(usData < dMinInputValue)
{ {
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(dMinInputValue.ToString()); DeTextBox.AppendText(dMinInputValue.ToString());
} }
...@@ -831,7 +839,10 @@ namespace GcDevicePc ...@@ -831,7 +839,10 @@ namespace GcDevicePc
} }
else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1)) else if (DeTextBox.Text.IndexOf(".") > -1 && DeTextBox.Text.Length - DeTextBox.Text.IndexOf(".") > (bRetainBit + 1))
{ {
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"精确小数点后{bRetainBit}位",DeTextBox,3000);
else
ToolTip1.Show($"Exact {bRetainBit} places after decimal point",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1)); DeTextBox.AppendText(usData.ToString().Substring(0,usData.ToString().Length -1));
} }
...@@ -843,7 +854,10 @@ namespace GcDevicePc ...@@ -843,7 +854,10 @@ namespace GcDevicePc
else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0) else if(DeTextBox.Text != "" && DeTextBox.Text.Length != 0)
{ {
string str = DeTextBox.Text; string str = DeTextBox.Text;
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
else
ToolTip1.Show($"The input value is {dMinInputValue}-{dMaxInpueValue}",DeTextBox,3000);ToolTip1.Show($"输入值为{dMinInputValue}-{dMaxInpueValue}的区间内",DeTextBox,3000);
DeTextBox.Clear(); DeTextBox.Clear();
DeTextBox.AppendText(str.Substring(0,str.Length -1)); DeTextBox.AppendText(str.Substring(0,str.Length -1));
} }
...@@ -858,7 +872,10 @@ namespace GcDevicePc ...@@ -858,7 +872,10 @@ namespace GcDevicePc
if(TempTextBox.Text.IndexOf(".") > -1) if(TempTextBox.Text.IndexOf(".") > -1)
{ {
string strData = TempTextBox.Text; string strData = TempTextBox.Text;
ToolTip1.Show("输入值为整数",TempTextBox,3000); if (bEnglishLanguage == false)
ToolTip1.Show("输入值应为整数", TempTextBox, 3000);
else
ToolTip1.Show("The input value should be an integer", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(strData.Substring(0,strData.Length -1)); TempTextBox.AppendText(strData.Substring(0,strData.Length -1));
} }
...@@ -879,13 +896,19 @@ namespace GcDevicePc ...@@ -879,13 +896,19 @@ namespace GcDevicePc
{ {
if (usData > usMaxValue) if (usData > usMaxValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMaxValue.ToString()); TempTextBox.AppendText(usMaxValue.ToString());
} }
else if(usData < usMinValue) else if(usData < usMinValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMinValue.ToString()); TempTextBox.AppendText(usMinValue.ToString());
} }
...@@ -902,7 +925,10 @@ namespace GcDevicePc ...@@ -902,7 +925,10 @@ namespace GcDevicePc
else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0) else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0)
{ {
string str = TempTextBox.Text; string str = TempTextBox.Text;
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(str.Substring(0,str.Length -1)); TempTextBox.AppendText(str.Substring(0,str.Length -1));
} }
...@@ -916,7 +942,10 @@ namespace GcDevicePc ...@@ -916,7 +942,10 @@ namespace GcDevicePc
string strData = textBox.Text; string strData = textBox.Text;
textBox.Clear(); textBox.Clear();
textBox.AppendText(strData.Substring(0,strData.ToString().Length -1)); textBox.AppendText(strData.Substring(0,strData.ToString().Length -1));
ToolTip1.Show($"输入的字符长度应小于{ucCharMaxLength}",textBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入的字符长度不能大于{ucCharMaxLength}",textBox,3000);
else
ToolTip1.Show($"Enter characters of length no greater than {ucCharMaxLength}",textBox,3000);
} }
} }
private void Button2_Click(object sender, EventArgs e) private void Button2_Click(object sender, EventArgs e)
......
GcDevicePc/auxtool.cs
View file @ 3bbc4be4
...@@ -29,7 +29,7 @@ namespace GcDevicePc ...@@ -29,7 +29,7 @@ namespace GcDevicePc
//private string HmiIP = null; //private string HmiIP = null;
//private ushort HmiPort = 911; //private ushort HmiPort = 911;
private ArrayList SearchRet = new ArrayList(); private ArrayList SearchRet = new ArrayList();
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
public auxtool() public auxtool()
{ {
InitializeComponent(); InitializeComponent();
...@@ -458,7 +458,10 @@ namespace GcDevicePc ...@@ -458,7 +458,10 @@ namespace GcDevicePc
if(TempTextBox.Text.IndexOf(".") > -1) if(TempTextBox.Text.IndexOf(".") > -1)
{ {
string strData = TempTextBox.Text; string strData = TempTextBox.Text;
ToolTip1.Show("输入值为整数",TempTextBox,3000); if (bEnglishLanguage == false)
ToolTip1.Show("输入值为整数", TempTextBox, 3000);
else
ToolTip1.Show("The input value should be an integer", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(strData.Substring(0,strData.Length -1)); TempTextBox.AppendText(strData.Substring(0,strData.Length -1));
} }
...@@ -493,13 +496,19 @@ namespace GcDevicePc ...@@ -493,13 +496,19 @@ namespace GcDevicePc
{ {
if (usData > usMaxValue) if (usData > usMaxValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMaxValue.ToString()); TempTextBox.AppendText(usMaxValue.ToString());
} }
else if(usData < usMinValue) else if(usData < usMinValue)
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMinValue.ToString()); TempTextBox.AppendText(usMinValue.ToString());
} }
...@@ -515,7 +524,10 @@ namespace GcDevicePc ...@@ -515,7 +524,10 @@ namespace GcDevicePc
} }
else if(TempTextBox.Text != "") else if(TempTextBox.Text != "")
{ {
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); if(bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000);
else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000);
TempTextBox.Clear(); TempTextBox.Clear();
} }
} }
......
GcDevicePc/globaldata.cs
View file @ 3bbc4be4
...@@ -196,7 +196,7 @@ namespace GcDevicePc ...@@ -196,7 +196,7 @@ namespace GcDevicePc
public static String DeviceName; //HMI名字 public static String DeviceName; //HMI名字
public static IPAddress myIpaddr; public static IPAddress myIpaddr;
public static int MAX_ARRAY_LEN = 5120;
//public static AppInit m_appinit = new AppInit(); //程序初始化 //public static AppInit m_appinit = new AppInit(); //程序初始化
......
VocsSetup/GC_Config/GC_DataPro/ExteCfg.config
View file @ 3bbc4be4
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<PARAMETER> <PARAMETER>
<DEBUG>True</DEBUG> <DEBUG>True</DEBUG>
<fid>True</fid> <fid>True</fid>
<file1>C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_Config\GC_Set\运行表\voc</file1> <file1>C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_Config\GC_Set\运行表\VOC</file1>
<file2>C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_Config\GC_Set\运行表\voc</file2> <file2>C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_Config\GC_Set\运行表\VOC</file2>
<file3>C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_Config\GC_Set\运行表\voc</file3> <file3>C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_Config\GC_Set\运行表\VOC</file3>
<adjust1>0</adjust1> <adjust1>0</adjust1>
<adjust2>1</adjust2> <adjust2>1</adjust2>
<adjust3>0</adjust3> <adjust3>0</adjust3>
...@@ -29,12 +29,16 @@ ...@@ -29,12 +29,16 @@
<vlue>1</vlue> <vlue>1</vlue>
</NMHCcfgSave> </NMHCcfgSave>
<AutoMessage> <AutoMessage>
<name>CH4</name> <name>甲苯</name>
<vlue>1</vlue> <vlue>0</vlue>
</AutoMessage> </AutoMessage>
<AutoMessage> <AutoMessage>
<name>NMHC</name> <name>二甲苯</name>
<vlue>1</vlue> <vlue>0</vlue>
</AutoMessage>
<AutoMessage>
<name>THC</name>
<vlue>0</vlue>
</AutoMessage> </AutoMessage>
</Cfg> </Cfg>
</GCCPC> </GCCPC>
\ No newline at end of file
VocsSetup/GC_Config/GC_Set/Instrument Method/TVOC/做样.ini deleted 100644 → 0
View file @ 163c51d5
Binary files "a/VocsSetup/GC_Config/GC_Set/Instrument Method/TVOC/\345\201\232\346\240\267.ini" and /dev/null differ Binary files "a/VocsSetup/GC_Config/GC_Set/Instrument Method/TVOC/\345\201\232\346\240\267.ini" and /dev/null differ
VocsSetup/GC_Config/GC_Set/Instrument Method/TVOC/双tvoc.ini deleted 100644 → 0
View file @ 163c51d5
Binary files "a/VocsSetup/GC_Config/GC_Set/Instrument Method/TVOC/\345\217\214tvoc.ini" and /dev/null differ Binary files "a/VocsSetup/GC_Config/GC_Set/Instrument Method/TVOC/\345\217\214tvoc.ini" and /dev/null differ
VocsSetup/GC_Config/GC_Set/Startup/startup.ini
View file @ 3bbc4be4
...@@ -5,7 +5,7 @@ MAC ...@@ -5,7 +5,7 @@ MAC
[StartUp] [StartUp]
自启动=1 自启动=1
打开系统=0 打开系统=0
运行类型=0 运行类型=2
Forceintegral=1 Forceintegral=1
space=500 space=500
Datetime=1 Datetime=1
...@@ -24,6 +24,6 @@ Name=admin ...@@ -24,6 +24,6 @@ Name=admin
Password=0 Password=0
[SendData] [SendData]
Thirdparty=3 Thirdparty=3
Foreign=0 Foreign=1
[SaveData] [SaveData]
ZBSaveData=1 ZBSaveData=1
VocsSetup/GC_Config/GC_Set/Startup/sys.ini
View file @ 3bbc4be4
...@@ -6,4 +6,4 @@ AutoEliminationOxygenSlope=1 ...@@ -6,4 +6,4 @@ AutoEliminationOxygenSlope=1
AutoEliminationOxygenIntercept=0 AutoEliminationOxygenIntercept=0
Count3=TRUE Count3=TRUE
[O2CpdCount] [O2CpdCount]
O2value=21 O2value=12
VocsSetup/GC_User/Logs/ErrLog_20201119.txt 0 → 100644
View file @ 3bbc4be4
This diff is collapsed.
VocsSetup/GC_User/Logs/ErrLog_20201123.txt 0 → 100644
View file @ 3bbc4be4
This diff is collapsed.
VocsSetup/GC_User/Logs/ErrLog_20201125.txt 0 → 100644
View file @ 3bbc4be4
Record Time：2020-11-25 15:16:39,151 Thread ID:[35]- Error：ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为160-读取保持寄存器数量为120
Record Time：2020-11-25 15:17:54,292 Thread ID:[41]- Error：ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为100-读取保持寄存器数量为24
Record Time：2020-11-25 15:18:26,285 Thread ID:[36]- Error：ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为160-读取保持寄存器数量为120
Record Time：2020-11-25 15:18:26,285 Thread ID:[35]- Error：ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为700-读取保持寄存器数量为16
Record Time：2020-11-25 15:18:40,981 Thread ID:[36]- Error：ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为160-读取保持寄存器数量为120
Record Time：2020-11-25 15:18:40,981 Thread ID:[35]- Error：ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为700-读取保持寄存器数量为16
Record Time：2020-11-25 15:21:11,370 Thread ID:[1]- Error：ClassName:GCModbus Func Name:WriteHoldingReg Info:写单个保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为150-保持寄存器数量为1
Record Time：2020-11-25 15:22:14,917 Thread ID:[31]- Error：ClassName:GCModbus Func Name:WriteHoldingReg Info:写单个保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为150-保持寄存器数量为1
Record Time：2020-11-25 15:25:51,128 Thread ID:[1]- Error：ClassName:GCModbus Func Name:WriteHoldingReg Info:写单个保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为150-保持寄存器数量为1
Record Time：2020-11-25 15:27:41,242 Thread ID:[35]- Error：ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为700-读取保持寄存器数量为16
Record Time：2020-11-25 15:27:41,742 Thread ID:[41]- Error：ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为100-读取保持寄存器数量为24
Record Time：2020-11-25 15:29:34,410 Thread ID:[1]- Error：ClassName:GCModbus Func Name:WriteSingleCoil Info:写单个线圈寄存器失败-IP地址为192.168.1.58-线圈起始地址为31-线圈寄存器数量为1
Record Time：2020-11-25 15:29:35,592 Thread ID:[32]- Error：ClassName:ChannelDataSave Func Name:Monitor_Data Info:Channel 1 Data Save Crash!
Record Time：2020-11-25 15:29:35,592 Thread ID:[32]- Error：ClassName:ChannelDataSave Func Name:Monitor_Data Info:索引超出范围。必须为非负值并小于集合大小。
参数名: index
Record Time：2020-11-25 15:33:43,461 Thread ID:[35]- Error：ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为700-读取保持寄存器数量为16
Record Time：2020-11-25 15:33:43,965 Thread ID:[41]- Error：ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为100-读取保持寄存器数量为24
Record Time：2020-11-25 15:51:44,811 Thread ID:[1]- Error：ClassName:GCModbus Func Name:WriteSingleCoil Info:写单个线圈寄存器失败-IP地址为192.168.1.58-线圈起始地址为31-线圈寄存器数量为1
Record Time：2020-11-25 16:09:25,866 Thread ID:[1]- Error：ClassName:GCModbus Func Name:WriteSingleCoil Info:写单个线圈寄存器失败-IP地址为192.168.1.58-线圈起始地址为31-线圈寄存器数量为1
Record Time：2020-11-25 16:35:21,536 Thread ID:[1]- Error：ClassName:GCModbus Func Name:WriteSingleCoil Info:写单个线圈寄存器失败-IP地址为192.168.1.58-线圈起始地址为31-线圈寄存器数量为1
VocsSetup/GC_User/Logs/HmiLog_20201119.txt 0 → 100644
View file @ 3bbc4be4
This diff is collapsed.
VocsSetup/GC_User/Logs/HmiLog_20201123.txt 0 → 100644
View file @ 3bbc4be4
This diff is collapsed.
VocsSetup/GC_User/Logs/HmiLog_20201125.txt 0 → 100644
View file @ 3bbc4be4
This diff is collapsed.
VocsSetup/GC_User/Logs/InfoLog_20201119.txt 0 → 100644
View file @ 3bbc4be4
This diff is collapsed.
VocsSetup/GC_User/Logs/InfoLog_20201123.txt 0 → 100644
View file @ 3bbc4be4
This diff is collapsed.
VocsSetup/GC_User/Logs/InfoLog_20201125.txt 0 → 100644
View file @ 3bbc4be4
This diff is collapsed.
VocsSetup/GC_User/ResultData/Record2.db
View file @ 3bbc4be4
This diff is collapsed.
dll/CKVocAnalyzer.dll
View file @ 3bbc4be4
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment