zoulei 1 年之前
父節點
當前提交
e3e0af59b9

+ 66 - 66
XdCxRhDW.App/CorTools/XlCalculateForm.Designer.cs

@@ -28,11 +28,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            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 editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.gridControl = new DevExpress.XtraGrid.GridControl();
             this.gridView = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -44,12 +44,12 @@
             this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gridControl)).BeginInit();
@@ -63,12 +63,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -89,10 +89,10 @@
             // 
             // gridControl
             // 
-            this.gridControl.Location = new System.Drawing.Point(12, 64);
+            this.gridControl.Location = new System.Drawing.Point(12, 63);
             this.gridControl.MainView = this.gridView;
             this.gridControl.Name = "gridControl";
-            this.gridControl.Size = new System.Drawing.Size(776, 374);
+            this.gridControl.Size = new System.Drawing.Size(776, 375);
             this.gridControl.TabIndex = 10;
             this.gridControl.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView});
@@ -104,9 +104,9 @@
             // 
             // btnCalculate
             // 
-            this.btnCalculate.Location = new System.Drawing.Point(722, 38);
+            this.btnCalculate.Location = new System.Drawing.Point(722, 36);
             this.btnCalculate.Name = "btnCalculate";
-            this.btnCalculate.Size = new System.Drawing.Size(66, 22);
+            this.btnCalculate.Size = new System.Drawing.Size(66, 23);
             this.btnCalculate.StyleController = this.layoutControl1;
             this.btnCalculate.TabIndex = 9;
             this.btnCalculate.Text = "推算";
@@ -114,20 +114,20 @@
             // 
             // txtSpanSeconds
             // 
-            this.txtSpanSeconds.Location = new System.Drawing.Point(538, 38);
+            this.txtSpanSeconds.Location = new System.Drawing.Point(538, 36);
             this.txtSpanSeconds.Name = "txtSpanSeconds";
             this.txtSpanSeconds.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)});
+            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.txtSpanSeconds.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtSpanSeconds.Properties.MaskSettings.Set("mask", "f0");
-            this.txtSpanSeconds.Size = new System.Drawing.Size(180, 22);
+            this.txtSpanSeconds.Size = new System.Drawing.Size(180, 23);
             this.txtSpanSeconds.StyleController = this.layoutControl1;
             this.txtSpanSeconds.TabIndex = 8;
             // 
             // txtEndTime
             // 
             this.txtEndTime.EditValue = null;
-            this.txtEndTime.Location = new System.Drawing.Point(302, 38);
+            this.txtEndTime.Location = new System.Drawing.Point(302, 36);
             this.txtEndTime.Name = "txtEndTime";
             this.txtEndTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -138,14 +138,14 @@
             this.txtEndTime.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
             this.txtEndTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.txtEndTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
-            this.txtEndTime.Size = new System.Drawing.Size(179, 22);
+            this.txtEndTime.Size = new System.Drawing.Size(179, 20);
             this.txtEndTime.StyleController = this.layoutControl1;
             this.txtEndTime.TabIndex = 7;
             // 
             // txtStartTime
             // 
             this.txtStartTime.EditValue = null;
-            this.txtStartTime.Location = new System.Drawing.Point(65, 38);
+            this.txtStartTime.Location = new System.Drawing.Point(65, 36);
             this.txtStartTime.Name = "txtStartTime";
             this.txtStartTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -156,18 +156,18 @@
             this.txtStartTime.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
             this.txtStartTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.txtStartTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
-            this.txtStartTime.Size = new System.Drawing.Size(180, 22);
+            this.txtStartTime.Size = new System.Drawing.Size(180, 20);
             this.txtStartTime.StyleController = this.layoutControl1;
             this.txtStartTime.TabIndex = 6;
             // 
             // txtTle
             // 
