Merge branch 'master' of http://139.155.15.221:3000/zoulei/XdCxRhDW

XdCxRhDW.App/EditForms/X1D1PosParamEditor.Designer.cs

@@ -29,11 +29,6 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            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();
             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();
@@ -54,7 +49,18 @@
             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.labelControl1 = new DevExpress.XtraEditors.LabelControl();
             this.sigTime = new DevExpress.XtraEditors.DateEdit();
             this.txtDtoCdb = new DevExpress.XtraEditors.ButtonEdit();
             this.txtYbMain = new DevExpress.XtraEditors.ButtonEdit();
@@ -65,6 +71,9 @@
             this.txtMainY = new DevExpress.XtraEditors.ButtonEdit();
             this.txtMainZ = new DevExpress.XtraEditors.ButtonEdit();
             this.btnOK = new DevExpress.XtraEditors.SimpleButton();
+            this.btnCalcXl = new DevExpress.XtraEditors.SimpleButton();
+            this.txtCxLocation = new DevExpress.XtraEditors.TextEdit();
+            this.txtcxFx = new DevExpress.XtraEditors.ButtonEdit();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -75,13 +84,15 @@
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
-            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.sigTime.Properties)).BeginInit();
@@ -94,6 +105,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtMainX.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtMainY.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtMainZ.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtCxLocation.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcxFx.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
@@ -104,12 +117,15 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -125,19 +141,33 @@
             this.layoutControl1.Controls.Add(this.txtMainY);
             this.layoutControl1.Controls.Add(this.txtMainZ);
             this.layoutControl1.Controls.Add(this.btnOK);
+            this.layoutControl1.Controls.Add(this.btnCalcXl);
+            this.layoutControl1.Controls.Add(this.txtCxLocation);
+            this.layoutControl1.Controls.Add(this.txtcxFx);
             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(564, 259);
+            this.layoutControl1.Size = new System.Drawing.Size(564, 324);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
+            // labelControl1
+            // 
+            this.labelControl1.Location = new System.Drawing.Point(22, 254);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(70, 14);
+            this.labelControl1.StyleController = this.layoutControl1;
+            this.labelControl1.TabIndex = 13;
+            this.labelControl1.Text = "labelControl1";
+            // 
             // sigTime
             // 
             this.sigTime.EditValue = null;
-            this.sigTime.Location = new System.Drawing.Point(375, 95);
+            this.sigTime.Location = new System.Drawing.Point(22, 91);
+            this.sigTime.MaximumSize = new System.Drawing.Size(0, 23);
+            this.sigTime.MinimumSize = new System.Drawing.Size(0, 23);
             this.sigTime.Name = "sigTime";
             this.sigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -148,34 +178,34 @@
             this.sigTime.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
             this.sigTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.sigTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
-            this.sigTime.Size = new System.Drawing.Size(167, 20);
+            this.sigTime.Size = new System.Drawing.Size(191, 23);
             this.sigTime.StyleController = this.layoutControl1;
             this.sigTime.TabIndex = 9;
             // 
             // txtDtoCdb
             // 
-            this.txtDtoCdb.Location = new System.Drawing.Point(22, 95);
+            this.txtDtoCdb.Location = new System.Drawing.Point(22, 146);
             this.txtDtoCdb.Name = "txtDtoCdb";
             this.txtDtoCdb.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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.txtDtoCdb.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtDtoCdb.Properties.MaskSettings.Set("mask", "f3");
             this.txtDtoCdb.Properties.MaxLength = 10;
             this.txtDtoCdb.Properties.NullValuePrompt = "必需";
-            this.txtDtoCdb.Size = new System.Drawing.Size(156, 23);
+            this.txtDtoCdb.Size = new System.Drawing.Size(191, 23);
             this.txtDtoCdb.StyleController = this.layoutControl1;
             this.txtDtoCdb.TabIndex = 6;
             // 
             // txtYbMain
             // 
-            this.txtYbMain.Location = new System.Drawing.Point(182, 95);
+            this.txtYbMain.Location = new System.Drawing.Point(217, 146);
             this.txtYbMain.Name = "txtYbMain";
             this.txtYbMain.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)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtYbMain.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtYbMain.Properties.MaskSettings.Set("mask", "f3");
             this.txtYbMain.Properties.MaxLength = 10;
