Skip to content

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

1.版本没有变更 

2.辅助工具增加单独发送桥流,改为依据TCD状态更新UI;增加强制点火,需要搭配hmi5.5或更高
3.方法-fid增加滤波(对数有效);以前没有显示保护温度的页面增加保护温度显示
4.修复错误报警的一些bug(主要是显示与实际不对应);更改了下日志字符格式(方便灵活设定扩展控件)
5.只有对数才显示信号系数
6.修复表界面温湿度没有依据配置显示
7.色谱配置初始化为"2"=机械阀(以前是"0"=epc)
8.修复超级选项内温湿度上下限反了
9.增加信号频率超过20数据/S时,处理为20数据/S
parent e7e40e67
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3191 additions and 2658 deletions
GcDevicePc/CK_UI/UserCtl.cs
View file @ ba85c3a4
......@@ -783,8 +783,10 @@ namespace GcDevicePc.CK_UI
}
// zedgraph.AxisChange();
}
private void datadisp2() //苯系物
/// <summary>
/// 苯系物,没有被使用过,因为辰科配置文件一直没有被使用过
/// </summary>
private void datadisp2()
{
try
{
......@@ -1010,6 +1012,9 @@ namespace GcDevicePc.CK_UI
}
// zedgraph.AxisChange();
}
/// <summary>
/// 结果数据刷新
/// </summary>
private void data()
{
try
......@@ -1129,7 +1134,9 @@ namespace GcDevicePc.CK_UI
Trace.Write(ex);
}
}
/// <summary>
/// 第二套数据刷新,没有用上过,因为辰科配置文件一直没有被使用
/// </summary>
private void data2()
{
try
......@@ -1224,7 +1231,7 @@ namespace GcDevicePc.CK_UI
datadisp();
UIVisible(false);
break;
case 1:
case 1://没有被使用过,因为辰科配置文件没有使用过
data2();
datadisp2();
......
GcDevicePc/ConfigMethod/FID.Designer.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/ConfigMethod/FID.cs
View file @ ba85c3a4
......@@ -44,57 +44,61 @@ 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)
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;
tb氢气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det1Epc2==0)
if (hwconfig.hwconfiginfo.u16Det1Epc2 == 0)
{
tb空气压力设定.Enabled=false;
tb空气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det1Epc3==0)
if (hwconfig.hwconfiginfo.u16Det1Epc3 == 0)
{
tb尾吹气压力设定.Enabled=false;
tb尾吹气压力设定.Enabled = false;
}
//保护温度
textBox5.Text = globaldata.m_hwconfig.hwconfiginfo.u16DetFrontPTemp.ToString();
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)
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;
tb氢气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det2Epc2==0)
if (hwconfig.hwconfiginfo.u16Det2Epc2 == 0)
{
tb空气压力设定.Enabled=false;
tb空气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det2Epc3==0)
if (hwconfig.hwconfiginfo.u16Det2Epc3 == 0)
{
tb尾吹气压力设定.Enabled=false;
tb尾吹气压力设定.Enabled = false;
}
textBox5.Text = globaldata.m_hwconfig.hwconfiginfo.u16DetInterPTemp.ToString();
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)
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;
tb氢气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det3Epc2==0)
if (hwconfig.hwconfiginfo.u16Det3Epc2 == 0)
{
tb空气压力设定.Enabled=false;
tb空气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det3Epc3==0)
if (hwconfig.hwconfiginfo.u16Det3Epc3 == 0)
{
tb尾吹气压力设定.Enabled=false;
tb尾吹气压力设定.Enabled = false;
}
textBox5.Text = globaldata.m_hwconfig.hwconfiginfo.u16DetBehindPTemp.ToString();
break;
default:
break;
......@@ -135,8 +139,10 @@ namespace GcDevicePc.ConfigMethod
cb灵敏度.SelectedIndex = this.methodconfig.fid[index].u16Sensitive;
cb极性.SelectedIndex = this.methodconfig.fid[index].u16Polarity;
cb极性.SelectedIndex = this.methodconfig.fid[index].u16Polarity;
//滤波深度
textBox4.Text = this.methodconfig.fid[index].u16FilterDepth.ToString();
if (this.methodconfig.fid[index].u16KeyFire == 1)
cBox自动点火.CheckState = CheckState.Checked;
else
......@@ -185,6 +191,8 @@ namespace GcDevicePc.ConfigMethod
this.methodconfig.fid[index].fSetH2Flow = string2float(tb氢气压力设定.Text);
this.methodconfig.fid[index].fAirFlowSet = string2float(tb空气压力设定.Text);
this.methodconfig.fid[index].fSetTailGas = string2float(tb尾吹气压力设定.Text);
//滤波深度
this.methodconfig.fid[index].u16FilterDepth = ushort.Parse(textBox4.Text);
this.methodconfig.fid[index].u16Sensitive = (ushort)cb灵敏度.SelectedIndex;
this.methodconfig.fid[index].u16Polarity = (ushort)cb极性.SelectedIndex;
......@@ -269,17 +277,11 @@ namespace GcDevicePc.ConfigMethod
double dMinInputValue = 0;
byte bRetainBit = 2;
TextBox DeTextBox = (TextBox)sender;
if (DeTextBox.Equals(txtyuzhi))
{
bRetainBit = 3;
dMinInputValue = -1000;
dMaxInpueValue = 1000;
}
else if (DeTextBox.Equals(fidsettemp))
if (DeTextBox.Equals(fidsettemp))
{
bRetainBit = 2;
dMinInputValue = 0;
dMaxInpueValue=configTemp;
dMaxInpueValue = configTemp;
//对比对应配置温度
//dMaxInpueValue = globaldata.m_hwconfig.hwconfiginfo.u16DetFrontPTemp;
}
......
GcDevicePc/ConfigMethod/FID.resx
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/ConfigMethod/FPD.cs
View file @ ba85c3a4
......@@ -41,57 +41,60 @@ 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)
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;
tb氢气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det1Epc2==0)
if (hwconfig.hwconfiginfo.u16Det1Epc2 == 0)
{
tb空气压力设定.Enabled=false;
tb空气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det1Epc3==0)
if (hwconfig.hwconfiginfo.u16Det1Epc3 == 0)
{
tb尾吹气压力设定.Enabled=false;
tb尾吹气压力设定.Enabled = false;
}
textBox5.Text = globaldata.m_hwconfig.hwconfiginfo.u16DetFrontPTemp.ToString();
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)
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;
tb氢气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det2Epc2==0)
if (hwconfig.hwconfiginfo.u16Det2Epc2 == 0)
{
tb空气压力设定.Enabled=false;
tb空气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det2Epc3==0)
if (hwconfig.hwconfiginfo.u16Det2Epc3 == 0)
{
tb尾吹气压力设定.Enabled=false;
tb尾吹气压力设定.Enabled = false;
}
textBox5.Text = globaldata.m_hwconfig.hwconfiginfo.u16DetInterPTemp.ToString();
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)
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;
tb氢气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det3Epc2==0)
if (hwconfig.hwconfiginfo.u16Det3Epc2 == 0)
{
tb空气压力设定.Enabled=false;
tb空气压力设定.Enabled = false;
}
if (hwconfig.hwconfiginfo.u16Det3Epc3==0)
if (hwconfig.hwconfiginfo.u16Det3Epc3 == 0)
{
tb尾吹气压力设定.Enabled=false;
tb尾吹气压力设定.Enabled = false;
}
textBox5.Text = globaldata.m_hwconfig.hwconfiginfo.u16DetBehindPTemp.ToString();
break;
default:
break;
......@@ -276,7 +279,7 @@ namespace GcDevicePc.ConfigMethod
{
bRetainBit = 2;
dMinInputValue = 0;
dMaxInpueValue=configTemp;
dMaxInpueValue = configTemp;
//对比对应配置温度
//dMaxInpueValue = globaldata.m_hwconfig.hwconfiginfo.u16DetFrontPTemp;
}
......
GcDevicePc/ConfigMethod/FPD.designer.cs
View file @ ba85c3a4
......@@ -67,11 +67,17 @@
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.ToolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.label19 = new System.Windows.Forms.Label();
this.label20 = new System.Windows.Forms.Label();
this.textBox5 = new System.Windows.Forms.TextBox();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// groupBox1
//
this.groupBox1.Controls.Add(this.label19);
this.groupBox1.Controls.Add(this.label20);
this.groupBox1.Controls.Add(this.textBox5);
this.groupBox1.Controls.Add(this.label17);
this.groupBox1.Controls.Add(this.textBox3);
this.groupBox1.Controls.Add(this.txtyuzhi);
......@@ -328,6 +334,22 @@
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
// label19
//
resources.ApplyResources(this.label19, "label19");
this.label19.Name = "label19";
//
// label20
//
resources.ApplyResources(this.label20, "label20");
this.label20.Name = "label20";
//
// textBox5
//
this.textBox5.BorderStyle = System.Windows.Forms.BorderStyle.None;
resources.ApplyResources(this.textBox5, "textBox5");
this.textBox5.Name = "textBox5";
//
// FPD
//
resources.ApplyResources(this, "$this");
......@@ -381,5 +403,8 @@
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.Label label20;
private System.Windows.Forms.TextBox textBox5;
}
}
\ No newline at end of file
GcDevicePc/ConfigMethod/FPD.resx
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/ConfigMethod/RealColTab.Designer.cs
View file @ ba85c3a4
......@@ -50,17 +50,17 @@
this.cBox启动风扇冷陷 = new System.Windows.Forms.CheckBox();
this.cBox启动制冷剂冷陷 = new System.Windows.Forms.CheckBox();
this.ProUpTab = new System.Windows.Forms.DataGridView();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColProNum = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.delMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.delMenudel = new System.Windows.Forms.ToolStripMenuItem();
this.ToolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.label11 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
......@@ -219,47 +219,12 @@
this.ProUpTab.RowTemplate.Height = 23;
this.ToolTip1.SetToolTip(this.ProUpTab, resources.GetString("ProUpTab.ToolTip"));
this.ProUpTab.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.ProUpTab_CellBeginEdit);
this.ProUpTab.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv程升表_CellContentClick);
this.ProUpTab.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.ProUpTab_CellFormatting);
this.ProUpTab.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.ProUpTab_CellMouseDown);
this.ProUpTab.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.ProUpTab_CellValueChanged);
this.ProUpTab.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dgv程升表_EditingControlShowing);
this.ProUpTab.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.ProUpTab_RowStateChanged);
//
// ColProNum
//
resources.ApplyResources(this.ColProNum, "ColProNum");
this.ColProNum.Name = "ColProNum";
this.ColProNum.ReadOnly = true;
this.ToolTip1.SetToolTip(this.ColProNum, resources.GetString("ColProNum.ToolTip"));
//
// label2
//
resources.ApplyResources(this.label2, "label2");
this.label2.Name = "label2";
this.ToolTip1.SetToolTip(this.label2, resources.GetString("label2.ToolTip"));
//
// label12
//
resources.ApplyResources(this.label12, "label12");
this.label12.Name = "label12";
this.ToolTip1.SetToolTip(this.label12, resources.GetString("label12.ToolTip"));
//
// delMenu
//
resources.ApplyResources(this.delMenu, "delMenu");
this.delMenu.ImageScalingSize = new System.Drawing.Size(24, 24);
this.delMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.delMenudel});
this.delMenu.Name = "delMenu";
this.ToolTip1.SetToolTip(this.delMenu, resources.GetString("delMenu.ToolTip"));
//
// delMenudel
//
resources.ApplyResources(this.delMenudel, "delMenudel");
this.delMenudel.Name = "delMenudel";
this.delMenudel.Click += new System.EventHandler(this.delMenudel_Click);
//
// Column1
//
resources.ApplyResources(this.Column1, "Column1");
......@@ -297,6 +262,40 @@
this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// ColProNum
//
resources.ApplyResources(this.ColProNum, "ColProNum");
this.ColProNum.Name = "ColProNum";
this.ColProNum.ReadOnly = true;
this.ToolTip1.SetToolTip(this.ColProNum, resources.GetString("ColProNum.ToolTip"));
//
// label2
//
resources.ApplyResources(this.label2, "label2");
this.label2.Name = "label2";
this.ToolTip1.SetToolTip(this.label2, resources.GetString("label2.ToolTip"));
//
// label12
//
resources.ApplyResources(this.label12, "label12");
this.label12.Name = "label12";
this.ToolTip1.SetToolTip(this.label12, resources.GetString("label12.ToolTip"));
//
// delMenu
//
resources.ApplyResources(this.delMenu, "delMenu");
this.delMenu.ImageScalingSize = new System.Drawing.Size(24, 24);
this.delMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.delMenudel});
this.delMenu.Name = "delMenu";
this.ToolTip1.SetToolTip(this.delMenu, resources.GetString("delMenu.ToolTip"));
//
// delMenudel
//
resources.ApplyResources(this.delMenudel, "delMenudel");
this.delMenudel.Name = "delMenudel";
this.delMenudel.Click += new System.EventHandler(this.delMenudel_Click);
//
// label11
//
resources.ApplyResources(this.label11, "label11");
......
GcDevicePc/ConfigMethod/RealColTab.cs
View file @ ba85c3a4
......@@ -437,7 +437,11 @@ namespace GcDevicePc.ConfigMethod
this.label12.Text = run_time.ToString("0.00") + " min";
}
/// <summary>
/// 柱箱程升菜单
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ProUpTab_CellMouseDown(object sender, DataGridViewCellMouseEventArgs e)
{
if (e.Button == MouseButtons.Right)
......@@ -475,7 +479,7 @@ namespace GcDevicePc.ConfigMethod
ProUpTab.Rows.Remove(row);
}
ProUpTab_CellValueChanged(sender, (DataGridViewCellEventArgs)e);
//ProUpTab_CellValueChanged(sender, (DataGridViewCellEventArgs)e);
}
......@@ -521,7 +525,11 @@ namespace GcDevicePc.ConfigMethod
}
/// <summary>
/// 判断是否可以编辑
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ProUpTab_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
{
DataGridView dgv = (DataGridView)sender;
......
GcDevicePc/ConfigMethod/RealColTab.resx
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/ConfigMethod/TCD.Designer.cs
View file @ ba85c3a4
......@@ -48,12 +48,17 @@
this.label23 = new System.Windows.Forms.Label();
this.label25 = new System.Windows.Forms.Label();
this.label26 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.textBox5 = new System.Windows.Forms.TextBox();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// groupBox1
//
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.textBox5);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.cListBoxSign);
......@@ -72,6 +77,7 @@
this.groupBox1.Controls.Add(this.label23);
this.groupBox1.Controls.Add(this.label25);
this.groupBox1.Controls.Add(this.label26);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
......@@ -87,7 +93,6 @@
//
// cListBoxSign
//
resources.ApplyResources(this.cListBoxSign, "cListBoxSign");
this.cListBoxSign.BackColor = System.Drawing.SystemColors.Control;
this.cListBoxSign.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.cListBoxSign.FormattingEnabled = true;
......@@ -95,6 +100,7 @@
resources.GetString("cListBoxSign.Items"),
resources.GetString("cListBoxSign.Items1"),
resources.GetString("cListBoxSign.Items2")});
resources.ApplyResources(this.cListBoxSign, "cListBoxSign");
this.cListBoxSign.Name = "cListBoxSign";
//
// cBox调零
......@@ -111,11 +117,11 @@
//
// cb极性
//
resources.ApplyResources(this.cb极性, "cb极性");
this.cb极性.FormattingEnabled = true;
this.cb极性.Items.AddRange(new object[] {
resources.GetString("cb极性.Items"),
resources.GetString("cb极性.Items1")});
resources.ApplyResources(this.cb极性, "cb极性");
this.cb极性.Name = "cb极性";
//
// tb参比气流量
......@@ -183,6 +189,22 @@
resources.ApplyResources(this.label26, "label26");
this.label26.Name = "label26";
//
// label3
//
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
//
// label4
//
resources.ApplyResources(this.label4, "label4");
this.label4.Name = "label4";
//
// textBox5
//
this.textBox5.BorderStyle = System.Windows.Forms.BorderStyle.None;
resources.ApplyResources(this.textBox5, "textBox5");
this.textBox5.Name = "textBox5";
//
// TCD
//
resources.ApplyResources(this, "$this");
......@@ -218,5 +240,8 @@
private System.Windows.Forms.CheckedListBox cListBoxSign;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox textBox5;
}
}
\ No newline at end of file
GcDevicePc/ConfigMethod/TCD.cs
View file @ ba85c3a4
......@@ -64,7 +64,7 @@ namespace GcDevicePc.ConfigMethod
default:
break;
}
textBox5.Text=configTemp.ToString();
//tb桥电流.Text = this.methodconfig.tcd[index].u16Electric.ToString();
tcdsettemp.Text = this.methodconfig.tcd[index].fHeaterTempSet.ToString();
......
GcDevicePc/ConfigMethod/TCD.resx
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/DataState.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/ErrorLogForm.Designer.cs deleted 100644 → 0
View file @ e7e40e67