-            this.txtTle.Location = new System.Drawing.Point(41, 12);
+            this.txtTle.Location = new System.Drawing.Point(65, 12);
             this.txtTle.Name = "txtTle";
             this.txtTle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txtTle.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtTle.Size = new System.Drawing.Size(747, 22);
+            this.txtTle.Size = new System.Drawing.Size(723, 20);
             this.txtTle.StyleController = this.layoutControl1;
             this.txtTle.TabIndex = 5;
             this.txtTle.ToolTip = "填写卫星的双行根数";
@@ -197,18 +197,51 @@
             this.layoutControlItem2.Control = this.txtTle;
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(780, 26);
-            this.layoutControlItem2.Text = "星历";
+            this.layoutControlItem2.Size = new System.Drawing.Size(780, 24);
+            this.layoutControlItem2.Text = "双行根数";
             this.layoutControlItem2.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(24, 14);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14);
             this.layoutControlItem2.TextToControlDistance = 5;
             // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.btnCalculate;
+            this.layoutControlItem5.Location = new System.Drawing.Point(710, 24);
+            this.layoutControlItem5.MaxSize = new System.Drawing.Size(70, 70);
+            this.layoutControlItem5.MinSize = new System.Drawing.Size(70, 26);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Size = new System.Drawing.Size(70, 27);
+            this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem5.TextVisible = false;
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.gridControl;
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 51);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.Size = new System.Drawing.Size(780, 379);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem6.TextVisible = false;
+            // 
+            // layoutControlGroup1
+            // 
+            this.layoutControlGroup1.GroupBordersVisible = false;
+            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem3,
+            this.layoutControlItem4});
+            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlGroup1.Name = "layoutControlGroup1";
+            this.layoutControlGroup1.ShowInCustomizationForm = false;
+            this.layoutControlGroup1.Size = new System.Drawing.Size(710, 27);
+            // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.txtStartTime;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(237, 26);
+            this.layoutControlItem1.Size = new System.Drawing.Size(237, 27);
             this.layoutControlItem1.Text = "开始时间";
             this.layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14);
@@ -219,7 +252,7 @@
             this.layoutControlItem3.Control = this.txtEndTime;
             this.layoutControlItem3.Location = new System.Drawing.Point(237, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(236, 26);
+            this.layoutControlItem3.Size = new System.Drawing.Size(236, 27);
             this.layoutControlItem3.Text = "结束时间";
             this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14);
@@ -230,45 +263,12 @@
             this.layoutControlItem4.Control = this.txtSpanSeconds;
             this.layoutControlItem4.Location = new System.Drawing.Point(473, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(237, 26);
+            this.layoutControlItem4.Size = new System.Drawing.Size(237, 27);
             this.layoutControlItem4.Text = "推算间隔";
             this.layoutControlItem4.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
             this.layoutControlItem4.TextToControlDistance = 5;
             // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.btnCalculate;
-            this.layoutControlItem5.Location = new System.Drawing.Point(710, 26);
-            this.layoutControlItem5.MaxSize = new System.Drawing.Size(70, 70);
-            this.layoutControlItem5.MinSize = new System.Drawing.Size(70, 26);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(70, 26);
-            this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem5.TextVisible = false;
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.gridControl;
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 52);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(780, 378);
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem6.TextVisible = false;
-            // 
-            // layoutControlGroup1
-            // 
-            this.layoutControlGroup1.GroupBordersVisible = false;
-            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
-            this.layoutControlItem3,
-            this.layoutControlItem4});
-            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 26);
-            this.layoutControlGroup1.Name = "layoutControlGroup1";
-            this.layoutControlGroup1.ShowInCustomizationForm = false;
-            this.layoutControlGroup1.Size = new System.Drawing.Size(710, 26);
-            // 
             // XlCalculateForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -291,12 +291,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             this.ResumeLayout(false);
 
         }

+ 74 - 26
XdCxRhDW.App/EditForms/SatEditor.Designer.cs

