zoulei преди 1 година
родител
ревизия
c1c91302b0

+ 2 - 2
Service/X2D1NoRefTaskServer/App.config

@@ -18,7 +18,7 @@
 		<add key="PosDtoFactor" value="1"/>
 
 		<!--实时任务采集时长(秒)-->
-		<add key="CapSeconds" value="60"/>
+		<add key="CapSeconds" value="15"/>
 
 		<!--主星转发延迟(us),平台信号中没有配置信号对应主星的转发延迟时将使用这个值-->
 		<add key="MainSatDelay" value="2235"/>
@@ -30,7 +30,7 @@
 		<add key="CheckFileType" value="0"/>
 
 		<!--并行处理线程个数(支持0到N,0表示不限制,每个频点都在独立的线程中处理)-->
-		<add key="ThreadCount" value="1"/>
+		<add key="ThreadCount" value="0"/>
 
 	</appSettings>
 	<startup>

+ 1 - 0
Service/X2D1NoRefTaskServer/Service/TaskService.cs

@@ -900,6 +900,7 @@ namespace X2D1NoRefTaskServer.Service
                                                                 SmpStart = deteResp.data[i].Start,
                                                                 UserName = deteResp.data[i].UserName,
                                                                 FfcHz = deteResp.data[i].FfcHz,
+                                                                Snr = deteResp.data[i].Snr,
                                                                 PosCheckType = deteResp.data[i].DmcType.GetEnumByDisplayName<EnumPosCheckTypeDto>(),
                                                             }
                                                         };

+ 16 - 0
XdCxRhDW.App/Controllers/PosController.cs

@@ -81,6 +81,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -198,6 +199,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -306,6 +308,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 ckRes = db.CheckRes.Add(ckRes);
 
@@ -449,6 +452,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -560,6 +564,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -703,6 +708,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -827,6 +833,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -969,6 +976,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -1088,6 +1096,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -1247,6 +1256,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -1366,6 +1376,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -1519,6 +1530,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -1639,6 +1651,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -1800,6 +1813,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -1925,6 +1939,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 
@@ -2065,6 +2080,7 @@ namespace XdCxRhDW.App.Controllers
                     ModType = dto.CheckRes?.ModType,
                     UserName = dto.CheckRes?.UserName,
                     FfcHz = dto.CheckRes?.FfcHz,
+                    Snr = dto.CheckRes?.Snr
                 };
                 db.CheckRes.Add(ckRes);
 

BIN
XdCxRhDW.DataEmulation/AddIns/SignalEmulation.dll


+ 1 - 1
XdCxRhDW.DataEmulation/AddIns/SignalEmulation.h

@@ -151,7 +151,7 @@ extern "C"
 	/// dt		时差
 	/// df		频差
 	///
-	SignalEmulation_EXPORT void genSignalsWithDtDf(char *file1, char *file2, __int64 fsample, int tlenms, double dt, double df);
+	SignalEmulation_EXPORT void genSignalsWithDtDf(char *file1, char *file2, __int64 fsample, int tlenms, double dt, double df, int snr1, int snr2);
 
 	///
 	/// 该函数用于合并两个信号到一个新的文件

+ 5 - 3
XdCxRhDW.DataEmulation/DataEmulationHelper.cs

@@ -13,7 +13,7 @@ namespace XdCxRhDW.DataEmulation
 
         #region cpp dll Interop 
         [DllImport(dll, EntryPoint = "genSignalsWithDtDf", CallingConvention = CallingConvention.Cdecl)]
-        private extern static void GenSignalsWithDtDfCore(string file1, string file2, long fsHz, int sigLenMs, double dt, double df);
+        private extern static void GenSignalsWithDtDfCore(string file1, string file2, long fsHz, int sigLenMs, double dt, double df, int snr2, int snr1);
         #endregion
 
         /// <summary>
@@ -25,9 +25,11 @@ namespace XdCxRhDW.DataEmulation
         /// <param name="sigLenMs">信号时长秒</param>
         /// <param name="dt">时差秒</param>
         /// <param name="df">频差Hz</param>