-            this.txtYbMain.Size = new System.Drawing.Size(189, 23);
+            this.txtYbMain.Size = new System.Drawing.Size(163, 23);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
             // 
@@ -186,7 +216,7 @@
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
             this.txtsatStation.Properties.MaxLength = 20;
-            this.txtsatStation.Size = new System.Drawing.Size(156, 20);
+            this.txtsatStation.Size = new System.Drawing.Size(191, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
             this.txtsatStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -194,11 +224,11 @@
             // txtcdbStation
             // 
             this.txtcdbStation.EditValue = "";
-            this.txtcdbStation.Location = new System.Drawing.Point(182, 45);
+            this.txtcdbStation.Location = new System.Drawing.Point(217, 45);
             this.txtcdbStation.Name = "txtcdbStation";
             this.txtcdbStation.Properties.AutoHeight = false;
             this.txtcdbStation.Properties.MaxLength = 20;
-            this.txtcdbStation.Size = new System.Drawing.Size(189, 20);
+            this.txtcdbStation.Size = new System.Drawing.Size(163, 20);
             this.txtcdbStation.StyleController = this.layoutControl1;
             this.txtcdbStation.TabIndex = 10;
             this.txtcdbStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -206,68 +236,107 @@
             // txtRefLocation
             // 
             this.txtRefLocation.EditValue = "";
-            this.txtRefLocation.Location = new System.Drawing.Point(375, 45);
+            this.txtRefLocation.Location = new System.Drawing.Point(384, 45);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
             this.txtRefLocation.Properties.MaxLength = 20;
-            this.txtRefLocation.Size = new System.Drawing.Size(167, 20);
+            this.txtRefLocation.Size = new System.Drawing.Size(158, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
             this.txtRefLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             // 
             // txtMainX
             // 
-            this.txtMainX.Location = new System.Drawing.Point(22, 146);
+            this.txtMainX.Location = new System.Drawing.Point(22, 197);
             this.txtMainX.Name = "txtMainX";
             this.txtMainX.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtMainX.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtMainX.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainX.Properties.MaxLength = 10;
             this.txtMainX.Properties.NullValuePrompt = "必需";
-            this.txtMainX.Size = new System.Drawing.Size(156, 20);
+            this.txtMainX.Size = new System.Drawing.Size(191, 20);
             this.txtMainX.StyleController = this.layoutControl1;
             this.txtMainX.TabIndex = 6;
             // 
             // txtMainY
             // 
-            this.txtMainY.Location = new System.Drawing.Point(182, 146);
+            this.txtMainY.Location = new System.Drawing.Point(217, 197);
             this.txtMainY.Name = "txtMainY";
             this.txtMainY.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            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)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -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.txtMainY.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtMainY.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainY.Properties.MaxLength = 10;
             this.txtMainY.Properties.NullValuePrompt = "必需";
-            this.txtMainY.Size = new System.Drawing.Size(189, 20);
+            this.txtMainY.Size = new System.Drawing.Size(163, 20);
             this.txtMainY.StyleController = this.layoutControl1;
             this.txtMainY.TabIndex = 6;
             // 
             // txtMainZ
             // 
-            this.txtMainZ.Location = new System.Drawing.Point(375, 146);
+            this.txtMainZ.Location = new System.Drawing.Point(384, 197);
             this.txtMainZ.Name = "txtMainZ";
             this.txtMainZ.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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.txtMainZ.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtMainZ.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainZ.Properties.MaxLength = 10;
             this.txtMainZ.Properties.NullValuePrompt = "必需";
-            this.txtMainZ.Size = new System.Drawing.Size(167, 20);
+            this.txtMainZ.Size = new System.Drawing.Size(158, 20);
             this.txtMainZ.StyleController = this.layoutControl1;
             this.txtMainZ.TabIndex = 6;
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(375, 177);
+            this.btnOK.Location = new System.Drawing.Point(384, 228);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(167, 22);
+            this.btnOK.Size = new System.Drawing.Size(158, 22);
             this.btnOK.StyleController = this.layoutControl1;
             this.btnOK.TabIndex = 12;
             this.btnOK.Text = "确定";
             this.btnOK.Click += new System.EventHandler(this.btnOk_Click);
             // 
+            // btnCalcXl
+            // 
+            this.btnCalcXl.Location = new System.Drawing.Point(217, 228);
+            this.btnCalcXl.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.btnCalcXl.Name = "btnCalcXl";
+            this.btnCalcXl.Size = new System.Drawing.Size(163, 22);
+            this.btnCalcXl.StyleController = this.layoutControl1;
+            this.btnCalcXl.TabIndex = 12;
+            this.btnCalcXl.Text = "星历推算";
+            this.btnCalcXl.Click += new System.EventHandler(this.btnCalcXl_Click);
+            // 
+            // txtCxLocation
+            // 
+            this.txtCxLocation.EditValue = "";
+            this.txtCxLocation.Location = new System.Drawing.Point(217, 91);
+            this.txtCxLocation.MaximumSize = new System.Drawing.Size(0, 23);
+            this.txtCxLocation.MinimumSize = new System.Drawing.Size(0, 23);
+            this.txtCxLocation.Name = "txtCxLocation";
+            this.txtCxLocation.Properties.AutoHeight = false;
+            this.txtCxLocation.Properties.MaxLength = 20;
+            this.txtCxLocation.Size = new System.Drawing.Size(163, 23);
+            this.txtCxLocation.StyleController = this.layoutControl1;
+            this.txtCxLocation.TabIndex = 10;
+            this.txtCxLocation.ToolTip = "经度纬度之间用英文逗号隔开";
+            // 
+            // txtcxFx
+            // 
+            this.txtcxFx.EditValue = "";
+            this.txtcxFx.Location = new System.Drawing.Point(384, 91);
+            this.txtcxFx.Name = "txtcxFx";
+            this.txtcxFx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "°", -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.txtcxFx.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            this.txtcxFx.Properties.MaskSettings.Set("mask", "f3");
+            this.txtcxFx.Properties.MaxLength = 20;
+            this.txtcxFx.Size = new System.Drawing.Size(158, 23);
+            this.txtcxFx.StyleController = this.layoutControl1;
+            this.txtcxFx.TabIndex = 10;
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -282,22 +351,25 @@
             this.layoutControlItem11,
             this.layoutControlItem12,
             this.layoutControlItem17,
-            this.emptySpaceItem4,
             this.layoutControlItem7,
-            this.layoutControlItem1,
             this.layoutControlItem2,
-            this.emptySpaceItem1});
+            this.emptySpaceItem1,
+            this.layoutControlItem4,
+            this.layoutControlItem8,
+            this.layoutControlItem5,
+            this.layoutControlItem1,
+            this.emptySpaceItem2});
             this.Root.Name = "Root";
             this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 20, 20, 20);
