1.

Merge remote-tracking branch 'origin/feature-AdvTrendData-20191123' into dev6.0

2. getsample界面通过容器获取gageinfo

Project.FLY.Thick.Base/FLY.Thick.Base.UI/CtMicroGage/CtMicroGage.xaml.cs

@@ -40,22 +40,11 @@ namespace FLY.Thick.Base.UI
         /// <summary>
         /// 初始化
         /// </summary>
-        /// <param name="dynAreaService"></param>
-        /// <param name="initParam"></param>
-        /// <param name="gageService"></param>
-        /// <param name="warningReasonWindow"></param>
+        /// <param name="container">容器</param>
         [InjectionMethod]
-        public void Init(
-            IDynAreaService dynAreaService,
-            IInitParamService initParam,
-            ITDGageService gageService,
-            WarningReasonWindow warningReasonWindow)
+        public void Init(IUnityContainer container)
         {
-            viewModel.Init(
-                dynAreaService.DynArea, 
-                initParam,
-                gageService,
-                warningReasonWindow);
+            container.BuildUp(viewModel);
         }
     }
     /// <summary>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/CtMicroGage/CtMicroGageVm.cs

@@ -11,6 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
+using Unity;
 
 namespace FLY.Thick.Base.UI
 {
@@ -79,15 +80,23 @@ namespace FLY.Thick.Base.UI
             });
         }
 
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        /// <param name="dynAreaService"></param>
+        /// <param name="initParam"></param>
+        /// <param name="gageService"></param>
+        /// <param name="warningReasonWindow"></param>
+        [InjectionMethod]
         public void Init(
-            DynArea dynArea, 
+            IDynAreaService dynAreaService, 
             IInitParamService initParam,
             ITDGageService gageService,
             WarningReasonWindow warningReasonWindow)
         {
 
             mTDGageService = gageService;
-            mDynArea = dynArea;
+            mDynArea = dynAreaService.DynArea;
             mInitParam = initParam;
             mWindow = warningReasonWindow;
 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgFlyAd.xaml

@@ -59,6 +59,10 @@
                                 <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="CRC" />
                                 <ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding HasCRC}"/>
                             </StackPanel>
+                            <StackPanel Orientation="Vertical" Margin="5">
+                                <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="不使用AD盒速度" />
+                                <ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsCalSpeed}" HorizontalAlignment="Left"/>
+                            </StackPanel>
                             <StackPanel Orientation="Vertical" Margin="5" >
                                 <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="脉冲/数据格" />
                                 <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding PosOfGrid}" />

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGetSample.xaml.cs

-using System;
+using FLY.Thick.Base.IService;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Net;
-
-using FLY.Thick.Base.IService;
-using FLY.Thick.Base.UI;
 using Unity;
 
-using System.ComponentModel;
-
-
 namespace FLY.Thick.Base.UI
 {
     /// <summary>
@@ -40,10 +29,10 @@ namespace FLY.Thick.Base.UI
         }
         [InjectionMethod]
         public void Init(
-            IUnityContainer container, 
+            IUnityContainer container,
             IGetSampleService getSampleService,
             IInitParamService initParamService,
-            IGageInfoService gageInfoService) 
+            IGageInfoService gageInfoService)
         {
 
             this.getSampleService = getSampleService;
@@ -95,7 +84,7 @@ namespace FLY.Thick.Base.UI
             FLY.ControlLibrary.Window_Tip.Show("应用成功",
                 null,
                 TimeSpan.FromSeconds(2));
-            
+
         }
 
         private void button_getorgad_Click(object sender, RoutedEventArgs e)
@@ -146,33 +135,35 @@ namespace FLY.Thick.Base.UI
                             TimeSpan.FromSeconds(2));
                         return;
                     }
-                    sampleCell.OrgAD = (ad1+ad2)/2;
+                    sampleCell.OrgAD = (ad1 + ad2) / 2;
                 }
             }
 
             FLY.ControlLibrary.Window_Tip.Show("设置完成",
                 null,
                 TimeSpan.FromSeconds(2));