-        public static void GenSignalsWithDtDf(string file1,string file2,long fsHz,int sigLenMs,double dt,double df)
+        /// <param name="snr1">文件1信噪比</param>
+        /// <param name="snr2">文件2信噪比</param>
+        public static void GenSignalsWithDtDf(string file1, string file2, long fsHz, int sigLenMs, double dt, double df, int snr1, int snr2)
         {
-            GenSignalsWithDtDfCore(file1, file2, fsHz, sigLenMs, dt, df);
+            GenSignalsWithDtDfCore(file1, file2, fsHz, sigLenMs, dt, df, snr2, snr1);
         }
     }
 }

+ 249 - 161
XdCxRhDW.DataEmulation/Form1.Designer.cs

@@ -28,16 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
-            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 editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -48,43 +38,71 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+            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.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.btnOpenDir = new DevExpress.XtraEditors.SimpleButton();
+            this.btnBuilder = new DevExpress.XtraEditors.SimpleButton();
+            this.txtFsHz = new DevExpress.XtraEditors.ButtonEdit();
+            this.txtFile2 = new DevExpress.XtraEditors.TextEdit();
             this.txtFile1 = new DevExpress.XtraEditors.TextEdit();
+            this.txtSigLen = new DevExpress.XtraEditors.ButtonEdit();
+            this.txtDto = new DevExpress.XtraEditors.ButtonEdit();
+            this.txtDfo = new DevExpress.XtraEditors.ButtonEdit();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtFile2 = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtFsHz = new DevExpress.XtraEditors.ButtonEdit();
+            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtSigLen = new DevExpress.XtraEditors.ButtonEdit();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtDto = new DevExpress.XtraEditors.ButtonEdit();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtDfo = new DevExpress.XtraEditors.ButtonEdit();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.btnBuilder = new DevExpress.XtraEditors.SimpleButton();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.btnOpenDir = new DevExpress.XtraEditors.SimpleButton();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtSnr1 = new DevExpress.XtraEditors.ButtonEdit();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtSnr2 = new DevExpress.XtraEditors.ButtonEdit();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtFsHz.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtFile2.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtFile1.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.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtFile2.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtFsHz.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSigLen.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDto.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDfo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtSnr1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtSnr2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -97,15 +115,101 @@
             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.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1113, 199, 650, 400);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(289, 388);
+            this.layoutControl1.Size = new System.Drawing.Size(289, 500);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
+            // btnOpenDir
+            // 
+            this.btnOpenDir.Location = new System.Drawing.Point(156, 460);
+            this.btnOpenDir.Name = "btnOpenDir";
+            this.btnOpenDir.Size = new System.Drawing.Size(121, 28);
+            this.btnOpenDir.StyleController = this.layoutControl1;
+            this.btnOpenDir.TabIndex = 8;
+            this.btnOpenDir.Text = "打开输出目录";
+            this.btnOpenDir.Click += new System.EventHandler(this.btnOpenDir_Click);
+            // 
+            // btnBuilder
+            // 
+            this.btnBuilder.Location = new System.Drawing.Point(12, 460);
+            this.btnBuilder.Name = "btnBuilder";
+            this.btnBuilder.Size = new System.Drawing.Size(120, 28);
+            this.btnBuilder.StyleController = this.layoutControl1;
+            this.btnBuilder.TabIndex = 7;
+            this.btnBuilder.Text = "生成";
+            this.btnBuilder.Click += new System.EventHandler(this.btnBuilder_ClickAsync);
+            // 
+            // txtFsHz
+            // 
+            this.txtFsHz.EditValue = "96000";
+            this.txtFsHz.Location = new System.Drawing.Point(12, 143);
+            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, 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(265, 23);
+            this.txtFsHz.StyleController = this.layoutControl1;
+            this.txtFsHz.TabIndex = 6;
+            // 
+            // txtFile2
+            // 
+            this.txtFile2.EditValue = "ch2.dat";
+            this.txtFile2.Location = new System.Drawing.Point(12, 87);
+            this.txtFile2.Name = "txtFile2";
+            this.txtFile2.Properties.AutoHeight = false;
+            this.txtFile2.Size = new System.Drawing.Size(265, 23);
+            this.txtFile2.StyleController = this.layoutControl1;
+            this.txtFile2.TabIndex = 5;
+            // 
+            // txtFile1
+            // 
+            this.txtFile1.EditValue = "ch1.dat";
+            this.txtFile1.Location = new System.Drawing.Point(12, 31);
+            this.txtFile1.Name = "txtFile1";
+            this.txtFile1.Properties.AutoHeight = false;
+            this.txtFile1.Size = new System.Drawing.Size(265, 23);
+            this.txtFile1.StyleController = this.layoutControl1;
+            this.txtFile1.TabIndex = 4;
+            // 
+            // txtSigLen
+            // 
+            this.txtSigLen.EditValue = "15";
+            this.txtSigLen.Location = new System.Drawing.Point(12, 199);
+            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, 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(265, 23);
+            this.txtSigLen.StyleController = this.layoutControl1;
+            this.txtSigLen.TabIndex = 6;
+            // 
+            // txtDto
+            // 
+            this.txtDto.EditValue = "1000";
+            this.txtDto.Location = new System.Drawing.Point(12, 255);
+            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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtDto.Size = new System.Drawing.Size(265, 23);
+            this.txtDto.StyleController = this.layoutControl1;
+            this.txtDto.TabIndex = 6;
+            // 
+            // txtDfo
+            // 
+            this.txtDfo.EditValue = "200";
+            this.txtDfo.Location = new System.Drawing.Point(12, 311);
+            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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtDfo.Size = new System.Drawing.Size(265, 23);
+            this.txtDfo.StyleController = this.layoutControl1;
+            this.txtDfo.TabIndex = 6;
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -113,26 +217,17 @@
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem1,
             this.layoutControlGroup1,
