1.版本没有变更

2.辅助工具增加单独发送桥流,改为依据TCD状态更新UI;增加强制点火,需要搭配hmi5.5或更高
3.方法-fid增加滤波(对数有效);以前没有显示保护温度的页面增加保护温度显示
4.修复错误报警的一些bug(主要是显示与实际不对应);更改了下日志字符格式(方便灵活设定扩展控件)
5.只有对数才显示信号系数
6.修复表界面温湿度没有依据配置显示
7.色谱配置初始化为"2"=机械阀(以前是"0"=epc)
8.修复超级选项内温湿度上下限反了
9.增加信号频率超过20数据/S时,处理为20数据/S

GcDevicePc/CK_UI/UserCtl.cs

@@ -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.cs

@@ -17,7 +17,7 @@ namespace GcDevicePc.ConfigMethod
 
         HWConfig hwconfig;
         GCMethodConfig methodconfig;
-          /// <summary>
+        /// <summary>
         /// 依据配置和方法文件,创建方法-检测器-fid子界面
         /// </summary>
         public FID(HWConfig hwconfig, ref GCMethodConfig methodconfig)
@@ -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;
             }
@@ -359,6 +361,6 @@ namespace GcDevicePc.ConfigMethod
             //}
             ToolTip1.Show("", DeTextBox, 3000);
         }
-       
+
     }
 }

GcDevicePc/ConfigMethod/FPD.cs

@@ -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;
             }
@@ -356,7 +359,7 @@ namespace GcDevicePc.ConfigMethod
             //}
             ToolTip1.Show("", DeTextBox, 3000);
         }
-          
-      
+
+
     }
 }

GcDevicePc/ConfigMethod/FPD.designer.cs

@@ -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/RealColTab.Designer.cs

@@ -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

@@ -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/TCD.Designer.cs

@@ -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

@@ -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/FormUser.cs

@@ -27,8 +27,8 @@ namespace GcDevicePc
             if (!MDIBase.bEnableTempHumi)
             {
                 //不显示温湿度
-                label1.Enabled=false;
-                label2.Enabled=false;
+                label1.Visible=false;
+                label2.Visible=false;
             }
         }
 

GcDevicePc/GCBuffer/HMIBuffer.cs

@@ -36,7 +36,7 @@ namespace GcDevicePc.GCBuffer
             public byte[] TenRelay;
 
             /// <summary>
-            /// 点火状态
+            /// 点火状态 0=未点火,1=点火中,2=点火成功,3=点火失败,4=点火熄灭,5=重新点火
             /// </summary>
             public ushort[] FireStatus;