-            
+
 
         }
 
         private void button_gageinfo_Click(object sender, RoutedEventArgs e)
         {
-            if (container.IsRegistered<Page>("pgGageInfo"))
-            {
-                var p = container.Resolve<Page>("pgGageInfo");
-                NavigationService.Navigate(p);
-            }
-            else
-            {
-                var p = container.Resolve<PgGageInfo>();
-                //PgGageInfo p = new PgGageInfo();
-                //container.BuildUp(p);
-                NavigationService.Navigate(p);
-            }
+            Page p = (container.IsRegistered<Page>("pgGageInfo")) ? container.Resolve<Page>("pgGageInfo") : new PgGageInfo();
+            container.BuildUp(p);
+            NavigationService.Navigate(p);
         }
 
+        private void btnGetTempDatasClick(object sender, RoutedEventArgs e)
+        {
+            getSampleService.GetTempFilterDatas((asyncContext, retData) =>
+            {
+                var ll = retData as List<List<TempFilterData>>;
+                tempdatas.ItemsSource = ll;
+                FLY.ControlLibrary.Window_Tip.Show("加载完成",
+                    $"共加载{ll.Count()}列数据",
+                    TimeSpan.FromSeconds(2));
+            }, null);
+        }
     }
 
     public class GetSampleVm : INotifyPropertyChanged
@@ -245,7 +236,7 @@ namespace FLY.Thick.Base.UI
 
         public bool IsChanged { get; set; }
     }
-    public class GetSampleVmUt:INotifyPropertyChanged
+    public class GetSampleVmUt : INotifyPropertyChanged
     {
         public GetSampleVmUt()
         {
@@ -327,8 +318,8 @@ namespace FLY.Thick.Base.UI
         #endregion
 
     }
-    
-   
+
+
 
     /// <summary>
     /// 列表转序号
@@ -381,7 +372,7 @@ namespace FLY.Thick.Base.UI
                     //在 设计模式中， View为null, 所以下面必须判断
                     if (cv != null)
                     {
-                        switch (cv.IndexOf(value)) 
+                        switch (cv.IndexOf(value))
                         {
                             case 0:
                                 return "正向";

Project.FLY.Thick.Base/FLY.Thick.Base/Client/FlyADServiceClient.cs

@@ -42,6 +42,10 @@ namespace FLY.Thick.Base.Client
                 }
             }
         }
+        /// <summary>
+        /// 通过脉冲计算速度，不使用AD盒的输出
+        /// </summary>
+        public bool IsCalSpeed { get; set; } = true;
 
         public int PosLen { get; set; }
 
@@ -82,7 +86,8 @@ namespace FLY.Thick.Base.Client
                 posoffset = PosOffset,
                 jogvelocity = JogVelocity,
                 hasCRC = HasCRC,
-                gridsmooth = GridSmooth
+                gridsmooth = GridSmooth,
+                IsCalSpeed = IsCalSpeed
             };
             
             string json = Newtonsoft.Json.JsonConvert.SerializeObject(p);
@@ -189,6 +194,7 @@ namespace FLY.Thick.Base.Client
                         Ratio02 = p.ratio02;
                         HasCRC = p.hasCRC;
                         GridSmooth = p.gridsmooth;
+                        IsCalSpeed = p.IsCalSpeed;
                     } break;
             }
         }

Project.FLY.Thick.Base/FLY.Thick.Base/Client/GetSampleServiceClient.cs

@@ -72,6 +72,22 @@ namespace FLY.Thick.Base.Client
         [JsonProperty]
         public int Window { get; set; }
 
+        /// <summary>
+        /// 使用%方式检查异常
+        /// </summary>
+        [JsonProperty]
+        public bool IsCheckByPercent { get; set; } = true;
+        /// <summary>
+        /// 异常% 单位%
+        /// </summary>
+        [JsonProperty]
+        public double ErrPercent { get; set; } = 2;
+        /// <summary>
+        /// 异常值
+        /// </summary>
+        [JsonProperty]
+        public int ErrValue { get; set; } = 200;
+
         /// <summary>
         /// 样品
         /// </summary>
@@ -109,6 +125,9 @@ namespace FLY.Thick.Base.Client
                 velocity = Velocity,
                 range = Range,
                 window = Window,
+                IsCheckByPercent = IsCheckByPercent,
+                ErrPercent =ErrPercent,
+                ErrValue = ErrValue,
                 search = Search,
                 samples = from sample in Samples
                           select
