11

Service/X2D1TaskServer54/Service/TaskService.cs

@@ -382,8 +382,8 @@ namespace X2D1NoRefTaskServer54.Service
                                                 sb.Append($"{100:D3}\t");//置信度
                                                 sb.Append($"{3}\t");//定位体制（0未知,1高轨多星，2高低轨，3星地,4星座）
                                                 sb.Append($"{(long)signalResult.data[i].Rate:D12}");//符号速率bps
-                                                sb.Append($"{(long)dto.CdbLon * 1e6:D10}");//超短站经度
-                                                sb.Append($"{(long)dto.CdbLat * 1e6:D10}");//超短站纬度
+                                                sb.Append($"{Convert.ToInt64(dto.CdbLon * 1e6):D10}");//超短站经度
+                                                sb.Append($"{Convert.ToInt64(dto.CdbLat * 1e6):D10}");//超短站纬度
                                                 sb.Append("\r\n");
                                                 string resFile = Path.Combine(PosResDir, $"两星一地定位结果_{posRes.SigTime:yyyyMMdd}.txt");
                                                 lock (this)

XdCxRhDW.App/EditForms/SignalEmulation.Designer.cs

@@ -59,7 +59,6 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.txtSplitTime = new DevExpress.XtraEditors.CheckEdit();
             this.btnOpenDir = new DevExpress.XtraEditors.SimpleButton();
             this.btnBuild = new DevExpress.XtraEditors.SimpleButton();
             this.txtFsHz = new DevExpress.XtraEditors.ButtonEdit();
@@ -72,7 +71,6 @@
             this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -82,7 +80,6 @@
             this.tablePanel1 = new DevExpress.Utils.Layout.TablePanel();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSplitTime.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtFsHz.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSigLen.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDto1.Properties)).BeginInit();
@@ -93,7 +90,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
@@ -107,7 +103,6 @@
             // layoutControl1
             // 
             this.tablePanel1.SetColumn(this.layoutControl1, 1);
-            this.layoutControl1.Controls.Add(this.txtSplitTime);
             this.layoutControl1.Controls.Add(this.btnOpenDir);
             this.layoutControl1.Controls.Add(this.btnBuild);
             this.layoutControl1.Controls.Add(this.txtFsHz);
@@ -116,28 +111,18 @@
             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.Location = new System.Drawing.Point(78, 94);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1113, 199, 650, 400);
             this.layoutControl1.Root = this.Root;
             this.tablePanel1.SetRow(this.layoutControl1, 1);
-            this.layoutControl1.Size = new System.Drawing.Size(396, 258);
+            this.layoutControl1.Size = new System.Drawing.Size(396, 246);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
-            // 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;
-            // 
             // btnOpenDir
             // 
-            this.btnOpenDir.Location = new System.Drawing.Point(210, 214);
+            this.btnOpenDir.Location = new System.Drawing.Point(210, 190);
             this.btnOpenDir.Name = "btnOpenDir";
             this.btnOpenDir.Size = new System.Drawing.Size(174, 24);
             this.btnOpenDir.StyleController = this.layoutControl1;
@@ -147,7 +132,7 @@
             // 
             // btnBuild
             // 
-            this.btnBuild.Location = new System.Drawing.Point(12, 214);
+            this.btnBuild.Location = new System.Drawing.Point(12, 190);
             this.btnBuild.Name = "btnBuild";
             this.btnBuild.Size = new System.Drawing.Size(174, 24);
             this.btnBuild.StyleController = this.layoutControl1;
@@ -158,7 +143,7 @@
             // txtFsHz
             // 
             this.txtFsHz.EditValue = "96000";
-            this.txtFsHz.Location = new System.Drawing.Point(12, 65);
+            this.txtFsHz.Location = new System.Drawing.Point(12, 41);
             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)});
@@ -169,7 +154,7 @@
             // txtSigLen
             // 
             this.txtSigLen.EditValue = "15";
-            this.txtSigLen.Location = new System.Drawing.Point(200, 65);
+            this.txtSigLen.Location = new System.Drawing.Point(200, 41);
             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)});
@@ -180,7 +165,7 @@
             // txtDto1
             // 
             this.txtDto1.EditValue = "1000";
-            this.txtDto1.Location = new System.Drawing.Point(12, 121);
+            this.txtDto1.Location = new System.Drawing.Point(12, 97);
             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)});
@@ -191,7 +176,7 @@
             // txtDfo1
             // 
             this.txtDfo1.EditValue = "200";
-            this.txtDfo1.Location = new System.Drawing.Point(200, 121);
+            this.txtDfo1.Location = new System.Drawing.Point(200, 97);
             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)});
@@ -202,7 +187,7 @@
             // txtDto2
             // 
             this.txtDto2.EditValue = "1500";
-            this.txtDto2.Location = new System.Drawing.Point(12, 177);
+            this.txtDto2.Location = new System.Drawing.Point(12, 153);
             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)});
@@ -213,7 +198,7 @@
             // txtDfo2
             // 
             this.txtDfo2.EditValue = "4311";
-            this.txtDfo2.Location = new System.Drawing.Point(200, 177);
+            this.txtDfo2.Location = new System.Drawing.Point(200, 153);
             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)});
@@ -234,7 +219,7 @@
             this.layoutControlItem1,
             this.layoutControlItem2});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(396, 258);
+            this.Root.Size = new System.Drawing.Size(396, 246);
             this.Root.TextVisible = false;
             // 
             // layoutControlGroup1
@@ -242,16 +227,15 @@
             this.layoutControlGroup1.GroupBordersVisible = false;
             this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem3,
