4-28

GcDevicePc/App.config

@@ -5,8 +5,8 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
   </configSections>
     <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
-      </startup>
+    
+      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
     <runtime>
     <legacyUnhandledExceptionPolicy enabled="true"/>
     </runtime>

GcDevicePc/CK_UI/AdjustFrom.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AdjustFrom));
             this.SuspendLayout();
             // 
             // AdjustFrom
@@ -36,9 +35,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(722, 382);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "AdjustFrom";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "校准";
             this.ResumeLayout(false);
 

GcDevicePc/CK_UI/AdjustFrom.cs

@@ -27,7 +27,7 @@ namespace GcDevicePc
 
             this.Controls.Add(adjust);
         }
-        public new void Show()
+        public void Show()
         {
             base.Show();
             if (adjust != null)

GcDevicePc/CK_UI/HistChartForm.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HistChartForm));
             this.SuspendLayout();
             // 
             // HistChartForm
@@ -36,9 +35,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(722, 382);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "HistChartForm";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "历史图谱";
             this.ResumeLayout(false);
 

GcDevicePc/CK_UI/HistChartForm.cs

@@ -27,7 +27,7 @@ namespace GcDevicePc
                     | System.Windows.Forms.AnchorStyles.Right)));
             this.Controls.Add(adjust);
         }
-        public new void Show()
+        public void Show()
         {
             base.Show();
             if (adjust != null)

GcDevicePc/CK_UI/InfoBarUser.Designer.cs

@@ -44,6 +44,7 @@
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.labelStart = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -52,6 +53,7 @@
             this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Controls.Add(this.labelStart);
             this.groupBox1.Controls.Add(this.textBoxport);
             this.groupBox1.Controls.Add(this.label6);
             this.groupBox1.Controls.Add(this.progressBarRun);
@@ -93,9 +95,9 @@
             // progressBarRun
             // 
             this.progressBarRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.progressBarRun.Location = new System.Drawing.Point(445, 29);
+            this.progressBarRun.Location = new System.Drawing.Point(447, 76);
             this.progressBarRun.Name = "progressBarRun";
-            this.progressBarRun.Size = new System.Drawing.Size(132, 68);
+            this.progressBarRun.Size = new System.Drawing.Size(132, 21);
             this.progressBarRun.TabIndex = 10;
             // 
             // textBoxRun
@@ -194,6 +196,14 @@
             this.timer1.Interval = 1000;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
+            // labelStart
+            // 
+            this.labelStart.AutoSize = true;
+            this.labelStart.Location = new System.Drawing.Point(480, 35);
+            this.labelStart.Name = "labelStart";
+            this.labelStart.Size = new System.Drawing.Size(0, 12);
+            this.labelStart.TabIndex = 13;
+            // 
             // InfoBarUser
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -224,5 +234,6 @@
         private System.Windows.Forms.Timer timer1;
         private System.Windows.Forms.TextBox textBoxport;
         private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label labelStart;
     }
 }

GcDevicePc/CK_UI/InfoBarUser.cs

@@ -29,6 +29,7 @@ namespace GcDevicePc.CK_UI
                 Color zcolor = Color.White;
                 Color waringcolor = Color.Coral;
                
+               
                //前进样口
 
                     if (globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp == 0.0f)