@@ -175,7 +194,10 @@ namespace FLY.Thick.Base.Client
                         Range = p.range;
                         Velocity = p.velocity;
                         Window = p.window;
-                        Search = p.search;
+                        IsCheckByPercent = p.IsCheckByPercent;
+                        ErrPercent = p.ErrPercent;
+                        ErrValue = p.ErrValue;
+
                         for (int i = 0; i < Samples.Count() && i < p.samples.Count(); i++)
                         {
                             var sample_src = p.samples.ElementAt(i);
@@ -186,6 +208,7 @@ namespace FLY.Thick.Base.Client
                             sample_desp.OrgAD = sample_src.orgad;
                             sample_desp.Position = sample_src.position;
                         }
+                        Search = p.search;
                         for (int i = 0; i < Features.Count() && i < p.features.Count(); i++)
                         {
                             var feature_src = p.features.ElementAt(i);
@@ -230,6 +253,23 @@ namespace FLY.Thick.Base.Client
         {
             PushGetValue(from, srcid, infoid, infodata);
         }
+        public override void PushCallFunction(IFConn from, uint srcid, uint magic, ushort funcid, byte[] retdata, object AsyncDelegate, object AsyncState)
+        {
+            switch (funcid) {
+                case GETSAMPLE_OBJ_INTERFACE.CALL_GET_TEMPDATAS:
+                    {
+                        string json = Misc.Converter.BytesToString(retdata);
+
+                        var reponse = Newtonsoft.Json.JsonConvert.DeserializeObject<List<List<TempFilterData>>>(json);
+                        (AsyncDelegate as AsyncCBHandler)(AsyncState, reponse);
+                    }
+                    break;
+            }
+        }
+        public void GetTempFilterDatas(AsyncCBHandler asyncCB, object asyncContext)
+        {
+            CurrObjSys.CallFunctionEx(mConn, mServerID, ID, GETSAMPLE_OBJ_INTERFACE.CALL_GET_TEMPDATAS, null, asyncCB, asyncContext);
+        }
     }
 
 }

Project.FLY.Thick.Base/FLY.Thick.Base/IService/IGetSampleService.cs

@@ -6,9 +6,13 @@ using FLY.Thick.Base.Common;
 using System.ComponentModel;
 using Newtonsoft.Json;
 using PropertyChanged;
+using FObjBase;
 
 namespace FLY.Thick.Base.IService
 {
+    /// <summary>
+    /// 
+    /// </summary>
     public interface IGetSampleService:INotifyPropertyChanged
     {
         /// <summary>
@@ -36,7 +40,18 @@ namespace FLY.Thick.Base.IService
         /// </summary>
         int Window { get; set; }
 
-
+        /// <summary>
+        /// 使用%方式检查异常
+        /// </summary>
+        bool IsCheckByPercent { get; set; }
+        /// <summary>
+        /// 异常%
+        /// </summary>
+        double ErrPercent { get; set; }
+        /// <summary>
+        /// 异常值
+        /// </summary>
+        int ErrValue { get; set; }
         /// <summary>
         /// 参数：样品点参数
         /// </summary>
@@ -60,6 +75,36 @@ namespace FLY.Thick.Base.IService
         /// 应用
         /// </summary>
         void Apply();
+
+        /// <summary>
+        ///  返回 List(List(TempFilterData))
+        /// </summary>
+        /// <param name="asyncCB"></param>
+        /// <param name="asyncContext"></param>
+        void GetTempFilterDatas(AsyncCBHandler asyncCB, object asyncContext);
+    }
+
+    /// <summary>
+    /// 采样记录
+    /// </summary>
+    public class TempFilterData
+    {
+        /// <summary>
+        /// 采集时间
+        /// </summary>
+        public DateTime Time { get; set; }
+        /// <summary>
+        /// Ad值
+        /// </summary>
+        public int Ad { get; set; }
+        /// <summary>
+        /// 滤波后的AD值
+        /// </summary>
+        public int FilterAd { get; set; }
+        /// <summary>
+        /// 复位
+        /// </summary>
+        public bool IsReset { get; set; }
     }
     
     /// <summary>

Project.FLY.Thick.Base/FLY.Thick.Base/OBJ_INTERFACE/FLYAD_OBJ_INTERFACE.cs

@@ -24,6 +24,7 @@ namespace FLY.Thick.Base.OBJ_INTERFACE
             public UInt32 jogvelocity;
             public bool hasCRC;
             public int gridsmooth;
+            public bool IsCalSpeed;
 
         }
 