@@ -28,6 +28,11 @@
         /// </summary>
         private void InitializeComponent()
         {
+            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 editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -40,6 +45,7 @@
             this.txtSatName = new DevExpress.XtraEditors.TextEdit();
             this.searchLookUpEdit1 = new DevExpress.XtraEditors.SearchLookUpEdit();
             this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.txtSatTrans = new DevExpress.XtraEditors.ButtonEdit();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -48,12 +54,14 @@
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtSatLon.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSatName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtSatTrans.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -62,6 +70,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -71,20 +80,21 @@
             this.layoutControl1.Controls.Add(this.txtSatLon);
             this.layoutControl1.Controls.Add(this.txtSatName);
             this.layoutControl1.Controls.Add(this.searchLookUpEdit1);
+            this.layoutControl1.Controls.Add(this.txtSatTrans);
             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(831, 101, 650, 400);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(258, 257);
+            this.layoutControl1.Size = new System.Drawing.Size(295, 321);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // btnOk
             // 
-            this.btnOk.Location = new System.Drawing.Point(131, 195);
+            this.btnOk.Location = new System.Drawing.Point(149, 246);
             this.btnOk.Name = "btnOk";
-            this.btnOk.Size = new System.Drawing.Size(105, 22);
+            this.btnOk.Size = new System.Drawing.Size(124, 22);
             this.btnOk.StyleController = this.layoutControl1;
             this.btnOk.TabIndex = 8;
             this.btnOk.Text = "确定";
@@ -92,9 +102,9 @@
             // 
             // btnCancel
             // 
-            this.btnCancel.Location = new System.Drawing.Point(22, 195);
+            this.btnCancel.Location = new System.Drawing.Point(22, 246);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(105, 22);
+            this.btnCancel.Size = new System.Drawing.Size(123, 22);
             this.btnCancel.StyleController = this.layoutControl1;
             this.btnCancel.TabIndex = 7;
             this.btnCancel.Text = "取消";
@@ -102,12 +112,15 @@
             // 
             // txtSatLon
             // 
-            this.txtSatLon.Location = new System.Drawing.Point(22, 147);
+            this.txtSatLon.Location = new System.Drawing.Point(22, 198);
             this.txtSatLon.Name = "txtSatLon";
+            this.txtSatLon.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
             this.txtSatLon.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.txtSatLon.Properties.NullValuePrompt = "非必需";
-            this.txtSatLon.Size = new System.Drawing.Size(214, 23);
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "°", -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.txtSatLon.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            this.txtSatLon.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+            this.txtSatLon.Properties.MaskSettings.Set("mask", "f1");
+            this.txtSatLon.Size = new System.Drawing.Size(251, 23);
             this.txtSatLon.StyleController = this.layoutControl1;
             this.txtSatLon.TabIndex = 6;
             // 
@@ -116,7 +129,7 @@
             this.txtSatName.Location = new System.Drawing.Point(22, 93);
             this.txtSatName.Name = "txtSatName";
             this.txtSatName.Properties.AutoHeight = false;
-            this.txtSatName.Size = new System.Drawing.Size(214, 23);
+            this.txtSatName.Size = new System.Drawing.Size(251, 23);
             this.txtSatName.StyleController = this.layoutControl1;
             this.txtSatName.TabIndex = 5;
             // 
@@ -128,7 +141,7 @@
             this.searchLookUpEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.searchLookUpEdit1.Properties.PopupView = this.searchLookUpEdit1View;
-            this.searchLookUpEdit1.Size = new System.Drawing.Size(214, 23);
+            this.searchLookUpEdit1.Size = new System.Drawing.Size(251, 23);
             this.searchLookUpEdit1.StyleController = this.layoutControl1;
             this.searchLookUpEdit1.TabIndex = 4;
             // 
@@ -139,6 +152,20 @@
             this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
             this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
             // 
+            // txtSatTrans
+            // 
+            this.txtSatTrans.Location = new System.Drawing.Point(22, 147);
+            this.txtSatTrans.Name = "txtSatTrans";
+            this.txtSatTrans.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
+            this.txtSatTrans.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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.txtSatTrans.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            this.txtSatTrans.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+            this.txtSatTrans.Properties.MaskSettings.Set("mask", "f3");
+            this.txtSatTrans.Size = new System.Drawing.Size(251, 23);
+            this.txtSatTrans.StyleController = this.layoutControl1;
+            this.txtSatTrans.TabIndex = 6;
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -150,18 +177,19 @@
             this.layoutControlItem3,
             this.layoutControlItem4,
             this.layoutControlItem5,
-            this.emptySpaceItem2});
+            this.emptySpaceItem2,
+            this.layoutControlItem6});
             this.Root.Name = "Root";
             this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 20, 20, 20);