@@ -39,7 +40,8 @@ namespace GcDevicePc.CK_UI
                     else
                     {
                          textBoxport.Text = globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp.ToString("#0.00")+"℃";
-                         if (globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp <= globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp)
+
+                         if (Math.Abs(globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp - globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp) <= 0.1)
                          {
                              textBoxport.BackColor = zcolor;
 
@@ -62,7 +64,8 @@ namespace GcDevicePc.CK_UI
                     else
                     {
                          textBoven.Text =globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp.ToString("#0.00")+"℃";
-                         if (globaldata.m_dpbuffer.ShowList.showtemp.ColSetTemp <= globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp)
+                        
+                         if (Math.Abs(globaldata.m_dpbuffer.ShowList.showtemp.ColSetTemp- globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp)<=0.1)
                          {
                              textBoven.BackColor = zcolor;
 
@@ -82,7 +85,7 @@ namespace GcDevicePc.CK_UI
                     else
                     {
                         textBmanifold.Text = globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1.ToString("#0.00") + "℃";
-                        if (globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp1 <= globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1)
+                        if (Math.Abs(globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp1 - globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1)<=0.1)
                         {
                             textBmanifold.BackColor = zcolor;
 
@@ -101,8 +104,8 @@ namespace GcDevicePc.CK_UI
 
                 else
                 {
-                    textBmanifold.Text = globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp.ToString("#0.00") + "℃";
-                    if (globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp <= globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp)
+                    textBFid.Text = globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp.ToString("#0.00") + "℃";
+                    if (Math.Abs(globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp- globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp)<=0.1)
                     {
                         textBFid.BackColor = zcolor;
 
@@ -172,11 +175,84 @@ namespace GcDevicePc.CK_UI
                 {
                     progressBarRun.Value = 0;
                 }
-
+                string strtext=null;
+                Color bkcolor=Color.Wheat;
+                setStatus(ref strtext, ref bkcolor);
+                labelStart.Text = strtext;
+                labelStart.BackColor = bkcolor;
+                
             }catch(Exception ex)
             {
                 Trace.Write(ex);
             }
         }
+
+        private void setStatus(ref string status_text, ref Color bkcolor)
+        {
+            try
+            {
+                ushort flag = 10;
+                if(globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue)
+                {
+                    flag = globaldata.m_hmibuffer.gcinfo.methodstatus;  //获取系统状态
+                }
+                if(globaldata.m_hmibuffer.gcinfo.hmioffline)
+                {
+                    flag = 9;
+                }
+                bkcolor = Color.Wheat;
+                switch (flag)
+                {
+                    case 0:
+                    case 1:
+                        status_text = "空闲中...";
+                        break;
+                    case 2:
+                        status_text = "仪器平衡中...";
+                        break;
+                    case 3:
+                        status_text = "已就绪...";
+                        break;
+                    case 4:
+                    case 5:
+                        if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 1)
+                            status_text = "方法运行中...";
+                        else if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 2)
+                            status_text = "方法运行中...";
+                        else if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 3)
+                            status_text = "方法运行中...";
+                        else
+                            status_text = "方法运行中...";
+                        break;
+                    case 6:
+                        if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 1)
+                           
+                        status_text = "后处理...";
+                        break;
+                    case 7:
+                        if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 1)
+                           
+                        status_text = "后处理完毕...";
+                        break;
+                    case 8:
+                        status_text = "信号稳定中...";
+                        break;
+                    case 9:
+                        status_text = "设备断开";
+                        bkcolor = Color.LightCoral;
+                        break;
+                    default:
+                        status_text = "设备连接";
+
+                        break;
+                }
+
+
+            }
+            catch(Exception ex)
+            {
+                Trace.Write(ex);
+            }
+        }
     }
 }

GcDevicePc/CK_UI/LandIn.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LandIn));
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.textBox1 = new System.Windows.Forms.TextBox();
@@ -108,9 +107,7 @@
             this.Controls.Add(this.textBox1);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "LandIn";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "登录";
             this.Load += new System.EventHandler(this.LandIn_Load);
             this.ResumeLayout(false);

GcDevicePc/CK_UI/LandIn.cs

@@ -11,10 +11,8 @@ namespace GcDevicePc.CK_UI
 {
     public partial class LandIn : Form
     {
-        private string user = "";
+        private string user = "admin";
         public static bool Island = false;
-        private CKVocAnalyzer.NumForm form = null;
-
         public LandIn()
         {
             InitializeComponent();
@@ -26,12 +24,6 @@ namespace GcDevicePc.CK_UI
             if (textBox1.Text == user && textBox2.Text == strpw)
             {
                 Island = true;
-                if (form != null || !form.IsDisposed)
-                {
-                    form.Hide();
-                }
-
-
             }
             else
             {
@@ -42,7 +34,6 @@ namespace GcDevicePc.CK_UI
         private void button2_Click(object sender, EventArgs e)  //放弃
         {
             Island = false;
-           
         }
 
         private void LandIn_Load(object sender, EventArgs e)
@@ -52,14 +43,9 @@ namespace GcDevicePc.CK_UI
 
         private void textBox2_Click(object sender, EventArgs e)
         {
-            if (form == null || form.IsDisposed)
-            {
-                form = new CKVocAnalyzer.NumForm((TextBox)sender);
-                System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LandIn));
-                form.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-                form.Show();
-            }
-           
+            CKVocAnalyzer.NumForm form = CKVocAnalyzer.NumForm.GetInstance((TextBox)sender);// new CKVocAnalyzer.NumForm((TextBox)sender);
+            
+            form.Show();
         }
     }
 }

