修改用户界面显示内容，添加仪器方法界面Epc相关设置，修改仪器方法界面的内容，修改仪器配置界面的配置设置，辅助工具界面新添第一次点火延迟设置，新增epc错误报警…

修改用户界面显示内容，添加仪器方法界面Epc相关设置，修改仪器方法界面的内容，修改仪器配置界面的配置设置，辅助工具界面新添第一次点火延迟设置，新增epc错误报警，主界面插入同实验室版本的工具栏的相关内容，修改右侧信息显示内容

GcDevicePc/CK_UI/HistChartForm.Designer.cs

@@ -39,7 +39,7 @@
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "HistChartForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "历史图谱";
+            this.Text = "历史谱图";
             this.ResumeLayout(false);
 
         }

GcDevicePc/CK_UI/UserCtl.cs

@@ -105,7 +105,7 @@ namespace GcDevicePc.CK_UI
                 mster.Fill = new Fill(Color.White, Color.FromArgb(220, 220, 255), 45.0f);
                 mster.PaneList.Clear();
                 mster.Title.IsVisible = true;
-                mster.Title.Text = "12小时非甲烷总烃趋势图";
+                mster.Title.Text = "非甲烷总烃趋势图";
                 mster.Margin.All = 10;
                 mster.InnerPaneGap = 0;
                 //zedgraph.GraphPane.XAxis.CrossAuto = true;
@@ -154,7 +154,7 @@ namespace GcDevicePc.CK_UI
                 mster.Fill = new Fill(Color.White, Color.FromArgb(220, 220, 255), 45.0f);
                 mster.PaneList.Clear();
                 mster.Title.IsVisible = true;
-                mster.Title.Text = "12小时趋势图";
+                mster.Title.Text = "趋势图";
                 mster.Margin.All = 10;
                 mster.InnerPaneGap = 0;
                 //zedgraph.GraphPane.XAxis.CrossAuto = true;

GcDevicePc/Common/FileHelper.cs

@@ -169,6 +169,10 @@ namespace GcDevicePc.Common
         /// <param name="val"></param>
         public void WriteProfileString(string section, string key, string val)
         {
+            if (val is null)
+            {
+                val = "";
+            }
             string writeval = val.ToString();
             WriteValue(section, key, writeval);
         }

GcDevicePc/Common/MoudbusOperation.cs

@@ -145,6 +145,11 @@ namespace GcDevicePc.Common
             }
         }
 
+        internal void GetEPCDataStatus()
+        {
+            throw new NotImplementedException();
+        }
+
         #endregion
 
         #region 通用函数
@@ -199,6 +204,23 @@ namespace GcDevicePc.Common
             return ret;
         }
 
+        private int GetEPCHoldingReg(ushort address, ushort num, ref UInt16[] state)
+        {
+            int ret = -1;
+            int count = 0;
+            if (setflag)
+            {
+                ret = globaldata.global_moudbus.ReadHoldingReg(address, num, this.strIP, modbus_port, ref state);
+                while (ret != 0)
+                {
+                    count++;
+                    if (count > 3)
+                        break;
+                    ret = globaldata.global_moudbus.ReadHoldingReg(address, num, this.strIP, modbus_port, ref state);
+                }
+            }
+            return ret;
+        }
 
         private int GetCoil(ushort address, ushort num, ref byte[] temp)
         {
@@ -550,13 +572,26 @@ namespace GcDevicePc.Common
             return ret;
         }
 
-
+        public int GetEPCStatusData(ref ushort[] data)
+        {
+            int ret = -1;
+            try
+            {
+                ret = GetEPCHoldingReg(700, 16, ref data);
+            }
+            catch (Exception e)
+            {
+                Log.Error(e.Message);
+            }
+            return ret;
+        }
         /// <summary>
         /// 获取HMI状态
         /// </summary>
         public void GetHMIStatusData()
         {
             UInt16[] hmistate = new UInt16[9];
+            UInt16[] epcdata = new UInt16[16];
             int ret = -1;
             ret = GetHMIState(ref hmistate);
 
@@ -593,6 +628,13 @@ namespace GcDevicePc.Common
                 Log.Info("HMI状态获取失败");
             }
 
+            ret = -1;
+            ret = GetEPCStatusData(ref epcdata);
+            if (ret == 0)
+            {
+                globaldata.m_hmibuffer.gcinfo.EPCStatus = epcdata;
+            }
+            
         }
 
         #endregion

GcDevicePc/ConfigMethod/AuxTabs.Designer.cs