-            this.Root.Size = new System.Drawing.Size(564, 259);
+            this.Root.Size = new System.Drawing.Size(564, 324);
             this.Root.TextVisible = false;
             // 
             // emptySpaceItem3
             // 
             this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 148);
+            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 199);
             this.emptySpaceItem3.Name = "emptySpaceItem3";
-            this.emptySpaceItem3.Size = new System.Drawing.Size(160, 33);
+            this.emptySpaceItem3.Size = new System.Drawing.Size(195, 33);
             this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem6
@@ -305,12 +377,12 @@
             this.layoutControlItem6.Control = this.txtDtoCdb;
             this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem6.CustomizationFormText = "轨道经度";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 46);
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 97);
             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(160, 51);
+            this.layoutControlItem6.Size = new System.Drawing.Size(195, 51);
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.Text = "主星超短时差";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
@@ -326,7 +398,7 @@
             this.layoutControlItem14.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
-            this.layoutControlItem14.Size = new System.Drawing.Size(160, 46);
+            this.layoutControlItem14.Size = new System.Drawing.Size(195, 46);
             this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem14.Text = "接收站经纬度";
             this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
@@ -337,12 +409,12 @@
             this.layoutControlItem9.Control = this.txtcdbStation;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem9.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem9.Location = new System.Drawing.Point(160, 0);
+            this.layoutControlItem9.Location = new System.Drawing.Point(195, 0);
             this.layoutControlItem9.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem9.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
