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

GcDevicePc/CK_UI/CurveDisPlay.cs

@@ -14,6 +14,10 @@ namespace GcDevicePc
     public partial class CurveDisPlay : DockContent
     {
        public static CKVocAnalyzer.CtrlWaveCurrent curdisp = new CKVocAnalyzer.CtrlWaveCurrent();
+        /// <summary>
+        /// 强制清除绘图数据
+        /// </summary>
+       public static bool forcePurge = false;
         public CurveDisPlay()
         {
             InitializeComponent();

GcDevicePc/MDIBase.cs

@@ -1842,15 +1842,22 @@ namespace GcDevicePc
                   
                     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);
-                        if (RunTableOpt(SharedSpace.MControl.path, SharedSpace.MControl.Name)==1)
+                        
+                    
+                        if (RunTableOpt(SharedSpace.MControl.path, SharedSpace.MControl.Name)==1&& SharedSpace.MControl.MethodType==1)
                         {
                             Trace.WriteLine(string.Format("开始校准{0},{1}", SharedSpace.MControl.zhouqi, SharedSpace.MControl.runcount), "sys");
                             SharedSpace.MControl.SetRun = true;//仪器进入校准环境
+                            CurveDisPlay.forcePurge = true;//强制清除数据
+                            AutoAdjust = DateTime.Now.AddSeconds(SharedSpace.MControl.dateend);
+                        }
+                        if (SharedSpace.MControl.MethodType == 2)
+                        {
+                            Trace.WriteLine(string.Format("开始校准{0},{1}", SharedSpace.MControl.zhouqi, SharedSpace.MControl.runcount), "sys");
+                            SharedSpace.MControl.SetRun = true;//仪器进入校准环境
+                            CurveDisPlay.forcePurge = true;
                             AutoAdjust = DateTime.Now.AddSeconds(SharedSpace.MControl.dateend);
                         }
-                   // Thread.Sleep(60 * 1000);
                 
                   
                     }else
@@ -1865,7 +1872,13 @@ namespace GcDevicePc
                     SharedSpace.MControl.IsEnd = true;
 
 
-                    if(RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName)==1)
+                    if (RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName) == 1 && SharedSpace.MControl.MethodType == 1)
+                    {
+                        SharedSpace.MControl.SetOut = false;
+                        SharedSpace.MControl.SetRun = false;
+                        Trace.WriteLine("校准结束", "sys");
+                    }
+                    if(SharedSpace.MControl.MethodType==2)
                     {
                         SharedSpace.MControl.SetOut = false;
                         SharedSpace.MControl.SetRun = false;
@@ -1877,15 +1890,15 @@ namespace GcDevicePc
                 {
                     SharedSpace.MControl.IsEnd = false;
                    
-                    //RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName);
-                    //RunTableOptWithCount(SharedSpace.MControl.defaultName, SharedSpace.MControl.defaultName, 1000);
-                   // Thread.Sleep(30 * 1000);
-                    //SharedSpace.MControl.SetOut = false;
-                    //SharedSpace.MControl.SetRun = false;
-                    //Trace.WriteLine("强制校准结束", "sys");
                   
 
-                    if (RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName) == 1)
+                    if (RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName) == 1&&SharedSpace.MControl.MethodType == 1)
+                    {
+                        SharedSpace.MControl.SetOut = false;
+                        SharedSpace.MControl.SetRun = false;
+                        Trace.WriteLine("强制校准结束", "sys");
+                    }
+                    if (SharedSpace.MControl.MethodType == 2)
                     {
                         SharedSpace.MControl.SetOut = false;
                         SharedSpace.MControl.SetRun = false;

GcDevicePc/ProThread/CKvocUpdata.cs

@@ -232,10 +232,11 @@ namespace GcDevicePc.ProThread
                         CurveDisPlay.curdisp.addDataRaw(listRaw); //记录原始数据
                             CurveDisPlay.curdisp.addPoint(listPoint, drbool);   //更新绘画区域
                         //绘制完，重新画图
-                         if (drbool)
+                            if (drbool || CurveDisPlay.forcePurge)
                         {
                             time = 0;
                             CurveDisPlay.curdisp.cleardata();
+                            CurveDisPlay.forcePurge = false;
 
                         }
                             

SharedSpace/Data.cs

@@ -22,5 +22,11 @@ namespace SharedSpace
        /// 值是否读取
        /// </summary>
        public static bool ReadChange = false;
+       /// <summary>
+       /// 自动校准  0 正常采样  1 校准开始  2 校准中  3 以校准
+       /// </summary>
+
+       public static int typesint = 0;
+
     }
 }

SharedSpace/DataType.cs

@@ -19,4 +19,21 @@ namespace SharedSpace
         /// </summary>
         public double vale { get; set; }
     }
+
+   public class AdjustCoef
+   {
+       /// <summary>
+       /// 名称
+       /// </summary>
+       public string name { get; set; }
+       /// <summary>
+       /// 系数K
+       /// </summary>
+       public double Bvale { get; set; }
+
+       /// <summary>
+       /// 常数 M
+       /// </summary>
+       public double Cvale { get; set; }
+   }
 }

SharedSpace/MControl.cs

@@ -58,5 +58,10 @@ namespace SharedSpace
        /// 强制终止
        /// </summary>
        public static bool forceEnd = false;
+       /// <summary>
+       /// 校准类型  1 常规  2 全程
+       /// </summary>
+
+       public static int MethodType = 0;
    }
 }

说明/RM.txt

@@ -3,4 +3,5 @@
 2、修复历史查看功能中的树形选择，历史数据反复出现问题；
 3、增加了历史查看功能，选中后，对应文件名背景颜色改变；
 4.王工更新文件传输库，解决开机容易传文件崩的
-
+2.18-6-7
+1.更新现有组件库