+namespace GcDevicePc.ConfigMethod
+{
+    partial class AuxTabs
+    {
+        /// <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.tabControlDet = new System.Windows.Forms.TabControl();
+            this.SuspendLayout();
+            // 
+            // tabControlDet
+            // 
+            this.tabControlDet.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControlDet.Location = new System.Drawing.Point(0, 0);
+            this.tabControlDet.Name = "tabControlDet";
+            this.tabControlDet.SelectedIndex = 0;
+            this.tabControlDet.Size = new System.Drawing.Size(592, 332);
+            this.tabControlDet.TabIndex = 1;
+            // 
+            // AuxTabs
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.White;
+            this.ClientSize = new System.Drawing.Size(592, 332);
+            this.Controls.Add(this.tabControlDet);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Name = "AuxTabs";
+            this.Text = "AuxTabs";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TabControl tabControlDet;
+    }
+}
\ No newline at end of file

GcDevicePc/ConfigMethod/AuxTabs.resx

+<?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/ConfigMethod/ChromColumn.cs

+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using GcDevicePc.GCBuffer;
+
+namespace GcDevicePc.ConfigMethod
+{
+    public partial class ChromColumn : Form
+    {
+        HWConfig hwconfig;
+        GCMethodConfig methodconfig;
+
+        public ChromColumn(HWConfig hwconfig, ref GCMethodConfig methodconfig)
+        {
+            InitializeComponent();
+
+            this.hwconfig = hwconfig;
+            this.methodconfig = methodconfig;
+        }
+
+        public void reflashContent(int index)
+        {
+            this.methodconfig.GetChromAllPara();
+            //int cFront = 0;
+            //int cBehind = 1;
+
+
+            //List<string> list = new List<string>();
+            //2list.Add("111111");
+            //list.Add("222222");
+            //list.Add("333333");
+            //list.Add("444444");
+            //comboBox1.DataSource = list;
+            //if (this.hwconfig.hwconfiginfo.u16ChromFront == 1)
+            {
+                txtCaliber.Text = this.methodconfig.chrom[index].fCalSet.ToString();
+
+                txtChromColumnDescribe.Text = this.methodconfig.chrom[index].sDescribe.ToString();
+                
+                if (this.methodconfig.chrom[index].sChromSelect == 0)
+                {
+                    lblChromColumnLocation.Text = "前色谱柱";
+                }
+                else
+                {
+                    lblChromColumnLocation.Text = "后色谱柱";
+                }
+
+                //if (this.methodconfig.chrom[cFront].u16ChromType == 0)
+                //{
+                //    txtChromColumnType.Text = "毛细孔柱";
+                //}
+                //else
+                //{
+                //    txtChromColumnType.Text = "填充柱";
+                //}
+
+
+                ChromeType.SelectedIndex = this.methodconfig.chrom[index].u16ChromType;
+
+                txtMaxProtectTemp.Text = this.methodconfig.chrom[index].fHigestTempSet.ToString();
+                txtSize.Text = this.methodconfig.chrom[index].fLengthSet.ToString();
+                txtThick.Text = this.methodconfig.chrom[index].fFilmThicknessSet.ToString();
+            }
+            
+        }
+        float string2float(string s)
+        {
+            float ret;
+
+            if (string.IsNullOrEmpty(s))
+            {
+                ret = 0;
+            }
+            else
+            {
+                ret = float.Parse(s);
+            }
+
+            return ret;
+        }
+        public void recordCurData(int index)
+        {
+            //int cFront = 0;
+            //int cBehind = 1;
+
+            //if (this.hwconfig.hwconfiginfo.u16ChromFront == 1)
+            {
+                this.methodconfig.chrom[index].fCalSet = string2float(txtCaliber.Text);
+                this.methodconfig.chrom[index].sDescribe = txtChromColumnDescribe.Text;
+                this.methodconfig.chrom[index].fHigestTempSet = string2float(txtMaxProtectTemp.Text);
+                this.methodconfig.chrom[index].fLengthSet = string2float(txtSize.Text);
+                this.methodconfig.chrom[index].fFilmThicknessSet = string2float(txtThick.Text);
+                
+            }
+
+            //if (this.hwconfig.hwconfiginfo.u16ChromBehind == 1)
+            //{
+            //    this.methodconfig.chrom[cBehind].fCalSet = string2float(txtCaliber.Text);
+            //    this.methodconfig.chrom[cBehind].sDescribe = txtChromColumnDescribe.Text;
+            //    this.methodconfig.chrom[cBehind].fHigestTempSet = string2float(txtMaxProtectTemp.Text);
+            //    this.methodconfig.chrom[cBehind].fLengthSet = string2float(txtSize.Text);
+            //    this.methodconfig.chrom[cBehind].fFilmThicknessSet = string2float(txtThick.Text);
+            //}
+        }
+    }
+}

GcDevicePc/ConfigMethod/ChromColumn.resx

+<?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/ConfigMethod/ChromTabs.Designer.cs

