zoulei 11 mēneši atpakaļ
vecāks
revīzija
e4df067ff0

+ 9 - 9
Service/X1LeoTaskServer54/App.config

@@ -9,32 +9,32 @@
 
 		<!--定位平台Http地址-->
 		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
-		
+
 		<!--采集数据目录-->
-		<add key="CapDir" value="D:\data1\AD"/>
+		<add key="CapDir" value="E:\data10\低轨单星仿真数据"/>
 
 		<!--定位结果输出目录-->
-		<add key="PosResDir" value="D:\data\PosRes"/>
+		<add key="PosResDir" value="E:\PosRes"/>
 
 		<!--状态上报目录-->
-		<add key="StateRptDir" value="D:\data\StateRes"/>
+		<add key="StateRptDir" value="E:\StateRes"/>
 
 		<!--卫星及星历-->
-		<add key ="Time1SatInfo" value="40892,-41275189.6404,5820330.8446,6331022.0431,1,2,3"/>
-		<add key ="Time2SatInfo" value="40892,4694560.4826,41891872.2374,47531.3795,1,2,3"/>
-		<add key ="Time3SatInfo" value="40892,4694560.4826,41891872.2374,47531.3795,1,2,3"/>
+		<add key ="Time1SatInfo" value="1234,-1608416.82,5994263.83,3139842.12,-6632.9542,-373.9141,-2678.0471"/>
+		<add key ="Time2SatInfo" value="1234,-3479304.94,5612482.70,2187901.77,-5784.2167,-2163.5059,-3632.7021"/>
+		<add key ="Time3SatInfo" value="1234,-5018683.88,4714452.40,1001435.81,-4399.2159,-3780.5070,-4206.3348"/>
 
 		<!--定位时差系数-->
 		<add key="PosDtoFactor" value="1"/>
 
 		<!--频差误差(单位:Hz)-->
-		<add key="DfoErr" value="0.01"/>
+		<add key="DfoErr" value="5"/>
 
 		<!--星历位置误差(单位:m)-->
 		<add key="EphPosErr" value="10000"/>
 
 		<!--星历速度误差(单位:m/s)-->
-		<add key="EphVelErr" value="0.1"/>
+		<add key="EphVelErr" value="5"/>
 
 	</appSettings>
 	<startup>

+ 115 - 0
Service/X1LeoTaskServer54/AppDebug.config

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<appSettings>
+		<!--服务ID-->
+		<add key="SvrID" value="001" />
+
+		<!--本地http端口-->
+		<add key="LocalHttpPort" value="8960" />
+
+		<!--定位平台Http地址-->
+		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
+
+		<!--采集数据目录-->
+		<add key="CapDir" value="D:\data10\低轨单星仿真数据"/>
+
+		<!--定位结果输出目录-->
+		<add key="PosResDir" value="D:\PosRes"/>
+
+		<!--状态上报目录-->
+		<add key="StateRptDir" value="D:\StateRes"/>
+
+		<!--卫星及星历-->
+		<add key ="Time1SatInfo" value="1234,-1608416.82,5994263.83,3139842.12,-6632.9542,-373.9141,-2678.0471"/>
+		<add key ="Time2SatInfo" value="1234,-3479304.94,5612482.70,2187901.77,-5784.2167,-2163.5059,-3632.7021"/>
+		<add key ="Time3SatInfo" value="1234,-5018683.88,4714452.40,1001435.81,-4399.2159,-3780.5070,-4206.3348"/>
+
+		<!--定位时差系数-->
+		<add key="PosDtoFactor" value="1"/>
+
+		<!--频差误差(单位:Hz)-->
+		<add key="DfoErr" value="5"/>
+
+		<!--星历位置误差(单位:m)-->
+		<add key="EphPosErr" value="10000"/>
+
+		<!--星历速度误差(单位:m/s)-->
+		<add key="EphVelErr" value="5"/>
+
+	</appSettings>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+	</startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.26.0.0" newVersion="3.26.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="ZstdSharp" publicKeyToken="8d151af33a4ad5cf" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-1.3.8.0" newVersion="1.3.8.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>

+ 1 - 1
Service/X1LeoTaskServer54/Program.cs

@@ -1,4 +1,5 @@
 using Microsoft.Win32;
+using Newtonsoft.Json.Linq;
 using Serilog;
 using System;
 using System.Collections.Generic;