GcDevicePc/CK_UI/UserCtl.Designer.cs

@@ -37,6 +37,12 @@
             this.textBox2 = new System.Windows.Forms.TextBox();
             this.textBox3 = new System.Windows.Forms.TextBox();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.textBox6 = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.textBox5 = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.textBox4 = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.groupBox1.SuspendLayout();
             this.SuspendLayout();
@@ -72,7 +78,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(42, 117);
+            this.label3.Location = new System.Drawing.Point(42, 102);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(54, 21);
             this.label3.TabIndex = 3;
@@ -82,7 +88,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(42, 188);
+            this.label4.Location = new System.Drawing.Point(42, 167);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(54, 21);
             this.label4.TabIndex = 4;
@@ -91,7 +97,7 @@
             // textBox1
             // 
             this.textBox1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.textBox1.Location = new System.Drawing.Point(6, 73);
+            this.textBox1.Location = new System.Drawing.Point(6, 67);
             this.textBox1.Name = "textBox1";
             this.textBox1.Size = new System.Drawing.Size(116, 29);
             this.textBox1.TabIndex = 5;
@@ -99,7 +105,7 @@
             // textBox2
             // 
             this.textBox2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.textBox2.Location = new System.Drawing.Point(6, 144);
+            this.textBox2.Location = new System.Drawing.Point(6, 131);
             this.textBox2.Name = "textBox2";
             this.textBox2.Size = new System.Drawing.Size(116, 29);
             this.textBox2.TabIndex = 6;
@@ -107,7 +113,7 @@
             // textBox3
             // 
             this.textBox3.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.textBox3.Location = new System.Drawing.Point(6, 215);
+            this.textBox3.Location = new System.Drawing.Point(6, 194);
             this.textBox3.Name = "textBox3";
             this.textBox3.Size = new System.Drawing.Size(116, 29);
             this.textBox3.TabIndex = 7;
@@ -115,6 +121,12 @@
             // groupBox1
             // 
             this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Controls.Add(this.textBox6);
+            this.groupBox1.Controls.Add(this.label6);
+            this.groupBox1.Controls.Add(this.textBox5);
+            this.groupBox1.Controls.Add(this.label5);
+            this.groupBox1.Controls.Add(this.textBox4);
+            this.groupBox1.Controls.Add(this.label1);
             this.groupBox1.Controls.Add(this.textBox1);
             this.groupBox1.Controls.Add(this.textBox3);
             this.groupBox1.Controls.Add(this.label2);
@@ -122,13 +134,67 @@
             this.groupBox1.Controls.Add(this.label3);
             this.groupBox1.Controls.Add(this.label4);
             this.groupBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBox1.Location = new System.Drawing.Point(598, 15);
+            this.groupBox1.Location = new System.Drawing.Point(598, 13);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(131, 273);
+            this.groupBox1.Size = new System.Drawing.Size(131, 413);
             this.groupBox1.TabIndex = 8;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "结果（ppm）";
             // 