+namespace GcDevicePc.ConfigMethod
+{
+    partial class ChromTabs
+    {
+        /// <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.tabControlDet = new System.Windows.Forms.TabControl();
+            this.SuspendLayout();
+            // 
+            // tabControlDet
+            // 
+            this.tabControlDet.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControlDet.Location = new System.Drawing.Point(0, 0);
+            this.tabControlDet.Name = "tabControlDet";
+            this.tabControlDet.SelectedIndex = 0;
+            this.tabControlDet.Size = new System.Drawing.Size(600, 350);
+            this.tabControlDet.TabIndex = 0;
+            // 
+            // ChromTabs
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(600, 350);
+            this.Controls.Add(this.tabControlDet);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Name = "ChromTabs";
+            this.Text = "ChromTabs";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TabControl tabControlDet;
+    }
+}
\ No newline at end of file

GcDevicePc/ConfigMethod/ChromTabs.cs

+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using GcDevicePc.GCBuffer;
+
+namespace GcDevicePc.ConfigMethod
+{
+    public partial class ChromTabs : Form
+    {
+
+        private ChromColumn[] chromColumn =new ChromColumn[2];
+        //private ChromeTab chromTab;
+
+
+        TabPage Page;
+
+        HWConfig hwconfig;
+        GCMethodConfig methodconfig;
+
+        public ChromTabs(HWConfig hwconfig, ref GCMethodConfig methodconfig)
+        {
+            InitializeComponent();
+
+            this.hwconfig = hwconfig;
+            this.methodconfig = methodconfig;
+
+            //chromTab = new ChromeTab(this.hwconfig, ref this.methodconfig);
+            chromColumn[0] = new ChromColumn(this.hwconfig, ref this.methodconfig);
+            chromColumn[1] = new ChromColumn(this.hwconfig, ref this.methodconfig);
+
+        }
+        
+
+        public void recordCurData()
+        {
+            //chromTab.recordCurData();
+            //chromColumn.recordCurData();
+            //this.methodconfig.SetChromAllPara();
+
+            if (this.hwconfig.hwconfiginfo.u16ChromNum >= 1)
+            {
+                if (this.hwconfig.hwconfiginfo.u16ChromFront == 1)
+                {
+                    chromColumn[0].recordCurData(0);
+                    if (this.hwconfig.hwconfiginfo.u16ChromBehind == 1)
+                    {
+                        chromColumn[1].recordCurData(1);
+                    }
+                }
+                else if (this.hwconfig.hwconfiginfo.u16ChromBehind == 1)
+                {
+                    chromColumn[0].recordCurData(1);
+                }
+            }
+            else
+            {
+                chromColumn[0].recordCurData(0);
+            }
+        }
+
+
+        private void Detadd_Dlg(int position,int type, int index)
+        {
+            //chromTab.TopLevel = false;
+            //chromTab.Show();
+            //tabControlDet.TabPages[0].Controls.Add(chromTab);
+            //chromTab.reflashContent();
+            switch (position)
+            {
+                case 0:
+                    chromColumn[0].TopLevel = false;
+                    chromColumn[0].Show();
+                    tabControlDet.TabPages[index].Controls.Add(chromColumn[0]);
+                    chromColumn[0].reflashContent(type);
+                    break;
+                case 1:
+                    chromColumn[1].TopLevel = false;
+                    chromColumn[1].Show();
+                    tabControlDet.TabPages[index].Controls.Add(chromColumn[1]);
+                    chromColumn[1].reflashContent(type);
+                    break;
+            }
+        }
+
+        public void reflashContent()
+        {
+            foreach (TabPage tabPage in tabControlDet.TabPages)
+            {
+                this.tabControlDet.TabPages.Remove(tabPage);
+            }
+
+            //for (int i = 0; i < 2; i++)
+            //{
+            //    Page = new TabPage();
+            //    Page.Location = new System.Drawing.Point(4, 22);
+            //    Page.Padding = new System.Windows.Forms.Padding(3);
+
+            //    Page.Size = new System.Drawing.Size(600, 350);
+            //    Page.TabIndex = i;
+
+            //    Page.Text = "";
+            //    Page.Name = "tabPage" + i.ToString();
+
+            //    Page.UseVisualStyleBackColor = true;
+            //    tabControlDet.Controls.Add(Page);
+
+            //}
+
+            //tabControlDet.TabPages[0].Text = "色谱柱";
+
+            //tabControlDet.TabPages[1].Text = "色谱柱参数";
+            //Detadd_Dlg();
+
+            if (this.hwconfig.hwconfiginfo.u16ChromNum >= 1)
+            {
+                if (this.hwconfig.hwconfiginfo.u16ChromFront == 1)
+                {
+                    Page = new TabPage();
+                    Page.Location = new System.Drawing.Point(4, 22);
+                    Page.Padding = new System.Windows.Forms.Padding(3);
+
+                    Page.Size = new System.Drawing.Size(600, 350);
+                    Page.TabIndex = tabControlDet.TabPages.Count;
+
+                    Page.Text = "";
+                    Page.Name = "tabPage" + tabControlDet.TabPages.Count.ToString();
+
+                    Page.UseVisualStyleBackColor = true;
+                    tabControlDet.Controls.Add(Page);
+                    tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = "前色谱柱";
+                    Detadd_Dlg(0,0, tabControlDet.TabPages.Count - 1);
+                    if (this.hwconfig.hwconfiginfo.u16ChromBehind == 1)
+                    {
+                        Page = new TabPage();
+                        Page.Location = new System.Drawing.Point(4, 22);
+                        Page.Padding = new System.Windows.Forms.Padding(3);
+
+                        Page.Size = new System.Drawing.Size(600, 350);
+                        Page.TabIndex = tabControlDet.TabPages.Count;
+
+                        Page.Text = "";
+                        Page.Name = "tabPage" + tabControlDet.TabPages.Count.ToString();
+
+                        Page.UseVisualStyleBackColor = true;
+                        tabControlDet.Controls.Add(Page);
+                        tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = "后色谱柱";
+                        Detadd_Dlg(1,1, tabControlDet.TabPages.Count - 1);
+                    }
+                }
+               else if (this.hwconfig.hwconfiginfo.u16ChromBehind == 1)
+                {
+                    Page = new TabPage();
+                    Page.Location = new System.Drawing.Point(4, 22);
+                    Page.Padding = new System.Windows.Forms.Padding(3);
+
+                    Page.Size = new System.Drawing.Size(600, 350);
+                    Page.TabIndex = tabControlDet.TabPages.Count;
+
+                    Page.Text = "";
+                    Page.Name = "tabPage" + tabControlDet.TabPages.Count.ToString();
+
+                    Page.UseVisualStyleBackColor = true;
+                    tabControlDet.Controls.Add(Page);
+                    tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = "后色谱柱";
+                    Detadd_Dlg(0, 1, tabControlDet.TabPages.Count - 1);
+                }
+            }
+            else
+            {
+                Page = new TabPage();
+                Page.Location = new System.Drawing.Point(4, 22);
+                Page.Padding = new System.Windows.Forms.Padding(3);
+
+                Page.Size = new System.Drawing.Size(600, 350);
+                Page.TabIndex = tabControlDet.TabPages.Count;
+
+                Page.Text = "";
+                Page.Name = "tabPage" + tabControlDet.TabPages.Count.ToString();
+
+                Page.UseVisualStyleBackColor = true;
+                tabControlDet.Controls.Add(Page);
+                tabControlDet.TabPages[tabControlDet.TabPages.Count - 1].Text = "色谱柱";
+                Detadd_Dlg(0, 0, tabControlDet.TabPages.Count - 1);
+            }
+            tabControlDet.SelectedIndex = 0;
+        }
+    }
+}