@@ -17,7 +18,6 @@ namespace X1LeoTaskServer54
     {
         static Program()
         {
-
             //设置私有路径
             Environment.CurrentDirectory = AppDomain.CurrentDomain.BaseDirectory;
             AppDomain.CurrentDomain.SetData("PRIVATE_BINPATH", "AddIns;");

+ 1 - 1
Service/X1LeoTaskServer54/Service/TaskService.cs

@@ -35,7 +35,7 @@ namespace X1LeoTaskServer54.Service
                 this.baseUrl = posPlatformAddr + "api/";
             else
                 this.baseUrl = posPlatformAddr + "/api/";
-
+            DirectoryInfo d = new DirectoryInfo("");
             CapDir = ConfigurationManager.AppSettings["CapDir"].Trim();
             PosResDir = ConfigurationManager.AppSettings["PosResDir"].Trim();
             StateDir = ConfigurationManager.AppSettings["StateRptDir"].Trim();

+ 1 - 0
Service/X1LeoTaskServer54/X1LeoTaskServer54.csproj

@@ -109,6 +109,7 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Service\TaskService.cs" />
+    <None Include="AppDebug.config" />
     <None Include="packages.config" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

+ 4 - 4
Service/X2D1TaskServer54/App.config

@@ -10,11 +10,11 @@
 		<!--定位平台Http地址-->
 		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
 
-		<!--检测结果目录-->
-		<add key="DetectDir" value="E:\data10\两星一地多目标仿真数据\Detected"/>
-
 		<!--采集数据目录-->
-		<add key="CapDir" value="E:\data10\两星一地多目标仿真数据\AD"/>
+		<add key="CapDir" value="E:\data10\两星一地仿真数据\AD"/>
+		
+		<!--检测结果目录-->
+		<add key="DetectDir" value="E:\data10\两星一地仿真数据\Detected"/>
 
 		<!--定位结果输出目录-->
 		<add key="PosResDir" value="E:\PosRes"/>

+ 3 - 3
Service/X2LeoTaskServer54/App.config

@@ -11,13 +11,13 @@
 		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
 
 		<!--采集数据目录-->
-		<add key="CapDir" value="D:\data2\AD"/>
+		<add key="CapDir" value="E:\data10\低轨双星仿真数据"/>
 
 		<!--定位结果输出目录-->
-		<add key="PosResDir" value="D:\data\PosRes"/>
+		<add key="PosResDir" value="E:\PosRes"/>
 
 		<!--状态上报目录-->
-		<add key="StateRptDir" value="D:\data\StateRes"/>
+		<add key="StateRptDir" value="E:\StateRes"/>
 
 		<!--卫星及星历-->
 		<add key ="MainSatInfo" value="23467,-41275189.6404,5820330.8446,6331022.0431,1,2,3"/>

+ 119 - 0
Service/X2LeoTaskServer54/AppDebug.config

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<appSettings>
+		<!--服务ID-->
+		<add key="SvrID" value="001" />
+
+		<!--本地http端口-->
+		<add key="LocalHttpPort" value="8970" />
+
+		<!--定位平台Http地址-->
+		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
+
+		<!--采集数据目录-->
+		<add key="CapDir" value="D:\data10\低轨双星仿真数据"/>
+
+		<!--定位结果输出目录-->
+		<add key="PosResDir" value="D:\PosRes"/>
+
+		<!--状态上报目录-->
+		<add key="StateRptDir" value="D:\StateRes"/>
+
+		<!--卫星及星历-->
+		<add key ="MainSatInfo" value="23467,-41275189.6404,5820330.8446,6331022.0431,1,2,3"/>
+		<add key ="Adja1SatInfo" value="40892,4694560.4826,41891872.2374,47531.3795,1,2,3"/>
+		<!--下行频点(MHz)-->
+		<add key ="TarFreqDown" value="252.05"/>
+		<add key ="RefFreqDown" value="352.05"/>
+		
+		<!--定位时差系数-->
+		<add key="PosDtoFactor" value="-1"/>
+
+		<!--时差误差(单位:us)-->
+		<add key="DtoErrus" value="1"/>
+		<!--频差误差(单位:Hz)-->
+		<add key="DfoErr" value="0.01"/>
+
+		<!--星历位置误差(单位:m)-->
+		<add key="EphPosErr" value="10000"/>
+
+		<!--星历速度误差(单位:m/s)-->
+		<add key="EphVelErr" value="0.1"/>
+
+	</appSettings>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+	</startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.26.0.0" newVersion="3.26.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="ZstdSharp" publicKeyToken="8d151af33a4ad5cf" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-1.3.8.0" newVersion="1.3.8.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>

+ 1 - 0
Service/X2LeoTaskServer54/X2LeoTaskServer54.csproj

@@ -108,6 +108,7 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Service\TaskService.cs" />
+    <None Include="AppDebug.config" />
     <None Include="packages.config" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

+ 4 - 6
Service/X3LeoTaskServer54/App.config

@@ -10,17 +10,15 @@
 		<!--定位平台Http地址-->
 		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
 
-		<!--检测结果目录-->
-		<add key="DetectDir" value="D:\data\Detect"/>
-
 		<!--采集数据目录-->
-		<add key="CapDir" value="D:\data\AD"/>
+		<add key="CapDir" value="E:\data10\低轨三星仿真数据"/>
 
 		<!--定位结果输出目录-->
-		<add key="PosResDir" value="D:\data\PosRes"/>
+		<add key="PosResDir" value="E:\PosRes"/>
 
 		<!--状态上报目录-->
-		<add key="StateRptDir" value="D:\data\StateRes"/>
+		<add key="StateRptDir" value="E:\StateRes"/>
+
 
 		<!--卫星及星历-->
 		<add key ="MainSatInfo" value="23467,-41275189.6404,5820330.8446,6331022.0431"/>

+ 111 - 0
Service/X3LeoTaskServer54/AppDebug.config

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<appSettings>
+		<!--服务ID-->
+		<add key="SvrID" value="001" />
+
+		<!--本地http端口-->
+		<add key="LocalHttpPort" value="8980" />
+
+		<!--定位平台Http地址-->
+		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
+
+		<!--采集数据目录-->
+		<add key="CapDir" value="D:\data10\低轨三星仿真数据"/>
+
+		<!--定位结果输出目录-->
+		<add key="PosResDir" value="D:\PosRes"/>
+
+		<!--状态上报目录-->
+		<add key="StateRptDir" value="D:\StateRes"/>
+
+
+		<!--卫星及星历-->
+		<add key ="MainSatInfo" value="23467,-41275189.6404,5820330.8446,6331022.0431"/>
+		<add key ="Adja1SatInfo" value="40892,4694560.4826,41891872.2374,47531.3795"/>
+
+		<!--定位时差系数-->
+		<add key="PosDtoFactor" value="-1"/>
+
+		<!--时差误差(单位:us)-->
+		<add key="DtoErrus" value="1"/>
+
+		<!--星历误差(单位:m)-->
+		<add key="EphErrm" value="10000"/>
+	</appSettings>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+	</startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.26.0.0" newVersion="3.26.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="ZstdSharp" publicKeyToken="8d151af33a4ad5cf" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-1.3.8.0" newVersion="1.3.8.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>

+ 1 - 0
Service/X3LeoTaskServer54/X3LeoTaskServer54.csproj

@@ -108,6 +108,7 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Service\TaskService.cs" />
+    <None Include="AppDebug.config" />
     <None Include="packages.config" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

+ 4 - 4
Service/X3TaskServer54/App.config

@@ -10,11 +10,11 @@
 		<!--定位平台Http地址-->
 		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
 
-		<!--检测结果目录-->
-		<add key="DetectDir" value="E:\data10\三星仿真数据\Detected"/>
-
 		<!--采集数据目录-->
-		<add key="CapDir" value="E:\data10\三星仿真数据\AD"/>
+		<add key="CapDir" value="E:\data10\高轨三星仿真数据\AD"/>
+		
+		<!--检测结果目录-->
+		<add key="DetectDir" value="E:\data10\高轨三星仿真数据\Detected"/>
 
 		<!--定位结果输出目录-->
 		<add key="PosResDir" value="E:\PosRes"/>

+ 88 - 5
XdCxRhDW.Api/AddIns/信号仿真/DataEmulationHelper.cs

@@ -16,13 +16,16 @@ namespace XdCxRhDW.Api
         [DllImport(dll, EntryPoint = "genSignalsWithDtDf", CallingConvention = CallingConvention.Cdecl)]
         private extern static void GenSignalsWithDtDfCore(string file1, string file2, long fsHz, int sigLenMs, double dt, double df, int snr2, int snr1);
 
+        [DllImport(dll, EntryPoint = "genSignalsWithTwoDtDf", CallingConvention = CallingConvention.Cdecl)]
+        private extern static void GenSignalsWithTwoDtDf(string file1, string file2, string file3, long fsHz, int sigLenMs, double dt1, double df1, double dt2, double df2, int snr2, int snr1, int snr3);
+
         //生成噪声,文件,采样率,时长ms,最大幅度
         [DllImport(dll, EntryPoint = "genNoizes", CallingConvention = CallingConvention.Cdecl)]
         private extern static void GenNoizes(string file1, long fsHz, int tlenms, int Am);
         #endregion
 
         /// <summary>
-        /// 生成一组常规信号文件
+        /// 生成一组(ch1、ch2两个文件)常规信号文件
         /// </summary>
         /// <param name="file1">输出文件1</param>
         /// <param name="file2">输出文件2</param>
@@ -36,7 +39,21 @@ namespace XdCxRhDW.Api
         {
             GenSignalsWithDtDfCore(file1, file2, fsHz, sigTimeLenMs, dt, df, snr2, snr1);
         }
-
+        /// <summary>
+        /// 生成两组(ch1、ch2、ch3三个文件)常规信号文件
+        /// </summary>
+        /// <param name="file1">输出文件1</param>
+        /// <param name="file2">输出文件2</param>
+        /// <param name="fsHz">采样率Hz</param>
+        /// <param name="sigTimeLenMs">信号时长(毫秒)</param>
+        /// <param name="dt">时差秒</param>
+        /// <param name="df">频差Hz</param>
+        /// <param name="snr1">文件1信噪比</param>
+        /// <param name="snr2">文件2信噪比</param>
+        public static void GenNormalFiles(string file1, string file2, string file3, long fsHz, int sigTimeLenMs, double dt1, double df1, double dt2, double df2, int snr1, int snr2, int snr3)
+        {
+            GenSignalsWithTwoDtDf(file1, file2, file3, fsHz, sigTimeLenMs, dt1, df1, dt2, df2, snr2, snr1, snr3);
+        }
         /// <summary>
         /// 生成单个噪声文件
         /// </summary>
@@ -46,10 +63,10 @@ namespace XdCxRhDW.Api
         /// <param name="am"></param>
         public static void GenNoizesFile(string file1, long fsHz, int timeLenMs, int am)
         {
-            GenNoizes(file1, fsHz, timeLenMs, am); 
+            GenNoizes(file1, fsHz, timeLenMs, am);
         }
         /// <summary>
-        /// 生成一组突发信号文件
+        /// 生成一组(ch1、ch2两个文件)突发信号文件
         /// </summary>
         /// <param name="file1">输出文件1</param>
         /// <param name="file2">输出文件2</param>
@@ -78,7 +95,61 @@ namespace XdCxRhDW.Api
                     fs.Write(s1, 0, s1.Length);
                     fs.Write(n21, 0, n21.Length);
                 }
-            
+
+            }
+            using (FileStream fs = new FileStream(file2, FileMode.Create))
+            {
+                for (int i = 0; i < brustCount; i++)
+                {
+                    fs.Write(n12, 0, n12.Length);
+                    fs.Write(s2, 0, s2.Length);
+                    fs.Write(n22, 0, n22.Length);
+                }
+            }
+            File.Delete("n11.dat");
+            File.Delete("n12.dat");
+            File.Delete("s1.dat");
+            File.Delete("s2.dat");
+            File.Delete("n21.dat");
+            File.Delete("n22.dat");
+        }
+
+        /// <summary>
+        /// 生成两组(ch1、ch2、ch3三个文件)突发信号文件
+        /// </summary>
+        /// <param name="file1">输出文件1</param>
+        /// <param name="file2">输出文件2</param>
+        /// <param name="fsHz">采样率Hz</param>
+        /// <param name="brustCount">突发个数</param>
+        /// <param name="dt">时差秒</param>
+        /// <param name="df">频差Hz</param>
+        public static void GenBrustFiles(string file1, string file2, string file3, long fsHz, int brustCount, double dt1, double df1, double dt2, double df2)
+        {
+            GenNoizes("n11.dat", fsHz, 900, 40);
+            GenNoizes("n12.dat", fsHz, 900, 40);
+            GenNoizes("n13.dat", fsHz, 900, 40);
+            GenNormalFiles("s1.dat", "s2.dat","s3.dat", fsHz, 100, dt1, df1, dt2, df2, 5, -5, 5);
+            GenNoizes("n21.dat", fsHz, 900, 40);
+            GenNoizes("n22.dat", fsHz, 900, 40);
+            GenNoizes("n23.dat", fsHz, 900, 40);
+            var n11 = File.ReadAllBytes("n11.dat");
+            var n12 = File.ReadAllBytes("n12.dat");
+            var n13 = File.ReadAllBytes("n13.dat");
+            var s1 = File.ReadAllBytes("s1.dat");
+            var s2 = File.ReadAllBytes("s2.dat");
+            var s3 = File.ReadAllBytes("s2.dat");
+            var n21 = File.ReadAllBytes("n21.dat");
+            var n22 = File.ReadAllBytes("n22.dat");
+            var n23 = File.ReadAllBytes("n23.dat");
+            using (FileStream fs = new FileStream(file1, FileMode.Create))
+            {
+                for (int i = 0; i < brustCount; i++)
+                {
+                    fs.Write(n11, 0, n11.Length);
+                    fs.Write(s1, 0, s1.Length);
+                    fs.Write(n21, 0, n21.Length);
+                }
+
             }
             using (FileStream fs = new FileStream(file2, FileMode.Create))
             {
@@ -89,12 +160,24 @@ namespace XdCxRhDW.Api
                     fs.Write(n22, 0, n22.Length);
                 }
             }