+            // textBox6
+            // 
+            this.textBox6.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox6.Location = new System.Drawing.Point(6, 376);
+            this.textBox6.Name = "textBox6";
+            this.textBox6.Size = new System.Drawing.Size(116, 29);
+            this.textBox6.TabIndex = 14;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.Location = new System.Drawing.Point(30, 352);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(76, 21);
+            this.label6.TabIndex = 13;
+            this.label6.Text = "二甲苯";
+            // 
+            // textBox5
+            // 
+            this.textBox5.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox5.Location = new System.Drawing.Point(6, 316);
+            this.textBox5.Name = "textBox5";
+            this.textBox5.Size = new System.Drawing.Size(116, 29);
+            this.textBox5.TabIndex = 12;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.Location = new System.Drawing.Point(38, 290);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(54, 21);
+            this.label5.TabIndex = 11;
+            this.label5.Text = "甲苯";
+            // 
+            // textBox4
+            // 
+            this.textBox4.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox4.Location = new System.Drawing.Point(6, 255);
+            this.textBox4.Name = "textBox4";
+            this.textBox4.Size = new System.Drawing.Size(116, 29);
+            this.textBox4.TabIndex = 10;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(46, 231);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(32, 21);
+            this.label1.TabIndex = 9;
+            this.label1.Text = "苯";
+            // 
             // timer1
             // 
             this.timer1.Enabled = true;
@@ -161,6 +227,12 @@
         private System.Windows.Forms.TextBox textBox3;
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.Timer timer1;
+        private System.Windows.Forms.TextBox textBox6;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox textBox5;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.TextBox textBox4;
+        private System.Windows.Forms.Label label1;
 
     }
 }

GcDevicePc/CK_UI/UserCtlAuto.cs

+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.Diagnostics;
+
+namespace GcDevicePc.CK_UI
+{
+    public partial class UserCtlAuto : UserControl
+    {
+        public UserCtlAuto()
+        {
+            InitializeComponent();
+        }
+
+        private void UserCtlAuto_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

GcDevicePc/CK_UI/UserCtlAuto.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/CK_UI/WaveTotalForm.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WaveTotalForm));
             this.SuspendLayout();
             // 
             // WaveTotalForm
@@ -36,9 +35,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(592, 325);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "WaveTotalForm";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "浓度查询";
             this.ResumeLayout(false);
 

GcDevicePc/CK_UI/WaveTotalForm.cs

@@ -28,7 +28,7 @@ namespace GcDevicePc
 
         }
 
-        public new void Show()
+        public void Show()
         {
             base.Show();
             if (total != null)

GcDevicePc/FormUser.Designer.cs

@@ -28,21 +28,12 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.infoBarUser1 = new GcDevicePc.CK_UI.InfoBarUser();
             this.userCtl1 = new GcDevicePc.CK_UI.UserCtl();
             this.buttonFID = new System.Windows.Forms.Button();
             this.buttonauto = new System.Windows.Forms.Button();
+            this.infoBarUser1 = new GcDevicePc.CK_UI.InfoBarUser();
             this.SuspendLayout();
             // 
-            // infoBarUser1
-            // 
-            this.infoBarUser1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.infoBarUser1.Location = new System.Drawing.Point(0, 497);
-            this.infoBarUser1.Name = "infoBarUser1";
-            this.infoBarUser1.Size = new System.Drawing.Size(614, 130);
-            this.infoBarUser1.TabIndex = 1;
-            // 
             // userCtl1
             // 
             this.userCtl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -51,12 +42,14 @@
             this.userCtl1.Location = new System.Drawing.Point(0, 16);
             this.userCtl1.Name = "userCtl1";
             this.userCtl1.Size = new System.Drawing.Size(758, 468);
+            this.userCtl1.Systemtype = 0;
             this.userCtl1.TabIndex = 0;
             // 
             // buttonFID
             // 
+            this.buttonFID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonFID.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.buttonFID.Location = new System.Drawing.Point(642, 506);
+            this.buttonFID.Location = new System.Drawing.Point(642, 525);
             this.buttonFID.Name = "buttonFID";
             this.buttonFID.Size = new System.Drawing.Size(89, 34);
             this.buttonFID.TabIndex = 2;
@@ -66,22 +59,32 @@
             // 
             // buttonauto
             // 
+            this.buttonauto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonauto.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.buttonauto.Location = new System.Drawing.Point(642, 562);
+            this.buttonauto.Location = new System.Drawing.Point(642, 571);
             this.buttonauto.Name = "buttonauto";
             this.buttonauto.Size = new System.Drawing.Size(89, 34);
             this.buttonauto.TabIndex = 3;
             this.buttonauto.Text = "自动校准";
             this.buttonauto.UseVisualStyleBackColor = true;
+            this.buttonauto.Click += new System.EventHandler(this.buttonauto_Click);
+            // 
+            // infoBarUser1
+            // 
+            this.infoBarUser1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.infoBarUser1.Location = new System.Drawing.Point(1, 494);
+            this.infoBarUser1.Name = "infoBarUser1";
+            this.infoBarUser1.Size = new System.Drawing.Size(613, 137);
+            this.infoBarUser1.TabIndex = 4;
             // 
             // FormUser
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(770, 639);
+            this.Controls.Add(this.infoBarUser1);
             this.Controls.Add(this.buttonauto);
             this.Controls.Add(this.buttonFID);
-            this.Controls.Add(this.infoBarUser1);
             this.Controls.Add(this.userCtl1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "FormUser";
@@ -89,7 +92,6 @@
             this.Activated += new System.EventHandler(this.FormUser_Activated);
             this.Deactivate += new System.EventHandler(this.FormUser_Deactivate);
             this.Load += new System.EventHandler(this.FormUser_Load);
-            this.Resize += new System.EventHandler(this.FormUser_Resize);
             this.ResumeLayout(false);
 
         }
@@ -97,9 +99,10 @@
         #endregion
 
         private CK_UI.UserCtl userCtl1;
-        private CK_UI.InfoBarUser infoBarUser1;
+       // private CK_UI.InfoBarUser infoBarUser1;
         private System.Windows.Forms.Button buttonFID;
         private System.Windows.Forms.Button buttonauto;
+        private CK_UI.InfoBarUser infoBarUser1;
 
     }
 }