Project.FLY.Thick.Base/FLY.Thick.Base/OBJ_INTERFACE/GETSAMPLE_OBJ_INTERFACE.cs

@@ -31,6 +31,9 @@ namespace FLY.Thick.Base.OBJ_INTERFACE
             public UInt32 velocity;
             public int range;
             public int window;
+            public bool IsCheckByPercent;
+            public double ErrPercent;
+            public int ErrValue;
             public IEnumerable<Pack_Params_SampleCell> samples;
             public int search;
             public IEnumerable<Pack_Params_SampleFeature> features;
@@ -74,5 +77,13 @@ namespace FLY.Thick.Base.OBJ_INTERFACE
         public const UInt16 PUSH_PARAMS = 0;
         public const UInt16 PUSH_STATE = 1;
         #endregion
+
+        #region CallFunction
+        /// <summary>
+        /// request:null
+        /// reponse:List(List(TempFilterData))
+        /// </summary>
+        public const UInt16 CALL_GET_TEMPDATAS = 0;
+        #endregion
     }
 }

Project.FLY.Thick.Base/FLY.Thick.Base/Server.OBJProxy/FlyAD_OBJProxy.cs

@@ -36,6 +36,7 @@ namespace FLY.Thick.Base.Server.OBJProxy
             if ((e.PropertyName == "LocalEP") ||
                 (e.PropertyName == "HasCRC") ||
                 (e.PropertyName == "GridSmooth") ||
+                (e.PropertyName == "IsCalSpeed") ||
                 (e.PropertyName == "PosOfGrid") ||
                 (e.PropertyName == "PosLen") ||
                 (e.PropertyName == "MotorType") ||
@@ -69,6 +70,7 @@ namespace FLY.Thick.Base.Server.OBJProxy
                             ep = mFlyAD.LocalEP.ToString(),
                             hasCRC = mFlyAD.HasCRC,
                             gridsmooth = mFlyAD.GridSmooth,
+                            IsCalSpeed = mFlyAD.IsCalSpeed,
                             posofgrid = mFlyAD.PosOfGrid,
                             motortype = (MOTORTYPE) mFlyAD.MotorType,
                             poslen = mFlyAD.PosLen,
@@ -98,6 +100,7 @@ namespace FLY.Thick.Base.Server.OBJProxy
                         
                         mFlyAD.HasCRC = p.hasCRC;
                         mFlyAD.GridSmooth = p.gridsmooth;
+                        mFlyAD.IsCalSpeed = p.IsCalSpeed;
                         var ep = Misc.StringConverter.ToIPEndPoint(p.ep);
                         if(!mFlyAD.LocalEP.Equals(ep))
                             mFlyAD.Connect(ep);

Project.FLY.Thick.Base/FLY.Thick.Base/Server.OBJProxy/GetSample_OBJProxy.cs

@@ -97,7 +97,9 @@ namespace FLY.Thick.Base.Server.OBJProxy
                 (e.PropertyName == "Velocity") ||
                 (e.PropertyName == "Range") ||
                 (e.PropertyName == "Window") ||
-                (e.PropertyName == "OnePointIsOffset") ||
+                (e.PropertyName == "IsCheckByPercent") ||
+                (e.PropertyName == "ErrPercent") ||
+                (e.PropertyName == "ErrValue") ||
                 (e.PropertyName == "Search"))
             {
                 push_params();
@@ -122,25 +124,31 @@ namespace FLY.Thick.Base.Server.OBJProxy
                             range = mGetSampleService.Range,
                             velocity = mGetSampleService.Velocity,
                             window = mGetSampleService.Window,
-                            search = mGetSampleService.Search,
-                            samples = from sample in mGetSampleService.Samples
+                            IsCheckByPercent = mGetSampleService.IsCheckByPercent,
+                            ErrPercent = mGetSampleService.ErrPercent,
+                            ErrValue = mGetSampleService.ErrValue,
+                            search = mGetSampleService.Search
+                        };
+
+                        p.samples = (from sample in mGetSampleService.Samples
+                                     select
+                                         new GETSAMPLE_OBJ_INTERFACE.Pack_Params_SampleCell()
+                                         {
+                                             enable = sample.Enable,
+                                             justForCheck = sample.JustForCheck,
+                                             orgad = sample.OrgAD,
+                                             position = sample.Position
+                                         });
+
+                        p.features = (from feature in mGetSampleService.Features
                                       select
-                                          new GETSAMPLE_OBJ_INTERFACE.Pack_Params_SampleCell()
+                                          new GETSAMPLE_OBJ_INTERFACE.Pack_Params_SampleFeature()
                                           {
-                                              enable = sample.Enable,
-                                              justForCheck = sample.JustForCheck,
-                                              orgad = sample.OrgAD,
-                                              position = sample.Position
-                                          },
-                            features = from feature in mGetSampleService.Features
-                                       select
-                                           new GETSAMPLE_OBJ_INTERFACE.Pack_Params_SampleFeature()
-                                           {
-                                               enable = feature.Enable,
-                                               startpos = feature.StartPos,
-                                               endpos = feature.EndPos
-                                           }
-                        };
+                                              enable = feature.Enable,
+                                              startpos = feature.StartPos,
+                                              endpos = feature.EndPos
+                                          });
+                       
                         string json = Newtonsoft.Json.JsonConvert.SerializeObject(p);
                         infodata = Misc.Converter.StringToBytes(json);
                     } break;
