Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

GcDevicePc/CK_UI/LandIn.cs

@@ -17,6 +17,7 @@ namespace GcDevicePc.CK_UI
         public LandIn()
         {
             InitializeComponent();
+            this.ControlBox = false;
         }
 
         private void button1_Click(object sender, EventArgs e)  //登录系统

GcDevicePc/CK_UI/UserCtl.cs

@@ -289,9 +289,9 @@ namespace GcDevicePc.CK_UI
                 textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString() + "ppm";
                 textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y, 2).ToString() + "ppm";
                 textBox3.Text = Math.Round(listCH4[listCH4.Count - 1].Y, 2).ToString() + "ppm";
-                textBox4.Text = Math.Round(listNmoc[listben.Count - 1].Y, 2).ToString() + "ppm";
-                textBox5.Text = Math.Round(listTHC[listjiaben.Count - 1].Y, 2).ToString() + "ppm";
-                textBox6.Text = Math.Round(listCH4[listerjiaben.Count - 1].Y, 2).ToString() + "ppm";
+                textBox4.Text = Math.Round(listben[listben.Count - 1].Y, 2).ToString() + "ppm";
+                textBox5.Text = Math.Round(listjiaben[listjiaben.Count - 1].Y, 2).ToString() + "ppm";
+                textBox6.Text = Math.Round(listerjiaben[listerjiaben.Count - 1].Y, 2).ToString() + "ppm";
                 mster.PaneList.Clear();
                 myPaneCh4.CurveList.Clear();
                 myPaneNmoc.CurveList.Clear();

GcDevicePc/MDIBase.cs

@@ -1785,29 +1785,59 @@ namespace GcDevicePc
 
             }
         }
+        /// <summary>
+        /// 校准完成时间
+        /// </summary>
 
+        DateTime AutoAdjust;
         private void timerWorker_Tick(object sender, EventArgs e)
         {
             try
             {
                 if (SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun == false)  //准备开始校准
                 {
-
-                    RunTableOptWithCount(SharedSpace.MControl.path, SharedSpace.MControl.Name, (ushort)SharedSpace.MControl.runcount);
+                    SharedSpace.MControl.errstr = null;
+                    SharedSpace.MControl.zhouqi = globaldata.m_dpbuffer.ShowList.showtime.alltime;
+                    Trace.WriteLine(string.Format("开始校准{0},{1}", SharedSpace.MControl.zhouqi, SharedSpace.MControl.runcount), "sys");
+                    if(SharedSpace.MControl.zhouqi*SharedSpace.MControl.runcount<=SharedSpace.MControl.dateend)
+                    {
+                     //   RunTableOpt(SharedSpace.MControl.path, SharedSpace.MControl.Name);
+                        RunTableOptWithCount(SharedSpace.MControl.path, SharedSpace.MControl.Name,100);
                     Thread.Sleep(60 * 1000);
                     SharedSpace.MControl.SetRun = true;//仪器进入校准环境
-                    Trace.WriteLine("开始校准","sys");
+                    AutoAdjust = DateTime.Now.AddSeconds(SharedSpace.MControl.dateend);
+                  
+                    }else
+                    {
+                        SharedSpace.MControl.errstr = "校准时间不够";
+                        SharedSpace.MControl.SetOut = false;
+                    }
                 }
                 //等待校准结束
-                if (globaldata.m_hmibuffer.gcinfo.batruncount >= SharedSpace.MControl.runcount - 1 && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun)
+                if (DateTime.Now >= AutoAdjust && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun)
                 {
                     SharedSpace.MControl.IsEnd = true;
-                    Thread.Sleep(60 * 1000);
-                    RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName);
+                  
+                   // RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName);
+                    RunTableOptWithCount(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName, 10000);
+                    Thread.Sleep(30 * 1000);
+                   // RunTableOptWithCount(65534);
                     SharedSpace.MControl.SetOut = false;
                     SharedSpace.MControl.SetRun = false;
                     Trace.WriteLine("校准结束", "sys");
                 }
+                if (SharedSpace.MControl.forceEnd && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun)
+                {
+                    SharedSpace.MControl.IsEnd = false;
+                   
+                    //RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName);
+                    RunTableOptWithCount(SharedSpace.MControl.defaultName, SharedSpace.MControl.defaultName, 10000);
+                    Thread.Sleep(30 * 1000);
+                    SharedSpace.MControl.SetOut = false;
+                    SharedSpace.MControl.SetRun = false;
+                    Trace.WriteLine("强制校准结束", "sys");
+
+                }
 
             }
             catch (Exception ex)

SharedSpace/MControl.cs

@@ -39,8 +39,24 @@ namespace SharedSpace
        /// </summary>
        public static string defaultName = "";
        /// <summary>
-       /// 最小运行次数
+       /// 最小运行次数，系统设置，用于反馈是否满足要求
        /// </summary>
        public static int runcount = 7;
+       /// <summary>
+       /// 校准周期总长（S）
+       /// </summary>
+       public static int dateend;
+       /// <summary>
+       /// 周期时长（s）
+       /// </summary>
+       public static int zhouqi;
+       /// <summary>
+       /// 仪器反馈，正常下为空；
+       /// </summary>
+       public static string errstr = null;
+       /// <summary>
+       /// 强制终止
+       /// </summary>
+       public static bool forceEnd = false;
    }
 }