死区压缩算法Bug修复。压缩参数开发环境不更新Bug修改

Common/Cdy.Tag.Network/SocketServer.cs

@@ -118,71 +118,79 @@ namespace Cdy.Tag
         /// <param name="port"></param>
         protected virtual async void StartInner(int port)
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            try
             {
-                GCSettings.LatencyMode = GCLatencyMode.SustainedLowLatency;
-            }
+                if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    GCSettings.LatencyMode = GCLatencyMode.SustainedLowLatency;
+                }
 
-            if (UseLibuv)
-            {
-                var dispatcher = new DispatcherEventLoopGroup();
-                bossGroup = dispatcher;
-                workGroup = new WorkerEventLoopGroup(dispatcher);
-            }
-            else
-            {
-                bossGroup = new MultithreadEventLoopGroup(1);
-                workGroup = new MultithreadEventLoopGroup();
-            }
+                if (UseLibuv)
+                {
+                    var dispatcher = new DispatcherEventLoopGroup();
+                    bossGroup = dispatcher;
+                    workGroup = new WorkerEventLoopGroup(dispatcher);
+                }
+                else
+                {
+                    bossGroup = new MultithreadEventLoopGroup(1);
+                    workGroup = new MultithreadEventLoopGroup();
+                }
 
-            X509Certificate2 tlsCertificate = null;
-            if (IsSsl)
-            {
-               // tlsCertificate = new X509Certificate2(Path.Combine(ExampleHelper.ProcessDirectory, "dotnetty.com.pfx"), "password");
-            }
+                X509Certificate2 tlsCertificate = null;
+                if (IsSsl)
+                {
+                    // tlsCertificate = new X509Certificate2(Path.Combine(ExampleHelper.ProcessDirectory, "dotnetty.com.pfx"), "password");
+                }
 
-            var bootstrap = new ServerBootstrap();
-            bootstrap.Group(bossGroup, workGroup);
+                var bootstrap = new ServerBootstrap();
+                bootstrap.Group(bossGroup, workGroup);
 
-            if (UseLibuv)
-            {
-                bootstrap.Channel<TcpServerChannel>();
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
-                    || RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                if (UseLibuv)
                 {
-                    bootstrap
-                        .Option(ChannelOption.SoReuseport, true)
-                        .ChildOption(ChannelOption.SoReuseaddr, true);
+                    bootstrap.Channel<TcpServerChannel>();
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
+                        || RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                    {
+                        bootstrap
+                            .Option(ChannelOption.SoReuseport, true)
+                            .ChildOption(ChannelOption.SoReuseaddr, true);
+                    }
+                }
+                else
+                {
+                    bootstrap.Channel<TcpServerSocketChannel>();
                 }
-            }
-            else
-            {
-                bootstrap.Channel<TcpServerSocketChannel>();
-            }
 
-            bootstrap
-                    .Option(ChannelOption.SoBacklog, 8192)
-                    .ChildHandler(new ActionChannelInitializer<IChannel>(channel =>
-                    {
-                        IChannelPipeline pipeline = channel.Pipeline;
-                        if (tlsCertificate != null)
+                bootstrap
+                        .Option(ChannelOption.SoBacklog, 8192)
+                        .ChildHandler(new ActionChannelInitializer<IChannel>(channel =>
                         {
-                            pipeline.AddLast(TlsHandler.Server(tlsCertificate));
-                        }
-                        pipeline.AddLast("framing-enc", new LengthFieldPrepender(4));
-                        pipeline.AddLast("framing-dec", new LengthFieldBasedFrameDecoder(Int32.MaxValue, 0, 4, 0, 4));
-                        mProcessHandle = new ServerChannelHandler(this);
-                        mProcessHandle.DataArrived = new ServerChannelHandler.DataArrivedDelegate((context,fun, data) => { return ExecuteCallBack(context,fun,data); });
-                        pipeline.AddLast(mProcessHandle);
-                    }));
-
-            if (string.IsNullOrEmpty(mIp))
-            {
-                boundChannel = await bootstrap.BindAsync(port);
+                            IChannelPipeline pipeline = channel.Pipeline;
+                            if (tlsCertificate != null)
+                            {
+                                pipeline.AddLast(TlsHandler.Server(tlsCertificate));
+                            }
+                            pipeline.AddLast("framing-enc", new LengthFieldPrepender(4));
+                            pipeline.AddLast("framing-dec", new LengthFieldBasedFrameDecoder(Int32.MaxValue, 0, 4, 0, 4));
+                            mProcessHandle = new ServerChannelHandler(this);
+                            mProcessHandle.DataArrived = new ServerChannelHandler.DataArrivedDelegate((context, fun, data) => { return ExecuteCallBack(context, fun, data); });
+                            pipeline.AddLast(mProcessHandle);
+                        }));
+
+                if (string.IsNullOrEmpty(mIp))
+                {
+                    boundChannel = await bootstrap.BindAsync(port);
+                }
+                else
+                {
+                    boundChannel = await bootstrap.BindAsync(IPAddress.Parse(mIp), port);
+                }
             }
