Commit 3495dd17 authored by leon.huang's avatar leon.huang

中译英修改完成。进入测试

parents 75f1e8f9 d4bf7f82
...@@ -33,13 +33,9 @@ ...@@ -33,13 +33,9 @@
// //
// AdjustFrom // AdjustFrom
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(971, 426);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "AdjustFrom"; this.Name = "AdjustFrom";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "校准";
this.ResumeLayout(false); this.ResumeLayout(false);
} }
......
This diff is collapsed.
...@@ -117,7 +117,20 @@ ...@@ -117,7 +117,20 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 12</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>971, 426</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
...@@ -284,4 +297,16 @@ ...@@ -284,4 +297,16 @@
AAA= AAA=
</value> </value>
</data> </data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>AdjustFrom</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>校准</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>en</value>
</metadata>
</root> </root>
\ No newline at end of file
...@@ -4,8 +4,10 @@ using System.Collections.Generic; ...@@ -4,8 +4,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.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
...@@ -14,6 +16,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -14,6 +16,7 @@ namespace GcDevicePc.ConfigMethod
public partial class AuxTabs : Form public partial class AuxTabs : Form
{ {
private injectionport.IPPIP[] m_iPPIP = new injectionport.IPPIP[2]; private injectionport.IPPIP[] m_iPPIP = new injectionport.IPPIP[2];
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
//private injectionport.IPSPL[] m_iPSPL = new injectionport.IPSPL[2]; //private injectionport.IPSPL[] m_iPSPL = new injectionport.IPSPL[2];
//private injectionport.IPVAL[] m_iPVAL = new injectionport.IPVAL[2]; //private injectionport.IPVAL[] m_iPVAL = new injectionport.IPVAL[2];
...@@ -275,7 +278,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -275,7 +278,7 @@ namespace GcDevicePc.ConfigMethod
Page.UseVisualStyleBackColor = true; Page.UseVisualStyleBackColor = true;
tabControlDet.Controls.Add(Page); tabControlDet.Controls.Add(Page);
tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = "辅助"; tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = bEnglishLanguage == false ?"辅助": "Auxiliary";
Detadd_Dlg(0, 0, tabControlDet.TabPages.Count - 1); Detadd_Dlg(0, 0, tabControlDet.TabPages.Count - 1);
} }
......
...@@ -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 ChromColumn(HWConfig hwconfig, ref GCMethodConfig methodconfig) public ChromColumn(HWConfig hwconfig, ref GCMethodConfig methodconfig)
{ {
InitializeComponent(); InitializeComponent();
...@@ -44,11 +46,11 @@ namespace GcDevicePc.ConfigMethod ...@@ -44,11 +46,11 @@ namespace GcDevicePc.ConfigMethod
if (this.methodconfig.chrom[index].sChromSelect == 0) if (this.methodconfig.chrom[index].sChromSelect == 0)
{ {
lblChromColumnLocation.Text = "前色谱柱"; lblChromColumnLocation.Text = bEnglishLanguage == false ? "前色谱柱":"Pre-Column";
} }
else else
{ {
lblChromColumnLocation.Text = "后色谱柱"; lblChromColumnLocation.Text = bEnglishLanguage == false ? "后色谱柱":"Back Column";
} }
//if (this.methodconfig.chrom[cFront].u16ChromType == 0) //if (this.methodconfig.chrom[cFront].u16ChromType == 0)
......
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChromeType.Items" xml:space="preserve">
<value>Capillary Column</value>
</data>
<data name="ChromeType.Items1" xml:space="preserve">
<value>Filling Column</value>
</data>
<data name="ChromeType.Items2" xml:space="preserve">
<value>Unknown</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label12.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 12</value>
</data>
<data name="label12.Text" xml:space="preserve">
<value>Column Type</value>
</data>
<data name="label11.Location" type="System.Drawing.Point, System.Drawing">
<value>208, 260</value>
</data>
<data name="label10.Location" type="System.Drawing.Point, System.Drawing">
<value>208, 218</value>
</data>
<data name="label9.Location" type="System.Drawing.Point, System.Drawing">
<value>208, 175</value>
</data>
<data name="txtThick.Location" type="System.Drawing.Point, System.Drawing">
<value>102, 255</value>
</data>
<data name="txtSize.Location" type="System.Drawing.Point, System.Drawing">
<value>102, 215</value>
</data>
<data name="txtCaliber.Location" type="System.Drawing.Point, System.Drawing">
<value>102, 173</value>
</data>
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 258</value>
</data>
<data name="label8.Size" type="System.Drawing.Size, System.Drawing">
<value>101, 12</value>
</data>
<data name="label8.Text" xml:space="preserve">
<value>Film Thickness:</value>
</data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
<value>50, 218</value>
</data>
<data name="label7.Size" type="System.Drawing.Size, System.Drawing">
<value>53, 12</value>
</data>
<data name="label7.Text" xml:space="preserve">
<value>Length:</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 177</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
<value>101, 12</value>
</data>
<data name="label6.Text" xml:space="preserve">
<value>Inner Diameter:</value>
</data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
<value>61, 128</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 12</value>
</data>
<data name="label4.Text" xml:space="preserve">
<value>Max.Tem:</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>19, 81</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>101, 12</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>Column Descrip:</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 38</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>107, 12</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Column position:</value>
</data>
<data name="groupBox1.Text" xml:space="preserve">
<value>Column Parameters</value>
</data>
</root>
\ No newline at end of file
This diff is collapsed.
...@@ -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,7 +17,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -15,7 +17,7 @@ namespace GcDevicePc.ConfigMethod
private ChromColumn[] chromColumn =new ChromColumn[2]; private ChromColumn[] chromColumn =new ChromColumn[2];
//private ChromeTab chromTab; //private ChromeTab chromTab;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
TabPage Page; TabPage Page;
...@@ -132,7 +134,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -132,7 +134,7 @@ namespace GcDevicePc.ConfigMethod
Page.UseVisualStyleBackColor = true; Page.UseVisualStyleBackColor = true;
tabControlDet.Controls.Add(Page); tabControlDet.Controls.Add(Page);
tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = "前色谱柱"; tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = bEnglishLanguage == false ? "前色谱柱":"Pre-Column";
Detadd_Dlg(0,0, tabControlDet.TabPages.Count - 1); Detadd_Dlg(0,0, tabControlDet.TabPages.Count - 1);
if (this.hwconfig.hwconfiginfo.u16ChromBehind == 1) if (this.hwconfig.hwconfiginfo.u16ChromBehind == 1)
{ {
...@@ -148,7 +150,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -148,7 +150,7 @@ namespace GcDevicePc.ConfigMethod
Page.UseVisualStyleBackColor = true; Page.UseVisualStyleBackColor = true;
tabControlDet.Controls.Add(Page); tabControlDet.Controls.Add(Page);
tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = "后色谱柱"; tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = bEnglishLanguage == false ? "后色谱柱":"Back Column";
Detadd_Dlg(1,1, tabControlDet.TabPages.Count - 1); Detadd_Dlg(1,1, tabControlDet.TabPages.Count - 1);
} }
} }
...@@ -166,7 +168,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -166,7 +168,7 @@ namespace GcDevicePc.ConfigMethod
Page.UseVisualStyleBackColor = true; Page.UseVisualStyleBackColor = true;
tabControlDet.Controls.Add(Page); tabControlDet.Controls.Add(Page);
tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = "后色谱柱"; tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = bEnglishLanguage == false ? "后色谱柱":"Back Column";
Detadd_Dlg(0, 1, tabControlDet.TabPages.Count - 1); Detadd_Dlg(0, 1, tabControlDet.TabPages.Count - 1);
} }
} }
...@@ -184,7 +186,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -184,7 +186,7 @@ namespace GcDevicePc.ConfigMethod
Page.UseVisualStyleBackColor = true; Page.UseVisualStyleBackColor = true;
tabControlDet.Controls.Add(Page); tabControlDet.Controls.Add(Page);
tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = "色谱柱"; tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = bEnglishLanguage == false ? "色谱柱":"Column";
Detadd_Dlg(0, 0, tabControlDet.TabPages.Count - 1); Detadd_Dlg(0, 0, tabControlDet.TabPages.Count - 1);
} }
tabControlDet.SelectedIndex = 0; tabControlDet.SelectedIndex = 0;
......
using System; using System;
using System.Globalization;
using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using GcDevicePc.GCBuffer; using GcDevicePc.GCBuffer;
...@@ -283,7 +285,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -283,7 +285,7 @@ namespace GcDevicePc.ConfigMethod
public TCD[] m_TcdDlg = new TCD[3]; public TCD[] m_TcdDlg = new TCD[3];
public FID[] m_FidDlg = new FID[3]; public FID[] m_FidDlg = new FID[3];
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
const int TCD = 0; const int TCD = 0;
const int FID = 1; const int FID = 1;
...@@ -496,38 +498,38 @@ namespace GcDevicePc.ConfigMethod ...@@ -496,38 +498,38 @@ namespace GcDevicePc.ConfigMethod
if (hwconfig.hwconfiginfo.u16DetFront == 1) if (hwconfig.hwconfiginfo.u16DetFront == 1)
{ {
tabControlDet.TabPages[0].Text = "前检测器"; tabControlDet.TabPages[0].Text = bEnglishLanguage == false ? "前检测器" : "Front detector";
Detadd_Dlg(0, 0); Detadd_Dlg(0, 0);
if (hwconfig.hwconfiginfo.u16DetInter == 1) if (hwconfig.hwconfiginfo.u16DetInter == 1)
{ {
tabControlDet.TabPages[1].Text = "中检测器"; tabControlDet.TabPages[1].Text = bEnglishLanguage == false ? "中检测器": "Middle detector";
Detadd_Dlg(1, 1); Detadd_Dlg(1, 1);
if (hwconfig.hwconfiginfo.u16DetBehind == 1) if (hwconfig.hwconfiginfo.u16DetBehind == 1)
{ {
tabControlDet.TabPages[2].Text = "后检测器"; tabControlDet.TabPages[2].Text = bEnglishLanguage == false ? "后检测器" : "Post detector";
Detadd_Dlg(2, 2); Detadd_Dlg(2, 2);
} }
} }
else if (hwconfig.hwconfiginfo.u16DetBehind == 1) else if (hwconfig.hwconfiginfo.u16DetBehind == 1)
{ {
tabControlDet.TabPages[1].Text = "后检测器"; tabControlDet.TabPages[1].Text = bEnglishLanguage == false ? "后检测器": "Post detector";
Detadd_Dlg(2, 1); Detadd_Dlg(2, 1);
} }
} }
else if (hwconfig.hwconfiginfo.u16DetInter == 1) else if (hwconfig.hwconfiginfo.u16DetInter == 1)
{ {
tabControlDet.TabPages[0].Text = "中检测器"; tabControlDet.TabPages[0].Text = bEnglishLanguage == false ? "中检测器":"Middle detector";
Detadd_Dlg(1, 0); Detadd_Dlg(1, 0);
if (hwconfig.hwconfiginfo.u16DetBehind == 1) if (hwconfig.hwconfiginfo.u16DetBehind == 1)
{ {
tabControlDet.TabPages[1].Text = "后检测器"; tabControlDet.TabPages[1].Text = bEnglishLanguage == false ? "后检测器": "Post detector";
Detadd_Dlg(2, 1); Detadd_Dlg(2, 1);
} }
} }
else if (hwconfig.hwconfiginfo.u16DetBehind == 1) else if (hwconfig.hwconfiginfo.u16DetBehind == 1)
{ {
tabControlDet.TabPages[0].Text = "后检测器"; tabControlDet.TabPages[0].Text = bEnglishLanguage == false ? "后检测器": "Post detector";
Detadd_Dlg(2, 0); Detadd_Dlg(2, 0);
} }
tabControlDet.SelectedIndex = 0; tabControlDet.SelectedIndex = 0;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -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,7 +17,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -15,7 +17,7 @@ namespace GcDevicePc.ConfigMethod
private injectionport.IPPIP[] m_iPPIP = new injectionport.IPPIP[2]; private injectionport.IPPIP[] m_iPPIP = new injectionport.IPPIP[2];
private injectionport.IPSPL[] m_iPSPL = new injectionport.IPSPL[2]; private injectionport.IPSPL[] m_iPSPL = new injectionport.IPSPL[2];
private injectionport.IPVAL[] m_iPVAL = new injectionport.IPVAL[2]; private injectionport.IPVAL[] m_iPVAL = new injectionport.IPVAL[2];
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
TabPage Page; TabPage Page;
...@@ -241,7 +243,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -241,7 +243,7 @@ namespace GcDevicePc.ConfigMethod
Page.UseVisualStyleBackColor = true; Page.UseVisualStyleBackColor = true;
tabControlDet.Controls.Add(Page); tabControlDet.Controls.Add(Page);
tabControlDet.TabPages[tabControlDet.TabPages.Count-1].Text = "前进样口"; tabControlDet.TabPages[tabControlDet.TabPages.Count-1].Text = bEnglishLanguage == false ? "前进样口": "Front INJ";
Detadd_Dlg(0,tabControlDet.TabPages.Count-1); Detadd_Dlg(0,tabControlDet.TabPages.Count-1);
if (hwconfig.hwconfiginfo.u16InjPortBehind == 1) if (hwconfig.hwconfiginfo.u16InjPortBehind == 1)
...@@ -258,7 +260,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -258,7 +260,7 @@ namespace GcDevicePc.ConfigMethod
Page.UseVisualStyleBackColor = true; Page.UseVisualStyleBackColor = true;
tabControlDet.Controls.Add(Page); tabControlDet.Controls.Add(Page);
tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = "后进样口"; tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = bEnglishLanguage == false ? "后进样口" : "Back INJ";
Detadd_Dlg(1, tabControlDet.TabPages.Count - 1); Detadd_Dlg(1, tabControlDet.TabPages.Count - 1);
} }
...@@ -277,7 +279,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -277,7 +279,7 @@ namespace GcDevicePc.ConfigMethod
Page.UseVisualStyleBackColor = true; Page.UseVisualStyleBackColor = true;
tabControlDet.Controls.Add(Page); tabControlDet.Controls.Add(Page);
tabControlDet.TabPages[tabControlDet.TabPages.Count-1].Text = "后进样口"; tabControlDet.TabPages[tabControlDet.TabPages.Count-1].Text = bEnglishLanguage == false ? "后进样口": "Back INJ";
Detadd_Dlg(1,tabControlDet.TabPages.Count-1); Detadd_Dlg(1,tabControlDet.TabPages.Count-1);
} }
...@@ -331,7 +333,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -331,7 +333,7 @@ namespace GcDevicePc.ConfigMethod
Page.UseVisualStyleBackColor = true; Page.UseVisualStyleBackColor = true;
tabControlDet.Controls.Add(Page); tabControlDet.Controls.Add(Page);
tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = "进样口"; tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = bEnglishLanguage == false ? "进样口" : "Injection Port";
Detadd_Dlg(0, tabControlDet.TabPages.Count - 1); Detadd_Dlg(0, tabControlDet.TabPages.Count - 1);
} }
} }
......
...@@ -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;
...@@ -17,7 +19,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -17,7 +19,7 @@ namespace GcDevicePc.ConfigMethod
const int cFront = 0; const int cFront = 0;
const int cBehind = 1; const int cBehind = 1;
private int indexOld = 0; private int indexOld = 0;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
HWConfig hwconfig; HWConfig hwconfig;
GCMethodConfig methodconfig; GCMethodConfig methodconfig;
...@@ -48,8 +50,8 @@ namespace GcDevicePc.ConfigMethod ...@@ -48,8 +50,8 @@ namespace GcDevicePc.ConfigMethod
InjSampleBox.Items.Clear(); InjSampleBox.Items.Clear();
InjSampleBox.Items.Add("前进样器"); InjSampleBox.Items.Add(bEnglishLanguage == false ? "前进样器" : "Front Injector");
InjSampleBox.Items.Add("后进样器"); InjSampleBox.Items.Add(bEnglishLanguage == false ? "后进样器": "Back Injector");
//for (int i = 0; i < this.InjSampleBox.Items.Count; i++) //for (int i = 0; i < this.InjSampleBox.Items.Count; i++)
//{ //{
......
This diff is collapsed.
This diff is collapsed.
...@@ -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;
using GcDevicePc.IniParam; using GcDevicePc.IniParam;
...@@ -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 SignalTab(HWConfig hwconfig, ref GCMethodConfig methodconfig) public SignalTab(HWConfig hwconfig, ref GCMethodConfig methodconfig)
{ {
InitializeComponent(); InitializeComponent();
...@@ -27,16 +29,16 @@ namespace GcDevicePc.ConfigMethod ...@@ -27,16 +29,16 @@ namespace GcDevicePc.ConfigMethod
private void updatecombobox() private void updatecombobox()
{ {
cleanALLItem(); cleanALLItem();
addALLItem("无"); addALLItem(bEnglishLanguage == false ? "无" :"No");
//if (this.hwconfig.hwconfiginfo.u16DetFront == 1) //if (this.hwconfig.hwconfiginfo.u16DetFront == 1)
{ {
if (this.hwconfig.hwconfiginfo.u16DetFrontType == 0) //TCD if (this.hwconfig.hwconfiginfo.u16DetFrontType == 0) //TCD
{ {
addALLItem("TCD(前)"); addALLItem(bEnglishLanguage == false ? "TCD(前)":"TCD(Front)");
} }
else if (this.hwconfig.hwconfiginfo.u16DetFrontType == 1) //FID else if (this.hwconfig.hwconfiginfo.u16DetFrontType == 1) //FID
{ {
addALLItem("FID(前)"); addALLItem(bEnglishLanguage == false ? "FID(前)":"FID(Front)");
} }
} }
...@@ -45,11 +47,11 @@ namespace GcDevicePc.ConfigMethod ...@@ -45,11 +47,11 @@ namespace GcDevicePc.ConfigMethod
{ {
if (this.hwconfig.hwconfiginfo.u16DetInterType == 0) //TCD if (this.hwconfig.hwconfiginfo.u16DetInterType == 0) //TCD
{ {
addALLItem("TCD(中)"); addALLItem(bEnglishLanguage == false ?"TCD(中)":"TCD(Middle)");
} }
else if (this.hwconfig.hwconfiginfo.u16DetInterType == 1) //FID else if (this.hwconfig.hwconfiginfo.u16DetInterType == 1) //FID
{ {
addALLItem("FID(中)"); addALLItem(bEnglishLanguage == false ?"FID(中)": "FID(Middle)");
} }
} }
...@@ -58,11 +60,11 @@ namespace GcDevicePc.ConfigMethod ...@@ -58,11 +60,11 @@ namespace GcDevicePc.ConfigMethod
{ {
if (this.hwconfig.hwconfiginfo.u16DetBehindType == 0) //TCD if (this.hwconfig.hwconfiginfo.u16DetBehindType == 0) //TCD
{ {
addALLItem("TCD(后)"); addALLItem(bEnglishLanguage == false ?"TCD(后)":"TCD(Back)");
} }
else if (this.hwconfig.hwconfiginfo.u16DetBehindType == 1) // FID else if (this.hwconfig.hwconfiginfo.u16DetBehindType == 1) // FID
{ {
addALLItem("FID(后)"); addALLItem(bEnglishLanguage == false ?"FID(后)":"FID(Back)");
} }
} }
} }
...@@ -155,16 +157,16 @@ namespace GcDevicePc.ConfigMethod ...@@ -155,16 +157,16 @@ namespace GcDevicePc.ConfigMethod
private void SignalDlg_Load(object sender, EventArgs e) private void SignalDlg_Load(object sender, EventArgs e)
{ {
cleanALLItem(); cleanALLItem();
addALLItem("无"); addALLItem(bEnglishLanguage == false ?"无":"No");
if (this.hwconfig.hwconfiginfo.u16DetFront == 1) if (this.hwconfig.hwconfiginfo.u16DetFront == 1)
{ {
if (this.hwconfig.hwconfiginfo.u16DetFrontType == 0) //TCD if (this.hwconfig.hwconfiginfo.u16DetFrontType == 0) //TCD
{ {
addALLItem("TCD(前)"); addALLItem(bEnglishLanguage == false ?"TCD(前)":"TCD(Front)");
} }
else if (this.hwconfig.hwconfiginfo.u16DetFrontType == 1) //FID else if (this.hwconfig.hwconfiginfo.u16DetFrontType == 1) //FID
{ {
addALLItem("FID(前)"); addALLItem(bEnglishLanguage == false ?"FID(前)":"FID(Front)");
} }
} }
...@@ -173,11 +175,11 @@ namespace GcDevicePc.ConfigMethod ...@@ -173,11 +175,11 @@ namespace GcDevicePc.ConfigMethod
{ {
if (this.hwconfig.hwconfiginfo.u16DetInterType == 0) //TCD if (this.hwconfig.hwconfiginfo.u16DetInterType == 0) //TCD
{ {
addALLItem("TCD(中)"); addALLItem(bEnglishLanguage == false ?"TCD(中)":"TCD(Middle)");
} }
else if (this.hwconfig.hwconfiginfo.u16DetInterType == 1) //FID else if (this.hwconfig.hwconfiginfo.u16DetInterType == 1) //FID
{ {
addALLItem("FID(中)"); addALLItem(bEnglishLanguage == false ?"FID(中)":"FID(Middle)");
} }
} }
...@@ -186,11 +188,11 @@ namespace GcDevicePc.ConfigMethod ...@@ -186,11 +188,11 @@ namespace GcDevicePc.ConfigMethod
{ {
if (this.hwconfig.hwconfiginfo.u16DetBehindType == 0) //TCD if (this.hwconfig.hwconfiginfo.u16DetBehindType == 0) //TCD
{ {
addALLItem("TCD(后)"); addALLItem(bEnglishLanguage == false ?"TCD(后)":"TCD(Back)");
} }
else if (this.hwconfig.hwconfiginfo.u16DetBehindType == 1) // FID else if (this.hwconfig.hwconfiginfo.u16DetBehindType == 1) // FID
{ {
addALLItem("FID(后)"); addALLItem(bEnglishLanguage == false ?"FID(后)":"FID(Back)");
} }
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -6,6 +6,7 @@ using System.Drawing; ...@@ -6,6 +6,7 @@ using System.Drawing;
using System.Globalization; 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;
...@@ -17,6 +18,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -17,6 +18,7 @@ namespace GcDevicePc.ConfigMethod
HWConfig hwconfig; HWConfig hwconfig;
GCMethodConfig methodconfig; GCMethodConfig methodconfig;
bool bNameTextBoxHasChange = false; bool bNameTextBoxHasChange = false;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
public ValveTab(HWConfig hwconfig, ref GCMethodConfig methodconfig) public ValveTab(HWConfig hwconfig, ref GCMethodConfig methodconfig)
{ {
InitializeComponent(); InitializeComponent();
...@@ -145,7 +147,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -145,7 +147,7 @@ namespace GcDevicePc.ConfigMethod
textBox = (TextBox)(this.Controls.Find("NameTextBox" + channel.ToString(), true)[0]); textBox = (TextBox)(this.Controls.Find("NameTextBox" + channel.ToString(), true)[0]);
if (textBox.Text == "") if (textBox.Text == "")
{ {
textBox.Text = "阀"; textBox.Text = bEnglishLanguage == false ? "阀": "Value";
} }
textBox.BorderStyle = BorderStyle.None; textBox.BorderStyle = BorderStyle.None;
textBox.ReadOnly = true; textBox.ReadOnly = true;
...@@ -438,7 +440,7 @@ namespace GcDevicePc.ConfigMethod ...@@ -438,7 +440,7 @@ namespace GcDevicePc.ConfigMethod
} }
catch catch
{ {
MessageBox.Show("阀数据出错!"); MessageBox.Show(bEnglishLanguage == false ? "阀数据出错!" : "Valve Data Error");
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
[SYSINFO]
ECOUNT=3
[ENTITY0]
ECC=苯,0,2,0,7.405103E-05,2.785646E-06,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,100,,1350420,,1
ECCD0_Orig0=1350420,uV*sec,0918110041-A,C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_User\原始数据\样气\2020年\09月\18日\0918110041-A.raw
[ENTITY1]
ECC=甲苯,0,2,0,7.333411E-05,-4.374901E-06,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,100,,1363622,,1
ECCD0_Orig0=1363622,uV*sec,0918110041-A,C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_User\原始数据\样气\2020年\09月\18日\0918110041-A.raw
[ENTITY2]
ECC=二甲苯,0,2,0,0,0,-2147483648,0,0,0,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,100,,0,,1
ECCD0_Orig0=0,uV*sec,0918110041-A,C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_User\原始数据\样气\2020年\09月\18日\0918110041-A.raw
[ENTITY3]
ECC=甲醇,0,2,0,0.007700845,-5.704416E-06,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,100,,12985.59,,1
ECCD0_Orig0=12985.59,uV*sec,0708185541-A,C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_User\原始数据\0708185541-A.raw
[ENTITY4]
ECC=丙烯醛,0,2,0,0.006722752,3.051122E-06,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,100,,14874.86,,1
ECCD0_Orig0=14874.86,uV*sec,0708185541-A,C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_User\原始数据\0708185541-A.raw
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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