+            using (FileStream fs = new FileStream(file3, FileMode.Create))
+            {
+                for (int i = 0; i < brustCount; i++)
+                {
+                    fs.Write(n13, 0, n13.Length);
+                    fs.Write(s3, 0, s3.Length);
+                    fs.Write(n23, 0, n23.Length);
+                }
+            }
             File.Delete("n11.dat");
             File.Delete("n12.dat");
+            File.Delete("n13.dat");
             File.Delete("s1.dat");
             File.Delete("s2.dat");
+            File.Delete("s3.dat");
             File.Delete("n21.dat");
             File.Delete("n22.dat");
+            File.Delete("n23.dat");
         }
     }
 }

+ 30 - 0
XdCxRhDW.Api/AddIns/定位/PosApi.cs

@@ -223,6 +223,21 @@ namespace XdCxRhDW.Api
                     posRes[5] = p2;
 
                 }
+                if (d1 > 200000 && d2 > 200000)
+                {
+                    if (posRes[1] < 5 && posRes[4] > 10 && posRes[4] < 30)
+                    {
+                        var p0 = posRes[0];
+                        var p1 = posRes[1];
+                        var p2 = posRes[2];
+                        posRes[0] = posRes[3];
+                        posRes[1] = posRes[4];
+                        posRes[2] = posRes[5];
+                        posRes[3] = p0;
+                        posRes[4] = p1;
+                        posRes[5] = p2;
+                    }
+                }
             }
             if (CalcConfidence && IsGeoPoint2(posRes))
             {
@@ -302,7 +317,22 @@ namespace XdCxRhDW.Api
                     posRes[3] = p0;
                     posRes[4] = p1;
                     posRes[5] = p2;
+                }
+                if (d1 > 200000 && d2 > 200000)
+                {
+                    if (posRes[1] < 5 && posRes[4] > 10 && posRes[4] < 30)
+                    {
 
+                        var p0 = posRes[0];
+                        var p1 = posRes[1];
+                        var p2 = posRes[2];
+                        posRes[0] = posRes[3];
+                        posRes[1] = posRes[4];
+                        posRes[2] = posRes[5];
+                        posRes[3] = p0;
+                        posRes[4] = p1;
+                        posRes[5] = p2;
+                    }
                 }
             }
             if (CalcConfidence && IsGeoPoint2(posRes))