GcDevicePc/ConfigMethod/ChromTabs.resx

+<?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/ConfigMethod/ChromeTab.cs

@@ -35,6 +35,32 @@ namespace GcDevicePc.ConfigMethod
             int cFront = 0;
             int cBehind = 1;
 
+            
+
+
+            {
+                ChromeMaxTemp.Text = this.methodconfig.chrom[cFront].fHigestTempSet.ToString();
+                ChromeLen.Text = this.methodconfig.chrom[cFront].fLengthSet.ToString();
+                ChromeCal.Text = this.methodconfig.chrom[cFront].fCalSet.ToString();
+                ChromeMem.Text = this.methodconfig.chrom[cFront].fFilmThicknessSet.ToString();
+                tb柱前压.Text = this.methodconfig.chrom[cFront].fPreSetValue.ToString();
+                tb柱流量.Text = this.methodconfig.chrom[cFront].fFlowSetValue.ToString();
+                tb线速度.Text = this.methodconfig.chrom[cFront].fActualAverageLineSpeed.ToString();
+                description.Text = this.methodconfig.chrom[cFront].sDescribe;
+            }
+
+            if (this.hwconfig.hwconfiginfo.u16ChromBehind == 1)
+            {
+                ChromeMaxTemp.Text = this.methodconfig.chrom[cBehind].fHigestTempSet.ToString();
+                ChromeLen.Text = this.methodconfig.chrom[cBehind].fLengthSet.ToString();
+                ChromeCal.Text = this.methodconfig.chrom[cBehind].fCalSet.ToString();
+                ChromeMem.Text = this.methodconfig.chrom[cBehind].fFilmThicknessSet.ToString();
+                tb柱前压.Text = this.methodconfig.chrom[cBehind].fPreSetValue.ToString();
+                tb柱流量.Text = this.methodconfig.chrom[cBehind].fFlowSetValue.ToString();
+                tb线速度.Text = this.methodconfig.chrom[cBehind].fActualAverageLineSpeed.ToString();
+                description.Text = this.methodconfig.chrom[cBehind].sDescribe;
+            }
+
             if (this.hwconfig.hwconfiginfo.u16ChromNum >= 1)
             {
                 ChromeSelect.Items.Clear();
@@ -90,30 +116,6 @@ namespace GcDevicePc.ConfigMethod
 
             }
 