\ No newline at end of file

GcDevicePc/FormUser.cs

@@ -34,19 +34,22 @@ namespace GcDevicePc
            // MessageBox.Show("停用");
            // Console.WriteLine("停用");
         }
-
         public event Fireport autofire;
+        //点火操作
         private void buttonFID_Click(object sender, EventArgs e)
         {
-            autofire(0,10,5);
+            if (globaldata.m_dpbuffer.ShowList.showDet.fDetStatue != 2)
+                autofire(0, 10, 5);
+            else
+                MessageBox.Show("点火操作禁止，FID已经点火成功");
 
         }
-
-        private void FormUser_Resize(object sender, EventArgs e)
+        //自动校准
+        private void buttonauto_Click(object sender, EventArgs e)  
         {
-            this.buttonFID.Location = new Point(this.infoBarUser1.Width + 50, this.infoBarUser1.Location.Y + 10);
-
-            this.buttonauto.Location = new Point(this.infoBarUser1.Width + 50, this.infoBarUser1.Location.Y + 80);
+            CKVocAnalyzer.AutoAdjust auto = new CKVocAnalyzer.AutoAdjust();
+            auto.Show();
         }
+      
     }
 }

GcDevicePc/GcDevicePc.csproj

@@ -102,7 +102,7 @@
     <Reference Include="Ini.Net, Version=1.0.5531.18665, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ini.net.1.1.0\lib\net20\Ini.Net.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+    <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="LogOperate">
@@ -111,6 +111,9 @@
     <Reference Include="ModbusLib">
       <HintPath>..\dll\ModbusLib.dll</HintPath>
     </Reference>
+    <Reference Include="SpaceM">
+      <HintPath>..\dll\SpaceM.dll</HintPath>
+    </Reference>
     <Reference Include="SQLite.Designer">
       <HintPath>..\dll\SQLite.Designer.dll</HintPath>
     </Reference>
@@ -124,7 +127,6 @@
     <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />

GcDevicePc/MDIBase.cs

@@ -73,6 +73,9 @@ namespace GcDevicePc
                     LogOperate.LogInit.Instance.path = CKVocAnalyzer.GlobalCKV.FolderLog;
                     LogOperate.LogInit.Instance.Init();
                     CKVocAnalyzer.GlobalCKV.tcpservice.tcpStart(CKVocAnalyzer.GlobalCKV.hostadd, CKVocAnalyzer.GlobalCKV.tcpport);