+ 7 - 4
XdCxRhDW.App/Controllers/SvrReportController.cs

@@ -32,10 +32,13 @@ namespace XdCxRhDW.App.Controllers
         {
             try
             {
-                if (dto.BaseHttpAddr.EndsWith("/"))
-                    dto.BaseHttpAddr = dto.BaseHttpAddr + "api/";
-                else
-                    dto.BaseHttpAddr = dto.BaseHttpAddr + "/api/";
+                if (!string.IsNullOrWhiteSpace(dto.BaseHttpAddr))
+                {
+                    if (dto.BaseHttpAddr.EndsWith("/"))
+                        dto.BaseHttpAddr = dto.BaseHttpAddr + "api/";
+                    else
+                        dto.BaseHttpAddr = dto.BaseHttpAddr + "/api/";
+                }
                 Messenger.Defalut.Pub("服务状态改变", dto);
                 return Success();
             }

+ 178 - 208
XdCxRhDW.App/EditForms/SignalEmulation.Designer.cs

@@ -28,11 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -58,69 +53,69 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.txtBrust = new DevExpress.XtraEditors.CheckEdit();
-            this.txtNormal = new DevExpress.XtraEditors.CheckEdit();
             this.btnOpenDir = new DevExpress.XtraEditors.SimpleButton();
-            this.btnBuildNormal = new DevExpress.XtraEditors.SimpleButton();
+            this.btnBuild = new DevExpress.XtraEditors.SimpleButton();
             this.txtFsHz = new DevExpress.XtraEditors.ButtonEdit();
             this.txtSigLen = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtDto = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtDfo = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtSnr1 = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtSnr2 = new DevExpress.XtraEditors.ButtonEdit();
+            this.txtDto1 = new DevExpress.XtraEditors.ButtonEdit();
+            this.txtDfo1 = new DevExpress.XtraEditors.ButtonEdit();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.itemSnr1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.itemSnr2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tablePanel1 = new DevExpress.Utils.Layout.TablePanel();
+            this.txtDto2 = new DevExpress.XtraEditors.ButtonEdit();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtDfo2 = new DevExpress.XtraEditors.ButtonEdit();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtSplitTime = new DevExpress.XtraEditors.CheckEdit();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtBrust.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtNormal.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtFsHz.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSigLen.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDto.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDfo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSnr1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSnr2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtDto1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtDfo1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemSnr1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemSnr2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).BeginInit();
             this.tablePanel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txtDto2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtDfo2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtSplitTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
             // 
             this.tablePanel1.SetColumn(this.layoutControl1, 1);
-            this.layoutControl1.Controls.Add(this.txtBrust);
-            this.layoutControl1.Controls.Add(this.txtNormal);
+            this.layoutControl1.Controls.Add(this.txtSplitTime);
             this.layoutControl1.Controls.Add(this.btnOpenDir);
-            this.layoutControl1.Controls.Add(this.btnBuildNormal);
+            this.layoutControl1.Controls.Add(this.btnBuild);
             this.layoutControl1.Controls.Add(this.txtFsHz);
             this.layoutControl1.Controls.Add(this.txtSigLen);
-            this.layoutControl1.Controls.Add(this.txtDto);
-            this.layoutControl1.Controls.Add(this.txtDfo);
-            this.layoutControl1.Controls.Add(this.txtSnr1);
-            this.layoutControl1.Controls.Add(this.txtSnr2);
+            this.layoutControl1.Controls.Add(this.txtDto1);
+            this.layoutControl1.Controls.Add(this.txtDfo1);
+            this.layoutControl1.Controls.Add(this.txtDto2);
+            this.layoutControl1.Controls.Add(this.txtDfo2);
             this.layoutControl1.Location = new System.Drawing.Point(78, 88);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1113, 199, 650, 400);