-            if (this.hwconfig.hwconfiginfo.u16ChromFront == 1)
-            {
-                ChromeMaxTemp.Text = this.methodconfig.chrom[cFront].fHigestTempSet.ToString();
-                ChromeLen.Text = this.methodconfig.chrom[cFront].fLengthSet.ToString();
-                ChromeCal.Text = this.methodconfig.chrom[cFront].fCalSet.ToString();
-                ChromeMem.Text = this.methodconfig.chrom[cFront].fFilmThicknessSet.ToString();
-                tb柱前压.Text = this.methodconfig.chrom[cFront].fPreSetValue.ToString();
-                tb柱流量.Text = this.methodconfig.chrom[cFront].fFlowSetValue.ToString();
-                tb线速度.Text = this.methodconfig.chrom[cFront].fActualAverageLineSpeed.ToString();
-                description.Text = this.methodconfig.chrom[cFront].sDescribe;
-            }
-
-            if (this.hwconfig.hwconfiginfo.u16ChromBehind == 1)
-            {
-                ChromeMaxTemp.Text = this.methodconfig.chrom[cBehind].fHigestTempSet.ToString();
-                ChromeLen.Text = this.methodconfig.chrom[cBehind].fLengthSet.ToString();
-                ChromeCal.Text = this.methodconfig.chrom[cBehind].fCalSet.ToString();
-                ChromeMem.Text = this.methodconfig.chrom[cBehind].fFilmThicknessSet.ToString();
-                tb柱前压.Text = this.methodconfig.chrom[cBehind].fPreSetValue.ToString();
-                tb柱流量.Text = this.methodconfig.chrom[cBehind].fFlowSetValue.ToString();
-                tb线速度.Text = this.methodconfig.chrom[cBehind].fActualAverageLineSpeed.ToString();
-                description.Text = this.methodconfig.chrom[cBehind].sDescribe;
-            }
-
             if (this.hwconfig.hwconfiginfo.u16StartType == 3)
             {
                 this.epcgroup.Enabled = true;
@@ -122,7 +124,6 @@ namespace GcDevicePc.ConfigMethod
             {
                 this.epcgroup.Enabled = false;
             }
-
         }
 
         public void recordCurData()
@@ -133,7 +134,7 @@ namespace GcDevicePc.ConfigMethod
             if (index < 0)
                 return;
 
-            if (this.hwconfig.hwconfiginfo.u16ChromNum == 2 && ChromeMaxTemp.Text != "")
+            if (this.hwconfig.hwconfiginfo.u16ChromNum == 2 )
             {
                 if (index == 1)
                 {
@@ -146,6 +147,7 @@ namespace GcDevicePc.ConfigMethod
                     this.methodconfig.chrom[index - 1].fActualAverageLineSpeed = float.Parse(tb线速度.Text);
                     this.methodconfig.chrom[index - 1].sDescribe = description.Text;
                 }
+
                 if (index == 0)
                 {
                     this.methodconfig.chrom[index + 1].fHigestTempSet = float.Parse(ChromeMaxTemp.Text);
@@ -158,7 +160,7 @@ namespace GcDevicePc.ConfigMethod
                     this.methodconfig.chrom[index + 1].sDescribe = description.Text;
                 }
             }