@@ -188,6 +196,9 @@ namespace FLY.Thick.Base.Server.OBJProxy
                         mGetSampleService.Range = p.range;
                         mGetSampleService.Velocity = p.velocity;
                         mGetSampleService.Window = p.window;
+                        mGetSampleService.IsCheckByPercent = p.IsCheckByPercent;
+                        mGetSampleService.ErrPercent = p.ErrPercent;
+                        mGetSampleService.ErrValue = p.ErrValue;
                         mGetSampleService.Search = p.search;
                         
                         for(int i=0;i<mGetSampleService.Samples.Count() && i<p.samples.Count();i++)
@@ -215,5 +226,20 @@ namespace FLY.Thick.Base.Server.OBJProxy
                     } break;
             }
         }
+
+        public override void CallFunction(IFConn from, uint srcid, uint magic, ushort funcid, byte[] infodata)
+        {
+            switch (funcid) {
+                case GETSAMPLE_OBJ_INTERFACE.CALL_GET_TEMPDATAS:
+                    {
+                        mGetSampleService.GetTempFilterDatas((context,retdata) =>
+                        {
+                            string json = Newtonsoft.Json.JsonConvert.SerializeObject(retdata);
+                            
+                            CurrObjSys.PushCallFunctionEx(from, srcid, ID, magic, funcid, Misc.Converter.StringToBytes(json));
+                        }, null);
+                    }break;
+            }
+        }
     }
 }

Project.FLY.Thick.Base/FLY.Thick.Base/Server/BorderSearch.cs

@@ -15,6 +15,11 @@ namespace FLY.Thick.Base.Server
     /// </summary>
     public class BorderSearch : IBorderSearchService, INotifyPropertyChanged, Misc.ISaveToXml
     {
+        /// <summary>
+        /// 报警测试
+        /// </summary>
+        public static FLY.OBJComponents.Common.ERRNO BORDER_ERRNO_NOFILM = new FLY.OBJComponents.Common.ERRNO() { Code = 50, Descrption = "边界异常,没有被测物" };
+
         #region 延时执行，Markno
         public const int MARKNO_SAVE = 1;
         #endregion
@@ -124,6 +129,7 @@ namespace FLY.Thick.Base.Server
 
         #endregion
 
+        OBJComponents.Server.WarningSystem warningSystem;
         private string param_path = "bordersearch.xml";
         public BorderSearch()
         {
@@ -151,6 +157,11 @@ namespace FLY.Thick.Base.Server
             };
             Load();
         }