-            else
+            catch(Exception ex)
             {
-                boundChannel = await bootstrap.BindAsync(IPAddress.Parse(mIp),port);
+                LoggerService.Service.Erro("SocketServer", ex.Message);
+                LoggerService.Service.Erro("SocketServer", ex.StackTrace.ToString());
             }
         }
 

Develop/DBDevelopClientWebApi/DBDevelopClientWebApi.csproj

@@ -19,4 +19,8 @@
     <ProjectReference Include="..\..\Common\Cdy.Tag\Cdy.Tag.csproj" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)\Output&quot; /y&#xD;&#xA;if exist  &quot;$(TargetDir)$(TargetName).XML&quot; copy &quot;$(TargetDir)$(TargetName).XML&quot; &quot;$(SolutionDir)\Output\Xml&quot; /y&#xD;&#xA;if exist  &quot;$(TargetDir)$(TargetName).pdb&quot;  copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)\Output&quot; /y" />
+  </Target>
+
 </Project>

Develop/DbManager.Desktop/ViewModel/Tag/CompressParameterModelBase.cs

@@ -46,7 +46,6 @@ namespace DBInStudio.Desktop.ViewModel
             }
         }
 
-
         #endregion ...Properties...
 
         #region ... Methods    ...
@@ -64,7 +63,7 @@ namespace DBInStudio.Desktop.ViewModel
         /// </summary>
         public virtual void FillParameters()
         {
-
+           
         }
 
         #endregion ...Methods...
@@ -109,6 +108,7 @@ namespace DBInStudio.Desktop.ViewModel
                 {
                     mDeadValue = value;
                     FillParameters();
+                    OnPropertyChanged("DeadValue");
                 }
             }
         }
@@ -180,6 +180,7 @@ namespace DBInStudio.Desktop.ViewModel
             {
                 Parameters.Add("DeadType", Type);
             }
+            base.FillParameters();
         }
 
         #endregion ...Methods...
@@ -291,6 +292,7 @@ namespace DBInStudio.Desktop.ViewModel
             {
                 Parameters.Add("SlopeType", Type);
             }
+            base.FillParameters();
         }
 
         #endregion ...Methods...

Develop/DbManager.Desktop/ViewModel/Tag/TagViewModel.cs

@@ -993,6 +993,10 @@ namespace DBInStudio.Desktop
         /// </summary>
         private void CheckRecordTypeParameterModel()
         {
+            if(CompressParameterModel!=null)
+            {
+                CompressParameterModel.PropertyChanged -= CompressParameterModel_PropertyChanged;
+            }
             if(mHisTagMode==null)
             {
                 CompressParameterModel = null;
@@ -1011,7 +1015,19 @@ namespace DBInStudio.Desktop
                     CompressParameterModel = new SlopeCompressParameterViewModel() { Parameters = HisTagMode.Parameters };
                     break;
             }
-            
+            if (CompressParameterModel != null)
+            {
+                CompressParameterModel.PropertyChanged += CompressParameterModel_PropertyChanged;
+            }
+        }
+
+        private void CompressParameterModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (mHisTagMode != null)
+            {
+               // mHisTagMode.Parameters = (sender as CompressParameterModelBase).Parameters;
+                IsChanged = true;
+            }
         }
 
         /// <summary>

RunTime/DBInRun/Program.cs

@@ -17,6 +17,7 @@ namespace DBInRun
         {
             Console.CancelKeyPress += Console_CancelKeyPress;
             AppDomain.CurrentDomain.ProcessExit += CurrentDomain_ProcessExit;
+            AppDomain.CurrentDomain.FirstChanceException += CurrentDomain_FirstChanceException;
             WindowConsolHelper.DisbleQuickEditMode();
 
             Runner.RunInstance.Init();
@@ -156,6 +157,12 @@ namespace DBInRun
             }
         }
 
+        private static void CurrentDomain_FirstChanceException(object sender, System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs e)
+        {
+            Console.WriteLine(e.Exception.StackTrace);
+            e.Exception.HResult = 0;
+        }
+
         /// <summary>
         /// 
         /// </summary>

RunTime/DBRuntime/His/Compress/Special/DeadAreaCompressUnit2.cs