-            this.layoutControlItem4,
-            this.layoutControlItem9});
+            this.layoutControlItem4});
             this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlGroup1.Name = "layoutControlGroup1";
-            this.layoutControlGroup1.Size = new System.Drawing.Size(376, 80);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(376, 56);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txtFsHz;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 56);
             this.layoutControlItem3.MinSize = new System.Drawing.Size(96, 56);
             this.layoutControlItem3.Name = "layoutControlItem3";
@@ -269,7 +253,7 @@
             this.layoutControlItem4.Control = this.txtSigLen;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "采样率";
-            this.layoutControlItem4.Location = new System.Drawing.Point(188, 24);
+            this.layoutControlItem4.Location = new System.Drawing.Point(188, 0);
             this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 56);
             this.layoutControlItem4.MinSize = new System.Drawing.Size(107, 56);
             this.layoutControlItem4.Name = "layoutControlItem4";
@@ -282,21 +266,12 @@
             this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
             this.layoutControlItem4.TextToControlDistance = 5;
             // 
-            // 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;
-            // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtDto1;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "采样率";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 80);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 56);
             this.layoutControlItem5.MaxSize = new System.Drawing.Size(0, 56);
             this.layoutControlItem5.MinSize = new System.Drawing.Size(83, 56);
             this.layoutControlItem5.Name = "layoutControlItem5";
@@ -314,7 +289,7 @@
             this.layoutControlItem6.Control = this.txtDfo1;
             this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem6.CustomizationFormText = "采样率";
-            this.layoutControlItem6.Location = new System.Drawing.Point(188, 80);
+            this.layoutControlItem6.Location = new System.Drawing.Point(188, 56);
             this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 56);
             this.layoutControlItem6.MinSize = new System.Drawing.Size(84, 56);
             this.layoutControlItem6.Name = "layoutControlItem6";
@@ -330,12 +305,12 @@
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.btnBuild;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 192);
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 168);
             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(188, 46);
+            this.layoutControlItem7.Size = new System.Drawing.Size(188, 58);
             this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem7.TextVisible = false;
@@ -343,12 +318,12 @@
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.btnOpenDir;
-            this.layoutControlItem8.Location = new System.Drawing.Point(188, 192);
+            this.layoutControlItem8.Location = new System.Drawing.Point(188, 168);
             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(188, 46);
+            this.layoutControlItem8.Size = new System.Drawing.Size(188, 58);
             this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem8.TextVisible = false;
@@ -358,7 +333,7 @@
             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.Location = new System.Drawing.Point(0, 112);
             this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 56);
             this.layoutControlItem1.MinSize = new System.Drawing.Size(83, 56);
             this.layoutControlItem1.Name = "layoutControlItem1";
@@ -376,7 +351,7 @@
             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.Location = new System.Drawing.Point(188, 112);
             this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 56);
             this.layoutControlItem2.MinSize = new System.Drawing.Size(84, 56);
             this.layoutControlItem2.Name = "layoutControlItem2";
@@ -401,7 +376,7 @@
             this.tablePanel1.Name = "tablePanel1";
             this.tablePanel1.Rows.AddRange(new DevExpress.Utils.Layout.TablePanelRow[] {
             new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 26F),
-            new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 280F),
+            new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 250F),
             new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 26F)});
             this.tablePanel1.Size = new System.Drawing.Size(551, 434);
             this.tablePanel1.TabIndex = 1;
@@ -421,7 +396,6 @@
             this.Text = "时频差数据仿真";
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txtSplitTime.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtFsHz.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSigLen.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDto1.Properties)).EndInit();
@@ -432,7 +406,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
@@ -467,8 +440,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraEditors.ButtonEdit txtDfo2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraEditors.CheckEdit txtSplitTime;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
     }
 }
 

XdCxRhDW.App/EditForms/SignalEmulation.cs

@@ -72,19 +72,9 @@ namespace XdCxRhDW.DataEmulation
             {
                 Directory.CreateDirectory("信号仿真");
                 var t1 = DateTime.Now;
-                string f1, f2, f3;
-                if (txtSplitTime.Checked)
-                {
-                    f1 = $"信号仿真\\{t1:yyyyMMddHHmmss}_D{260}_FS{fsHz}_ch1_xd1.dat";
-                    f2 = $"信号仿真\\{t1.AddMinutes(5):yyyyMMddHHmmss}_D{260}_FS{fsHz}_ch1_xd1.dat";
-                    f3 = $"信号仿真\\{t1.AddMinutes(10):yyyyMMddHHmmss}_D{260}_FS{fsHz}_ch1_xd1.dat";
-                }
-                else
-                {
-                    f1 = $"信号仿真\\{t1:yyyyMMddHHmmss}_D{260}_FS{fsHz}_ch1.dat";
-                    f2 = $"信号仿真\\{t1:yyyyMMddHHmmss}_D{260}_FS{fsHz}_ch2.dat";
-                    f3 = $"信号仿真\\{t1:yyyyMMddHHmmss}_D{260}_FS{fsHz}_ch3.dat";
-                }
+                var f1 = $"信号仿真\\{t1:yyyyMMddHHmmss}_D{260}_FS{fsHz}_ch1.dat";
+                var f2 = $"信号仿真\\{t1:yyyyMMddHHmmss}_D{260}_FS{fsHz}_ch2.dat";
+                var f3 = $"信号仿真\\{t1:yyyyMMddHHmmss}_D{260}_FS{fsHz}_ch3.dat";
                 DataEmulationHelper.GenBrustFiles(f1, f2, f3, fsHz, brustCount, dt1, df1, dt2, df2);
             });
             btnBuild.Enabled = true;