-            this.Root.Size = new System.Drawing.Size(258, 257);
+            this.Root.Size = new System.Drawing.Size(295, 321);
             this.Root.TextVisible = false;
             // 
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 199);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 250);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(218, 18);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(255, 31);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem1
@@ -171,7 +199,7 @@
             this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 44);
             this.layoutControlItem1.MinSize = new System.Drawing.Size(54, 44);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(218, 44);
+            this.layoutControlItem1.Size = new System.Drawing.Size(255, 44);
             this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem1.Text = "卫星";
             this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
@@ -185,7 +213,7 @@
             this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 54);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem2.Size = new System.Drawing.Size(218, 54);
+            this.layoutControlItem2.Size = new System.Drawing.Size(255, 54);
             this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem2.Text = "卫星名称";
             this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
@@ -194,12 +222,12 @@
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txtSatLon;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 98);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 149);
             this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 51);
             this.layoutControlItem3.MinSize = new System.Drawing.Size(54, 51);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem3.Size = new System.Drawing.Size(218, 51);
+            this.layoutControlItem3.Size = new System.Drawing.Size(255, 51);
             this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem3.Text = "轨道经度";
             this.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
@@ -208,37 +236,53 @@
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.btnCancel;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 173);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 224);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(109, 26);
+            this.layoutControlItem4.Size = new System.Drawing.Size(127, 26);
             this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem4.TextVisible = false;
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.btnOk;
-            this.layoutControlItem5.Location = new System.Drawing.Point(109, 173);
+            this.layoutControlItem5.Location = new System.Drawing.Point(127, 224);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(109, 26);
+            this.layoutControlItem5.Size = new System.Drawing.Size(128, 26);
             this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem5.TextVisible = false;
             // 
             // emptySpaceItem2
             // 
             this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 149);
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 200);
             this.emptySpaceItem2.MaxSize = new System.Drawing.Size(0, 24);
             this.emptySpaceItem2.MinSize = new System.Drawing.Size(104, 24);
             this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(218, 24);
+            this.emptySpaceItem2.Size = new System.Drawing.Size(255, 24);
             this.emptySpaceItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txtSatTrans;
+            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem6.CustomizationFormText = "轨道经度";
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 98);
+            this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 51);
+            this.layoutControlItem6.MinSize = new System.Drawing.Size(54, 51);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.layoutControlItem6.Size = new System.Drawing.Size(255, 51);
+            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem6.Text = "卫星本振";
+            this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14);
+            // 
             // SatEditor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(258, 257);
+            this.ClientSize = new System.Drawing.Size(295, 321);
             this.Controls.Add(this.layoutControl1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             this.Name = "SatEditor";
@@ -250,6 +294,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtSatName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtSatTrans.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -258,6 +303,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -279,5 +325,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
+        private DevExpress.XtraEditors.ButtonEdit txtSatTrans;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
     }
 }

+ 4 - 1
XdCxRhDW.App/EditForms/SatEditor.cs

@@ -42,7 +42,8 @@ namespace XdCxRhDW.App.EditForms
             if (this.Text == "编辑卫星" && info != null)
             {
                 this.txtSatName.Text = info.SatName;
-                this.txtSatLon.Text = info.SatLon.ToString();
+                this.txtSatLon.Text = info.SatLon?.ToString();
+                this.txtSatTrans.Text=info.SatTrans?.ToString();
             }
         }
 