-            this.layoutControlItem9.Size = new System.Drawing.Size(193, 46);
+            this.layoutControlItem9.Size = new System.Drawing.Size(167, 46);
             this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem9.Text = "超短波经纬度";
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
@@ -353,12 +425,12 @@
             this.layoutControlItem10.Control = this.txtRefLocation;
             this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem10.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem10.Location = new System.Drawing.Point(353, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(362, 0);
             this.layoutControlItem10.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem10.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
-            this.layoutControlItem10.Size = new System.Drawing.Size(171, 46);
+            this.layoutControlItem10.Size = new System.Drawing.Size(162, 46);
             this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem10.Text = "参考站经纬度";
             this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
@@ -369,12 +441,12 @@
             this.layoutControlItem3.Control = this.txtMainX;
             this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem3.CustomizationFormText = "轨道经度";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 97);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 148);
             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(160, 51);
+            this.layoutControlItem3.Size = new System.Drawing.Size(195, 51);
             this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem3.Text = "主星星历X";
             this.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
@@ -385,12 +457,12 @@
             this.layoutControlItem11.Control = this.txtMainY;
             this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem11.CustomizationFormText = "轨道经度";
-            this.layoutControlItem11.Location = new System.Drawing.Point(160, 97);
+            this.layoutControlItem11.Location = new System.Drawing.Point(195, 148);
             this.layoutControlItem11.MaxSize = new System.Drawing.Size(0, 51);
             this.layoutControlItem11.MinSize = new System.Drawing.Size(54, 51);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem11.Size = new System.Drawing.Size(193, 51);
+            this.layoutControlItem11.Size = new System.Drawing.Size(167, 51);
             this.layoutControlItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem11.Text = "主星星历Y";
             this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
@@ -401,12 +473,12 @@
             this.layoutControlItem12.Control = this.txtMainZ;
             this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem12.CustomizationFormText = "轨道经度";
-            this.layoutControlItem12.Location = new System.Drawing.Point(353, 97);
+            this.layoutControlItem12.Location = new System.Drawing.Point(362, 148);
             this.layoutControlItem12.MaxSize = new System.Drawing.Size(0, 51);
             this.layoutControlItem12.MinSize = new System.Drawing.Size(54, 51);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem12.Size = new System.Drawing.Size(171, 51);
+            this.layoutControlItem12.Size = new System.Drawing.Size(162, 51);
             this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem12.Text = "主星星历Z";
             this.layoutControlItem12.TextLocation = DevExpress.Utils.Locations.Top;
@@ -417,69 +489,34 @@
             this.layoutControlItem17.Control = this.btnOK;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(353, 148);
+            this.layoutControlItem17.Location = new System.Drawing.Point(362, 199);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem17.Size = new System.Drawing.Size(171, 33);
+            this.layoutControlItem17.Size = new System.Drawing.Size(162, 33);
             this.layoutControlItem17.Text = "layoutControlItem1";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem17.TextVisible = false;
             // 
-            // emptySpaceItem4
-            // 
-            this.emptySpaceItem4.AllowHotTrack = false;
-            this.emptySpaceItem4.Location = new System.Drawing.Point(160, 148);
-            this.emptySpaceItem4.Name = "emptySpaceItem4";
-            this.emptySpaceItem4.Size = new System.Drawing.Size(193, 33);
-            this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
-            // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txtYbMain;
             this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem7.CustomizationFormText = "轨道经度";
-            this.layoutControlItem7.Location = new System.Drawing.Point(160, 46);
+            this.layoutControlItem7.Location = new System.Drawing.Point(195, 97);
             this.layoutControlItem7.MaxSize = new System.Drawing.Size(0, 51);
             this.layoutControlItem7.MinSize = new System.Drawing.Size(54, 51);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem7.Size = new System.Drawing.Size(193, 51);
+            this.layoutControlItem7.Size = new System.Drawing.Size(167, 51);
             this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem7.Text = "样本主星时差";
             this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.sigTime;
