Commit 87fb0c27 authored by leon.huang's avatar leon.huang

version 1.7.3 修改中译英限制输入需求

parent 0d4acae9
...@@ -301,13 +301,19 @@ namespace GcDevicePc.ConfigMethod ...@@ -301,13 +301,19 @@ namespace GcDevicePc.ConfigMethod
if (dData > globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp || dData < 0) if (dData > globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp || dData < 0)
{ {
ProUpTab.Rows[i].Cells[2].Value = dData < 0 ? "0.00" : globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp.ToString(); ProUpTab.Rows[i].Cells[2].Value = dData < 0 ? "0.00" : globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp.ToString();
MessageBox.Show($"输入值不在0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}的区间内"); if(bEnglishLanguage == false)
MessageBox.Show($"The input value is 0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}的区间内");
else
MessageBox.Show($"The input value is 0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}");
} }
} }
else if(ProUpTab.Rows[i].Cells[2].Value.ToString() != "") else if(ProUpTab.Rows[i].Cells[2].Value.ToString() != "")
{ {
ProUpTab.Rows[i].Cells[2].Value = "0.00"; ProUpTab.Rows[i].Cells[2].Value = "0.00";
if(bEnglishLanguage == false)
MessageBox.Show($"输入值不在0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}的区间内"); MessageBox.Show($"输入值不在0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}的区间内");
else
MessageBox.Show($"The input value is 0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}");
} }
} }
if (ProUpTab.Rows[i].Cells[3].Value != null ) if (ProUpTab.Rows[i].Cells[3].Value != null )
...@@ -322,13 +328,19 @@ namespace GcDevicePc.ConfigMethod ...@@ -322,13 +328,19 @@ namespace GcDevicePc.ConfigMethod
if (dData > 1080 || dData < 0) if (dData > 1080 || dData < 0)
{ {
ProUpTab.Rows[i].Cells[3].Value = dData < 0 ? "0.00" : "1080.00"; ProUpTab.Rows[i].Cells[3].Value = dData < 0 ? "0.00" : "1080.00";
if(bEnglishLanguage == false)
MessageBox.Show("输入值不在0-1080的区间内"); MessageBox.Show("输入值不在0-1080的区间内");
else
MessageBox.Show("The input value is not in the range of 0 to 1080");
} }
} }
else if(ProUpTab.Rows[i].Cells[3].Value.ToString() != "") else if(ProUpTab.Rows[i].Cells[3].Value.ToString() != "")
{ {
ProUpTab.Rows[i].Cells[3].Value = "0.00"; ProUpTab.Rows[i].Cells[3].Value = "0.00";
if(bEnglishLanguage == false)
MessageBox.Show("输入值不在0-1080的区间内"); MessageBox.Show("输入值不在0-1080的区间内");
else
MessageBox.Show("The input value is not in the range of 0 to 1080");
} }
} }
if (ProUpTab.Rows[i].Cells[3].Value != null && ProUpTab.Rows[i].Cells[2].Value != null && ProUpTab.Rows[i].Cells[1].Value != null) if (ProUpTab.Rows[i].Cells[3].Value != null && ProUpTab.Rows[i].Cells[2].Value != null && ProUpTab.Rows[i].Cells[1].Value != null)
...@@ -375,7 +387,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -375,7 +387,10 @@ namespace GcDevicePc.ConfigMethod
} }
catch catch
{ {
if(bEnglishLanguage == false)
MessageBox.Show("请检查程升表中的数据是否正确!"); MessageBox.Show("请检查程升表中的数据是否正确!");
else
MessageBox.Show("Please check if the data in the rise chart is correct");
} }
try try
...@@ -385,7 +400,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -385,7 +400,10 @@ namespace GcDevicePc.ConfigMethod
} }
catch catch
{ {
if(bEnglishLanguage == false)
MessageBox.Show("请检查程升表中的数据是否正确!"); MessageBox.Show("请检查程升表中的数据是否正确!");
else
MessageBox.Show("Please check if the data in the rise chart is correct");
} }
} }
...@@ -443,7 +461,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -443,7 +461,10 @@ namespace GcDevicePc.ConfigMethod
} }
else else
{ {
if(bEnglishLanguage == false)
MessageBox.Show("删除失败,不能删除第一行!"); MessageBox.Show("删除失败,不能删除第一行!");
else
MessageBox.Show("Delete failed. The first row cannot be deleted");
} }
string[] sStage = new string[5]; string[] sStage = new string[5];
......
...@@ -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,7 +16,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -14,7 +16,7 @@ namespace GcDevicePc.ConfigMethod
{ {
HWConfig hwconfig; HWConfig hwconfig;
GCMethodConfig methodconfig; GCMethodConfig methodconfig;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
public TCD(HWConfig hwconfig, ref GCMethodConfig methodconfig) public TCD(HWConfig hwconfig, ref GCMethodConfig methodconfig)
{ {
InitializeComponent(); InitializeComponent();
...@@ -165,7 +167,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -165,7 +167,10 @@ namespace GcDevicePc.ConfigMethod
float tmpval = string2float(tcdsettemp.Text); float tmpval = string2float(tcdsettemp.Text);
if(tmpval > 400.0f) if(tmpval > 400.0f)
{ {
if(bEnglishLanguage == false)
MessageBox.Show("设置温度需要小于400"); MessageBox.Show("设置温度需要小于400");
else
MessageBox.Show("Set the temperature to less than 400");
tcdsettemp.Text = "0"; tcdsettemp.Text = "0";
} }
else else
...@@ -174,7 +179,10 @@ namespace GcDevicePc.ConfigMethod ...@@ -174,7 +179,10 @@ namespace GcDevicePc.ConfigMethod
{ {
if (tmpval > configTemp) if (tmpval > configTemp)
{ {
if(bEnglishLanguage == false)
MessageBox.Show("设置温度不能大于保护温度"); MessageBox.Show("设置温度不能大于保护温度");
else
MessageBox.Show("The setting temperature must not be greater than the protection temperature");
(sender as TextBox).Text = "0"; (sender as TextBox).Text = "0";
} }
} }
......
...@@ -401,12 +401,18 @@ namespace GcDevicePc.ConfigMethod.injectionport ...@@ -401,12 +401,18 @@ namespace GcDevicePc.ConfigMethod.injectionport
double nextnum = Convert.ToDouble((sender as TextBox).Text); double nextnum = Convert.ToDouble((sender as TextBox).Text);
if (nextnum < 5) if (nextnum < 5)
{ {
if(bEnglishLanguage == false)
MessageBox.Show("流量设置不能小于5"); MessageBox.Show("流量设置不能小于5");
else
MessageBox.Show("The flow setting cannot be less than 5");
(sender as TextBox).Text = lastnum.ToString(); (sender as TextBox).Text = lastnum.ToString();
} }
if (nextnum > 200) if (nextnum > 200)
{ {
if(bEnglishLanguage == false)
MessageBox.Show("流量设置不能大于200"); MessageBox.Show("流量设置不能大于200");
else
MessageBox.Show("The flow setting cannot be greater than 200");
(sender as TextBox).Text = lastnum.ToString(); (sender as TextBox).Text = lastnum.ToString();
} }
} }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging> <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ReferencePath>D:\workspace\VS2017\voc\dll\</ReferencePath> <ReferencePath>C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\dll\</ReferencePath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<StartAction>Project</StartAction> <StartAction>Project</StartAction>
......
...@@ -5,7 +5,7 @@ MAC ...@@ -5,7 +5,7 @@ MAC
[StartUp] [StartUp]
自启动=1 自启动=1
打开系统=0 打开系统=0
运行类型=2 运行类型=0
Forceintegral=1 Forceintegral=1
space=500 space=500
Datetime=1 Datetime=1
......
Record Time:2020-11-26 11:36:10,471 Thread ID:[5]- Error:ClassName:FileServerClient Func Name:WtClientCopyfromServer Info:The operation has timed out.
Record Time:2020-11-26 11:36:13,606 Thread ID:[21]- Error:ClassName:FileServerClient Func Name:ClientCopyfromServer Info:Thread was being aborted.
Record Time:2020-11-26 18:19:20,038 Thread ID:[40]- Error:ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为100-读取保持寄存器数量为24
Record Time:2020-11-26 18:19:20,254 Thread ID:[40]- Error:ClassName:GCModbus Func Name:ReadHoldingReg Info:读保持寄存器失败-IP地址为192.168.1.58-保持寄存器起始地址为1101-读取保持寄存器数量为4
Record Time:2020-11-26 18:19:27,787 Thread ID:[1]- Error:ClassName:GCModbus Func Name:WriteSingleCoil Info:写单个线圈寄存器失败-IP地址为192.168.1.58-线圈起始地址为33-线圈寄存器数量为1
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Record Time:2020-11-27 08:19:05,753 Thread ID:[7]- Info:Start Get PC Local IP...
Record Time:2020-11-27 08:19:17,176 Thread ID:[7]- Info:Start Search HMI...
Record Time:2020-11-27 08:19:19,177 Thread ID:[5]- Info:DevStatus.ini 信息获取同步...
Record Time:2020-11-27 08:19:20,306 Thread ID:[5]- Info:DevStatus.ini 信息获取同步...
Record Time:2020-11-27 08:19:22,065 Thread ID:[5]- Info:SingleAnal.ini 开始同步...
Record Time:2020-11-27 08:19:23,349 Thread ID:[5]- Info:SingleAnal.ini 同步完成...
Record Time:2020-11-27 08:19:23,359 Thread ID:[5]- Info:DevStatus.ini 开始同步...
Record Time:2020-11-27 08:19:24,239 Thread ID:[5]- Info:DevStatus.ini 同步完成...
Record Time:2020-11-27 08:19:24,249 Thread ID:[5]- Info:RunMethod.ini 开始同步...
Record Time:2020-11-27 08:19:25,162 Thread ID:[5]- Info:RunMethod.ini 同步完成...
Record Time:2020-11-27 08:19:28,053 Thread ID:[1]- Info:System Init Success
Record Time:2020-11-27 08:19:29,044 Thread ID:[7]- Info:Start Search HMI...
Record Time:2020-11-27 08:22:41,276 Thread ID:[1]- Info:SingleAnal.ini 开始同步...
Record Time:2020-11-27 08:22:41,532 Thread ID:[1]- Info:SingleAnal.ini 同步完成...
Record Time:2020-11-27 08:22:41,533 Thread ID:[1]- Info:DevStatus.ini 开始同步...
Record Time:2020-11-27 08:22:41,713 Thread ID:[1]- Info:DevStatus.ini 同步完成...
Record Time:2020-11-27 08:22:41,714 Thread ID:[1]- Info:RunMethod.ini 开始同步...
Record Time:2020-11-27 08:22:41,838 Thread ID:[1]- Info:RunMethod.ini 同步完成...
Record Time:2020-11-27 08:27:32,421 Thread ID:[1]- Info:SingleAnal.ini 开始同步...
Record Time:2020-11-27 08:27:32,737 Thread ID:[1]- Info:SingleAnal.ini 同步完成...
Record Time:2020-11-27 08:27:32,738 Thread ID:[1]- Info:DevStatus.ini 开始同步...
Record Time:2020-11-27 08:27:32,943 Thread ID:[1]- Info:DevStatus.ini 同步完成...
Record Time:2020-11-27 08:27:32,943 Thread ID:[1]- Info:RunMethod.ini 开始同步...
Record Time:2020-11-27 08:27:33,072 Thread ID:[1]- Info:RunMethod.ini 同步完成...
Record Time:2020-11-27 08:29:10,565 Thread ID:[7]- Info:Start Get PC Local IP...
Record Time:2020-11-27 08:29:11,819 Thread ID:[5]- Info:DevStatus.ini 信息获取同步...
Record Time:2020-11-27 08:29:12,957 Thread ID:[5]- Info:DevStatus.ini 信息获取同步...
Record Time:2020-11-27 08:29:14,805 Thread ID:[5]- Info:SingleAnal.ini 开始同步...
Record Time:2020-11-27 08:29:16,036 Thread ID:[5]- Info:SingleAnal.ini 同步完成...
Record Time:2020-11-27 08:29:16,037 Thread ID:[5]- Info:DevStatus.ini 开始同步...
Record Time:2020-11-27 08:29:16,925 Thread ID:[5]- Info:DevStatus.ini 同步完成...
Record Time:2020-11-27 08:29:16,925 Thread ID:[5]- Info:RunMethod.ini 开始同步...
Record Time:2020-11-27 08:29:17,867 Thread ID:[5]- Info:RunMethod.ini 同步完成...
Record Time:2020-11-27 08:29:20,347 Thread ID:[1]- Info:System Init Success
Record Time:2020-11-27 08:29:21,226 Thread ID:[7]- Info:Start Search HMI...
Record Time:2020-11-27 08:29:32,300 Thread ID:[7]- Info:Start Search HMI...
Record Time:2020-11-27 08:30:55,715 Thread ID:[7]- Info:Start Get PC Local IP...
Record Time:2020-11-27 08:30:57,016 Thread ID:[5]- Info:DevStatus.ini 信息获取同步...
Record Time:2020-11-27 08:30:58,144 Thread ID:[5]- Info:DevStatus.ini 信息获取同步...
Record Time:2020-11-27 08:30:59,999 Thread ID:[5]- Info:SingleAnal.ini 开始同步...
Record Time:2020-11-27 08:31:01,209 Thread ID:[5]- Info:SingleAnal.ini 同步完成...
Record Time:2020-11-27 08:31:01,209 Thread ID:[5]- Info:DevStatus.ini 开始同步...
Record Time:2020-11-27 08:31:02,124 Thread ID:[5]- Info:DevStatus.ini 同步完成...
Record Time:2020-11-27 08:31:02,124 Thread ID:[5]- Info:RunMethod.ini 开始同步...
Record Time:2020-11-27 08:31:03,084 Thread ID:[5]- Info:RunMethod.ini 同步完成...
Record Time:2020-11-27 08:31:05,488 Thread ID:[1]- Info:System Init Success
Record Time:2020-11-27 08:31:06,394 Thread ID:[7]- Info:Start Search HMI...
Record Time:2020-11-27 08:31:17,469 Thread ID:[7]- Info:Start Search HMI...
Record Time:2020-11-27 08:33:09,019 Thread ID:[1]- Info:SingleAnal.ini 开始同步...
Record Time:2020-11-27 08:33:09,374 Thread ID:[1]- Info:SingleAnal.ini 同步完成...
Record Time:2020-11-27 08:33:09,375 Thread ID:[1]- Info:DevStatus.ini 开始同步...
Record Time:2020-11-27 08:33:09,580 Thread ID:[1]- Info:DevStatus.ini 同步完成...
Record Time:2020-11-27 08:33:09,580 Thread ID:[1]- Info:RunMethod.ini 开始同步...
Record Time:2020-11-27 08:33:09,652 Thread ID:[1]- Info:RunMethod.ini 同步完成...
Record Time:2020-11-27 08:34:40,401 Thread ID:[1]- Info:SingleAnal.ini 开始同步...
Record Time:2020-11-27 08:34:40,637 Thread ID:[1]- Info:SingleAnal.ini 同步完成...
Record Time:2020-11-27 08:34:40,638 Thread ID:[1]- Info:DevStatus.ini 开始同步...
Record Time:2020-11-27 08:34:40,773 Thread ID:[1]- Info:DevStatus.ini 同步完成...
Record Time:2020-11-27 08:34:40,774 Thread ID:[1]- Info:RunMethod.ini 开始同步...
Record Time:2020-11-27 08:34:40,899 Thread ID:[1]- Info:RunMethod.ini 同步完成...
Record Time:2020-11-27 11:15:59,235 Thread ID:[9]- Info:Start Get PC Local IP...
Record Time:2020-11-27 11:16:01,132 Thread ID:[6]- Info:DevStatus.ini 信息获取同步...
Record Time:2020-11-27 11:16:02,142 Thread ID:[6]- Info:DevStatus.ini 信息获取同步...
Record Time:2020-11-27 11:16:04,057 Thread ID:[6]- Info:SingleAnal.ini 开始同步...
Record Time:2020-11-27 11:16:05,375 Thread ID:[6]- Info:SingleAnal.ini 同步完成...
Record Time:2020-11-27 11:16:05,376 Thread ID:[6]- Info:DevStatus.ini 开始同步...
Record Time:2020-11-27 11:16:06,225 Thread ID:[6]- Info:DevStatus.ini 同步完成...
Record Time:2020-11-27 11:16:06,226 Thread ID:[6]- Info:RunMethod.ini 开始同步...
Record Time:2020-11-27 11:16:07,142 Thread ID:[6]- Info:RunMethod.ini 同步完成...
Record Time:2020-11-27 11:16:09,992 Thread ID:[9]- Info:Start Search HMI...
Record Time:2020-11-27 11:16:10,430 Thread ID:[1]- Info:System Init Success
Record Time:2020-11-27 11:16:21,410 Thread ID:[9]- Info:Start Search HMI...
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -569,3 +569,20 @@ ...@@ -569,3 +569,20 @@
【2020-11-25 15:27:45.8364】,True 【2020-11-25 15:27:45.8364】,True
【2020-11-25 15:27:45.8503】,A保存 【2020-11-25 15:27:45.8503】,A保存
【2020-11-25 15:29:43.4999】,18248778 【2020-11-25 15:29:43.4999】,18248778
【2020-11-26 11:08:57.3846】,服务器开始启动:192.168.2.50:12345
【2020-11-26 11:15:33.8720】,服务器开始启动:192.168.2.50:12345
【2020-11-26 11:30:42.5276】,服务器开始启动:192.168.2.50:12345
【2020-11-26 11:33:15.2714】,服务器开始启动:192.168.2.50:12345
【2020-11-26 11:35:04.4788】,服务器开始启动:192.168.2.50:12345
【2020-11-26 11:36:18.8082】,服务器开始启动:192.168.2.50:12345
【2020-11-26 11:38:22.1387】,服务器开始启动:192.168.2.50:12345
【2020-11-26 16:56:51.1057】,服务器开始启动:192.168.2.50:12345
【2020-11-27 08:19:28.0366】,服务器开始启动:192.168.2.50:12345
【2020-11-27 08:29:20.3366】,服务器开始启动:192.168.2.50:12345
【2020-11-27 08:31:05.4778】,服务器开始启动:192.168.2.50:12345
【2020-11-27 08:58:20.4010】,A开始保存数据
【2020-11-27 08:58:20.4219】,True
【2020-11-27 08:58:20.4488】,A保存
【2020-11-27 08:58:20.5994】,True
【2020-11-27 08:58:20.6114】,A保存
【2020-11-27 11:16:10.4189】,服务器开始启动:192.168.2.50:12345
This diff is collapsed.
【2020-11-26 10:22:28.3120】,服务器开始启动:192.168.2.50:12345
【2020-11-26 10:41:19.1357】,服务器开始启动:192.168.2.50:12345
【2020-11-26 10:43:51.8476】,服务器开始启动:192.168.2.50:12345
【2020-11-26 11:03:16.7916】,服务器开始启动:192.168.2.50:12345
No preview for this file type
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