@@ -60,6 +61,8 @@ namespace XdCxRhDW.App.EditForms
                 var satCodeStr = sat.Substring(idx + 1, sat.Length - idx - 2);
                 info.SatCode = Convert.ToInt32(satCodeStr);
                 info.SatName = txtSatName.Text.Trim();
+                if (!string.IsNullOrWhiteSpace(txtSatTrans.Text))
+                    info.SatTrans = Convert.ToDouble(txtSatTrans.Text); 
                 if (!string.IsNullOrWhiteSpace(txtSatLon.Text))
                     info.SatLon = Convert.ToDouble(txtSatLon.Text);
                 this.DialogResult = DialogResult.OK;

+ 14 - 3
XdCxRhDW.App/ExtensionsDev/LayoutControlExtension.cs

@@ -1,14 +1,18 @@
 using DevExpress.Utils;
+using DevExpress.Utils.Controls;
 using DevExpress.XtraEditors;
 using DevExpress.XtraLayout;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Web.UI.WebControls;
 using System.Windows.Forms;
+using System.Xml;
 using XdCxRhDW.Core;
 
 namespace ExtensionsDev
@@ -23,7 +27,7 @@ namespace ExtensionsDev
             ctrl.OptionsFocus.AllowFocusGroups = false;
             ctrl.OptionsFocus.AllowFocusTabbedGroups = false;
             ctrl.OptionsFocus.AllowFocusControlOnLabelClick = true;
-           // ctrl.Root.GroupBordersVisible = false;
+            // ctrl.Root.GroupBordersVisible = false;
             System.Windows.Forms.Control findCtrl = ctrl;
             string GetLayoutName()
             {
@@ -57,9 +61,16 @@ namespace ExtensionsDev
                 uCtrl.Load += loadEvent;
             }
 
-            if (name != null && File.Exists($"Layout\\{name}.xml"))
+            if ( name != null && File.Exists($"Layout\\{name}.xml"))
             {
-                ctrl.RestoreLayoutFromXml($"Layout\\{name}.xml");
+                if (Debugger.IsAttached)
+                {
+                    File.Delete($"Layout\\{name}.xml");
+                }
+                else 
+                {
+                    ctrl.RestoreLayoutFromXml($"Layout\\{name}.xml");
+                }
             }
         }
 

+ 1 - 1
XdCxRhDW.App/MainForm.cs

@@ -41,7 +41,7 @@ namespace XdCxRhDW
             ctrlTypes.Add("目标管理", typeof(CtrlTarget));
             ctrlTypes.Add("系统设置", typeof(CtrlSysSettings));
             //ctrlTypes.Add("参估工具", typeof(CorToolForm));
-            ctrlTypes.Add("检测参估工具", typeof(DetectToolForm));
+            ctrlTypes.Add("检测参估工具(CPU)", typeof(DetectToolForm));
             ctrlTypes.Add("星历推算", typeof(XlCalculateForm));
             btn_ItemClick(null, null);
             XlScan();

+ 53 - 11
XdCxRhDW.App/UserControl/CtrlSysSettings.Designer.cs

@@ -29,6 +29,11 @@ namespace XdCxRhDW.App.UserControl
         /// </summary>
         private void InitializeComponent()
         {
+            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();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             this.tablePanel1 = new DevExpress.Utils.Layout.TablePanel();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.txtMapService = new DevExpress.XtraEditors.TextEdit();
@@ -40,6 +45,8 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtYDPZThreshold = new DevExpress.XtraEditors.ButtonEdit();
             ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).BeginInit();
             this.tablePanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