-            this.layoutControlItem1.Location = new System.Drawing.Point(353, 46);
-            this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 54);
-            this.layoutControlItem1.MinSize = new System.Drawing.Size(76, 51);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(171, 51);
-            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem1.Text = "信号时间";
-            this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // dxErrorProvider
-            // 
-            this.dxErrorProvider.ContainerControl = this;
-            // 
-            // labelControl1
-            // 
-            this.labelControl1.Location = new System.Drawing.Point(22, 203);
-            this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(70, 14);
-            this.labelControl1.StyleController = this.layoutControl1;
-            this.labelControl1.TabIndex = 13;
-            this.labelControl1.Text = "labelControl1";
-            // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.labelControl1;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 181);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 232);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.Size = new System.Drawing.Size(524, 18);
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
@@ -488,18 +525,89 @@
             // 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(524, 20);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(524, 34);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.btnCalcXl;
+            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem4.CustomizationFormText = "layoutControlItem1";
+            this.layoutControlItem4.Location = new System.Drawing.Point(195, 199);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
+            this.layoutControlItem4.Size = new System.Drawing.Size(167, 33);
+            this.layoutControlItem4.Text = "layoutControlItem1";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem4.TextVisible = false;
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txtcxFx;
+            this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem8.CustomizationFormText = "参考站经纬度";
+            this.layoutControlItem8.Location = new System.Drawing.Point(362, 46);
+            this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 51);
+            this.layoutControlItem8.MinSize = new System.Drawing.Size(50, 51);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
+            this.layoutControlItem8.Size = new System.Drawing.Size(162, 51);
+            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem8.Text = "测向方向值";
+            this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txtCxLocation;
+            this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem5.CustomizationFormText = "参考站经纬度";
+            this.layoutControlItem5.Location = new System.Drawing.Point(195, 46);
+            this.layoutControlItem5.MaxSize = new System.Drawing.Size(0, 51);
+            this.layoutControlItem5.MinSize = new System.Drawing.Size(77, 51);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
+            this.layoutControlItem5.Size = new System.Drawing.Size(167, 51);
+            this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem5.Text = "测向站经纬度";
+            this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.sigTime;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 46);
+            this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 51);
+            this.layoutControlItem1.MinSize = new System.Drawing.Size(76, 51);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
+            this.layoutControlItem1.Size = new System.Drawing.Size(195, 51);
+            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem1.Text = "信号时间";
+            this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // emptySpaceItem2
+            // 
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(362, 97);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(162, 51);
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // dxErrorProvider
+            // 
+            this.dxErrorProvider.ContainerControl = this;
+            // 
             // X1D1PosParamEditor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.layoutControl1);
             this.Name = "X1D1PosParamEditor";
-            this.Size = new System.Drawing.Size(564, 259);
+            this.Size = new System.Drawing.Size(564, 324);
             this.Load += new System.EventHandler(this.X1D1DTOParamEditor_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
@@ -513,6 +621,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtMainX.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtMainY.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtMainZ.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtCxLocation.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcxFx.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
@@ -523,12 +633,15 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -559,9 +672,15 @@
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3;
         private DevExpress.XtraEditors.SimpleButton btnOK;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem4;
         private DevExpress.XtraEditors.LabelControl labelControl1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
+        private DevExpress.XtraEditors.SimpleButton btnCalcXl;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraEditors.TextEdit txtCxLocation;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraEditors.ButtonEdit txtcxFx;
     }
 }

XdCxRhDW.App/EditForms/X1D1PosParamEditor.cs

@@ -20,6 +20,7 @@ using System.Threading.Tasks;
 using System.Windows.Documents;
 using System.Windows.Forms;
 using XdCxRhDW.Core.Api;
+using XdCxRhDW.Repostory;
 using XdCxRhDW.Repostory.EFContext;
 using XdCxRhDW.Repostory.Model;
 
@@ -37,10 +38,17 @@ namespace XdCxRhDW.App.EditForms
             this.info = info;
             this.listSat = new List<SatInfo>();
             this.mapControl1 = mapControl;
+            this.labelControl1.Text = $"";
             //this.StartPosition = FormStartPosition.CenterParent;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtcdbStation.EditValueChanged += TxtcdbStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
+            txtCxLocation.EditValueChanged += TxtCxLocation_EditValueChanged;
+        }
+
+        private void TxtCxLocation_EditValueChanged(object sender, EventArgs e)
+        {
+            txtCxLocation.CheckLonLat(dxErrorProvider, "测向站");
         }
 
         private void TxtRefLocation_EditValueChanged(object sender, EventArgs e)