-            else if (this.hwconfig.hwconfiginfo.u16ChromNum == 1 && ChromeMaxTemp.Text != "")
+            else if (this.hwconfig.hwconfiginfo.u16ChromNum == 1)
             {
                 if (this.hwconfig.hwconfiginfo.u16ChromFront == 1)
                 {

GcDevicePc/ConfigMethod/DetTab.Designer.cs

@@ -33,14 +33,15 @@
             // 
             // tabControlDet
             // 
-            this.tabControlDet.Location = new System.Drawing.Point(7, 6);
+            this.tabControlDet.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControlDet.Location = new System.Drawing.Point(0, 0);
             this.tabControlDet.Multiline = true;
             this.tabControlDet.Name = "tabControlDet";
             this.tabControlDet.SelectedIndex = 0;
-            this.tabControlDet.Size = new System.Drawing.Size(561, 314);
+            this.tabControlDet.Size = new System.Drawing.Size(592, 332);
             this.tabControlDet.TabIndex = 10;
             // 
-            // Det
+            // DetTab
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -48,7 +49,7 @@
             this.ClientSize = new System.Drawing.Size(592, 332);
             this.Controls.Add(this.tabControlDet);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "Det";
+            this.Name = "DetTab";
             this.Text = "Det";
             this.Load += new System.EventHandler(this.Det_Load);
             this.ResumeLayout(false);

GcDevicePc/ConfigMethod/FID.cs

@@ -31,10 +31,39 @@ namespace GcDevicePc.ConfigMethod
             this.methodconfig.GetFidByID(index);
 
             fidsettemp.Text = this.methodconfig.fid[index].fHeaterTempSet.ToString();
+            if (hwconfig.hwconfiginfo.u16StartType == 1 || hwconfig.hwconfiginfo.u16StartType == 2)
+            {
                 tb氢气压力设定.Text = this.methodconfig.fid[index].fSetH2Flow.ToString();
                 tb空气压力设定.Text = this.methodconfig.fid[index].fAirFlowSet.ToString();
                 tb尾吹气压力设定.Text = this.methodconfig.fid[index].fSetTailGas.ToString();
 
+                if (this.methodconfig.fid[index].u16KeyH2Flow == 1)
+                    cBox氢气.CheckState = CheckState.Checked;
+                else
+                    cBox氢气.CheckState = CheckState.Unchecked;
+
+                if (this.methodconfig.fid[index].u16KeyAirFlow == 1)
+                    cBox空气.CheckState = CheckState.Checked;
+                else
+                    cBox空气.CheckState = CheckState.Unchecked;
+
+                if (this.methodconfig.fid[index].u16KeyTailGas == 1)
+                    cBox尾吹气.CheckState = CheckState.Checked;
+                else
+                    cBox尾吹气.CheckState = CheckState.Unchecked;
+            }
+            else
+            {
+                tb氢气压力设定.Enabled = false;
+                tb空气压力设定.Enabled = false;
+                tb尾吹气压力设定.Enabled = false;
+
+                cBox氢气.Enabled = false;
+                cBox空气.Enabled = false;
+                cBox尾吹气.Enabled = false;
+            }
+            
+
             cb灵敏度.SelectedIndex = this.methodconfig.fid[index].u16Sensitive;
             cb极性.SelectedIndex = this.methodconfig.fid[index].u16Polarity;
 
@@ -53,20 +82,7 @@ namespace GcDevicePc.ConfigMethod
             else
                 cBox加热器.CheckState = CheckState.Unchecked;
 
-            if (this.methodconfig.fid[index].u16KeyH2Flow == 1)
-                cBox氢气.CheckState = CheckState.Checked;
-            else
-                cBox氢气.CheckState = CheckState.Unchecked;
-
-            if (this.methodconfig.fid[index].u16KeyAirFlow == 1)
-                cBox空气.CheckState = CheckState.Checked;
-            else
-                cBox空气.CheckState = CheckState.Unchecked;
 
-            if (this.methodconfig.fid[index].u16KeyTailGas == 1)
-                cBox尾吹气.CheckState = CheckState.Checked;
-            else
-                cBox尾吹气.CheckState = CheckState.Unchecked;
 
             if (this.methodconfig.fid[index].u16SigDeduct < 3 && this.methodconfig.fid[index].u16SigDeduct >= 0)
                 cListBoxSign.SetItemChecked(this.methodconfig.fid[index].u16SigDeduct, true);
@@ -84,7 +100,7 @@ namespace GcDevicePc.ConfigMethod
         {
             float ret;
 
-            if(s == "" || s == null)
+            if(string.IsNullOrEmpty(s))
             {
                 ret = 0;
             }
@@ -141,6 +157,13 @@ namespace GcDevicePc.ConfigMethod
                 this.methodconfig.fid[index].u16SigDeduct = 2;
             else if (cListBoxSign.GetItemChecked(2) == true)
                 this.methodconfig.fid[index].u16SigDeduct = 3;
+
+            this.methodconfig.epc[0].fristFlow = string2float(tb尾吹气压力设定.Text);
+            this.methodconfig.epc[0].gasType1 = (ushort)0;
+            this.methodconfig.epc[0].SecondFlow = string2float(tb氢气压力设定.Text);
+            this.methodconfig.epc[0].gasType2 = (ushort)0;
+            this.methodconfig.epc[0].ThirdFlow = string2float(tb空气压力设定.Text);
+            this.methodconfig.epc[0].gasType3 = (ushort)0;
         }
 
         private void fidsettemp_TextChanged(object sender, EventArgs e)

GcDevicePc/ConfigMethod/MethodMain.Designer.cs

@@ -46,6 +46,7 @@
             this.tabPage8 = new System.Windows.Forms.TabPage();
             this.methodimages = new System.Windows.Forms.ImageList();
             this.panelright = new System.Windows.Forms.Panel();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.savebth = new System.Windows.Forms.Button();
             this.saveasbth = new System.Windows.Forms.Button();
             this.resetbth = new System.Windows.Forms.Button();
@@ -54,6 +55,7 @@
             this.panelmain.SuspendLayout();
             this.tabmain.SuspendLayout();
             this.panelright.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
             // 
             // paneltitle
@@ -142,7 +144,7 @@
             this.tabPage1.ImageIndex = 0;
             this.tabPage1.Location = new System.Drawing.Point(4, 64);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
             this.tabPage1.Size = new System.Drawing.Size(592, 332);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "tabPage1";
@@ -153,7 +155,7 @@
             this.tabPage2.ImageIndex = 1;
             this.tabPage2.Location = new System.Drawing.Point(4, 64);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
             this.tabPage2.Size = new System.Drawing.Size(592, 332);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "tabPage2";
@@ -251,6 +253,7 @@
             // panelright
             // 
             this.panelright.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(217)))), ((int)(((byte)(240)))));