@@ -130,46 +125,25 @@
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
-            // txtBrust
-            // 
-            this.txtBrust.Location = new System.Drawing.Point(199, 12);
-            this.txtBrust.Name = "txtBrust";
-            this.txtBrust.Properties.Caption = "突发信号";
-            this.txtBrust.Size = new System.Drawing.Size(185, 20);
-            this.txtBrust.StyleController = this.layoutControl1;
-            this.txtBrust.TabIndex = 10;
-            this.txtBrust.CheckedChanged += new System.EventHandler(this.txtBrust_CheckedChanged);
-            // 
-            // txtNormal
-            // 
-            this.txtNormal.EditValue = true;
-            this.txtNormal.Location = new System.Drawing.Point(12, 12);
-            this.txtNormal.Name = "txtNormal";
-            this.txtNormal.Properties.Caption = "常规信号";
-            this.txtNormal.Size = new System.Drawing.Size(183, 20);
-            this.txtNormal.StyleController = this.layoutControl1;
-            this.txtNormal.TabIndex = 9;
-            this.txtNormal.CheckedChanged += new System.EventHandler(this.txtNormal_CheckedChanged);
-            // 
             // btnOpenDir
             // 
-            this.btnOpenDir.Location = new System.Drawing.Point(209, 214);
+            this.btnOpenDir.Location = new System.Drawing.Point(210, 214);
             this.btnOpenDir.Name = "btnOpenDir";
-            this.btnOpenDir.Size = new System.Drawing.Size(175, 24);
+            this.btnOpenDir.Size = new System.Drawing.Size(174, 24);
             this.btnOpenDir.StyleController = this.layoutControl1;
             this.btnOpenDir.TabIndex = 8;
             this.btnOpenDir.Text = "打开输出目录";
             this.btnOpenDir.Click += new System.EventHandler(this.btnOpenDir_Click);
             // 
-            // btnBuildNormal
+            // btnBuild
             // 
-            this.btnBuildNormal.Location = new System.Drawing.Point(12, 214);
-            this.btnBuildNormal.Name = "btnBuildNormal";
-            this.btnBuildNormal.Size = new System.Drawing.Size(173, 24);
-            this.btnBuildNormal.StyleController = this.layoutControl1;
-            this.btnBuildNormal.TabIndex = 7;
-            this.btnBuildNormal.Text = "生成信号";
-            this.btnBuildNormal.Click += new System.EventHandler(this.btnBuilder_ClickAsync);
+            this.btnBuild.Location = new System.Drawing.Point(12, 214);
+            this.btnBuild.Name = "btnBuild";
+            this.btnBuild.Size = new System.Drawing.Size(174, 24);
+            this.btnBuild.StyleController = this.layoutControl1;
+            this.btnBuild.TabIndex = 7;
+            this.btnBuild.Text = "生成信号";
+            this.btnBuild.Click += new System.EventHandler(this.btnBuilder_ClickAsync);
             // 
             // txtFsHz
             // 
@@ -177,65 +151,43 @@
             this.txtFsHz.Location = new System.Drawing.Point(12, 65);
             this.txtFsHz.Name = "txtFsHz";
             this.txtFsHz.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtFsHz.Size = new System.Drawing.Size(183, 23);
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtFsHz.Size = new System.Drawing.Size(184, 23);
             this.txtFsHz.StyleController = this.layoutControl1;
             this.txtFsHz.TabIndex = 6;
             // 
             // txtSigLen
             // 
             this.txtSigLen.EditValue = "15";
-            this.txtSigLen.Location = new System.Drawing.Point(199, 65);
+            this.txtSigLen.Location = new System.Drawing.Point(200, 65);
             this.txtSigLen.Name = "txtSigLen";
             this.txtSigLen.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "秒", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSigLen.Size = new System.Drawing.Size(185, 23);
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "个", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtSigLen.Size = new System.Drawing.Size(184, 23);
             this.txtSigLen.StyleController = this.layoutControl1;
             this.txtSigLen.TabIndex = 6;
             // 
-            // txtDto
-            // 
-            this.txtDto.EditValue = "1000";
-            this.txtDto.Location = new System.Drawing.Point(12, 121);
-            this.txtDto.Name = "txtDto";
-            this.txtDto.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDto.Size = new System.Drawing.Size(183, 23);
-            this.txtDto.StyleController = this.layoutControl1;
-            this.txtDto.TabIndex = 6;
-            // 
-            // txtDfo
-            // 
-            this.txtDfo.EditValue = "200";
-            this.txtDfo.Location = new System.Drawing.Point(199, 121);
-            this.txtDfo.Name = "txtDfo";
-            this.txtDfo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDfo.Size = new System.Drawing.Size(185, 23);
-            this.txtDfo.StyleController = this.layoutControl1;
-            this.txtDfo.TabIndex = 6;
-            // 
-            // txtSnr1
-            // 
-            this.txtSnr1.EditValue = "5";
-            this.txtSnr1.Location = new System.Drawing.Point(12, 177);
-            this.txtSnr1.Name = "txtSnr1";
-            this.txtSnr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "dB", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSnr1.Size = new System.Drawing.Size(183, 23);
-            this.txtSnr1.StyleController = this.layoutControl1;
-            this.txtSnr1.TabIndex = 6;
-            // 
-            // txtSnr2
-            // 
-            this.txtSnr2.EditValue = "-5";
-            this.txtSnr2.Location = new System.Drawing.Point(199, 177);
-            this.txtSnr2.Name = "txtSnr2";
-            this.txtSnr2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "dB", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSnr2.Size = new System.Drawing.Size(185, 23);
-            this.txtSnr2.StyleController = this.layoutControl1;
-            this.txtSnr2.TabIndex = 6;
+            // txtDto1
+            // 
+            this.txtDto1.EditValue = "1000";
+            this.txtDto1.Location = new System.Drawing.Point(12, 121);
+            this.txtDto1.Name = "txtDto1";
+            this.txtDto1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtDto1.Size = new System.Drawing.Size(184, 23);
+            this.txtDto1.StyleController = this.layoutControl1;
+            this.txtDto1.TabIndex = 6;
+            // 
+            // txtDfo1
+            // 
+            this.txtDfo1.EditValue = "200";
+            this.txtDfo1.Location = new System.Drawing.Point(200, 121);
+            this.txtDfo1.Name = "txtDfo1";
+            this.txtDfo1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtDfo1.Size = new System.Drawing.Size(184, 23);
+            this.txtDfo1.StyleController = this.layoutControl1;
+            this.txtDfo1.TabIndex = 6;
             // 
             // Root
             // 
@@ -244,11 +196,11 @@
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlGroup1,
             this.layoutControlItem5,
