Skip to content

G
GC_Branch
Commit 997ae3dd authored by 周磊's avatar 周磊
Browse files
Options

1.版本1.9.8 

此版本是使用1.9.1旧版本进行更新,拟定在重构色谱软件出现前,供在线使用
2.去除云盒子
3.增加FPD
4.重写配置和方法读写,实现勾选有效(取消勾选会保留UI值,但是不会使用)
5.扩展epc,支持三块
6.增加nmhc直测与间接测选项(选项内进行设定,在CKVocAnalyzer下的CtrlWaveCurrent进行本地ini读取设定)
parent 5587fca6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 47583 additions and 38453 deletions
GcDevicePc.sln
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/CK_UI/CurveDisPlay.cs
View file @ 997ae3dd
......@@ -13,11 +13,7 @@ namespace GcDevicePc
{
public partial class CurveDisPlay : DockContent
{
public class DrawingSubform
{
public CKVocAnalyzer.CtrlWaveCurrent curdisp;
}
public static CKVocAnalyzer.CtrlWaveCurrent curdisp = new CKVocAnalyzer.CtrlWaveCurrent();
public static CKVocAnalyzer.CtrlWaveCurrent curdisp = new CKVocAnalyzer.CtrlWaveCurrent(1);
/// <summary>
/// 强制清除绘图数据
/// </summary>
......
GcDevicePc/CK_UI/CurveDisPlay2.cs
View file @ 997ae3dd
......@@ -12,7 +12,7 @@ namespace GcDevicePc.CK_UI
{
public partial class CurveDisPlay2 : DockContent
{
public static CKVocAnalyzer.CtrlWaveCurrent curdisp2 = new CKVocAnalyzer.CtrlWaveCurrent();
public static CKVocAnalyzer.CtrlWaveCurrent curdisp2 = new CKVocAnalyzer.CtrlWaveCurrent(2);
public CurveDisPlay2()
{
InitializeComponent();
......
GcDevicePc/CK_UI/CurveDisPlay3.cs
View file @ 997ae3dd
......@@ -12,7 +12,7 @@ namespace GcDevicePc.CK_UI
{
public partial class CurveDisPlay3 : DockContent
{
public static CKVocAnalyzer.CtrlWaveCurrent curdisp3 = new CKVocAnalyzer.CtrlWaveCurrent();
public static CKVocAnalyzer.CtrlWaveCurrent curdisp3 = new CKVocAnalyzer.CtrlWaveCurrent(3);
public CurveDisPlay3()
{
InitializeComponent();
......
GcDevicePc/CloudBox/DataInstance.cs deleted 100644 → 0
View file @ 5587fca6
This diff is collapsed.
GcDevicePc/CloudBox/GCData.cs deleted 100644 → 0
View file @ 5587fca6
This diff is collapsed.
GcDevicePc/ConfigDlg/Det.cs
View file @ 997ae3dd
......@@ -16,6 +16,7 @@ namespace GcDevicePc.ConfigDlg
{
public TCDDlg[] m_TcdDlg = new TCDDlg[3];
public FIDDlg[] m_FidDlg = new FIDDlg[3];
public FPDDlg[] m_FpdDlg = new FPDDlg[3];
const int TCD = 0;
const int FID = 1;
......@@ -32,7 +33,10 @@ namespace GcDevicePc.ConfigDlg
m_TcdDlg[2] = new TCDDlg();
m_FidDlg[0] = new FIDDlg();
m_FidDlg[1] = new FIDDlg();
m_FidDlg[2] = new FIDDlg();
m_FidDlg[2] = new FIDDlg();
m_FpdDlg[0] = new FPDDlg();
m_FpdDlg[1] = new FPDDlg();
m_FpdDlg[2] = new FPDDlg();
}
private void DetRec_Dlg(int position)
......@@ -48,6 +52,10 @@ namespace GcDevicePc.ConfigDlg
{
m_FidDlg[0].recordCurData(0);
}
else if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 3)
{
m_FpdDlg[0].recordCurData(0);
}
else
{
......@@ -61,6 +69,10 @@ namespace GcDevicePc.ConfigDlg
else if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 1)
{
m_FidDlg[1].recordCurData(1);
}
else if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 3)
{
m_FpdDlg[1].recordCurData(1);
}
else
{
......@@ -75,6 +87,10 @@ namespace GcDevicePc.ConfigDlg
else if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 1)
{
m_FidDlg[2].recordCurData(2);
}
else if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 3)
{
m_FpdDlg[2].recordCurData(2);
}
else
{
......@@ -145,6 +161,14 @@ namespace GcDevicePc.ConfigDlg
tabControlDet.TabPages[index].Controls.Add(m_FidDlg[position]);
m_FidDlg[position].reflashContent(position);
// fidnum++;
}
else if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 3)
{
m_FpdDlg[position].TopLevel = false;
m_FpdDlg[position].Show();
tabControlDet.TabPages[index].Controls.Add(m_FpdDlg[position]);
m_FpdDlg[position].reflashContent(position);
// fidnum++;
}
else
{
......@@ -168,6 +192,14 @@ namespace GcDevicePc.ConfigDlg
m_FidDlg[position].reflashContent(position);
// fidnum++;
}
else if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 3)
{
m_FpdDlg[position].TopLevel = false;
m_FpdDlg[position].Show();
tabControlDet.TabPages[index].Controls.Add(m_FpdDlg[position]);
m_FpdDlg[position].reflashContent(position);
// fidnum++;
}
else
{
......@@ -189,6 +221,14 @@ namespace GcDevicePc.ConfigDlg
tabControlDet.TabPages[index].Controls.Add(m_FidDlg[position]);
m_FidDlg[position].reflashContent(position);
// fidnum++;
}
else if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 3)
{
m_FpdDlg[position].TopLevel = false;
m_FpdDlg[position].Show();
tabControlDet.TabPages[index].Controls.Add(m_FpdDlg[position]);
m_FpdDlg[position].reflashContent(position);
// fidnum++;
}
else
{
......
GcDevicePc/ConfigDlg/FIDDlg.Designer.cs
View file @ 997ae3dd
......@@ -47,6 +47,7 @@
this.label16 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
......@@ -59,7 +60,6 @@
this.label4 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
......@@ -264,18 +264,27 @@
this.label15.Location = new System.Drawing.Point(261, 208);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(41, 12);
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(261, 180);
this.label15.TabIndex = 0;
this.label15.Text = "ml/min";
//
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(261, 180);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(41, 12);
this.label13.TabIndex = 0;
this.label13.Text = "ml/min";
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(261, 149);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(17, 12);
this.label12.TabIndex = 0;
this.label12.Text = "℃";
//
// label10
//
this.label10.AutoSize = true;
......@@ -384,15 +393,6 @@
this.label1.TabIndex = 0;
this.label1.Text = "FID";
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(261, 149);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(17, 12);
this.label12.TabIndex = 0;
this.label12.Text = "℃";
//
// FIDDlg
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......
GcDevicePc/ConfigDlg/FPDDlg.Designer.cs 0 → 100644
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/ConfigDlg/FPDDlg.cs 0 → 100644
View file @ 997ae3dd
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading;//.Tasks;
using System.Windows.Forms;
using GcDevicePc.DevParam;
using GcDevicePc.IniParam;
namespace GcDevicePc.ConfigDlg
{
public partial class FPDDlg : Form
{
public FPDDlg()
{
InitializeComponent();
}
public void reflashContent(int index)
{
globaldata.m_profileMethod.GetDevState();
globaldata.m_profileMethod.GetFpdAllPara();
tb温度设定.Text = CProfileDevice.m_DevParam.fpd[index].fHeaterTempSet.ToString();
tb氢气压力设定.Text = CProfileDevice.m_DevParam.fpd[index].fSetH2Flow.ToString();
tb空气压力设定.Text = CProfileDevice.m_DevParam.fpd[index].fAirFlowSet.ToString();
tb尾吹气压力设定.Text = CProfileDevice.m_DevParam.fpd[index].fSetTailGas.ToString();
cb灵敏度.SelectedIndex = CProfileDevice.m_DevParam.fpd[index].u16Sensitive;
cb极性.SelectedIndex = CProfileDevice.m_DevParam.fpd[index].u16Polarity;
if (CProfileDevice.m_DevParam.fpd[index].u16KeyFire == 1)
cBox自动点火.CheckState = CheckState.Checked;
else
cBox自动点火.CheckState = CheckState.Unchecked;
if (CProfileDevice.m_DevParam.fpd[index].u16Zero == 1)
cBox自动调零.CheckState = CheckState.Checked;
else
cBox自动调零.CheckState = CheckState.Unchecked;
if (CProfileDevice.m_DevParam.fpd[index].u16KeyHeater == 1)
cBox加热器.CheckState = CheckState.Checked;
else
cBox加热器.CheckState = CheckState.Unchecked;
if (CProfileDevice.m_DevParam.fpd[index].u16KeyH2Flow == 1)
cBox氢气.CheckState = CheckState.Checked;
else
cBox氢气.CheckState = CheckState.Unchecked;
if (CProfileDevice.m_DevParam.fpd[index].u16KeyAirFlow == 1)
cBox空气.CheckState = CheckState.Checked;
else
cBox空气.CheckState = CheckState.Unchecked;
if (CProfileDevice.m_DevParam.fpd[index].u16KeyTailGas == 1)
cBox尾吹气.CheckState = CheckState.Checked;
else
cBox尾吹气.CheckState = CheckState.Unchecked;
if (CProfileDevice.m_DevParam.fpd[index].u16SigDeduct < 3 && CProfileDevice.m_DevParam.fpd[index].u16SigDeduct >= 0)
cListBoxSign.SetItemChecked(CProfileDevice.m_DevParam.fpd[index].u16SigDeduct, true);
}
private void TextBoxDec_KeyPress(object sender, KeyPressEventArgs e)
{
if (e.KeyChar != 8 && !Char.IsDigit(e.KeyChar) && e.KeyChar != '.')
{
e.Handled = true;
}
}
float string2float(string s)
{
float ret;
if(s == "" || s == null)
{
ret = 0;
}
else
{
ret = float.Parse(s);
}
return ret;
}
public void recordCurData(int index)
{
CProfileDevice.m_DevParam.fpd[index].fHeaterTempSet = string2float(tb温度设定.Text);
CProfileDevice.m_DevParam.fpd[index].fSetH2Flow = string2float(tb氢气压力设定.Text);
CProfileDevice.m_DevParam.fpd[index].fAirFlowSet = string2float(tb空气压力设定.Text);
CProfileDevice.m_DevParam.fpd[index].fSetTailGas = string2float(tb尾吹气压力设定.Text);
CProfileDevice.m_DevParam.fpd[index].u16Sensitive = (ushort)cb灵敏度.SelectedIndex;
CProfileDevice.m_DevParam.fpd[index].u16Polarity = (ushort)cb极性.SelectedIndex;
if (cBox自动点火.CheckState == CheckState.Checked)
CProfileDevice.m_DevParam.fpd[index].u16KeyFire = 1;
else
CProfileDevice.m_DevParam.fpd[index].u16KeyFire = 0;
if (cBox自动调零.CheckState == CheckState.Checked)
CProfileDevice.m_DevParam.fpd[index].u16Zero = 1;
else
CProfileDevice.m_DevParam.fpd[index].u16Zero = 0;
if (cBox加热器.CheckState == CheckState.Checked)
CProfileDevice.m_DevParam.fpd[index].u16KeyHeater = 1;
else
CProfileDevice.m_DevParam.fpd[index].u16KeyHeater = 0;
if (cBox氢气.CheckState == CheckState.Checked)
CProfileDevice.m_DevParam.fpd[index].u16KeyH2Flow = 1;
else
CProfileDevice.m_DevParam.fpd[index].u16KeyH2Flow = 0;
if (cBox空气.CheckState == CheckState.Checked)
CProfileDevice.m_DevParam.fpd[index].u16KeyAirFlow = 1;
else
CProfileDevice.m_DevParam.fpd[index].u16KeyAirFlow = 0;
if (cBox尾吹气.CheckState == CheckState.Checked)
CProfileDevice.m_DevParam.fpd[index].u16KeyTailGas = 1;
else
CProfileDevice.m_DevParam.fpd[index].u16KeyTailGas = 0;
if (cListBoxSign.GetItemChecked(0) == true)
CProfileDevice.m_DevParam.fpd[index].u16SigDeduct = 1;
else if (cListBoxSign.GetItemChecked(1) == true)
CProfileDevice.m_DevParam.fpd[index].u16SigDeduct = 2;
else if (cListBoxSign.GetItemChecked(2) == true)
CProfileDevice.m_DevParam.fpd[index].u16SigDeduct = 3;
}
}
}
GcDevicePc/ConfigDlg/FPDDlg.resx 0 → 100644
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/ConfigDlg/MethodConfig.cs
View file @ 997ae3dd
......@@ -80,6 +80,7 @@ namespace GcDevicePc
globaldata.m_profileMethod.SetAuxiliaryAllPara();
m_det.recordCurData();
globaldata.m_profileMethod.SetFidAllPara();
globaldata.m_profileMethod.SetFpdAllPara();
globaldata.m_profileMethod.SetTcdAllPara();
// m_SignalDlg.recordCurData();
......
GcDevicePc/ConfigMethod/DetTab.cs
View file @ 997ae3dd
......@@ -8,7 +8,8 @@ namespace GcDevicePc.ConfigMethod
{
public partial class DetTab : Form
{
#region
//方法-检测器标签页
#region 已注释
//public TCD[] m_TcdDlg = new TCD[3];
//public FID[] m_FidDlg = new FID[3];
......@@ -282,18 +283,19 @@ namespace GcDevicePc.ConfigMethod
//}
#endregion
public TCD[] m_TcdDlg = new TCD[3];
public FID[] m_FidDlg = new FID[3];
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
public FPD[] m_FpdDlg = new FPD[3];
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true : false;
const int TCD = 0;
const int FID = 1;
const int FPD = 2;
TabPage Page;
HWConfig hwconfig;
GCMethodConfig methodconfig;
//通过配置文件和方法文件进行检测器标签页创建(此标签下可以包含多个检测器分页)
public DetTab(HWConfig hwconfig, ref GCMethodConfig methodconfig)
{
InitializeComponent();
......@@ -307,8 +309,9 @@ namespace GcDevicePc.ConfigMethod
m_FidDlg[0] = new FID(this.hwconfig, ref this.methodconfig);
m_FidDlg[1] = new FID(this.hwconfig, ref this.methodconfig);
m_FidDlg[2] = new FID(this.hwconfig, ref this.methodconfig);
m_FpdDlg[0] = new FPD(this.hwconfig, ref this.methodconfig);
m_FpdDlg[1] = new FPD(this.hwconfig, ref this.methodconfig);
m_FpdDlg[2] = new FPD(this.hwconfig, ref this.methodconfig);
}
private void DetRec_Dlg(int position)
......@@ -324,9 +327,9 @@ namespace GcDevicePc.ConfigMethod
{
m_FidDlg[0].recordCurData(0);
}
else
else if (this.hwconfig.hwconfiginfo.u16DetFrontType ==3)
{
m_FpdDlg[0].recordCurData(0);
}
break;
case 1:
......@@ -338,6 +341,10 @@ namespace GcDevicePc.ConfigMethod
{
m_FidDlg[1].recordCurData(1);
}
else if (this.hwconfig.hwconfiginfo.u16DetInterType == 3)
{
m_FpdDlg[1].recordCurData(1);
}
else
{
......@@ -352,6 +359,10 @@ namespace GcDevicePc.ConfigMethod
{
m_FidDlg[2].recordCurData(2);
}
else if (this.hwconfig.hwconfiginfo.u16DetBehindType == 3)
{
m_FpdDlg[2].recordCurData(2);
}
else
{
......@@ -397,6 +408,7 @@ namespace GcDevicePc.ConfigMethod
{
DetRec_Dlg(2);
}
}
}
/// <summary>
......@@ -421,6 +433,13 @@ namespace GcDevicePc.ConfigMethod
tabControlDet.TabPages[index].Controls.Add(m_FidDlg[position]);
m_FidDlg[position].reflashContent(position);
}
else if (hwconfig.hwconfiginfo.u16DetFrontType == 3)
{
m_FpdDlg[position].TopLevel = false;
m_FpdDlg[position].Show();
tabControlDet.TabPages[index].Controls.Add(m_FpdDlg[position]);
m_FpdDlg[position].reflashContent(position);
}
else
{
......@@ -440,6 +459,13 @@ namespace GcDevicePc.ConfigMethod
m_FidDlg[position].Show();
tabControlDet.TabPages[index].Controls.Add(m_FidDlg[position]);
m_FidDlg[position].reflashContent(position);
}
else if (hwconfig.hwconfiginfo.u16DetInterType == 3)
{
m_FpdDlg[position].TopLevel = false;
m_FpdDlg[position].Show();
tabControlDet.TabPages[index].Controls.Add(m_FpdDlg[position]);
m_FpdDlg[position].reflashContent(position);
}
else
{
......@@ -460,6 +486,13 @@ namespace GcDevicePc.ConfigMethod
m_FidDlg[position].Show();
tabControlDet.TabPages[index].Controls.Add(m_FidDlg[position]);
m_FidDlg[position].reflashContent(position);
}
else if (hwconfig.hwconfiginfo.u16DetBehindType == 3)
{
m_FpdDlg[position].TopLevel = false;
m_FpdDlg[position].Show();
tabControlDet.TabPages[index].Controls.Add(m_FpdDlg[position]);
m_FpdDlg[position].reflashContent(position);
}
else
{
......@@ -504,34 +537,34 @@ namespace GcDevicePc.ConfigMethod
Detadd_Dlg(0, 0);
if (hwconfig.hwconfiginfo.u16DetInter == 1)
{
tabControlDet.TabPages[1].Text = bEnglishLanguage == false ? "中检测器": "Middle detector";
tabControlDet.TabPages[1].Text = bEnglishLanguage == false ? "中检测器" : "Middle detector";
Detadd_Dlg(1, 1);
if (hwconfig.hwconfiginfo.u16DetBehind == 1)
{
tabControlDet.TabPages[2].Text = bEnglishLanguage == false ? "后检测器" : "Post detector";
tabControlDet.TabPages[2].Text = bEnglishLanguage == false ? "后检测器" : "Post detector";
Detadd_Dlg(2, 2);
}
}
else if (hwconfig.hwconfiginfo.u16DetBehind == 1)
{
tabControlDet.TabPages[1].Text = bEnglishLanguage == false ? "后检测器": "Post detector";
tabControlDet.TabPages[1].Text = bEnglishLanguage == false ? "后检测器" : "Post detector";
Detadd_Dlg(2, 1);
}
}
else if (hwconfig.hwconfiginfo.u16DetInter == 1)
{
tabControlDet.TabPages[0].Text = bEnglishLanguage == false ? "中检测器":"Middle detector";
tabControlDet.TabPages[0].Text = bEnglishLanguage == false ? "中检测器" : "Middle detector";
Detadd_Dlg(1, 0);
if (hwconfig.hwconfiginfo.u16DetBehind == 1)
{
tabControlDet.TabPages[1].Text = bEnglishLanguage == false ? "后检测器": "Post detector";
tabControlDet.TabPages[1].Text = bEnglishLanguage == false ? "后检测器" : "Post detector";
Detadd_Dlg(2, 1);
}
}
else if (hwconfig.hwconfiginfo.u16DetBehind == 1)
{
tabControlDet.TabPages[0].Text = bEnglishLanguage == false ? "后检测器": "Post detector";
tabControlDet.TabPages[0].Text = bEnglishLanguage == false ? "后检测器" : "Post detector";
Detadd_Dlg(2, 0);
}
tabControlDet.SelectedIndex = 0;
......
GcDevicePc/ConfigMethod/FID.Designer.cs
View file @ 997ae3dd
......@@ -31,6 +31,10 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FID));
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label17 = new System.Windows.Forms.Label();
this.textBox3 = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.textBox1 = new System.Windows.Forms.TextBox();
this.txtyuzhi = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.cListBoxSign = new System.Windows.Forms.CheckedListBox();
......@@ -47,7 +51,6 @@
this.tb氢气压力设定 = new System.Windows.Forms.TextBox();
this.cBox空气 = new System.Windows.Forms.CheckBox();
this.cBox氢气 = new System.Windows.Forms.CheckBox();
this.cBox加热器 = new System.Windows.Forms.CheckBox();
this.label16 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
......@@ -70,6 +73,10 @@
// groupBox1
//
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.label17);
this.groupBox1.Controls.Add(this.textBox3);
this.groupBox1.Controls.Add(this.textBox2);
this.groupBox1.Controls.Add(this.textBox1);
this.groupBox1.Controls.Add(this.txtyuzhi);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.cListBoxSign);
......@@ -86,7 +93,6 @@
this.groupBox1.Controls.Add(this.tb氢气压力设定);
this.groupBox1.Controls.Add(this.cBox空气);
this.groupBox1.Controls.Add(this.cBox氢气);
this.groupBox1.Controls.Add(this.cBox加热器);
this.groupBox1.Controls.Add(this.label16);
this.groupBox1.Controls.Add(this.label15);
this.groupBox1.Controls.Add(this.label13);
......@@ -106,6 +112,39 @@
this.groupBox1.TabStop = false;
this.ToolTip1.SetToolTip(this.groupBox1, resources.GetString("groupBox1.ToolTip"));
//
// label17
//
resources.ApplyResources(this.label17, "label17");
this.label17.Name = "label17";
this.ToolTip1.SetToolTip(this.label17, resources.GetString("label17.ToolTip"));
//
// textBox3
//
resources.ApplyResources(this.textBox3, "textBox3");
this.textBox3.BackColor = System.Drawing.SystemColors.Window;
this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.textBox3.Name = "textBox3";
this.textBox3.ReadOnly = true;
this.ToolTip1.SetToolTip(this.textBox3, resources.GetString("textBox3.ToolTip"));
//
// textBox2
//
resources.ApplyResources(this.textBox2, "textBox2");
this.textBox2.BackColor = System.Drawing.SystemColors.Window;
this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.textBox2.Name = "textBox2";
this.textBox2.ReadOnly = true;
this.ToolTip1.SetToolTip(this.textBox2, resources.GetString("textBox2.ToolTip"));
//
// textBox1
//
resources.ApplyResources(this.textBox1, "textBox1");
this.textBox1.BackColor = System.Drawing.SystemColors.Window;
this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.textBox1.Name = "textBox1";
this.textBox1.ReadOnly = true;
this.ToolTip1.SetToolTip(this.textBox1, resources.GetString("textBox1.ToolTip"));
//
// txtyuzhi
//
resources.ApplyResources(this.txtyuzhi, "txtyuzhi");
......@@ -235,13 +274,6 @@
this.ToolTip1.SetToolTip(this.cBox氢气, resources.GetString("cBox氢气.ToolTip"));
this.cBox氢气.UseVisualStyleBackColor = true;
//
// cBox加热器
//
resources.ApplyResources(this.cBox加热器, "cBox加热器");
this.cBox加热器.Name = "cBox加热器";
this.ToolTip1.SetToolTip(this.cBox加热器, resources.GetString("cBox加热器.ToolTip"));
this.cBox加热器.UseVisualStyleBackColor = true;
//
// label16
//
resources.ApplyResources(this.label16, "label16");
......@@ -356,7 +388,6 @@
private System.Windows.Forms.TextBox fidsettemp;
private System.Windows.Forms.TextBox tb氢气压力设定;
private System.Windows.Forms.CheckBox cBox氢气;
private System.Windows.Forms.CheckBox cBox加热器;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.Label label11;
......@@ -383,5 +414,9 @@
private System.Windows.Forms.TextBox txtyuzhi;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.ToolTip ToolTip1;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Label label17;
}
}
\ No newline at end of file
GcDevicePc/ConfigMethod/FID.cs
View file @ 997ae3dd
......@@ -17,6 +17,9 @@ namespace GcDevicePc.ConfigMethod
HWConfig hwconfig;
GCMethodConfig methodconfig;
/// <summary>
/// 依据配置和方法文件,创建方法-检测器-fid子界面
/// </summary>
public FID(HWConfig hwconfig, ref GCMethodConfig methodconfig)
{
InitializeComponent();
......@@ -41,12 +44,57 @@ namespace GcDevicePc.ConfigMethod
{
case 0:
configTemp = globaldata.m_hwconfig.hwconfiginfo.u16DetFrontPTemp;
this.textBox1.Text= hwconfig.hwconfiginfo.u16Det1EpcName1;
this.textBox2.Text= hwconfig.hwconfiginfo.u16Det1EpcName2;
this.textBox3.Text= hwconfig.hwconfiginfo.u16Det1EpcName3;
if (hwconfig.hwconfiginfo.u16Det1Epc1==0)
{
tb氢气压力设定.Enabled=false;
}
if (hwconfig.hwconfiginfo.u16Det1Epc2==0)
{
tb空气压力设定.Enabled=false;
}
if (hwconfig.hwconfiginfo.u16Det1Epc3==0)
{
tb尾吹气压力设定.Enabled=false;
}
break;
case 1:
configTemp = globaldata.m_hwconfig.hwconfiginfo.u16DetInterPTemp;
this.textBox1.Text= hwconfig.hwconfiginfo.u16Det2EpcName1;
this.textBox2.Text= hwconfig.hwconfiginfo.u16Det2EpcName2;
this.textBox3.Text= hwconfig.hwconfiginfo.u16Det2EpcName3;
if (hwconfig.hwconfiginfo.u16Det2Epc1==0)
{
tb氢气压力设定.Enabled=false;
}
if (hwconfig.hwconfiginfo.u16Det2Epc2==0)
{
tb空气压力设定.Enabled=false;
}
if (hwconfig.hwconfiginfo.u16Det2Epc3==0)
{
tb尾吹气压力设定.Enabled=false;
}
break;
case 2:
configTemp = globaldata.m_hwconfig.hwconfiginfo.u16DetBehindPTemp;
this.textBox1.Text= hwconfig.hwconfiginfo.u16Det3EpcName1;
this.textBox2.Text= hwconfig.hwconfiginfo.u16Det3EpcName2;
this.textBox3.Text= hwconfig.hwconfiginfo.u16Det3EpcName3;
if (hwconfig.hwconfiginfo.u16Det3Epc1==0)
{
tb氢气压力设定.Enabled=false;
}
if (hwconfig.hwconfiginfo.u16Det3Epc2==0)
{
tb空气压力设定.Enabled=false;
}
if (hwconfig.hwconfiginfo.u16Det3Epc3==0)
{
tb尾吹气压力设定.Enabled=false;
}
break;
default:
break;
......@@ -311,6 +359,6 @@ namespace GcDevicePc.ConfigMethod
//}
ToolTip1.Show("", DeTextBox, 3000);
}
}
}
GcDevicePc/ConfigMethod/FID.en.resx
View file @ 997ae3dd
......@@ -117,6 +117,18 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="label17.Text" xml:space="preserve">
<value>Temp</value>
</data>
<data name="textBox3.Text" xml:space="preserve">
<value>flow3</value>
</data>
<data name="textBox2.Text" xml:space="preserve">
<value>flow2</value>
</data>
<data name="textBox1.Text" xml:space="preserve">
<value>flow1</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>386, 89</value>
......@@ -160,27 +172,6 @@
<data name="cb灵敏度.Items2" xml:space="preserve">
<value>Low</value>
</data>
<data name="cBox尾吹气.Size" type="System.Drawing.Size, System.Drawing">
<value>84, 16</value>
</data>
<data name="cBox尾吹气.Text" xml:space="preserve">
<value>Makeup Gas</value>
</data>
<data name="cBox空气.Size" type="System.Drawing.Size, System.Drawing">
<value>42, 16</value>
</data>
<data name="cBox空气.Text" xml:space="preserve">
<value>Air</value>
</data>
<data name="cBox氢气.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 16</value>
</data>
<data name="cBox氢气.Text" xml:space="preserve">
<value>Hydrogen</value>
</data>
<data name="cBox加热器.Text" xml:space="preserve">
<value>Heater</value>
</data>
<data name="label9.Location" type="System.Drawing.Point, System.Drawing">
<value>448, 214</value>
</data>
......
GcDevicePc/ConfigMethod/FID.resx
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/ConfigMethod/FPD.cs 0 → 100644
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/ConfigMethod/FPD.designer.cs 0 → 100644
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/ConfigMethod/FPD.en.resx 0 → 100644
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/ConfigMethod/FPD.resx 0 → 100644
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/ConfigMethod/MethodMain.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/ConfigMethod/SignalTab.cs
View file @ 997ae3dd
......@@ -40,6 +40,10 @@ namespace GcDevicePc.ConfigMethod
{
addALLItem(bEnglishLanguage == false ? "FID(前)":"FID(Front)");
}
else if (this.hwconfig.hwconfiginfo.u16DetFrontType == 3) //FPD
{
addALLItem(bEnglishLanguage == false ? "FPD(前)":"FPD(Front)");
}
}
......@@ -53,6 +57,10 @@ namespace GcDevicePc.ConfigMethod
{
addALLItem(bEnglishLanguage == false ?"FID(中)": "FID(Middle)");
}
else if (this.hwconfig.hwconfiginfo.u16DetInterType == 3) //FPD
{
addALLItem(bEnglishLanguage == false ?"FPD(中)": "FPD(Middle)");
}
}
......@@ -66,6 +74,10 @@ namespace GcDevicePc.ConfigMethod
{
addALLItem(bEnglishLanguage == false ?"FID(后)":"FID(Back)");
}
else if (this.hwconfig.hwconfiginfo.u16DetBehindType == 3) // FPD
{
addALLItem(bEnglishLanguage == false ?"FPD(后)":"FPD(Back)");
}
}
}
......@@ -168,6 +180,10 @@ namespace GcDevicePc.ConfigMethod
{
addALLItem(bEnglishLanguage == false ?"FID(前)":"FID(Front)");
}
else if (this.hwconfig.hwconfiginfo.u16DetFrontType == 3) //FPD
{
addALLItem(bEnglishLanguage == false ?"FPD(前)":"FPD(Front)");
}
}
......@@ -181,6 +197,10 @@ namespace GcDevicePc.ConfigMethod
{
addALLItem(bEnglishLanguage == false ?"FID(中)":"FID(Middle)");
}
else if (this.hwconfig.hwconfiginfo.u16DetInterType == 3) //FPD
{
addALLItem(bEnglishLanguage == false ?"FPD(中)":"FPD(Middle)");
}
}
......@@ -194,6 +214,10 @@ namespace GcDevicePc.ConfigMethod
{
addALLItem(bEnglishLanguage == false ?"FID(后)":"FID(Back)");
}
else if (this.hwconfig.hwconfiginfo.u16DetBehindType == 3) // FPD
{
addALLItem(bEnglishLanguage == false ?"FPD(后)":"FPD(Back)");
}
}
}
......
GcDevicePc/ConfigMethod/TCD.cs
View file @ 997ae3dd
......@@ -17,6 +17,9 @@ namespace GcDevicePc.ConfigMethod
HWConfig hwconfig;
GCMethodConfig methodconfig;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false;
/// <summary>
/// 依据配置和方法文件,创建方法-检测器-tcd子界面
/// </summary>
public TCD(HWConfig hwconfig, ref GCMethodConfig methodconfig)
{
InitializeComponent();
......
GcDevicePc/ConfigMethod/injectionport/IPPIP.Designer.cs
View file @ 997ae3dd
......@@ -228,7 +228,6 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "IPPIP";
this.ToolTip1.SetToolTip(this, resources.GetString("$this.ToolTip"));
this.Load += new System.EventHandler(this.IPPIP_Load);
this.ResumeLayout(false);
this.PerformLayout();
......
GcDevicePc/DataState.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Auxiliary.byn.resx 0 → 100644
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Auxiliary.cs
View file @ 997ae3dd
......@@ -42,6 +42,9 @@ namespace GcDevicePc.DeviceConfigUI
this.checkBox_EPC_AUX1_1.Checked=this.hWConfig.hwconfiginfo.u16Aux1Epc1== 1 ? true : false;
this.checkBox_EPC_AUX1_2.Checked=this.hWConfig.hwconfiginfo.u16Aux1Epc2== 1 ? true : false;
this.checkBox_EPC_AUX1_3.Checked=this.hWConfig.hwconfiginfo.u16Aux1Epc3== 1 ? true : false;
this.textBox_EPC_AUX1_1.Text=this.hWConfig.hwconfiginfo.u16Aux1EpcName1;
this.textBox_EPC_AUX1_2.Text=this.hWConfig.hwconfiginfo.u16Aux1EpcName2;
this.textBox_EPC_AUX1_3.Text=this.hWConfig.hwconfiginfo.u16Aux1EpcName3;
this.AuxHeaterName1.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterName1;
this.AuxHeaterPTemp1.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp1.ToString();
......@@ -49,6 +52,9 @@ namespace GcDevicePc.DeviceConfigUI
this.checkBox_EPC_AUX2_1.Checked=this.hWConfig.hwconfiginfo.u16Aux2Epc1== 1 ? true : false;
this.checkBox_EPC_AUX2_2.Checked=this.hWConfig.hwconfiginfo.u16Aux2Epc2== 1 ? true : false;
this.checkBox_EPC_AUX2_3.Checked=this.hWConfig.hwconfiginfo.u16Aux2Epc3== 1 ? true : false;
this.textBox_EPC_AUX2_1.Text=this.hWConfig.hwconfiginfo.u16Aux2EpcName1;
this.textBox_EPC_AUX2_2.Text=this.hWConfig.hwconfiginfo.u16Aux2EpcName2;
this.textBox_EPC_AUX2_3.Text=this.hWConfig.hwconfiginfo.u16Aux2EpcName3;
this.AuxHeaterName2.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterName2;
this.AuxHeaterPTemp2.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp2.ToString();
......@@ -72,12 +78,18 @@ namespace GcDevicePc.DeviceConfigUI
this.hWConfig.hwconfiginfo.u16Aux1Epc1 = this.checkBox_EPC_AUX1_1.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux1Epc2 = this.checkBox_EPC_AUX1_2.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux1Epc3 = this.checkBox_EPC_AUX1_3.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux1EpcName1 =this.textBox_EPC_AUX1_1.Text;
this.hWConfig.hwconfiginfo.u16Aux1EpcName2 =this.textBox_EPC_AUX1_2.Text;
this.hWConfig.hwconfiginfo.u16Aux1EpcName3 =this.textBox_EPC_AUX1_3.Text;
this.hWConfig.hwconfiginfo.u16AuxHeaterName1 = this.AuxHeaterName1.Text;
this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp1 = int.Parse(this.AuxHeaterPTemp1.Text);
this.hWConfig.hwconfiginfo.u16AuxHeater2 = this.AuxHeater2.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux2Epc1 = this.checkBox_EPC_AUX2_1.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux2Epc2 = this.checkBox_EPC_AUX2_2.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux2Epc3 = this.checkBox_EPC_AUX2_3.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux2EpcName1 =this.textBox_EPC_AUX2_1.Text;
this.hWConfig.hwconfiginfo.u16Aux2EpcName2 =this.textBox_EPC_AUX2_2.Text;
this.hWConfig.hwconfiginfo.u16Aux2EpcName3 =this.textBox_EPC_AUX2_3.Text;
this.hWConfig.hwconfiginfo.u16AuxHeaterName2 = this.AuxHeaterName2.Text;
this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp2 = int.Parse(this.AuxHeaterPTemp2.Text);
}
......
GcDevicePc/DeviceConfigUI/Auxiliary.en.resx
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Auxiliary.resx
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/DeviceConfigUI/ConfigDevice.cs
View file @ 997ae3dd
......@@ -432,6 +432,7 @@ namespace GcDevicePc.DeviceConfigUI
globaldata.m_profileMethod.GetChromAllPara();
globaldata.m_profileMethod.GetColTableElseAllPara();
globaldata.m_profileMethod.GetFidAllPara();
globaldata.m_profileMethod.GetFpdAllPara();
globaldata.m_profileMethod.GetTcdAllPara();
globaldata.m_profileMethod.GetAuxiliaryAllPara();
}
......
GcDevicePc/DeviceConfigUI/Detection.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Detection.en.resx
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Detection.resx
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Sampling.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Sampling.en.resx
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Sampling.resx
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/ExpansionMethod/TempTrend.resx → GcDevicePc/DrawUI/TempTrend.resx
View file @ 997ae3dd
......@@ -120,9 +120,6 @@
<metadata name="cms_Chart.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>367, 22</value>
</metadata>
<metadata name="tim_ReadInterval.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>216, 22</value>
</metadata>
<metadata name="cms_file.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>480, 22</value>
</metadata>
......
GcDevicePc/EPCTips.Designer.cs
View file @ 997ae3dd
......@@ -65,7 +65,7 @@
this.Controls.Add(this.button1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
this.Name = "EPCTips";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "警 告";
this.ResumeLayout(false);
this.PerformLayout();
......
GcDevicePc/Formdebug.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/GCBuffer/GCMethodConfig.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/GCBuffer/HWConfig.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/GcDevicePc.csproj
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/IniParam/Device.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/IniParam/IniOp.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/MDIBase.Designer.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/MDIBase.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/MDIBase.resx
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/ProThread/CKvocUpdataSum.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/ProThread/HMIControl.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/StartForm.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/SysConfigSecondary.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/SysConfigSecondary.en.resx
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/SysConfigSecondary.resx
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/SysConfigsecondary.Designer.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/auxtool.cs
View file @ 997ae3dd
This diff is collapsed.
GcDevicePc/globaldata.cs
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Config/GC_Set/Startup/sys.ini
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/CKVocAnalyzer.dll
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/EnvDTE.dll
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/LogOperate.dll
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/Microsoft.mshtml.dll
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/ModbusLib.dll
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/SQLiteOperate.dll
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/SpaceM.dll
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/Spire.Doc.dll
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/Spire.Doc.xml
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/Spire.Pdf.dll
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/Spire.Pdf.xml
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_Control/stdole.dll
View file @ 997ae3dd
This diff is collapsed.
VocsSetup/GC_User/ResultData/Record2.db
View file @ 997ae3dd
This diff is collapsed.
dll/CKVocAlgorithm.dll
View file @ 997ae3dd
This diff is collapsed.
dll/CKVocAnalyzer.dll
View file @ 997ae3dd
This diff is collapsed.
dll/WindowsFormsControlLibrary_PopUp.dll 0 → 100644
View file @ 997ae3dd
This diff is collapsed.
gcdevicepc_nmoc8-16 @ 81c40539
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