+
+        public void Init(OBJComponents.Server.WarningSystem warningSystem) 
+        {
+            this.warningSystem = warningSystem;
+        }
         void Default() 
         {
             Enable = false;
@@ -589,8 +600,10 @@ namespace FLY.Thick.Base.Server
             int borderend_grid;//validend_grid;
 
             if (!FindFilm_Threshold(dat, validbegin_grid, validend_grid, TempAD, TempRange, out borderbegin_grid, out borderend_grid))
+            {
+                warningSystem.Add(BORDER_ERRNO_NOFILM.Code, BORDER_ERRNO_NOFILM.Descrption, OBJComponents.Common.ERR_STATE.ON);
                 return false;
-
+            }
             //N2 只是用来判断一下膜够不够宽而已，没用
             int N2_grid = (N2*3+SensorWidth) / posOfGrid;
             
@@ -605,9 +618,8 @@ namespace FLY.Thick.Base.Server
                 FindFilm_Break(dat, sensor_grid, filter_grid, ref borderbegin_grid, ref borderend_grid);
             }
 
-            int idx = 0;
-            if (direction == DIRECTION.BACKWARD)
-                idx = 1;
+            int idx = (direction == DIRECTION.FORWARD) ? 0 : 1;
+
             //转为 脉冲
             border[idx].Begin = (borderbegin_grid + gridBegin) * posOfGrid;
             border[idx].End = (borderend_grid +gridBegin) * posOfGrid;

Project.FLY.Thick.Base/FLY.Thick.Base/Server/SysParam.cs

@@ -38,6 +38,11 @@ namespace FLY.Thick.Base.Server
         /// </summary>
         public int FLYAD7_GridSmooth { get; set; } = 0;
 
+        /// <summary>
+        /// 电脑计算速度，不通过AD盒获取
+        /// </summary>
+        public bool FLYAD7_IsCalSpeed { get; set; } = true;
+
         #endregion
 
         private string param_path = "sysparam.xml";
@@ -58,7 +63,8 @@ namespace FLY.Thick.Base.Server
                 return;
             if ((e.PropertyName == "FLYAD7EP")||
                 (e.PropertyName == "FLYAD7_HasCRC")||
-                (e.PropertyName == "FLYAD7_GridSmooth")
+                (e.PropertyName == "FLYAD7_GridSmooth")||
+                (e.PropertyName == "FLYAD7_IsCalSpeed")
             )
             {
                 Save();
@@ -91,7 +97,7 @@ namespace FLY.Thick.Base.Server
             "FLYAD7EP",
             "FLYAD7_HasCRC",
             "FLYAD7_GridSmooth",
-            "DBPath"
+            "FLYAD7_IsCalSpeed"
             };
         }
     }

Project.FLY.Thick.Base/FLY.Thick.Base/Server/TempFilter.cs