-            this.layoutControlItem2,
             this.layoutControlItem4,
             this.layoutControlItem5,
             this.layoutControlItem6,
             this.layoutControlItem8,
-            this.layoutControlItem7});
+            this.layoutControlItem7,
+            this.layoutControlItem9,
+            this.layoutControlItem10});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(289, 388);
+            this.Root.Size = new System.Drawing.Size(289, 500);
             this.Root.TextVisible = false;
             // 
-            // txtFile1
-            // 
-            this.txtFile1.EditValue = "ch1.dat";
-            this.txtFile1.Location = new System.Drawing.Point(12, 31);
-            this.txtFile1.Name = "txtFile1";
-            this.txtFile1.Properties.AutoHeight = false;
-            this.txtFile1.Size = new System.Drawing.Size(265, 23);
-            this.txtFile1.StyleController = this.layoutControl1;
-            this.txtFile1.TabIndex = 4;
-            // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.txtFile1;
@@ -148,47 +243,20 @@
             this.layoutControlItem1.TextSize = new System.Drawing.Size(55, 14);
             this.layoutControlItem1.TextToControlDistance = 5;
             // 
-            // txtFile2
-            // 
-            this.txtFile2.EditValue = "ch2.dat";
-            this.txtFile2.Location = new System.Drawing.Point(12, 87);
-            this.txtFile2.Name = "txtFile2";
-            this.txtFile2.Properties.AutoHeight = false;
-            this.txtFile2.Size = new System.Drawing.Size(265, 23);
-            this.txtFile2.StyleController = this.layoutControl1;
-            this.txtFile2.TabIndex = 5;
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txtFile2;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 46);
-            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 56);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(114, 56);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem2.Size = new System.Drawing.Size(269, 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(55, 14);
-            this.layoutControlItem2.TextToControlDistance = 5;
-            // 
-            // txtFsHz
+            // layoutControlGroup1
             // 
-            this.txtFsHz.EditValue = "96000";
-            this.txtFsHz.Location = new System.Drawing.Point(12, 143);
-            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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtFsHz.Size = new System.Drawing.Size(265, 23);
-            this.txtFsHz.StyleController = this.layoutControl1;
-            this.txtFsHz.TabIndex = 6;
+            this.layoutControlGroup1.GroupBordersVisible = false;
+            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem3,
+            this.layoutControlItem2});
+            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 46);
+            this.layoutControlGroup1.Name = "layoutControlGroup1";
+            this.layoutControlGroup1.Size = new System.Drawing.Size(269, 112);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txtFsHz;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
             this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 56);
             this.layoutControlItem3.MinSize = new System.Drawing.Size(96, 56);
             this.layoutControlItem3.Name = "layoutControlItem3";
@@ -201,16 +269,21 @@
             this.layoutControlItem3.TextSize = new System.Drawing.Size(36, 14);
             this.layoutControlItem3.TextToControlDistance = 5;
             // 
-            // txtSigLen
+            // layoutControlItem2
             // 