@@ -63,6 +71,7 @@ namespace XdCxRhDW.App.EditForms
         {
 
             StationRes station;
+            CxRes cx;
             using (RHDWContext db = new RHDWContext())
             {
                 listSat = await db.SatInfos.ToListAsync();
@@ -71,6 +80,7 @@ namespace XdCxRhDW.App.EditForms
             {
                 cg = await db.CgRes.Where(m => m.ID == info.CgResID).FirstOrDefaultAsync();
                 station = await db.StationRes.Where(m => m.ID == info.StationResID).FirstOrDefaultAsync();
+                cx = await db.CxRes.Where(m => m.ID == info.CxResID).FirstOrDefaultAsync();
             }
             if (cg != null)
             {
@@ -80,12 +90,18 @@ namespace XdCxRhDW.App.EditForms
                 this.txtMainX.Text = $"{cg.MainX.Value:f3}";
                 this.txtMainY.Text = $"{cg.MainY.Value:f3}";
                 this.txtMainZ.Text = $"{cg.MainZ.Value:f3}";
+
+            }
+            if (cx != null)
+            {
+                this.txtcxFx.Text = $"{cx.Fx:f3}";
             }
             if (station != null)
             {
                 this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
                 this.txtcdbStation.Text = $"{station.CdbTxLon:f3},{station.CdbTxLat:f3}";
                 this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
+                this.txtCxLocation.Text = $"{station.CxLon:f3},{station.CxLat:f3}";
             }
         }
 
@@ -111,41 +127,83 @@ namespace XdCxRhDW.App.EditForms
             if (!CheckParam()) { return; }
             try
             {
-
                 var MsAnt = txtsatStation.GetLonLat();
                 var CDBAnt = txtcdbStation.GetLonLat();
                 var RefGeod = txtRefLocation.GetLonLat();
+                var CXStation = txtCxLocation.GetLonLat();
 
+                var sigTime = this.sigTime.DateTime;
                 var DtoCdb = Convert.ToDouble(this.txtDtoCdb.Text);
                 var YbMainDto = Convert.ToDouble(this.txtYbMain.Text);
+                var Fx = Convert.ToDouble(this.txtcxFx.Text);
 
                 var MainX = Convert.ToDouble(this.txtMainX.Text);
                 var MainY = Convert.ToDouble(this.txtMainY.Text);
                 var MainZ = Convert.ToDouble(this.txtMainZ.Text);
                 double[] msEph = new double[] { MainX, MainY, MainZ, 0, 0, 0 };
 
-                //DtoLineXdOption dtoLineXd = new DtoLineXdOption();
-                //dtoLineXd.MsEph = msEph;
-                //dtoLineXd.MsAnt = MsAnt;
-                //dtoLineXd.CDBAnt = CDBAnt;
-                //dtoLineXd.RefGeod = RefGeod;
-                //dtoLineXd.xdDto = DtoCdb;
-                //dtoLineXd.RefDto = YbMainDto;
-                //dtoLineXd.PosLon = info.PosLon;
-                //dtoLineXd.PosLat = info.PosLat;
-
-                //var msat = listSat.FirstOrDefault(m => m.SatCode == cg.MainCode.Value)?.Sat;
-                //if (string.IsNullOrWhiteSpace(msat)) msat = cg.MainCode.Value.ToString();
-                //var xdDtoLine = PosApi.X1D1_Pos(dtoLineXd);
-                //mapControl1.DrawDtoPonit($"[{msat},超短{CDBAnt[0]}°]带参时差线", xdDtoLine);
+                var StationRes = new StationRes()
+                {
+                    SatTxLon = MsAnt[0],
+                    SatTxLat = MsAnt[1],
+                    CdbTxLon = CDBAnt[0],
+                    CdbTxLat = CDBAnt[1],
+                    CxLon = CXStation[0],
+                    CxLat = CXStation[1],
+                    RefLon = RefGeod[0],
+                    RefLat = RefGeod[1],
+                };
+
+                var cgRes = new CgRes()
+                {
+                    SigTime = sigTime,
+                    DtoCdb = DtoCdb,
+                    YbMainDto = YbMainDto,
+                    MainX = MainX,
+                    MainY = MainY,
+                    MainZ = MainZ,
+                };
+
+                var cxRes = new CxRes()
+                {
+                    SigTime = sigTime,
+                    Fx = Fx,
+                };
+
+                var res = PosApi.X1D1_Pos(cgRes, StationRes, cxRes);
+                this.labelControl1.Text = $"定位点:[{res[0]},{res[1]}] 镜像点:[{res[3]},{res[4]}]";
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"绘制{info.PosResType.GetEnumDisplayName()}时差线失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"绘制{info.PosResType.GetEnumDisplayName()}时差线失败");
+                Serilog.Log.Error(ex, $"手动{info.PosResType.GetEnumDisplayName()}定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"手动{info.PosResType.GetEnumDisplayName()}定位失败");
             }
         }
 
+        private async void btnCalcXl_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                var sigTime = this.sigTime.DateTime;
+                var xlInfo = await XlCache.GetLatestAsync(cg.MainCode.Value, sigTime);
+                if (xlInfo == null)
+                {
+                    DxHelper.MsgBoxHelper.ShowWarning($"卫星:{cg.MainCode.Value}未找到对应的星历信息,请导入星历");
+                    return;
+                }
+                var p = EphHelper.Calc(xlInfo.TwoLine, sigTime);
+                this.txtMainX.Text = $"{p.X:f3}";
+                this.txtMainY.Text = $"{p.Y:f3}";
+                this.txtMainZ.Text = $"{p.Z:f3}";
+
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Error(ex, $"手动{info.PosResType.GetEnumDisplayName()}推算星历失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"手动{info.PosResType.GetEnumDisplayName()}推算星历失败");
+            }
 
+
+        }
     }
 }