-using System;
+using FLY.Thick.Base.IService;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 
 namespace FLY.Thick.Base.Server
 {
 
-
+    /// <summary>
+    /// 样品修正 滤波
+    /// </summary>
     public class TempFilter
     {
         DateTime sampleTime;
         int sampleFailure;
         int swfilterCnt;
 
+        /// <summary>
+        /// 滤波器
+        /// </summary>
         class SWFilter
         {
+            /// <summary>
+            /// 缓存区
+            /// </summary>
             int[] buffer;
+            /// <summary>
+            /// 缓存区大小
+            /// </summary>
             int bufferSize;
+            /// <summary>
+            /// 队列尾
+            /// </summary>
             int lastData;
+            /// <summary>
+            /// 默认值
+            /// </summary>
             int initvalue;
 
             public SWFilter(int buffersize)
@@ -44,7 +63,7 @@ namespace FLY.Thick.Base.Server
                     window--;
                 }
                 if (cnt == 0) return initvalue;
-                return (int)(sum / cnt + 0.5);
+                return (int)Math.Round(sum / cnt);
             }
 
             public void Clear(int initvalue)
@@ -65,7 +84,7 @@ namespace FLY.Thick.Base.Server
 
             public void SetSize(int buffersize) 
             {
-                if (buffersize != this.bufferSize) 
+                if (this.bufferSize != buffersize) 
                 {
                     this.bufferSize = buffersize;
 
@@ -78,8 +97,14 @@ namespace FLY.Thick.Base.Server
         SWFilter swfilter;
         int tempBIndex;
         int[] tempBuf = new int[3];
+        /// <summary>
+        /// 前一个AD值
+        /// </summary>
         int preValue;
 
+        /// <summary>
+        /// 
+        /// </summary>
         public TempFilter()
         {
             sampleFailure = 0;
@@ -90,20 +115,40 @@ namespace FLY.Thick.Base.Server
             preValue = -1;
         }
 
+        /// <summary>
+        /// 复位失败次数
+        /// </summary>
         public void ResetSampleFailure()
         {
             sampleFailure = 0;
         }
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
         public bool IsSampleFailure()
         {
             if (sampleFailure < 0) return true;
             return false;
         }
+
+        /// <summary>
+        /// 输入原始AD值，输出滤波后AD值
+        /// </summary>
+        /// <param name="ad"></param>
+        /// <returns></returns>
         public int CalSampleAD(int ad) 
         {
-            int originAD;
-            return CalSampleAD(ad, out originAD);
+            return CalSampleAD(ad, out int originAD);
         }
+        
+        /// <summary>
+        /// 输入原始AD值，输出滤波后AD值
+        /// </summary>
+        /// <param name="ad"></param>
+        /// <param name="originAD"></param>
+        /// <returns></returns>
         public int CalSampleAD(int ad, out int originAD)
         {
             originAD = 0;
@@ -137,7 +182,7 @@ namespace FLY.Thick.Base.Server
 
             if (delta > 0.01 * Math.Abs(preValue))//跳到超过 1% ，有问题
             {
-                if (tempBIndex < 1)		// Sudden Changed! Need 3 times to confirm.
+                if (tempBIndex < 1)		//  突变!! 需要2次确认 因为可能只是很大的噪声
                 {
                     tempBIndex++;
                     tempBuf[tempBIndex] = ad;
@@ -173,10 +218,93 @@ namespace FLY.Thick.Base.Server
             preValue = swfilter.CalValue(swfilterCnt);
             return preValue;
         }
+        
+        /// <summary>
+        /// 移动滤波窗口大小
+        /// </summary>
+        /// <param name="window"></param>
         public void SetWindow(int window) 
         {
             if (window < 50)
                 swfilterCnt = window;
         }
     }
+
+
+
+    /// <summary>
+    /// 样品修正 滤波, 返回N分钟内数据的均值。
+    /// 如果波动较大，提示异常
+    /// </summary>
+    public class TempFilter2
+    {
+        List<TempFilterData> Datas = new List<TempFilterData>();
+
+        TimeSpan keepTime = TimeSpan.FromMinutes(6);
+        /// <summary>
+        /// 
+        /// </summary>
+        public TempFilter2()
+        {
+
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="ad">原始AD</param>
+        /// <param name="filterTime">滤波时间</param>
+        /// <returns>滤波后Ad</returns>
+        public int CalSampleAD(int ad, TimeSpan filterTime)
+        {
+            
+            if (filterTime.TotalSeconds <= 0)
+            {
+                filterTime = TimeSpan.Zero;
+            }
+            keepTime = TimeSpan.FromMinutes(Math.Max(6, filterTime.TotalMinutes * 3));
+
+            var now = DateTime.Now;
+            Datas.RemoveAll(d => d.Time < now - keepTime);
+            Datas.Add(new TempFilterData()
+            {
+                Ad = ad,
+                FilterAd = ad,
+                Time = now
+            });
+            double sum = 0;
+            int cnt = 0;
+            for (int i = 0; i < Datas.Count(); i++)
+            {
+                var d = Datas[Datas.Count()-1-i];
+                if (d.Time >= (now - filterTime) && d.IsReset == false)
+                {
+                    sum += d.Ad;
+                    cnt++;
+                }
+                else {
+                    break;
+                }
+            }
+            if (cnt > 0)
+            {
+                Datas.Last().FilterAd = (int)Math.Round(sum / cnt);
+            }
+            return Datas.Last().FilterAd;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void Reset()
+        {
+            var now = DateTime.Now;
+            Datas.RemoveAll(d => d.Time < now - keepTime);
+            Datas.Add(new TempFilterData() { IsReset = true, Time = DateTime.Now });
+        }
+
+        public List<TempFilterData> GetDatas()
+        {
+            return Datas;
+        }
+    }
 }