-            this.txtSigLen.EditValue = "15";
-            this.txtSigLen.Location = new System.Drawing.Point(12, 199);
-            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, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSigLen.Size = new System.Drawing.Size(265, 23);
-            this.txtSigLen.StyleController = this.layoutControl1;
-            this.txtSigLen.TabIndex = 6;
+            this.layoutControlItem2.Control = this.txtFile2;
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 56);
+            this.layoutControlItem2.MinSize = new System.Drawing.Size(114, 56);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.layoutControlItem2.Size = new System.Drawing.Size(269, 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(55, 14);
+            this.layoutControlItem2.TextToControlDistance = 5;
             // 
             // layoutControlItem4
             // 
@@ -230,17 +303,6 @@
             this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
             this.layoutControlItem4.TextToControlDistance = 5;
             // 
-            // txtDto
-            // 
-            this.txtDto.EditValue = "1000";
-            this.txtDto.Location = new System.Drawing.Point(12, 255);
-            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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDto.Size = new System.Drawing.Size(265, 23);
-            this.txtDto.StyleController = this.layoutControl1;
-            this.txtDto.TabIndex = 6;
-            // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtDto;
@@ -259,17 +321,6 @@
             this.layoutControlItem5.TextSize = new System.Drawing.Size(24, 14);
             this.layoutControlItem5.TextToControlDistance = 5;
             // 
-            // txtDfo
-            // 
-            this.txtDfo.EditValue = "200";
-            this.txtDfo.Location = new System.Drawing.Point(12, 311);
-            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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDfo.Size = new System.Drawing.Size(265, 23);
-            this.txtDfo.StyleController = this.layoutControl1;
-            this.txtDfo.TabIndex = 6;
-            // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txtDfo;
@@ -288,20 +339,23 @@
             this.layoutControlItem6.TextSize = new System.Drawing.Size(24, 14);
             this.layoutControlItem6.TextToControlDistance = 5;
             // 
-            // btnBuilder
+            // layoutControlItem8
             // 
-            this.btnBuilder.Location = new System.Drawing.Point(12, 348);
-            this.btnBuilder.Name = "btnBuilder";
-            this.btnBuilder.Size = new System.Drawing.Size(120, 28);
-            this.btnBuilder.StyleController = this.layoutControl1;
-            this.btnBuilder.TabIndex = 7;
-            this.btnBuilder.Text = "生成";
-            this.btnBuilder.Click += new System.EventHandler(this.btnBuilder_ClickAsync);
+            this.layoutControlItem8.Control = this.btnOpenDir;
+            this.layoutControlItem8.Location = new System.Drawing.Point(134, 438);
+            this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 42);
+            this.layoutControlItem8.MinSize = new System.Drawing.Size(89, 42);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 12, 2);
+            this.layoutControlItem8.Size = new System.Drawing.Size(135, 42);
+            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem8.TextVisible = false;
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.btnBuilder;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 326);
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 438);
             this.layoutControlItem7.MaxSize = new System.Drawing.Size(0, 42);
             this.layoutControlItem7.MinSize = new System.Drawing.Size(89, 42);
             this.layoutControlItem7.Name = "layoutControlItem7";
@@ -311,43 +365,69 @@
             this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem7.TextVisible = false;
             // 