@@ -32,6 +32,10 @@ namespace Cdy.Tag
 
         protected ProtoMemory mVarintMemory2;
 
+        //Dictionary<int, double> dvals = new Dictionary<int, double>();
+
+        //Dictionary<int, int> dtims = new Dictionary<int, int>();
+
         /// <summary>
         /// 
         /// </summary>
@@ -57,7 +61,7 @@ namespace Cdy.Tag
             }
             else
             {
-                return Math.Abs((newVal - preVal) / preVal) > deadArea;
+                return preVal > 0 ? Math.Abs((newVal - preVal) / preVal) > deadArea : true;
             }
         }
 
@@ -99,7 +103,7 @@ namespace Cdy.Tag
         {
             int preids = 0;
             mVarintMemory2.Reset();
-
+            //dtims.Clear();
             bool isFirst = true;
             int id = 0;
 
@@ -121,6 +125,8 @@ namespace Cdy.Tag
                     {
                         mVarintMemory2.WriteInt32(id - preids);
                     }
+                    //dtims.Add(i, id);
+                    preids = id;
                 }
                 else
                 {
@@ -431,6 +437,14 @@ namespace Cdy.Tag
                     target.Write(cqus);
                     rsize += 4;
                     rsize += cqus.Length;
+
+                    //StringBuilder sb = new StringBuilder();
+                    //foreach(var vv in dvals)
+                    //{
+                    //    sb.Append(dtims[vv.Key] + "," + vv.Value+";");
+                    //}
+                    //System.IO.File.WriteAllText(DateTime.Now.Ticks.ToString() + ".deadarea", sb.ToString());
+
                     break;
                 case TagType.Float:
                     FindEmpityIds(source, sourceAddr, (int)count, emptys);
@@ -947,6 +961,8 @@ namespace Cdy.Tag
                     double dsval = 0;
                     mDCompress.Reset();
                     mDCompress.Precision = this.Precision;
+                    //dvals.Clear();
+
                     for (int i = 0; i < count; i++)
                     {
                         if (i != ig)
@@ -957,6 +973,7 @@ namespace Cdy.Tag
                                 mDCompress.Append(id);
                                 isFirst = false;
                                 dsval = id;
+                                //dvals.Add(i, id);
                             }
                             else
                             {
@@ -965,6 +982,7 @@ namespace Cdy.Tag
                                     mDCompress.Append(id);
                                     // mMarshalMemory.Write(id);
                                     dsval = id;
+                                    //dvals.Add(i, id);
                                 }
                                 else
                                 {

RunTime/DBRuntime/His/Compress/Special/SlopeCompressUnit2.cs

@@ -96,13 +96,12 @@ namespace Cdy.Tag
                     {
                         isFirst = false;
                         mVarintMemory2.WriteInt32(id);
-                        preids = id;
                     }
                     else
                     {
                         mVarintMemory2.WriteInt32(id - preids);
-                        preids = id;
                     }
+                    preids = id;
                     ig = usedIndex.ReadIndex < usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
                 }
             }

RunTime/DBRuntime/His/HisEnginer2.cs

@@ -306,7 +306,7 @@ namespace Cdy.Tag
                             mHisTag = new LongPoint3HisRunTag() { Id = vv.Value.Id, Circle = vv.Value.Circle, Type = vv.Value.Type, TagType = vv.Value.TagType, RealMemoryAddr = realbaseaddr, RealMemoryPtr = realHandle, RealValueAddr = realaddr, CompressType = vv.Value.CompressType, Parameters = vv.Value.Parameters };
                             break;
                     }
-                    mHisTag.MaxCount = count;
+                    mHisTag.MaxCount = count-1;
                     mHisTags.Add(vv.Key, mHisTag);
 
                     if (mHisTag.Type == Cdy.Tag.RecordType.Timer)

RunTime/DBRuntime/His/obsolete/HisEnginer.cs

@@ -298,7 +298,7 @@ namespace Cdy.Tag
                             mHisTag = new LongPoint3HisRunTag() { Id = vv.Value.Id, Circle = vv.Value.Circle, Type = vv.Value.Type, TagType = vv.Value.TagType, RealMemoryAddr = realbaseaddr, RealMemoryPtr = realHandle, RealValueAddr = realaddr, CompressType = vv.Value.CompressType, Parameters = vv.Value.Parameters };
                             break;
                     }
-                    mHisTag.MaxCount = count;
+                    mHisTag.MaxCount = count-1;
                     mHisTags.Add(vv.Key, mHisTag);
 
                     if (mHisTag.Type == Cdy.Tag.RecordType.Timer)