-            this.itemSnr1,
             this.layoutControlItem6,
-            this.itemSnr2,
             this.layoutControlItem7,
-            this.layoutControlItem8});
+            this.layoutControlItem8,
+            this.layoutControlItem1,
+            this.layoutControlItem2});
             this.Root.Name = "Root";
             this.Root.Size = new System.Drawing.Size(396, 258);
             this.Root.TextVisible = false;
@@ -259,8 +211,7 @@
             this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem3,
             this.layoutControlItem4,
-            this.layoutControlItem1,
-            this.layoutControlItem2});
+            this.layoutControlItem9});
             this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlGroup1.Name = "layoutControlGroup1";
             this.layoutControlGroup1.Size = new System.Drawing.Size(376, 80);
@@ -273,7 +224,7 @@
             this.layoutControlItem3.MinSize = new System.Drawing.Size(96, 56);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem3.Size = new System.Drawing.Size(187, 56);
+            this.layoutControlItem3.Size = new System.Drawing.Size(188, 56);
             this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem3.Text = "采样率";
             this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@@ -286,40 +237,22 @@
             this.layoutControlItem4.Control = this.txtSigLen;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "采样率";
-            this.layoutControlItem4.Location = new System.Drawing.Point(187, 24);
+            this.layoutControlItem4.Location = new System.Drawing.Point(188, 24);
             this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 56);
             this.layoutControlItem4.MinSize = new System.Drawing.Size(107, 56);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem4.Size = new System.Drawing.Size(189, 56);
+            this.layoutControlItem4.Size = new System.Drawing.Size(188, 56);
             this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem4.Text = "信号时长";
+            this.layoutControlItem4.Text = "突发个数";
             this.layoutControlItem4.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
             this.layoutControlItem4.TextToControlDistance = 5;
             // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.txtNormal;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(187, 24);
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem1.TextVisible = false;
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txtBrust;
-            this.layoutControlItem2.Location = new System.Drawing.Point(187, 0);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(189, 24);
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem2.TextVisible = false;
-            // 
             // layoutControlItem5
             // 
-            this.layoutControlItem5.Control = this.txtDto;
+            this.layoutControlItem5.Control = this.txtDto1;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "采样率";
             this.layoutControlItem5.Location = new System.Drawing.Point(0, 80);
@@ -327,77 +260,41 @@
             this.layoutControlItem5.MinSize = new System.Drawing.Size(83, 56);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem5.Size = new System.Drawing.Size(187, 56);
+            this.layoutControlItem5.Size = new System.Drawing.Size(188, 56);
             this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem5.Text = "时差";
+            this.layoutControlItem5.Text = "时差1";
             this.layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(24, 14);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(31, 14);
             this.layoutControlItem5.TextToControlDistance = 5;
             // 
-            // itemSnr1
-            // 
-            this.itemSnr1.Control = this.txtSnr1;
-            this.itemSnr1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.itemSnr1.CustomizationFormText = "采样率";
-            this.itemSnr1.Location = new System.Drawing.Point(0, 136);
-            this.itemSnr1.MaxSize = new System.Drawing.Size(0, 56);
-            this.itemSnr1.MinSize = new System.Drawing.Size(83, 56);
-            this.itemSnr1.Name = "itemSnr1";
-            this.itemSnr1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.itemSnr1.Size = new System.Drawing.Size(187, 56);
-            this.itemSnr1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.itemSnr1.Text = "文件1信噪比";
-            this.itemSnr1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.itemSnr1.TextLocation = DevExpress.Utils.Locations.Top;
-            this.itemSnr1.TextSize = new System.Drawing.Size(67, 14);
-            this.itemSnr1.TextToControlDistance = 5;
-            // 
             // layoutControlItem6
             // 
-            this.layoutControlItem6.Control = this.txtDfo;
+            this.layoutControlItem6.Control = this.txtDfo1;
             this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem6.CustomizationFormText = "采样率";
-            this.layoutControlItem6.Location = new System.Drawing.Point(187, 80);
+            this.layoutControlItem6.Location = new System.Drawing.Point(188, 80);
             this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 56);
             this.layoutControlItem6.MinSize = new System.Drawing.Size(84, 56);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem6.Size = new System.Drawing.Size(189, 56);
+            this.layoutControlItem6.Size = new System.Drawing.Size(188, 56);
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem6.Text = "频差";
+            this.layoutControlItem6.Text = "频差1";
             this.layoutControlItem6.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(24, 14);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(31, 14);
             this.layoutControlItem6.TextToControlDistance = 5;
             // 
-            // itemSnr2
-            // 
-            this.itemSnr2.Control = this.txtSnr2;
-            this.itemSnr2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.itemSnr2.CustomizationFormText = "采样率";
-            this.itemSnr2.Location = new System.Drawing.Point(187, 136);
-            this.itemSnr2.MaxSize = new System.Drawing.Size(0, 56);
-            this.itemSnr2.MinSize = new System.Drawing.Size(83, 56);
-            this.itemSnr2.Name = "itemSnr2";
-            this.itemSnr2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.itemSnr2.Size = new System.Drawing.Size(189, 56);
-            this.itemSnr2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.itemSnr2.Text = "文件2信噪比";
-            this.itemSnr2.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.itemSnr2.TextLocation = DevExpress.Utils.Locations.Top;
-            this.itemSnr2.TextSize = new System.Drawing.Size(67, 14);
-            this.itemSnr2.TextToControlDistance = 5;
-            // 
             // layoutControlItem7
             // 
-            this.layoutControlItem7.Control = this.btnBuildNormal;
+            this.layoutControlItem7.Control = this.btnBuild;
             this.layoutControlItem7.Location = new System.Drawing.Point(0, 192);
             this.layoutControlItem7.MaxSize = new System.Drawing.Size(0, 38);
             this.layoutControlItem7.MinSize = new System.Drawing.Size(89, 38);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 12, 12, 2);
-            this.layoutControlItem7.Size = new System.Drawing.Size(187, 46);
+            this.layoutControlItem7.Size = new System.Drawing.Size(188, 46);
             this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem7.TextVisible = false;
@@ -405,12 +302,12 @@
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.btnOpenDir;
-            this.layoutControlItem8.Location = new System.Drawing.Point(187, 192);
+            this.layoutControlItem8.Location = new System.Drawing.Point(188, 192);
             this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 38);
             this.layoutControlItem8.MinSize = new System.Drawing.Size(89, 38);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 12, 2);