XdCxRhDW.App/UserControl/CtrlCgRes.cs

@@ -158,8 +158,9 @@ namespace XdCxRhDW.App.UserControl
                 }
                 else
                 {
-                    if (!Directory.Exists("DbPart")) return new List<CgRes>();
-                    var yearDirs = Directory.EnumerateDirectories(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "DbPart")).OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name));//年目录,倒叙排列
+                    var dir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "DbPart");
+                    if (!Directory.Exists(dir)) return new List<CgRes>();
+                    var yearDirs = Directory.EnumerateDirectories(dir).OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name));//年目录,倒叙排列
                     foreach (var yearDir in yearDirs)
                     {
                         //每一天的db文件,倒序排列

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -1187,7 +1187,8 @@ namespace XdCxRhDW.App.UserControl
         {
             try
             {
-                if (!Directory.Exists("DbPart")) return new List<PosRes>();
+                var dir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "DbPart");
+                if (!Directory.Exists(dir)) return new List<PosRes>();
                 DateTime end = DateTime.MinValue;
                 DateTime start = DateTime.MinValue;
                 if (txtTimeCho.Text == "自定义")

XdCxRhDW.Repostory/XlCache.cs

@@ -22,8 +22,9 @@ namespace XdCxRhDW.Repostory
             try
             {
                 List<XlInfo> list = new List<XlInfo>();
-                if (!Directory.Exists("DbPart")) return list;
-                var yearDirs = Directory.EnumerateDirectories(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "DbPart")).OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name));//年目录,倒叙排列
+                var dir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "DbPart");
+                if (!Directory.Exists(dir)) return list;
+                var yearDirs = Directory.EnumerateDirectories(dir).OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name));//年目录,倒叙排列
                 foreach (var yearDir in yearDirs)
                 {
                     //每一天的db文件,倒序排列

XdCxRhDW.WebApi/Controllers/PosController.cs

@@ -193,6 +193,7 @@ namespace XdCxRhDW.App.WebAPI
                     SigTime = dto.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                    CxResID = cxRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -1689,8 +1690,9 @@ namespace XdCxRhDW.App.WebAPI
             {
                 DateTime start = dto.BeginTime;
                 DateTime end = dto.EndTime;
-                if (!Directory.Exists("DbPart")) return Success(posList);
-                var yearDirs = Directory.EnumerateDirectories(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "DbPart")).OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name));//年目录,倒叙排列
+                var dir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "DbPart");
+                if (!Directory.Exists(dir)) return Success(posList);
+                var yearDirs = Directory.EnumerateDirectories(dir).OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name));//年目录,倒叙排列
                 foreach (var yearDir in yearDirs)
                 {
                     //每一天的db文件,倒序排列