@@ -52,6 +59,8 @@ namespace XdCxRhDW.App.UserControl
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYDPZThreshold.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // tablePanel1
@@ -79,6 +88,7 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControl1.Controls.Add(this.btnSave);
             this.layoutControl1.Controls.Add(this.txtHttpPort);
             this.layoutControl1.Controls.Add(this.txtXLDirectory);
+            this.layoutControl1.Controls.Add(this.txtYDPZThreshold);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.Location = new System.Drawing.Point(252, 136);
             this.layoutControl1.Name = "layoutControl1";
@@ -90,15 +100,15 @@ namespace XdCxRhDW.App.UserControl
             // 
             // txtMapService
             // 
-            this.txtMapService.Location = new System.Drawing.Point(12, 190);
+            this.txtMapService.Location = new System.Drawing.Point(12, 189);
             this.txtMapService.Name = "txtMapService";
-            this.txtMapService.Size = new System.Drawing.Size(189, 22);
+            this.txtMapService.Size = new System.Drawing.Size(189, 20);
             this.txtMapService.StyleController = this.layoutControl1;
             this.txtMapService.TabIndex = 7;
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(12, 252);
+            this.btnSave.Location = new System.Drawing.Point(12, 322);
             this.btnSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnSave.MaximumSize = new System.Drawing.Size(0, 22);
             this.btnSave.MinimumSize = new System.Drawing.Size(0, 22);
@@ -111,19 +121,19 @@ namespace XdCxRhDW.App.UserControl
             // 
             // txtHttpPort
             // 
-            this.txtHttpPort.EditValue = "8091";
-            this.txtHttpPort.Location = new System.Drawing.Point(12, 30);
+            this.txtHttpPort.EditValue = "";
+            this.txtHttpPort.Location = new System.Drawing.Point(12, 29);
             this.txtHttpPort.Name = "txtHttpPort";
-            this.txtHttpPort.Size = new System.Drawing.Size(189, 22);
+            this.txtHttpPort.Size = new System.Drawing.Size(189, 20);
             this.txtHttpPort.StyleController = this.layoutControl1;
             this.txtHttpPort.TabIndex = 5;
             // 
             // txtXLDirectory
             // 
-            this.txtXLDirectory.Location = new System.Drawing.Point(12, 110);
+            this.txtXLDirectory.Location = new System.Drawing.Point(12, 109);
             this.txtXLDirectory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtXLDirectory.Name = "txtXLDirectory";
-            this.txtXLDirectory.Size = new System.Drawing.Size(189, 22);
+            this.txtXLDirectory.Size = new System.Drawing.Size(189, 20);
             this.txtXLDirectory.StyleController = this.layoutControl1;
             this.txtXLDirectory.TabIndex = 6;
             // 
@@ -135,7 +145,8 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem3,
             this.layoutControlItem4,
             this.layoutControlItem5,
-            this.layoutControlItem6});
+            this.layoutControlItem6,
+            this.layoutControlItem1});
             this.Root.Name = "Root";
             this.Root.Size = new System.Drawing.Size(213, 356);
             this.Root.TextVisible = false;
@@ -143,10 +154,10 @@ namespace XdCxRhDW.App.UserControl
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.btnSave;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 240);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 310);
             this.layoutControlItem3.MinSize = new System.Drawing.Size(36, 26);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(193, 96);
+            this.layoutControlItem3.Size = new System.Drawing.Size(193, 26);
             this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem3.TextVisible = false;
@@ -193,6 +204,33 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem6.TextSize = new System.Drawing.Size(96, 14);
             // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txtYDPZThreshold;