-            this.layoutControlItem8.Size = new System.Drawing.Size(189, 46);
+            this.layoutControlItem8.Size = new System.Drawing.Size(188, 46);
             this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem8.TextVisible = false;
@@ -433,6 +330,83 @@
             this.tablePanel1.TabIndex = 1;
             this.tablePanel1.UseSkinIndents = true;
             // 
+            // txtDto2
+            // 
+            this.txtDto2.EditValue = "1000";
+            this.txtDto2.Location = new System.Drawing.Point(12, 177);
+            this.txtDto2.Name = "txtDto2";
+            this.txtDto2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtDto2.Size = new System.Drawing.Size(184, 23);
+            this.txtDto2.StyleController = this.layoutControl1;
+            this.txtDto2.TabIndex = 6;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txtDto2;
+            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem1.CustomizationFormText = "采样率";
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 136);
+            this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 56);
+            this.layoutControlItem1.MinSize = new System.Drawing.Size(83, 56);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.layoutControlItem1.Size = new System.Drawing.Size(188, 56);
+            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem1.Text = "时差2";
+            this.layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(31, 14);
+            this.layoutControlItem1.TextToControlDistance = 5;
+            // 
+            // txtDfo2
+            // 
+            this.txtDfo2.EditValue = "200";
+            this.txtDfo2.Location = new System.Drawing.Point(200, 177);
+            this.txtDfo2.Name = "txtDfo2";
+            this.txtDfo2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtDfo2.Size = new System.Drawing.Size(184, 23);
+            this.txtDfo2.StyleController = this.layoutControl1;
+            this.txtDfo2.TabIndex = 6;
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txtDfo2;
+            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem2.CustomizationFormText = "采样率";
+            this.layoutControlItem2.Location = new System.Drawing.Point(188, 136);
+            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 56);
+            this.layoutControlItem2.MinSize = new System.Drawing.Size(84, 56);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.layoutControlItem2.Size = new System.Drawing.Size(188, 56);
+            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem2.Text = "频差2";
+            this.layoutControlItem2.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(31, 14);
+            this.layoutControlItem2.TextToControlDistance = 5;
+            // 
+            // txtSplitTime
+            // 
+            this.txtSplitTime.EditValue = true;
+            this.txtSplitTime.Location = new System.Drawing.Point(12, 12);
+            this.txtSplitTime.Name = "txtSplitTime";
+            this.txtSplitTime.Properties.Caption = "分时信号";
+            this.txtSplitTime.Size = new System.Drawing.Size(372, 20);
+            this.txtSplitTime.StyleController = this.layoutControl1;
+            this.txtSplitTime.TabIndex = 9;
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txtSplitTime;
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.Size = new System.Drawing.Size(376, 24);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem9.TextVisible = false;
+            // 
             // SignalEmulation
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -447,28 +421,26 @@
             this.Text = "时频差数据仿真";
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txtBrust.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtNormal.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtFsHz.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSigLen.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDto.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDfo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSnr1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSnr2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtDto1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtDfo1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemSnr1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemSnr2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).EndInit();
             this.tablePanel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txtDto2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtDfo2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtSplitTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -481,24 +453,22 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraEditors.ButtonEdit txtSigLen;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraEditors.ButtonEdit txtDto;
-        private DevExpress.XtraEditors.ButtonEdit txtDfo;
+        private DevExpress.XtraEditors.ButtonEdit txtDto1;
+        private DevExpress.XtraEditors.ButtonEdit txtDfo1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraEditors.SimpleButton btnBuildNormal;
+        private DevExpress.XtraEditors.SimpleButton btnBuild;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
         private DevExpress.XtraEditors.SimpleButton btnOpenDir;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraEditors.ButtonEdit txtSnr1;
-        private DevExpress.XtraEditors.ButtonEdit txtSnr2;
-        private DevExpress.XtraLayout.LayoutControlItem itemSnr1;
-        private DevExpress.XtraLayout.LayoutControlItem itemSnr2;
-        private DevExpress.XtraEditors.CheckEdit txtBrust;
-        private DevExpress.XtraEditors.CheckEdit txtNormal;
+        private DevExpress.Utils.Layout.TablePanel tablePanel1;
+        private DevExpress.XtraEditors.ButtonEdit txtDto2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraEditors.ButtonEdit txtDfo2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.Utils.Layout.TablePanel tablePanel1;
+        private DevExpress.XtraEditors.CheckEdit txtSplitTime;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
     }
 }
 

+ 29 - 68
XdCxRhDW.App/EditForms/SignalEmulation.cs

@@ -22,49 +22,36 @@ namespace XdCxRhDW.DataEmulation
 
         private void btnOpenDir_Click(object sender, EventArgs e)
         {
-            System.Diagnostics.Process.Start("explorer.exe", ".\\");
+            System.Diagnostics.Process.Start("explorer.exe", ".\\信号仿真\\");
         }
 
         private async void btnBuilder_ClickAsync(object sender, EventArgs e)
         {
-            if (!txtNormal.Checked && !txtBrust.Checked)
-            {
-                return;
-            }
             if (!long.TryParse(txtFsHz.Text, out long fsHz))
             {
                 XtraMessageBox.Show("采样率非数字!");
                 return;
             }
-            if (!double.TryParse(txtDto.Text, out double dt))
+            if (!double.TryParse(txtDto1.Text, out double dt1))
             {
-                XtraMessageBox.Show("时差非数字!");
+                XtraMessageBox.Show("时差1非数字!");
                 return;
             }
-            double sigTimeLen = 0;
-            int brustCount = 0;
-            if (txtNormal.Checked)
-            {
-                double.TryParse(txtSigLen.Text, out sigTimeLen);
-            }
-            else
-            {
-                int.TryParse(txtSigLen.Text, out brustCount);
-            }
+            int.TryParse(txtSigLen.Text, out int brustCount);
 
-            if (!double.TryParse(txtDfo.Text, out double df))
+            if (!double.TryParse(txtDfo1.Text, out double df1))
             {
-                XtraMessageBox.Show("频差非数字!");
+                XtraMessageBox.Show("频差1非数字!");
                 return;
             }
-            if (!double.TryParse(txtSnr1.Text, out double snr1))
+            if (!double.TryParse(txtDto2.Text, out double dt2))
             {
-                XtraMessageBox.Show("文件1信噪比非数字!");
+                XtraMessageBox.Show("时差2非数字!");
                 return;
             }
-            if (!double.TryParse(txtSnr2.Text, out double snr2))
+            if (!double.TryParse(txtDfo2.Text, out double df2))
             {
-                XtraMessageBox.Show("文件2信噪比非数字!");
+                XtraMessageBox.Show("频差2非数字!");
                 return;
             }
             if (fsHz <= 0 || fsHz > 100000000)
@@ -72,62 +59,36 @@ namespace XdCxRhDW.DataEmulation
                 XtraMessageBox.Show("采样率范围(0,100000000]!");
                 return;
             }