+            this.panelright.Controls.Add(this.pictureBox1);
             this.panelright.Controls.Add(this.savebth);
             this.panelright.Controls.Add(this.saveasbth);
             this.panelright.Controls.Add(this.resetbth);
@@ -261,6 +264,15 @@
             this.panelright.TabIndex = 2;
             this.panelright.Paint += new System.Windows.Forms.PaintEventHandler(this.panelright_Paint);
             // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+            this.pictureBox1.Location = new System.Drawing.Point(25, 105);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(96, 96);
+            this.pictureBox1.TabIndex = 3;
+            this.pictureBox1.TabStop = false;
+            // 
             // savebth
             // 
             this.savebth.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
@@ -313,15 +325,17 @@
             this.Controls.Add(this.paneltitle);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "MethodMain";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "MethodMain";
+            this.TopMost = true;
             this.Load += new System.EventHandler(this.MethodMain_Load);
             this.paneltitle.ResumeLayout(false);
             this.panelmain.ResumeLayout(false);
             this.tabmain.ResumeLayout(false);
             this.panelright.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -348,5 +362,6 @@
         private System.Windows.Forms.TabPage tabPage8;
         private System.Windows.Forms.Button savebth;
         private System.Windows.Forms.Button saveasbth;
+        private System.Windows.Forms.PictureBox pictureBox1;
     }
 }
\ No newline at end of file

GcDevicePc/ConfigMethod/PortTab.cs

@@ -36,11 +36,11 @@ namespace GcDevicePc.ConfigMethod
             {
                 if (this.hwconfig.hwconfiginfo.u16StartType != 2 || this.hwconfig.hwconfiginfo.u16StartType != 1)
                 {
-                    this.cargasgroup.Enabled = false;
+                    this.cargasgroup.Enabled = true;
                 }
                 else
                 {
-                    this.cargasgroup.Enabled = true;
+                    this.cargasgroup.Enabled = false;
                 }
 
                 InjPortBox.Items.Clear();
@@ -84,6 +84,9 @@ namespace GcDevicePc.ConfigMethod
 
                 ShuntPer.Text = this.methodconfig.port[index].u16SplitRatio.ToString();
                 ShuntFlow.Text = this.methodconfig.port[index].fSplitFlow.ToString();
+                CarrierGas1.Text = this.methodconfig.port[index].fCarrierGas1.ToString();
+                CarrierGas2.Text = this.methodconfig.port[index].fCarrierGas2.ToString();
+                CarrierGas3.Text = this.methodconfig.port[index].fCarrierGas3.ToString();
 
                 if (this.methodconfig.port[index].bCarrierGasSave == true)
                     cBox省EPC.CheckState = CheckState.Checked;
@@ -101,6 +104,9 @@ namespace GcDevicePc.ConfigMethod
                 this.Shuntmode.Enabled = true;
                 this.ShuntPer.Enabled = true;
                 this.ShuntFlow.Enabled = true;
+                this.CarrierGas1.Enabled = true;
+                this.CarrierGas2.Enabled = true;
+                this.CarrierGas3.Enabled = true;
             }
             else
             {
@@ -110,6 +116,9 @@ namespace GcDevicePc.ConfigMethod
                 this.Shuntmode.Enabled = false;
                 this.ShuntPer.Enabled = false;
                 this.ShuntFlow.Enabled = false;
+                this.CarrierGas1.Enabled = false;
+                this.CarrierGas2.Enabled = false;
+                this.CarrierGas3.Enabled = false;
                 this.cargasgroup.Enabled = false;
             }                                                      
         }
@@ -145,6 +154,9 @@ namespace GcDevicePc.ConfigMethod
                 cBox加热器.CheckState = CheckState.Unchecked;
             ShuntPer.Text = this.methodconfig.port[index].u16SplitRatio.ToString();
             ShuntFlow.Text = this.methodconfig.port[index].fSplitFlow.ToString();