namespace GcDevicePc
{
partial class ErrorLogForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.listView2 = new System.Windows.Forms.ListView();
this.listView1 = new System.Windows.Forms.ListView();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.Location = new System.Drawing.Point(0, 0);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.listView2);
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.listView1);
this.splitContainer1.Size = new System.Drawing.Size(1178, 518);
this.splitContainer1.SplitterDistance = 332;
this.splitContainer1.TabIndex = 1;
//
// listView2
//
this.listView2.Dock = System.Windows.Forms.DockStyle.Fill;
this.listView2.HideSelection = false;
this.listView2.Location = new System.Drawing.Point(0, 0);
this.listView2.Name = "listView2";
this.listView2.Size = new System.Drawing.Size(332, 518);
this.listView2.TabIndex = 0;
this.listView2.UseCompatibleStateImageBehavior = false;
this.listView2.SelectedIndexChanged += new System.EventHandler(this.listView2_SelectedIndexChanged);
//
// listView1
//
this.listView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.listView1.HideSelection = false;
this.listView1.Location = new System.Drawing.Point(0, 0);
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(842, 518);
this.listView1.TabIndex = 0;
this.listView1.UseCompatibleStateImageBehavior = false;
//
// ErrorLogForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1178, 518);
this.Controls.Add(this.splitContainer1);
this.Name = "ErrorLogForm";
this.Text = "ErrorLogForm";
this.Load += new System.EventHandler(this.ErrorLogForm_Load);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.ListView listView2;
private System.Windows.Forms.ListView listView1;
}
}
\ No newline at end of file
GcDevicePc/ErrorLogForm.cs deleted 100644 → 0
View file @ e7e40e67
This diff is collapsed.
GcDevicePc/ErrorLogForm.resx deleted 100644 → 0
View file @ e7e40e67
<?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>
</root>
\ No newline at end of file
GcDevicePc/FormUser.cs
View file @ ba85c3a4
......@@ -27,8 +27,8 @@ namespace GcDevicePc
if (!MDIBase.bEnableTempHumi)
{
//不显示温湿度
label1.Enabled=false;
label2.Enabled=false;
label1.Visible=false;
label2.Visible=false;
}
}
......
GcDevicePc/GCBuffer/GCMethodConfig.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/GCBuffer/HMIBuffer.cs
View file @ ba85c3a4
......@@ -36,7 +36,7 @@ namespace GcDevicePc.GCBuffer
public byte[] TenRelay;
/// <summary>
/// 点火状态
/// 点火状态 0=未点火,1=点火中,2=点火成功,3=点火失败,4=点火熄灭,5=重新点火
/// </summary>
public ushort[] FireStatus;
......
GcDevicePc/GCBuffer/HWConfig.cs
View file @ ba85c3a4
......@@ -299,7 +299,7 @@ namespace GcDevicePc.GCBuffer
hwconfiginfo.GCNum = "GC001";
hwconfiginfo.GCName = "VocHMI";
hwconfiginfo.GCName = "China";
hwconfiginfo.u16StartType = 0;
hwconfiginfo.u16StartType = 2;
#endregion
#region 进样单元
......@@ -853,7 +853,7 @@ namespace GcDevicePc.GCBuffer
hwconfiginfo.GCNum = "GC001";
hwconfiginfo.GCName = "VocHMI";
hwconfiginfo.GCName = "China";
hwconfiginfo.u16StartType = 0;
hwconfiginfo.u16StartType = 2;
SavaHWConfig();
}
#endregion
......
GcDevicePc/GcData_TCP.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/GcDevicePc.csproj
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/IniParam/Device.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/MDIBase.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/ProThread/GcDataTh.cs
View file @ ba85c3a4
......@@ -616,7 +616,7 @@ namespace GcDevicePc.ProThread
try
{
ret = GetHmiAbnormalHoldingReg(1101, 6, ref temp);//温控报警
ret = GetHmiAbnormalHoldingReg(1108, 3, ref temp2);//检测报警
ret = GetHmiAbnormalHoldingReg(1107, 3, ref temp2);//检测报警
ret = GetHmiAbnormalHoldingReg(807, 2, ref temp3);//温湿度报警
temp.CopyTo(data, 0);
temp2.CopyTo(data, 6);
......
GcDevicePc/ProThread/HMIControl.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/SysConfig.Designer.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/SysConfig.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/SysConfig.resx
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/SysConfigSecondary.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/SysConfigSecondary.resx
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/SysConfigsecondary.Designer.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/auxtool.Designer.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/auxtool.cs
View file @ ba85c3a4
This diff is collapsed.
GcDevicePc/auxtool.resx
View file @ ba85c3a4
This diff is collapsed.
VocsSetup/GC_Config/GC_Set/Startup/sys.ini
View file @ ba85c3a4
This diff is collapsed.
VocsSetup/GC_Control/LogOperate.dll
View file @ ba85c3a4
This diff is collapsed.
VocsSetup/GC_Control/Microsoft.mshtml.dll
View file @ ba85c3a4
This diff is collapsed.
VocsSetup/GC_Control/ModbusLib.dll
View file @ ba85c3a4
This diff is collapsed.
VocsSetup/GC_Control/SQLiteOperate.dll
View file @ ba85c3a4
This diff is collapsed.
VocsSetup/GC_Control/SharedSpace.dll
View file @ ba85c3a4
This diff is collapsed.
VocsSetup/GC_Control/SpaceM.dll
View file @ ba85c3a4
This diff is collapsed.
VocsSetup/GC_User/ResultData/Record2.db
View file @ ba85c3a4
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