-            if (txtNormal.Checked)
-            {
-                if (sigTimeLen <= 0 || sigTimeLen > 120)
-                {
-                    XtraMessageBox.Show("信号时长范围(0,120]!");
-                    return;
-                }
-            }
-            if (txtBrust.Checked)
+
+            if (brustCount <= 0 || brustCount > 500)
             {
-                if (brustCount <= 0 || brustCount > 500)
-                {
-                    XtraMessageBox.Show("突发个数范围(0,500]");
-                    return;
-                }
+                XtraMessageBox.Show("突发个数范围(0,500]");
+                return;
             }
-            btnBuildNormal.Enabled = false;
+            btnBuild.Enabled = false;
+            dt1 = dt1 / 1e6;
+            dt2 = dt2 / 1e6;
             await Task.Run(() =>
             {
-                if (txtNormal.Checked)
+                Directory.CreateDirectory("信号仿真");
+                var t1 = DateTime.Now;
+                string f1, f2, f3;
+                if (txtSplitTime.Checked)
                 {
-                    DataEmulationHelper.GenNormalFiles("常规信号_ch1.dat", "常规信号_ch2.dat", fsHz, (int)(sigTimeLen * 1000), dt / 1e6, df, (int)snr1, (int)snr2);
+                    f1 = $"信号仿真\\{t1:yyyyMMddHHmmss}_突发信号_{fsHz}_ch1.dat";
+                    f2 = $"信号仿真\\{t1.AddMinutes(5):yyyyMMddHHmmss}_突发信号_{fsHz}_ch1.dat";
+                    f3 = $"信号仿真\\{t1.AddMinutes(10):yyyyMMddHHmmss}_突发信号_{fsHz}_ch1.dat";
                 }
                 else
                 {
-                    DataEmulationHelper.GenBrustFiles("突发信号_ch1.dat", "突发信号_ch2.dat", fsHz, brustCount, dt / 1e6, df);
+                    f1 = $"信号仿真\\{t1:yyyyMMddHHmmss}_突发信号_{fsHz}_ch1.dat";
+                    f2 = $"信号仿真\\{t1:yyyyMMddHHmmss}_突发信号_{fsHz}_ch2.dat";
+                    f3 = $"信号仿真\\{t1:yyyyMMddHHmmss}_突发信号_{fsHz}_ch3.dat";
                 }
+                DataEmulationHelper.GenBrustFiles(f1, f2, f3, fsHz, brustCount, dt1, df1, dt2, df2);
             });
-            btnBuildNormal.Enabled = true;
-        }
-
-
-        private void txtBrust_CheckedChanged(object sender, EventArgs e)
-        {
-            if (txtBrust.Checked)
-            {
-                txtNormal.Checked = false;
-                layoutControlItem4.Text = "突发个数";
-                txtSigLen.Properties.Buttons[0].Caption = "个";
-                itemSnr1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
-                itemSnr2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
-                layoutControl1.BestFit();
-            }
+            btnBuild.Enabled = true;
         }
 
-        private void txtNormal_CheckedChanged(object sender, EventArgs e)
-        {
-            if (txtNormal.Checked)
-            {
-                txtBrust.Checked = false;
-                layoutControlItem4.Text = "信号时长";
-                txtSigLen.Properties.Buttons[0].Caption = "秒";
-                itemSnr1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
-                itemSnr2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
-                layoutControl1.BestFit();
-            }
-        }
     }
 }

+ 10 - 1
XdCxRhDW.App/UserControl/CtrlSvrs.cs

@@ -1,4 +1,5 @@
 using DevExpress.Mvvm.Native;
+using DevExpress.Utils.Extensions;
 using DevExpress.Utils.Html;
 using DevExpress.XtraEditors;
 using System;
@@ -33,7 +34,8 @@ namespace XdCxRhDW.App.UserControl
 
         private void CtrlSvrs_Load(object sender, EventArgs e)
         {
-            gridSvrs.UseDefault(list).UseGroup().UseRowNumber();
+            gridSvrs.UseDefault(list).UseGroup().UseRowNumber().UseNullValueText();
+            gridView1.ShowingEditor += GridView1_ShowingEditor;
             gridSvrs.UseEdit();
             var linkEdit = new DevExpress.XtraEditors.Repository.RepositoryItemHyperLinkEdit();
             this.gridSvrs.RepositoryItems.Add(linkEdit);
@@ -49,6 +51,13 @@ namespace XdCxRhDW.App.UserControl
                 this.simpleLabelItem2.Text = $"如果服务无法注册到平台需要到平台所在设备允许防火墙通过平台端口{SysConfig.Config.HttpPort}";
 
         }
+
+        private void GridView1_ShowingEditor(object sender, CancelEventArgs e)
+        {
+            var cellValue = gridView1.GetFocusedRowCellValue(nameof(ModelSvr.SwaggerAddr));
+            e.Cancel = cellValue == null || string.IsNullOrWhiteSpace(cellValue.ToString());
+        }
+
         private void RefreshSvr(List<ModelSvr> items)
         {
             if (!this.IsHandleCreated || this.Disposing || this.IsDisposed) return;

+ 2 - 2
XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -11,7 +11,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XdCxRhDW.App</RootNamespace>
-    <AssemblyName>定位平台</AssemblyName>
+    <AssemblyName>联合定位平台</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
@@ -42,7 +42,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <DocumentationFile>bin\Debug\定位平台.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\联合定位平台.xml</DocumentationFile>
     <NoWarn>CS1591;CS0612</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">