+                    //自动删除
+                    SpaceM.SpaceThread sthread = new SpaceM.SpaceThread(CKVocAnalyzer.GlobalCKV.HistDataPath,CKVocAnalyzer.GlobalCKV.SpaceSize,CKVocAnalyzer.GlobalCKV.SpaceTimes);
+                    sthread.SpaceStart();
 
                     Log.Info("System Init Success");
                 }
@@ -125,7 +128,7 @@ namespace GcDevicePc
 
             Formstr = "用户窗口";
             startTime = DateTime.Now;
-            toolStripStatusLabeSystme.Text = string.Format("状态：{0}", Formstr);
+          //  toolStripStatusLabeSystme.Text = string.Format("状态：{0}", Formstr);
 
             timespan = System.DateTime.Now - startTime;
             toolStripStatusLabelusertime.Text = string.Format("运行时间：{0}", timespan.Days.ToString() + "天" + timespan.Hours.ToString() + "时" + timespan.Minutes.ToString() + "分" + timespan.Seconds.ToString() + "秒");
@@ -273,23 +276,28 @@ namespace GcDevicePc
             {
                 if (isbool)
                 {
-                    NetWorkMenu.Enabled = true;
-                    MethodBrowseMenuItem.Enabled = true;
-                    NewMethodMenu.Enabled = true;
-                    OpenMethodMenu.Enabled = true;
-                    MethodBrowseMenuItem.Enabled = true;
-                    CalibrationMenu.Enabled = true;
-                    GCConfigMenuItem.Enabled = true;
+                    NetWorkMenu.Visible = true;
+                    MethodBrowseMenuItem.Visible = true;
+                    NewMethodMenu.Visible = true;
+                    OpenMethodMenu.Visible = true;
+                    MethodBrowseMenuItem.Visible = true;
+                    CalibrationMenu.Visible = true;
+                    GCConfigMenuItem.Visible = true;
+                    AuxToolMenu.Visible = true;
+                    参数设置ToolStripMenuItem.Visible = true;
+                   
 
                 }else
                 {
-                    NetWorkMenu.Enabled = false;
-                    MethodBrowseMenuItem.Enabled = false;
-                    NewMethodMenu.Enabled = false;
-                    OpenMethodMenu.Enabled = false;
-                    MethodBrowseMenuItem.Enabled = false;
-                    CalibrationMenu.Enabled = false;
-                    GCConfigMenuItem.Enabled = false;
+                    NetWorkMenu.Visible = false;
+                    MethodBrowseMenuItem.Visible = false;
+                    NewMethodMenu.Visible = false;
+                    OpenMethodMenu.Visible = false;
+                    MethodBrowseMenuItem.Visible = false;
+                    CalibrationMenu.Visible = false;
+                    GCConfigMenuItem.Visible = false;
+                    AuxToolMenu.Visible = false;
+                    参数设置ToolStripMenuItem.Visible = false;
                 }
 
             }
@@ -306,8 +314,8 @@ namespace GcDevicePc
         /// <param name="e"></param>
         private void timer1_Tick(object sender, EventArgs e)
         {
-            this.Text = String.Format("VOCs在线监测-1.0.0.0   {0}",Formstr);
-            toolStripStatusLabeSystme.Text = String.Format("状态：{0}", statestr);
+            this.Text = String.Format("VOCs在线监测-1.0.2.1   {0}",Formstr);
+          //  toolStripStatusLabeSystme.Text = String.Format("状态：{0}", statestr);
             timespan = System.DateTime.Now - startTime;
             toolStripStatusLabelusertime.Text = String.Format("运行时间：{0}", 
                 timespan.Days.ToString() + "天" + timespan.Hours.ToString() + "时" + timespan.Minutes.ToString() + "分" + timespan.Seconds.ToString() + "秒");
@@ -1730,5 +1738,19 @@ namespace GcDevicePc
                 Log.Error(ex.Message);
             }
         }
+
+        private void 参数设置ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                CKVocAnalyzer.SetInfoForm sf = new CKVocAnalyzer.SetInfoForm();
+                sf.Show();
+
+            }
+            catch(Exception ex)
+            {
+                Trace.Write(ex);
+            }
+        }
     }
 }

GcDevicePc/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace GcDevicePc.Properties {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

GcDevicePc/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace GcDevicePc.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));