+            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem1.CustomizationFormText = "Wms地址";
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 240);
+            this.layoutControlItem1.MinSize = new System.Drawing.Size(50, 25);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(193, 70);
+            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem1.Text = "运动判证阈值";
+            this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(96, 14);
+            // 
+            // txtYDPZThreshold
+            // 
+            this.txtYDPZThreshold.Location = new System.Drawing.Point(12, 269);
+            this.txtYDPZThreshold.Name = "txtYDPZThreshold";
+            this.txtYDPZThreshold.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.txtYDPZThreshold.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            this.txtYDPZThreshold.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+            this.txtYDPZThreshold.Properties.MaskSettings.Set("mask", "f0");
+            this.txtYDPZThreshold.Size = new System.Drawing.Size(189, 23);
+            this.txtYDPZThreshold.StyleController = this.layoutControl1;
+            this.txtYDPZThreshold.TabIndex = 7;
+            // 
             // CtrlSysSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -213,6 +251,8 @@ namespace XdCxRhDW.App.UserControl
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYDPZThreshold.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -230,5 +270,7 @@ namespace XdCxRhDW.App.UserControl
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraEditors.TextEdit txtMapService;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraEditors.ButtonEdit txtYDPZThreshold;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
     }
 }

+ 5 - 2
XdCxRhDW.App/UserControl/CtrlSysSettings.cs

@@ -42,6 +42,9 @@ namespace XdCxRhDW.App.UserControl
                             this.txtXLDirectory.Text = res.XLDirectory.ToString();
                         if (!string.IsNullOrEmpty(res.MapService))
                             this.txtMapService.Text = res.MapService.ToString();
+                        if (res.YDPZThreshold > 0)
+                            this.txtYDPZThreshold.Text = res.YDPZThreshold.ToString();
+
                     }
                 }
             }
@@ -64,7 +67,7 @@ namespace XdCxRhDW.App.UserControl
                         {
                             HttpPort = Convert.ToInt32(txtHttpPort.Text),
                             XLDirectory = txtXLDirectory.Text,
-                            MapService=txtMapService.Text,
+                            MapService = txtMapService.Text,
                         };
                         db.SysSetings.Add(res);
                     }
@@ -74,7 +77,7 @@ namespace XdCxRhDW.App.UserControl
                         res.XLDirectory = txtXLDirectory.Text;
                         res.MapService = txtMapService.Text;
                     }
-                    
+
                     await db.SaveChangesAsync();
                     DxHelper.MsgBoxHelper.ShowInfo("配置信息保存成功!");
                 }

+ 8 - 11
XdCxRhDW.Core/Api/理论时频差/TheoryDtoDfoApi.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using XdCxRhDW.Repostory.EFContext;
 using XdCxRhDW.Repostory.Model;
 
 namespace XdCxRhDW.Core.Api.理论时频差
@@ -28,16 +29,13 @@ namespace XdCxRhDW.Core.Api.理论时频差
         #endregion
 
 