-            // layoutControlGroup1
-            // 
-            this.layoutControlGroup1.GroupBordersVisible = false;
-            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem3});
-            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 102);
-            this.layoutControlGroup1.Name = "layoutControlGroup1";
-            this.layoutControlGroup1.Size = new System.Drawing.Size(269, 56);
-            // 
-            // btnOpenDir
-            // 
-            this.btnOpenDir.Location = new System.Drawing.Point(156, 348);
-            this.btnOpenDir.Name = "btnOpenDir";
-            this.btnOpenDir.Size = new System.Drawing.Size(121, 28);
-            this.btnOpenDir.StyleController = this.layoutControl1;
-            this.btnOpenDir.TabIndex = 8;
-            this.btnOpenDir.Text = "打开输出目录";
-            this.btnOpenDir.Click += new System.EventHandler(this.btnOpenDir_Click);
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.btnOpenDir;
-            this.layoutControlItem8.Location = new System.Drawing.Point(134, 326);
-            this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 42);
-            this.layoutControlItem8.MinSize = new System.Drawing.Size(89, 42);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 12, 2);
-            this.layoutControlItem8.Size = new System.Drawing.Size(135, 42);
-            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem8.TextVisible = false;
+            // txtSnr1
+            // 
+            this.txtSnr1.EditValue = "10";
+            this.txtSnr1.Location = new System.Drawing.Point(12, 367);
+            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, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtSnr1.Size = new System.Drawing.Size(265, 23);
+            this.txtSnr1.StyleController = this.layoutControl1;
+            this.txtSnr1.TabIndex = 6;
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txtSnr1;
+            this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem9.CustomizationFormText = "采样率";
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 326);
+            this.layoutControlItem9.MaxSize = new System.Drawing.Size(0, 56);
+            this.layoutControlItem9.MinSize = new System.Drawing.Size(83, 56);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.layoutControlItem9.Size = new System.Drawing.Size(269, 56);
+            this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem9.Text = "文件1信噪比";
+            this.layoutControlItem9.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(67, 14);
+            this.layoutControlItem9.TextToControlDistance = 5;
+            // 
+            // txtSnr2
+            // 
+            this.txtSnr2.EditValue = "-5";
+            this.txtSnr2.Location = new System.Drawing.Point(12, 423);
+            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, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtSnr2.Size = new System.Drawing.Size(265, 23);
+            this.txtSnr2.StyleController = this.layoutControl1;
+            this.txtSnr2.TabIndex = 6;
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txtSnr2;
+            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem10.CustomizationFormText = "采样率";
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 382);
+            this.layoutControlItem10.MaxSize = new System.Drawing.Size(0, 56);
+            this.layoutControlItem10.MinSize = new System.Drawing.Size(83, 56);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.layoutControlItem10.Size = new System.Drawing.Size(269, 56);
+            this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem10.Text = "文件2信噪比";
+            this.layoutControlItem10.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(67, 14);
+            this.layoutControlItem10.TextToControlDistance = 5;
             // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(289, 388);
+            this.ClientSize = new System.Drawing.Size(289, 500);
             this.Controls.Add(this.layoutControl1);
             this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.MaximizeBox = false;
@@ -357,22 +437,26 @@
             this.Text = "时频差数据仿真";
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtFsHz.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtFile2.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtFile1.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.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtFile2.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtFsHz.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSigLen.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDto.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDfo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtSnr1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtSnr2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -398,6 +482,10 @@
         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 layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
     }
 }
 

+ 11 - 7
XdCxRhDW.DataEmulation/Form1.cs

@@ -48,6 +48,16 @@ namespace XdCxRhDW.DataEmulation
                 XtraMessageBox.Show("频差非数字!");
                 return;
             }
+            if (!double.TryParse(txtSnr1.Text, out double snr1))
+            {
+                XtraMessageBox.Show("文件1信噪比非数字!");
+                return;
+            }
+            if (!double.TryParse(txtSnr2.Text, out double snr2))
+            {
+                XtraMessageBox.Show("文件2信噪比非数字!");
+                return;
+            }
             if (fsHz <= 0 || fsHz > 100000000)
             {
                 XtraMessageBox.Show("采样率范围(0,100000000]!");
@@ -61,13 +71,7 @@ namespace XdCxRhDW.DataEmulation
             btnBuilder.Enabled = false;
             await Task.Run(() =>
             {
-                try
-                {
-                    DataEmulationHelper.GenSignalsWithDtDf(file1, file2, fsHz, (int)(sigTimeLen * 1000), dt / 1e6, df);
-                }
-                catch (Exception ex)
-                {
-                }
+                DataEmulationHelper.GenSignalsWithDtDf(file1, file2, fsHz, (int)(sigTimeLen * 1000), dt / 1e6, df, (int)snr1, (int)snr2);
             });
             btnBuilder.Enabled = true;
         }

+ 6 - 0
XdCxRhDW.Entity/CheckRes.cs

@@ -60,5 +60,11 @@ namespace XdCxRhDW.Entity
         [Display(Name = "频偏")]
         public double? FfcHz { get; set; }
 
+        /// <summary>
+        /// 信号信噪比(dB)
+        /// </summary>
+        [Display(Name ="信号信噪比")]
+        public double? Snr { get; set; }
+
     }
 }

+ 5 - 0
XdCxRhDw.Dto/PosDto/CheckResDto.cs

@@ -52,5 +52,10 @@ namespace XdCxRhDW.Dto
         /// 频偏Hz(可空)
         /// </summary>
         public double? FfcHz { get; set; }
+
+        /// <summary>
+        /// 信号信噪比(可空)
+        /// </summary>
+        public double? Snr { get; set; }
     }
 }