+            CarrierGas1.Text = this.methodconfig.port[index].fCarrierGas1.ToString();
+            CarrierGas2.Text = this.methodconfig.port[index].fCarrierGas2.ToString();
+            CarrierGas3.Text = this.methodconfig.port[index].fCarrierGas3.ToString();
 
             if (this.methodconfig.port[index].bCarrierGasSave == true)
                 cBox省EPC.CheckState = CheckState.Checked;
@@ -192,6 +204,9 @@ namespace GcDevicePc.ConfigMethod
 
                 this.methodconfig.port[index].u16SplitRatio = System.UInt16.Parse(ShuntPer.Text);
                 this.methodconfig.port[index].fSplitFlow = float.Parse(ShuntFlow.Text);
+                this.methodconfig.port[index].fCarrierGas1 = float.Parse(CarrierGas1.Text);
+                this.methodconfig.port[index].fCarrierGas2 = float.Parse(CarrierGas2.Text);
+                this.methodconfig.port[index].fCarrierGas3 = float.Parse(CarrierGas3.Text);
 
                 if (cBox省EPC.CheckState == CheckState.Checked)
                 {

GcDevicePc/ConfigMethod/RealColTab.cs

@@ -29,7 +29,6 @@ namespace GcDevicePc.ConfigMethod
             {
                 this.ProUpTab.Columns[i].Width = avgWidth;//设置每一列的宽度
             }
-            
         }
 
         public void reflashContent()
@@ -41,8 +40,6 @@ namespace GcDevicePc.ConfigMethod
             sStage[2] = "2nd";
             sStage[3] = "3rd";
 
-            ProUpTab.RowHeadersVisible = false;
-
             try
             {
                 ProUpTab.Columns[0].ReadOnly = true;
@@ -61,10 +58,15 @@ namespace GcDevicePc.ConfigMethod
 
             int ProNum = this.methodconfig.col.u16ColProNum;
             OSetTemp.Text = this.methodconfig.col.fColTempSet.ToString();
-            OActTemp.Text = this.methodconfig.col.fColTempActual.ToString();
+            //OActTemp.Text = this.methodconfig.col.fColTempActual.ToString();
             OMAXTemp.Text = (this.methodconfig.col.fHigestTemp == 0.0f)
                 ? this.hwconfig.hwconfiginfo.u16ColPTemp.ToString()
                 : this.methodconfig.col.fHigestTemp.ToString();
+            if (this.hwconfig.hwconfiginfo.u16ColPTemp == 0 && this.methodconfig.col.fHigestTemp == 0)
+            {
+                OMAXTemp.Text = "250";
+            }
+
             OBalTime.Text = this.methodconfig.col.fBalanceTime.ToString();
             tb后运行温度.Text = this.methodconfig.col.fBehindRunTemp.ToString();
             tb后运行时间.Text = this.methodconfig.col.fBehindRunTime.ToString();
@@ -146,7 +148,6 @@ namespace GcDevicePc.ConfigMethod
         private void TextBoxDec_KeyPress(object sender, KeyPressEventArgs e)
         {
             if (e.KeyChar != 8 && !Char.IsDigit(e.KeyChar) && e.KeyChar != '.')
-            // if (e.KeyChar != 8 && !Char.IsDigit(e.KeyChar))
             {
                 e.Handled = true;
             }
@@ -160,10 +161,7 @@ namespace GcDevicePc.ConfigMethod
 
         private void dgv程升表_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)
         {
-            //if (this.dgv程升表.CurrentCell.ColumnIndex == 1)
-            //{
             e.Control.KeyPress += new KeyPressEventHandler(TextBoxDec_KeyPress);
-            //}
         }
 
         public void recordCurData()

GcDevicePc/ConfigMethod/SPortTabs.Designer.cs

+namespace GcDevicePc.ConfigMethod
+{
+    partial class SPortTabs
+    {
+        /// <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.tabControlDet = new System.Windows.Forms.TabControl();
+            this.SuspendLayout();
+            // 
+            // tabControlDet
+            // 
+            this.tabControlDet.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControlDet.Location = new System.Drawing.Point(0, 0);
+            this.tabControlDet.Name = "tabControlDet";
+            this.tabControlDet.SelectedIndex = 0;
+            this.tabControlDet.Size = new System.Drawing.Size(592, 332);
+            this.tabControlDet.TabIndex = 0;
+            // 
+            // SPortTabs
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(592, 332);
+            this.Controls.Add(this.tabControlDet);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Name = "SPortTabs";
+            this.Text = "SPortTab";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TabControl tabControlDet;
+    }
+}
\ No newline at end of file

GcDevicePc/Controls/PictureMenu.cs

@@ -329,6 +329,8 @@ namespace GcDevicePc.Controls
                 sysbtn.Click += Sys_Click;
                 this.PMPanel.Controls.Add(sysbtn);
             }
+
+            ((HMIStatus)PMPanel.Controls[10]).Visible = false;
         }
 
         private void btn_MouseUp(object sender, MouseEventArgs e)