-        public static EnumTargetState TheoryDfo(CgRes cRes, StationRes sRes, PosRes posRes)
+        public static EnumTargetState TheoryDfo(CgRes cRes, StationRes sRes, PosRes posRes,int YDPZThreshold)
         {
             //张老板说理论频差如果和参估计算出来的频差差值比较大,就说明目标在运动(多路参估每一路都要比较,有一路判定运动则为运动)
             //?具体多少差异需要确定一下
-            //?理论值和实测值是否有正负号差异需要确定一下
-            //?星地的频差是否也支持判定需要确认
-
-            if (cRes.TarFreqUp == null || cRes.TarFreqDown == null)
+            //主邻星本振不一样时该怎么计算
+            if (cRes.TarFreqUp == null || cRes.TarFreqDown == null|| YDPZThreshold <= 0)
                 return EnumTargetState.Unknown;
-            double flagHz = 10;//暂定小于10Hz则判定静止
             double[] target = new double[3] { posRes.PosLon, posRes.PosLat, 0 };
             double[] rec = new double[3] { sRes.SatTxLon, sRes.SatTxLat, 0 };
             double[] xlMain = new double[6] { cRes.MainX.Value, cRes.MainY.Value, cRes.MainZ.Value, cRes.MainVx.Value, cRes.MainVy.Value, cRes.MainVz.Value };
@@ -47,11 +45,10 @@ namespace XdCxRhDW.Core.Api.理论时频差
                 var xlAdja1 = new double[6] { cRes.Adja1X.Value, cRes.Adja1Y.Value, cRes.Adja1Z.Value, cRes.Adja1Vx.Value, cRes.Adja1Vy.Value, cRes.Adja1Vz.Value };
                 double res = DFO_Est(target, rec, rec, xlMain, xlAdja1, cRes.TarFreqUp.Value, cRes.TarFreqDown.Value);
                 var val = Math.Abs(res - cRes.Dfo1.Value);
-                if (val < flagHz)
+                if (val < YDPZThreshold)
                     return EnumTargetState.Stationary;
                 else
                     return EnumTargetState.Movement;
-                //星地那一路不知道接口支持不,暂时不管,如果有接口,则只要有一路判定运动则为运动
             }
             else if (posRes.PosResType == EnumPosResType.X2Dfo)
             {
@@ -59,7 +56,7 @@ namespace XdCxRhDW.Core.Api.理论时频差
                 var xlAdja1 = new double[6] { cRes.Adja1X.Value, cRes.Adja1Y.Value, cRes.Adja1Z.Value, cRes.Adja1Vx.Value, cRes.Adja1Vy.Value, cRes.Adja1Vz.Value };
                 double res = DFO_Est(target, rec, rec, xlMain, xlAdja1, cRes.TarFreqUp.Value, cRes.TarFreqDown.Value);
                 var val = Math.Abs(res - cRes.Dfo1.Value);
-                if (val < flagHz)
+                if (val < YDPZThreshold)
                     return EnumTargetState.Stationary;
                 else
                     return EnumTargetState.Movement;
@@ -77,7 +74,7 @@ namespace XdCxRhDW.Core.Api.理论时频差
                     var xlAdja1 = new double[6] { cRes.Adja1X.Value, cRes.Adja1Y.Value, cRes.Adja1Z.Value, cRes.Adja1Vx.Value, cRes.Adja1Vy.Value, cRes.Adja1Vz.Value };
                     double res = DFO_Est(target, rec, rec, xlMain, xlAdja1, cRes.TarFreqUp.Value, cRes.TarFreqDown.Value);
                     var val = Math.Abs(res - cRes.Dfo1.Value);
-                    if (val >= flagHz)
+                    if (val >= YDPZThreshold)
                         return EnumTargetState.Movement;
                 }
                 if (cRes.Dfo2 != null)
@@ -85,7 +82,7 @@ namespace XdCxRhDW.Core.Api.理论时频差
                     var xlAdja2 = new double[6] { cRes.Adja2X.Value, cRes.Adja2Y.Value, cRes.Adja2Z.Value, cRes.Adja2Vx.Value, cRes.Adja2Vy.Value, cRes.Adja2Vz.Value };
                     double res = DFO_Est(target, rec, rec, xlMain, xlAdja2, cRes.TarFreqUp.Value, cRes.TarFreqDown.Value);
                     var val = Math.Abs(res - cRes.Dfo2.Value);
-                    if (val >= flagHz)
+                    if (val >= YDPZThreshold)
                         return EnumTargetState.Movement;
                 }
                 return EnumTargetState.Stationary;

+ 3 - 0
XdCxRhDW.Repostory/Model/SatInfo.cs

@@ -20,6 +20,9 @@ namespace XdCxRhDW.Repostory.Model
         [Display(Name = "轨道经度")]
         public double? SatLon { get; set; }
 
+        [Display(Name = "卫星本振(MHz)")]
+        public double? SatTrans { get; set; }
+
         [Display(Name = "卫星")]
         public string Sat
         {

+ 2 - 0
XdCxRhDW.Repostory/Model/SysSetings.cs

@@ -14,5 +14,7 @@ namespace XdCxRhDW.Repostory.Model
         public int HttpPort { get; set; }
         public string XLDirectory { get; set; }
         public string MapService { get; set; }
+
+        public int YDPZThreshold { get; set; }
     }
 }