wyq 2 лет назад
Родитель
Сommit
cc030d32a3

+ 14 - 30
XdCxRhDW.App/EditForms/X1D1DTOParamEditor.Designer.cs

@@ -61,7 +61,6 @@
             this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
@@ -84,7 +83,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             this.SuspendLayout();
             // 
@@ -118,7 +116,7 @@
             // sigTime
             // 
             this.sigTime.EditValue = null;
-            this.sigTime.Location = new System.Drawing.Point(382, 85);
+            this.sigTime.Location = new System.Drawing.Point(382, 81);
             this.sigTime.Name = "sigTime";
             this.sigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -135,7 +133,7 @@
             // 
             // txtDtoCdb
             // 
-            this.txtDtoCdb.Location = new System.Drawing.Point(14, 85);
+            this.txtDtoCdb.Location = new System.Drawing.Point(14, 81);
             this.txtDtoCdb.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtDtoCdb.Name = "txtDtoCdb";
             this.txtDtoCdb.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -147,7 +145,7 @@
             // 
             // txtYbMain
             // 
-            this.txtYbMain.Location = new System.Drawing.Point(214, 85);
+            this.txtYbMain.Location = new System.Drawing.Point(214, 81);
             this.txtYbMain.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtYbMain.Name = "txtYbMain";
             this.txtYbMain.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -195,7 +193,7 @@
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(382, 188);
+            this.btnOK.Location = new System.Drawing.Point(382, 164);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
             this.btnOK.Size = new System.Drawing.Size(170, 22);
@@ -206,7 +204,7 @@
             // 
             // btnEphCalc
             // 
-            this.btnEphCalc.Location = new System.Drawing.Point(214, 188);
+            this.btnEphCalc.Location = new System.Drawing.Point(214, 164);
             this.btnEphCalc.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnEphCalc.Name = "btnEphCalc";
             this.btnEphCalc.Size = new System.Drawing.Size(164, 22);
@@ -230,8 +228,7 @@
             this.layoutControlItem1,
             this.emptySpaceItem2,
             this.layoutControlItem2,
-            this.layoutControlItem3,
-            this.emptySpaceItem1});
+            this.layoutControlItem3});
             this.Root.Name = "Root";
             this.Root.Size = new System.Drawing.Size(564, 262);
             this.Root.TextVisible = false;
@@ -239,7 +236,7 @@
             // emptySpaceItem3
             // 
             this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 169);
+            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 145);
             this.emptySpaceItem3.Name = "emptySpaceItem3";
             this.emptySpaceItem3.Size = new System.Drawing.Size(202, 33);
             this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
@@ -253,7 +250,7 @@
             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.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
             this.layoutControlItem6.Size = new System.Drawing.Size(202, 51);
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
@@ -316,7 +313,7 @@
             this.layoutControlItem17.Control = this.btnOK;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(370, 169);
+            this.layoutControlItem17.Location = new System.Drawing.Point(370, 145);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
             this.layoutControlItem17.Size = new System.Drawing.Size(174, 33);
@@ -333,7 +330,7 @@
             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.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
             this.layoutControlItem7.Size = new System.Drawing.Size(168, 51);
             this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem7.Text = "样本主星时差";
@@ -347,7 +344,7 @@
             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.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
             this.layoutControlItem1.Size = new System.Drawing.Size(174, 51);
             this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
@@ -358,9 +355,9 @@
             // emptySpaceItem2
             // 
             this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 202);
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 178);
             this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(544, 40);
+            this.emptySpaceItem2.Size = new System.Drawing.Size(544, 64);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem2
@@ -380,7 +377,7 @@
             this.layoutControlItem3.Control = this.btnEphCalc;
             this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem3.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem3.Location = new System.Drawing.Point(202, 169);
+            this.layoutControlItem3.Location = new System.Drawing.Point(202, 145);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
             this.layoutControlItem3.Size = new System.Drawing.Size(168, 33);
@@ -388,17 +385,6 @@
             this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem3.TextVisible = false;
             // 
-            // emptySpaceItem1
-            // 
-            this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 145);
-            this.emptySpaceItem1.MaxSize = new System.Drawing.Size(0, 24);
-            this.emptySpaceItem1.MinSize = new System.Drawing.Size(104, 24);
-            this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(544, 24);
-            this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
-            // 
             // dxErrorProvider
             // 
             this.dxErrorProvider.ContainerControl = this;
@@ -432,7 +418,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             this.ResumeLayout(false);
 
@@ -463,6 +448,5 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraEditors.SimpleButton btnEphCalc;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
     }
 }

+ 20 - 19
XdCxRhDW.App/EditForms/X2D1DTOParamEditor.Designer.cs

@@ -29,11 +29,6 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -49,6 +44,11 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.ucEphXYZAdaj = new XdCxRhDW.App.UserControl.UCEphXYZ();
             this.ucEphXYZMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
@@ -134,6 +134,7 @@
             // 
             this.ucEphXYZAdaj.Location = new System.Drawing.Point(12, 208);
             this.ucEphXYZAdaj.Name = "ucEphXYZAdaj";
+            this.ucEphXYZAdaj.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
             this.ucEphXYZAdaj.Size = new System.Drawing.Size(618, 44);
             this.ucEphXYZAdaj.TabIndex = 14;
             // 
@@ -147,7 +148,7 @@
             // sigTime
             // 
             this.sigTime.EditValue = null;
-            this.sigTime.Location = new System.Drawing.Point(242, 136);
+            this.sigTime.Location = new System.Drawing.Point(242, 132);
             this.sigTime.Name = "sigTime";
             this.sigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -164,11 +165,11 @@
             // 
             // txtDtoSx
             // 
-            this.txtDtoSx.Location = new System.Drawing.Point(14, 85);
+            this.txtDtoSx.Location = new System.Drawing.Point(14, 81);
             this.txtDtoSx.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtDtoSx.Name = "txtDtoSx";
             this.txtDtoSx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -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, "us", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtDtoSx.Properties.NullValuePrompt = "必需";
             this.txtDtoSx.Size = new System.Drawing.Size(224, 20);
             this.txtDtoSx.StyleController = this.layoutControl1;
@@ -176,11 +177,11 @@
             // 
             // txtDtoCdb
             // 
-            this.txtDtoCdb.Location = new System.Drawing.Point(242, 85);
+            this.txtDtoCdb.Location = new System.Drawing.Point(242, 81);
             this.txtDtoCdb.MaximumSize = new System.Drawing.Size(0, 20);
             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, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", 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.NullValuePrompt = "必需";
             this.txtDtoCdb.Size = new System.Drawing.Size(190, 20);
             this.txtDtoCdb.StyleController = this.layoutControl1;
@@ -188,22 +189,22 @@
             // 
             // txtYbMain
             // 
-            this.txtYbMain.Location = new System.Drawing.Point(436, 85);
+            this.txtYbMain.Location = new System.Drawing.Point(436, 81);
             this.txtYbMain.MaximumSize = new System.Drawing.Size(0, 20);
             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.Size = new System.Drawing.Size(192, 20);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
             // 
             // txtYbAdja
             // 
-            this.txtYbAdja.Location = new System.Drawing.Point(12, 136);
+            this.txtYbAdja.Location = new System.Drawing.Point(12, 132);
             this.txtYbAdja.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtYbAdja.Name = "txtYbAdja";
             this.txtYbAdja.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtYbAdja.Size = new System.Drawing.Size(226, 20);
             this.txtYbAdja.StyleController = this.layoutControl1;
             this.txtYbAdja.TabIndex = 6;
@@ -306,7 +307,7 @@
             this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 51);
             this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 51);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
             this.layoutControlItem2.Size = new System.Drawing.Size(230, 51);
             this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem2.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
@@ -323,7 +324,7 @@
             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.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
             this.layoutControlItem6.Size = new System.Drawing.Size(194, 51);
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.Text = "主星超短时差";
@@ -387,7 +388,7 @@
             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.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
             this.layoutControlItem1.Size = new System.Drawing.Size(392, 51);
             this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
@@ -418,7 +419,7 @@
             this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 51);
             this.layoutControlItem8.MinSize = new System.Drawing.Size(54, 51);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
             this.layoutControlItem8.Size = new System.Drawing.Size(230, 51);
             this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem8.Text = "样本邻星时差";
@@ -479,7 +480,7 @@
             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.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
             this.layoutControlItem7.Size = new System.Drawing.Size(198, 51);
             this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem7.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);

+ 94 - 97
XdCxRhDW.App/EditForms/X2D1PosParamEditor.Designer.cs

@@ -29,16 +29,6 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -49,7 +39,19 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            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 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();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.ucEphXYZAdaj = new XdCxRhDW.App.UserControl.UCEphXYZ();
+            this.ucEphXYZMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
             this.lblRes = new DevExpress.XtraEditors.LabelControl();
             this.txtSigTime = new DevExpress.XtraEditors.DateEdit();
             this.txtDtoSx = new DevExpress.XtraEditors.ButtonEdit();
@@ -74,12 +76,10 @@
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
-            this.ucEphXYZAdaj = new XdCxRhDW.App.UserControl.UCEphXYZ();
-            this.ucEphXYZMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtSigTime.Properties)).BeginInit();
@@ -104,10 +104,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -134,9 +134,24 @@
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
+            // ucEphXYZAdaj
+            // 
+            this.ucEphXYZAdaj.Location = new System.Drawing.Point(22, 208);
+            this.ucEphXYZAdaj.Name = "ucEphXYZAdaj";
+            this.ucEphXYZAdaj.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.ucEphXYZAdaj.Size = new System.Drawing.Size(598, 44);
+            this.ucEphXYZAdaj.TabIndex = 16;
+            // 
+            // ucEphXYZMain
+            // 
+            this.ucEphXYZMain.Location = new System.Drawing.Point(22, 160);
+            this.ucEphXYZMain.Name = "ucEphXYZMain";
+            this.ucEphXYZMain.Size = new System.Drawing.Size(598, 44);
+            this.ucEphXYZMain.TabIndex = 15;
+            // 
             // lblRes
             // 
-            this.lblRes.Location = new System.Drawing.Point(22, 299);
+            this.lblRes.Location = new System.Drawing.Point(22, 289);
             this.lblRes.Name = "lblRes";
             this.lblRes.Size = new System.Drawing.Size(598, 14);
             this.lblRes.StyleController = this.layoutControl1;
@@ -145,7 +160,7 @@
             // txtSigTime
             // 
             this.txtSigTime.EditValue = null;
-            this.txtSigTime.Location = new System.Drawing.Point(244, 146);
+            this.txtSigTime.Location = new System.Drawing.Point(244, 131);
             this.txtSigTime.Name = "txtSigTime";
             this.txtSigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -162,11 +177,11 @@
             // 
             // txtDtoSx
             // 
-            this.txtDtoSx.Location = new System.Drawing.Point(24, 95);
+            this.txtDtoSx.Location = new System.Drawing.Point(24, 85);
             this.txtDtoSx.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtDtoSx.Name = "txtDtoSx";
             this.txtDtoSx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtDtoSx.Properties.NullValuePrompt = "必需";
             this.txtDtoSx.Size = new System.Drawing.Size(216, 20);
             this.txtDtoSx.StyleController = this.layoutControl1;
@@ -174,11 +189,11 @@
             // 
             // txtDtoCdb
             // 
-            this.txtDtoCdb.Location = new System.Drawing.Point(244, 95);
+            this.txtDtoCdb.Location = new System.Drawing.Point(244, 85);
             this.txtDtoCdb.MaximumSize = new System.Drawing.Size(0, 20);
             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, 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, "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.NullValuePrompt = "必需";
             this.txtDtoCdb.Size = new System.Drawing.Size(185, 20);
             this.txtDtoCdb.StyleController = this.layoutControl1;
@@ -186,22 +201,22 @@
             // 
             // txtYbMain
             // 
-            this.txtYbMain.Location = new System.Drawing.Point(433, 95);
+            this.txtYbMain.Location = new System.Drawing.Point(433, 85);
             this.txtYbMain.MaximumSize = new System.Drawing.Size(0, 20);
             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, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", 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.Size = new System.Drawing.Size(185, 20);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
             // 
             // txtYbAdja
             // 
-            this.txtYbAdja.Location = new System.Drawing.Point(24, 146);
+            this.txtYbAdja.Location = new System.Drawing.Point(24, 131);
             this.txtYbAdja.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtYbAdja.Name = "txtYbAdja";
             this.txtYbAdja.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtYbAdja.Size = new System.Drawing.Size(216, 20);
             this.txtYbAdja.StyleController = this.layoutControl1;
             this.txtYbAdja.TabIndex = 6;
@@ -209,7 +224,8 @@
             // txtsatStation
             // 
             this.txtsatStation.EditValue = "";
-            this.txtsatStation.Location = new System.Drawing.Point(24, 45);
+            this.txtsatStation.Location = new System.Drawing.Point(24, 39);
+            this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
             this.txtsatStation.Properties.MaxLength = 20;
@@ -221,7 +237,8 @@
             // txtcdbStation
             // 
             this.txtcdbStation.EditValue = "";
-            this.txtcdbStation.Location = new System.Drawing.Point(244, 45);
+            this.txtcdbStation.Location = new System.Drawing.Point(244, 39);
+            this.txtcdbStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtcdbStation.Name = "txtcdbStation";
             this.txtcdbStation.Properties.AutoHeight = false;
             this.txtcdbStation.Properties.MaxLength = 20;
@@ -233,7 +250,8 @@
             // txtRefLocation
             // 
             this.txtRefLocation.EditValue = "";
-            this.txtRefLocation.Location = new System.Drawing.Point(433, 45);
+            this.txtRefLocation.Location = new System.Drawing.Point(433, 39);
+            this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
             this.txtRefLocation.Properties.MaxLength = 20;
@@ -244,7 +262,7 @@
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(435, 273);
+            this.btnOK.Location = new System.Drawing.Point(435, 263);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
             this.btnOK.Size = new System.Drawing.Size(183, 22);
@@ -255,7 +273,7 @@
             // 
             // btnEphCalc
             // 
-            this.btnEphCalc.Location = new System.Drawing.Point(244, 273);
+            this.btnEphCalc.Location = new System.Drawing.Point(244, 263);
             this.btnEphCalc.Name = "btnEphCalc";
             this.btnEphCalc.Size = new System.Drawing.Size(185, 22);
             this.btnEphCalc.StyleController = this.layoutControl1;
@@ -294,11 +312,10 @@
             this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem2.CustomizationFormText = "轨道经度";
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 46);
-            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 51);
+            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 46);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem2.Size = new System.Drawing.Size(222, 51);
+            this.layoutControlItem2.Size = new System.Drawing.Size(222, 46);
             this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem2.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
             this.layoutControlItem2.Text = "双星时差";
@@ -311,11 +328,10 @@
             this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem6.CustomizationFormText = "轨道经度";
             this.layoutControlItem6.Location = new System.Drawing.Point(222, 46);
-            this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem6.MinSize = new System.Drawing.Size(54, 51);
+            this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem6.MinSize = new System.Drawing.Size(54, 46);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem6.Size = new System.Drawing.Size(189, 51);
+            this.layoutControlItem6.Size = new System.Drawing.Size(189, 46);
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.Text = "目标星地时差";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
@@ -330,7 +346,6 @@
             this.layoutControlItem14.MaxSize = new System.Drawing.Size(0, 46);
             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(222, 46);
             this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem14.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
@@ -347,7 +362,6 @@
             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(189, 46);
             this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem9.Text = "超短波经纬度";
@@ -363,7 +377,6 @@
             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(191, 46);
             this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem10.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
@@ -374,12 +387,11 @@
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.txtSigTime;
-            this.layoutControlItem1.Location = new System.Drawing.Point(222, 97);
-            this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 54);
-            this.layoutControlItem1.MinSize = new System.Drawing.Size(76, 51);
+            this.layoutControlItem1.Location = new System.Drawing.Point(222, 92);
+            this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem1.MinSize = new System.Drawing.Size(76, 46);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(380, 51);
+            this.layoutControlItem1.Size = new System.Drawing.Size(380, 46);
             this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.layoutControlItem1.Text = "信号时间";
@@ -391,7 +403,7 @@
             this.layoutControlItem17.Control = this.btnOK;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(411, 244);
+            this.layoutControlItem17.Location = new System.Drawing.Point(411, 234);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
             this.layoutControlItem17.Size = new System.Drawing.Size(191, 33);
@@ -405,12 +417,12 @@
             this.layoutControlItem8.Control = this.txtYbAdja;
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.CustomizationFormText = "轨道经度";
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 97);
-            this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem8.MinSize = new System.Drawing.Size(54, 51);
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 92);
+            this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem8.MinSize = new System.Drawing.Size(54, 46);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem8.Size = new System.Drawing.Size(222, 51);
+            this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 1);
+            this.layoutControlItem8.Size = new System.Drawing.Size(222, 46);
             this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem8.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
             this.layoutControlItem8.Text = "样本邻星时差";
@@ -420,15 +432,15 @@
             // emptySpaceItem2
             // 
             this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 295);
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 285);
             this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(602, 34);
+            this.emptySpaceItem2.Size = new System.Drawing.Size(602, 44);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.lblRes;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 277);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 267);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.Size = new System.Drawing.Size(602, 18);
             this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
@@ -437,7 +449,7 @@
             // emptySpaceItem3
             // 
             this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 244);
+            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 234);
             this.emptySpaceItem3.Name = "emptySpaceItem3";
             this.emptySpaceItem3.Size = new System.Drawing.Size(222, 33);
             this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
@@ -445,52 +457,17 @@
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.btnEphCalc;
-            this.layoutControlItem5.Location = new System.Drawing.Point(222, 244);
+            this.layoutControlItem5.Location = new System.Drawing.Point(222, 234);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
             this.layoutControlItem5.Size = new System.Drawing.Size(189, 33);
             this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem5.TextVisible = false;
             // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txtYbMain;
-            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem7.CustomizationFormText = "轨道经度";
-            this.layoutControlItem7.Location = new System.Drawing.Point(411, 46);
-            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(191, 51);
-            this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem7.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
-            this.layoutControlItem7.Text = "样本主星时差";
-            this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // dxErrorProvider
-            // 
-            this.dxErrorProvider.ContainerControl = this;
-            // 
-            // ucEphXYZAdaj
-            // 
-            this.ucEphXYZAdaj.Location = new System.Drawing.Point(22, 218);
-            this.ucEphXYZAdaj.Name = "ucEphXYZAdaj";
-            this.ucEphXYZAdaj.Size = new System.Drawing.Size(598, 44);
-            this.ucEphXYZAdaj.TabIndex = 16;
-            // 
-            // ucEphXYZMain
-            // 
-            this.ucEphXYZMain.Location = new System.Drawing.Point(22, 170);
-            this.ucEphXYZMain.Name = "ucEphXYZMain";
-            this.ucEphXYZMain.Size = new System.Drawing.Size(598, 44);
-            this.ucEphXYZMain.TabIndex = 15;
-            // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.ucEphXYZMain;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 148);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 138);
             this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 48);
             this.layoutControlItem3.MinSize = new System.Drawing.Size(166, 48);
             this.layoutControlItem3.Name = "layoutControlItem3";
@@ -502,7 +479,7 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.ucEphXYZAdaj;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 196);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 186);
             this.layoutControlItem11.MaxSize = new System.Drawing.Size(0, 48);
             this.layoutControlItem11.MinSize = new System.Drawing.Size(166, 48);
             this.layoutControlItem11.Name = "layoutControlItem11";
@@ -511,6 +488,26 @@
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
             // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txtYbMain;
+            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem7.CustomizationFormText = "轨道经度";
+            this.layoutControlItem7.Location = new System.Drawing.Point(411, 46);
+            this.layoutControlItem7.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem7.MinSize = new System.Drawing.Size(54, 46);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.Size = new System.Drawing.Size(191, 46);
+            this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem7.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
+            this.layoutControlItem7.Text = "样本主星时差";
+            this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // dxErrorProvider
+            // 
+            this.dxErrorProvider.ContainerControl = this;
+            // 
             // X2D1PosParamEditor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -543,10 +540,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             this.ResumeLayout(false);
 
         }

+ 239 - 524
XdCxRhDW.App/EditForms/X3DTOParamEditor.Designer.cs

@@ -54,52 +54,10 @@
             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();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions13 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject49 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject50 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject51 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject52 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions14 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject53 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject54 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject55 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject56 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.ucEphXYZAdja2 = new XdCxRhDW.App.UserControl.UCEphXYZ();
+            this.ucEphXYZAdja1 = new XdCxRhDW.App.UserControl.UCEphXYZ();
+            this.ucEphXYZMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
             this.sigTime = new DevExpress.XtraEditors.DateEdit();
             this.txtDtoSx = new DevExpress.XtraEditors.ButtonEdit();
             this.txtDtoSx1 = new DevExpress.XtraEditors.ButtonEdit();
@@ -107,40 +65,25 @@
             this.txtYbAdja = new DevExpress.XtraEditors.ButtonEdit();
             this.txtsatStation = new DevExpress.XtraEditors.TextEdit();
             this.txtRefLocation = new DevExpress.XtraEditors.TextEdit();
-            this.txtMainX = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtMainY = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtMainZ = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtAdjaX = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtAdjaY = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtAdjaZ = new DevExpress.XtraEditors.ButtonEdit();
             this.btnOK = new DevExpress.XtraEditors.SimpleButton();
-            this.txtAdjaY1 = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtAdjaX1 = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtAdjaZ1 = new DevExpress.XtraEditors.ButtonEdit();
             this.txtYbAdja1 = new DevExpress.XtraEditors.ButtonEdit();
+            this.btnEphCalc = new DevExpress.XtraEditors.SimpleButton();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
@@ -152,44 +95,31 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtYbAdja.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtsatStation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation.Properties)).BeginInit();
-            ((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.txtAdjaX.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaY.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaZ.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaY1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaX1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaZ1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtYbAdja1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
             // 
+            this.layoutControl1.Controls.Add(this.ucEphXYZAdja2);
+            this.layoutControl1.Controls.Add(this.ucEphXYZAdja1);
+            this.layoutControl1.Controls.Add(this.ucEphXYZMain);
             this.layoutControl1.Controls.Add(this.sigTime);
             this.layoutControl1.Controls.Add(this.txtDtoSx);
             this.layoutControl1.Controls.Add(this.txtDtoSx1);
@@ -197,17 +127,9 @@
             this.layoutControl1.Controls.Add(this.txtYbAdja);
             this.layoutControl1.Controls.Add(this.txtsatStation);
             this.layoutControl1.Controls.Add(this.txtRefLocation);
-            this.layoutControl1.Controls.Add(this.txtMainX);
-            this.layoutControl1.Controls.Add(this.txtMainY);
-            this.layoutControl1.Controls.Add(this.txtMainZ);
-            this.layoutControl1.Controls.Add(this.txtAdjaX);
-            this.layoutControl1.Controls.Add(this.txtAdjaY);
-            this.layoutControl1.Controls.Add(this.txtAdjaZ);
             this.layoutControl1.Controls.Add(this.btnOK);
-            this.layoutControl1.Controls.Add(this.txtAdjaY1);
-            this.layoutControl1.Controls.Add(this.txtAdjaX1);
-            this.layoutControl1.Controls.Add(this.txtAdjaZ1);
             this.layoutControl1.Controls.Add(this.txtYbAdja1);
+            this.layoutControl1.Controls.Add(this.btnEphCalc);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
             this.layoutControl1.Name = "layoutControl1";
@@ -217,10 +139,31 @@
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
+            // ucEphXYZAdja2
+            // 
+            this.ucEphXYZAdja2.Location = new System.Drawing.Point(12, 246);
+            this.ucEphXYZAdja2.Name = "ucEphXYZAdja2";
+            this.ucEphXYZAdja2.Size = new System.Drawing.Size(618, 44);
+            this.ucEphXYZAdja2.TabIndex = 15;
+            // 
+            // ucEphXYZAdja1
+            // 
+            this.ucEphXYZAdja1.Location = new System.Drawing.Point(12, 198);
+            this.ucEphXYZAdja1.Name = "ucEphXYZAdja1";
+            this.ucEphXYZAdja1.Size = new System.Drawing.Size(618, 44);
+            this.ucEphXYZAdja1.TabIndex = 14;
+            // 
+            // ucEphXYZMain
+            // 
+            this.ucEphXYZMain.Location = new System.Drawing.Point(12, 150);
+            this.ucEphXYZMain.Name = "ucEphXYZMain";
+            this.ucEphXYZMain.Size = new System.Drawing.Size(618, 44);
+            this.ucEphXYZMain.TabIndex = 13;
+            // 
             // sigTime
             // 
             this.sigTime.EditValue = null;
-            this.sigTime.Location = new System.Drawing.Point(428, 85);
+            this.sigTime.Location = new System.Drawing.Point(241, 75);
             this.sigTime.Name = "sigTime";
             this.sigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -231,60 +174,65 @@
             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(202, 20);
+            this.sigTime.Size = new System.Drawing.Size(387, 20);
             this.sigTime.StyleController = this.layoutControl1;
             this.sigTime.TabIndex = 9;
             // 
             // txtDtoSx
             // 
-            this.txtDtoSx.Location = new System.Drawing.Point(12, 85);
+            this.txtDtoSx.Location = new System.Drawing.Point(440, 29);
+            this.txtDtoSx.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtDtoSx.Name = "txtDtoSx";
             this.txtDtoSx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtDtoSx.Properties.NullValuePrompt = "必需";
-            this.txtDtoSx.Size = new System.Drawing.Size(229, 23);
+            this.txtDtoSx.Size = new System.Drawing.Size(188, 20);
             this.txtDtoSx.StyleController = this.layoutControl1;
             this.txtDtoSx.TabIndex = 6;
             // 
             // txtDtoSx1
             // 
-            this.txtDtoSx1.Location = new System.Drawing.Point(245, 85);
+            this.txtDtoSx1.Location = new System.Drawing.Point(14, 75);
+            this.txtDtoSx1.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtDtoSx1.Name = "txtDtoSx1";
             this.txtDtoSx1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtDtoSx1.Properties.NullValuePrompt = "必需";
-            this.txtDtoSx1.Size = new System.Drawing.Size(179, 23);
+            this.txtDtoSx1.Size = new System.Drawing.Size(223, 20);
             this.txtDtoSx1.StyleController = this.layoutControl1;
             this.txtDtoSx1.TabIndex = 6;
             // 
             // txtYbMain
             // 
-            this.txtYbMain.Location = new System.Drawing.Point(12, 136);
+            this.txtYbMain.Location = new System.Drawing.Point(14, 121);
+            this.txtYbMain.MaximumSize = new System.Drawing.Size(0, 20);
             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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYbMain.Size = new System.Drawing.Size(229, 23);
+            this.txtYbMain.Size = new System.Drawing.Size(223, 20);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
             // 
             // txtYbAdja
             // 
-            this.txtYbAdja.Location = new System.Drawing.Point(245, 136);
+            this.txtYbAdja.Location = new System.Drawing.Point(241, 121);
+            this.txtYbAdja.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtYbAdja.Name = "txtYbAdja";
             this.txtYbAdja.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -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.txtYbAdja.Size = new System.Drawing.Size(179, 23);
+            this.txtYbAdja.Size = new System.Drawing.Size(195, 20);
             this.txtYbAdja.StyleController = this.layoutControl1;
             this.txtYbAdja.TabIndex = 6;
             // 
             // txtsatStation
             // 
             this.txtsatStation.EditValue = "";
-            this.txtsatStation.Location = new System.Drawing.Point(12, 35);
+            this.txtsatStation.Location = new System.Drawing.Point(14, 29);
+            this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
             this.txtsatStation.Properties.MaxLength = 20;
-            this.txtsatStation.Size = new System.Drawing.Size(229, 20);
+            this.txtsatStation.Size = new System.Drawing.Size(223, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
             this.txtsatStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -292,162 +240,69 @@
             // txtRefLocation
             // 
             this.txtRefLocation.EditValue = "";
-            this.txtRefLocation.Location = new System.Drawing.Point(245, 35);
+            this.txtRefLocation.Location = new System.Drawing.Point(241, 29);
+            this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
             this.txtRefLocation.Properties.MaxLength = 20;
-            this.txtRefLocation.Size = new System.Drawing.Size(179, 20);
+            this.txtRefLocation.Size = new System.Drawing.Size(195, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
             this.txtRefLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             // 
-            // txtMainX
-            // 
-            this.txtMainX.Location = new System.Drawing.Point(12, 187);
-            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, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtMainX.Properties.NullValuePrompt = "必需";
-            this.txtMainX.Size = new System.Drawing.Size(229, 20);
-            this.txtMainX.StyleController = this.layoutControl1;
-            this.txtMainX.TabIndex = 6;
-            // 
-            // txtMainY
-            // 
-            this.txtMainY.Location = new System.Drawing.Point(245, 187);
-            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, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtMainY.Properties.NullValuePrompt = "必需";
-            this.txtMainY.Size = new System.Drawing.Size(179, 20);
-            this.txtMainY.StyleController = this.layoutControl1;
-            this.txtMainY.TabIndex = 6;
-            // 
-            // txtMainZ
-            // 
-            this.txtMainZ.Location = new System.Drawing.Point(428, 187);
-            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, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtMainZ.Properties.NullValuePrompt = "必需";
-            this.txtMainZ.Size = new System.Drawing.Size(202, 20);
-            this.txtMainZ.StyleController = this.layoutControl1;
-            this.txtMainZ.TabIndex = 6;
-            // 
-            // txtAdjaX
-            // 
-            this.txtAdjaX.Location = new System.Drawing.Point(12, 238);
-            this.txtAdjaX.Name = "txtAdjaX";
-            this.txtAdjaX.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtAdjaX.Properties.NullValuePrompt = "必需";
-            this.txtAdjaX.Size = new System.Drawing.Size(229, 20);
-            this.txtAdjaX.StyleController = this.layoutControl1;
-            this.txtAdjaX.TabIndex = 6;
-            // 
-            // txtAdjaY
-            // 
-            this.txtAdjaY.Location = new System.Drawing.Point(245, 238);
-            this.txtAdjaY.Name = "txtAdjaY";
-            this.txtAdjaY.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtAdjaY.Properties.NullValuePrompt = "必需";
-            this.txtAdjaY.Size = new System.Drawing.Size(179, 20);
-            this.txtAdjaY.StyleController = this.layoutControl1;
-            this.txtAdjaY.TabIndex = 6;
-            // 
-            // txtAdjaZ
-            // 
-            this.txtAdjaZ.Location = new System.Drawing.Point(428, 238);
-            this.txtAdjaZ.Name = "txtAdjaZ";
-            this.txtAdjaZ.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtAdjaZ.Properties.NullValuePrompt = "必需";
-            this.txtAdjaZ.Size = new System.Drawing.Size(202, 20);
-            this.txtAdjaZ.StyleController = this.layoutControl1;
-            this.txtAdjaZ.TabIndex = 6;
-            // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(428, 320);
+            this.btnOK.Location = new System.Drawing.Point(440, 301);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(202, 22);
+            this.btnOK.Size = new System.Drawing.Size(188, 22);
             this.btnOK.StyleController = this.layoutControl1;
             this.btnOK.TabIndex = 12;
             this.btnOK.Text = "确定";
             this.btnOK.Click += new System.EventHandler(this.btnOk_Click);
             // 
-            // txtAdjaY1
-            // 
-            this.txtAdjaY1.Location = new System.Drawing.Point(245, 289);
-            this.txtAdjaY1.Name = "txtAdjaY1";
-            this.txtAdjaY1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtAdjaY1.Properties.NullValuePrompt = "必需";
-            this.txtAdjaY1.Size = new System.Drawing.Size(179, 20);
-            this.txtAdjaY1.StyleController = this.layoutControl1;
-            this.txtAdjaY1.TabIndex = 6;
-            // 
-            // txtAdjaX1
-            // 
-            this.txtAdjaX1.Location = new System.Drawing.Point(12, 289);
-            this.txtAdjaX1.Name = "txtAdjaX1";
-            this.txtAdjaX1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtAdjaX1.Properties.NullValuePrompt = "必需";
-            this.txtAdjaX1.Size = new System.Drawing.Size(229, 20);
-            this.txtAdjaX1.StyleController = this.layoutControl1;
-            this.txtAdjaX1.TabIndex = 6;
-            // 
-            // txtAdjaZ1
-            // 
-            this.txtAdjaZ1.Location = new System.Drawing.Point(428, 289);
-            this.txtAdjaZ1.Name = "txtAdjaZ1";
-            this.txtAdjaZ1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions13, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject49, serializableAppearanceObject50, serializableAppearanceObject51, serializableAppearanceObject52, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtAdjaZ1.Properties.NullValuePrompt = "必需";
-            this.txtAdjaZ1.Size = new System.Drawing.Size(202, 20);
-            this.txtAdjaZ1.StyleController = this.layoutControl1;
-            this.txtAdjaZ1.TabIndex = 6;
-            // 
             // txtYbAdja1
             // 
-            this.txtYbAdja1.Location = new System.Drawing.Point(428, 136);
+            this.txtYbAdja1.Location = new System.Drawing.Point(440, 121);
+            this.txtYbAdja1.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtYbAdja1.Name = "txtYbAdja1";
             this.txtYbAdja1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions14, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject53, serializableAppearanceObject54, serializableAppearanceObject55, serializableAppearanceObject56, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYbAdja1.Size = new System.Drawing.Size(202, 23);
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtYbAdja1.Size = new System.Drawing.Size(188, 20);
             this.txtYbAdja1.StyleController = this.layoutControl1;
             this.txtYbAdja1.TabIndex = 6;
             // 
+            // btnEphCalc
+            // 
+            this.btnEphCalc.Location = new System.Drawing.Point(241, 301);
+            this.btnEphCalc.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.btnEphCalc.Name = "btnEphCalc";
+            this.btnEphCalc.Size = new System.Drawing.Size(195, 22);
+            this.btnEphCalc.StyleController = this.layoutControl1;
+            this.btnEphCalc.TabIndex = 12;
+            this.btnEphCalc.Text = "星历推算";
+            this.btnEphCalc.Click += new System.EventHandler(this.btnEphCalc_Click);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.emptySpaceItem3,
-            this.layoutControlItem2,
-            this.layoutControlItem6,
             this.layoutControlItem14,
-            this.layoutControlItem10,
-            this.layoutControlItem3,
-            this.layoutControlItem11,
-            this.layoutControlItem15,
-            this.layoutControlItem13,
-            this.layoutControlItem16,
             this.layoutControlItem7,
             this.layoutControlItem17,
-            this.emptySpaceItem4,
             this.layoutControlItem8,
-            this.layoutControlItem4,
-            this.layoutControlItem5,
-            this.layoutControlItem9,
-            this.emptySpaceItem5,
-            this.layoutControlItem1,
-            this.layoutControlItem12,
             this.layoutControlItem18,
-            this.emptySpaceItem2});
+            this.emptySpaceItem2,
+            this.layoutControlItem10,
+            this.layoutControlItem2,
+            this.layoutControlItem6,
+            this.layoutControlItem1,
+            this.layoutControlItem19,
+            this.layoutControlItem3,
+            this.layoutControlItem4,
+            this.layoutControlItem5});
             this.Root.Name = "Root";
             this.Root.Size = new System.Drawing.Size(642, 405);
             this.Root.TextVisible = false;
@@ -455,43 +310,11 @@
             // emptySpaceItem3
             // 
             this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 301);
+            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 282);
             this.emptySpaceItem3.Name = "emptySpaceItem3";
-            this.emptySpaceItem3.Size = new System.Drawing.Size(233, 33);
+            this.emptySpaceItem3.Size = new System.Drawing.Size(229, 33);
             this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
             // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txtDtoSx;
-            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem2.CustomizationFormText = "轨道经度";
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 46);
-            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem2.Size = new System.Drawing.Size(233, 51);
-            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem2.Text = "主邻1时差";
-            this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(79, 14);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txtDtoSx1;
-            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem6.CustomizationFormText = "轨道经度";
-            this.layoutControlItem6.Location = new System.Drawing.Point(233, 46);
-            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(183, 51);
-            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem6.Text = "主邻2时差";
-            this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(79, 14);
-            // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txtsatStation;
@@ -501,121 +324,25 @@
             this.layoutControlItem14.MaxSize = new System.Drawing.Size(0, 46);
             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(233, 46);
+            this.layoutControlItem14.Size = new System.Drawing.Size(229, 46);
             this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem14.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
             this.layoutControlItem14.Text = "接收站经纬度";
             this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem14.TextSize = new System.Drawing.Size(79, 14);
             // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txtRefLocation;
-            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem10.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem10.Location = new System.Drawing.Point(233, 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(183, 46);
-            this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem10.Text = "参考站经纬度";
-            this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(79, 14);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txtMainX;
-            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem3.CustomizationFormText = "轨道经度";
-            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(233, 51);
-            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem3.Text = "主星星历X";
-            this.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(79, 14);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txtMainY;
-            this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem11.CustomizationFormText = "轨道经度";
-            this.layoutControlItem11.Location = new System.Drawing.Point(233, 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(183, 51);
-            this.layoutControlItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem11.Text = "主星星历Y";
-            this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(79, 14);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txtAdjaY;
-            this.layoutControlItem15.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem15.CustomizationFormText = "轨道经度";
-            this.layoutControlItem15.Location = new System.Drawing.Point(233, 199);
-            this.layoutControlItem15.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem15.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem15.Size = new System.Drawing.Size(183, 51);
-            this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem15.Text = "邻星1星历Y";
-            this.layoutControlItem15.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(79, 14);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txtAdjaX;
-            this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem13.CustomizationFormText = "轨道经度";
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 199);
-            this.layoutControlItem13.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem13.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem13.Size = new System.Drawing.Size(233, 51);
-            this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem13.Text = "邻星1星历X";
-            this.layoutControlItem13.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(79, 14);
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.txtAdjaZ;
-            this.layoutControlItem16.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem16.CustomizationFormText = "轨道经度";
-            this.layoutControlItem16.Location = new System.Drawing.Point(416, 199);
-            this.layoutControlItem16.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem16.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem16.Size = new System.Drawing.Size(206, 51);
-            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem16.Text = "邻星1星历Z";
-            this.layoutControlItem16.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(79, 14);
-            // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txtYbMain;
             this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem7.CustomizationFormText = "轨道经度";
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 97);
-            this.layoutControlItem7.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem7.MinSize = new System.Drawing.Size(54, 51);
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 92);
+            this.layoutControlItem7.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem7.MinSize = new System.Drawing.Size(54, 46);
             this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem7.Size = new System.Drawing.Size(233, 51);
+            this.layoutControlItem7.Size = new System.Drawing.Size(229, 46);
             this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem7.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
             this.layoutControlItem7.Text = "样本主星时差";
             this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem7.TextSize = new System.Drawing.Size(79, 14);
@@ -625,147 +352,163 @@
             this.layoutControlItem17.Control = this.btnOK;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(416, 301);
+            this.layoutControlItem17.Location = new System.Drawing.Point(428, 282);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem17.Size = new System.Drawing.Size(206, 33);
+            this.layoutControlItem17.Size = new System.Drawing.Size(194, 33);
+            this.layoutControlItem17.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             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(233, 301);
-            this.emptySpaceItem4.Name = "emptySpaceItem4";
-            this.emptySpaceItem4.Size = new System.Drawing.Size(183, 33);
-            this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
-            // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txtYbAdja;
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.CustomizationFormText = "轨道经度";
-            this.layoutControlItem8.Location = new System.Drawing.Point(233, 97);
-            this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem8.MinSize = new System.Drawing.Size(54, 51);
+            this.layoutControlItem8.Location = new System.Drawing.Point(229, 92);
+            this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem8.MinSize = new System.Drawing.Size(54, 46);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem8.Size = new System.Drawing.Size(183, 51);
+            this.layoutControlItem8.Size = new System.Drawing.Size(199, 46);
             this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem8.Text = "样本邻星1时差";
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem8.TextSize = new System.Drawing.Size(79, 14);
             // 
-            // layoutControlItem4
+            // layoutControlItem18
             // 
-            this.layoutControlItem4.Control = this.txtAdjaY1;
-            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem4.CustomizationFormText = "轨道经度";
-            this.layoutControlItem4.Location = new System.Drawing.Point(233, 250);
-            this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem4.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem4.Size = new System.Drawing.Size(183, 51);
-            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem4.Text = "邻星2星历Y";
-            this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(79, 14);
+            this.layoutControlItem18.Control = this.txtYbAdja1;
+            this.layoutControlItem18.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem18.CustomizationFormText = "轨道经度";
+            this.layoutControlItem18.Location = new System.Drawing.Point(428, 92);
+            this.layoutControlItem18.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem18.MinSize = new System.Drawing.Size(54, 46);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.Size = new System.Drawing.Size(194, 46);
+            this.layoutControlItem18.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem18.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
+            this.layoutControlItem18.Text = "样本邻星2时差";
+            this.layoutControlItem18.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(79, 14);
             // 
-            // layoutControlItem5
+            // emptySpaceItem2
             // 
-            this.layoutControlItem5.Control = this.txtAdjaX1;
-            this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem5.CustomizationFormText = "轨道经度";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 250);
-            this.layoutControlItem5.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem5.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem5.Size = new System.Drawing.Size(233, 51);
-            this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem5.Text = "邻星2星历X";
-            this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(79, 14);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txtAdjaZ1;
-            this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem9.CustomizationFormText = "轨道经度";
-            this.layoutControlItem9.Location = new System.Drawing.Point(416, 250);
-            this.layoutControlItem9.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem9.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem9.Size = new System.Drawing.Size(206, 51);
-            this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem9.Text = "邻星2星历Z";
-            this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(79, 14);
-            // 
-            // emptySpaceItem5
-            // 
-            this.emptySpaceItem5.AllowHotTrack = false;
-            this.emptySpaceItem5.Location = new System.Drawing.Point(416, 0);
-            this.emptySpaceItem5.Name = "emptySpaceItem5";
-            this.emptySpaceItem5.Size = new System.Drawing.Size(206, 46);
-            this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 315);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(622, 70);
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txtRefLocation;
+            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem10.CustomizationFormText = "参考站经纬度";
+            this.layoutControlItem10.Location = new System.Drawing.Point(229, 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.Size = new System.Drawing.Size(199, 46);
+            this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem10.Text = "参考站经纬度";
+            this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(79, 14);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txtDtoSx;
+            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem2.CustomizationFormText = "轨道经度";
+            this.layoutControlItem2.Location = new System.Drawing.Point(428, 0);
+            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 46);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(194, 46);
+            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem2.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
+            this.layoutControlItem2.Text = "主邻1时差";
+            this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(79, 14);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txtDtoSx1;
+            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem6.CustomizationFormText = "轨道经度";
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 46);
+            this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem6.MinSize = new System.Drawing.Size(1, 1);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.Size = new System.Drawing.Size(229, 46);
+            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem6.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
+            this.layoutControlItem6.Text = "主邻2时差";
+            this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(79, 14);
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.sigTime;
-            this.layoutControlItem1.Location = new System.Drawing.Point(416, 46);
-            this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 54);
-            this.layoutControlItem1.MinSize = new System.Drawing.Size(83, 51);
+            this.layoutControlItem1.Location = new System.Drawing.Point(229, 46);
+            this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem1.MinSize = new System.Drawing.Size(83, 46);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(206, 51);
+            this.layoutControlItem1.Size = new System.Drawing.Size(393, 46);
             this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.layoutControlItem1.Text = "信号时间";
             this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem1.TextSize = new System.Drawing.Size(79, 14);
             // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txtMainZ;
-            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem12.CustomizationFormText = "轨道经度";
-            this.layoutControlItem12.Location = new System.Drawing.Point(416, 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(206, 51);
-            this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem12.Text = "主星星历Z";
-            this.layoutControlItem12.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(79, 14);
+            // layoutControlItem19
             // 
-            // layoutControlItem18
+            this.layoutControlItem19.Control = this.btnEphCalc;
+            this.layoutControlItem19.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem19.CustomizationFormText = "layoutControlItem1";
+            this.layoutControlItem19.Location = new System.Drawing.Point(229, 282);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
+            this.layoutControlItem19.Size = new System.Drawing.Size(199, 33);
+            this.layoutControlItem19.Text = "layoutControlItem1";
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem19.TextVisible = false;
             // 
-            this.layoutControlItem18.Control = this.txtYbAdja1;
-            this.layoutControlItem18.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem18.CustomizationFormText = "轨道经度";
-            this.layoutControlItem18.Location = new System.Drawing.Point(416, 97);
-            this.layoutControlItem18.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem18.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem18.Size = new System.Drawing.Size(206, 51);
-            this.layoutControlItem18.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem18.Text = "样本邻星2时差";
-            this.layoutControlItem18.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(79, 14);
+            // layoutControlItem3
             // 
-            // emptySpaceItem2
+            this.layoutControlItem3.Control = this.ucEphXYZMain;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 138);
+            this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 48);
+            this.layoutControlItem3.MinSize = new System.Drawing.Size(166, 48);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(622, 48);
+            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem3.TextVisible = false;
             // 
-            this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 334);
-            this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(622, 51);
-            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.ucEphXYZAdja1;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 186);
+            this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 48);
+            this.layoutControlItem4.MinSize = new System.Drawing.Size(166, 48);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(622, 48);
+            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem4.TextVisible = false;
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.ucEphXYZAdja2;
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 234);
+            this.layoutControlItem5.MaxSize = new System.Drawing.Size(0, 48);
+            this.layoutControlItem5.MinSize = new System.Drawing.Size(166, 48);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Size = new System.Drawing.Size(622, 48);
+            this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem5.TextVisible = false;
             // 
             // dxErrorProvider
             // 
@@ -789,39 +532,23 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtYbAdja.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtsatStation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation.Properties)).EndInit();
-            ((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.txtAdjaX.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaY.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaZ.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaY1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaX1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaZ1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtYbAdja1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             this.ResumeLayout(false);
 
@@ -845,32 +572,20 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraEditors.TextEdit txtRefLocation;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraEditors.ButtonEdit txtMainX;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraEditors.ButtonEdit txtMainY;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraEditors.ButtonEdit txtMainZ;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraEditors.ButtonEdit txtAdjaX;
-        private DevExpress.XtraEditors.ButtonEdit txtAdjaY;
-        private DevExpress.XtraEditors.ButtonEdit txtAdjaZ;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
         private DevExpress.XtraEditors.SimpleButton btnOK;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem4;
-        private DevExpress.XtraEditors.ButtonEdit txtAdjaY1;
-        private DevExpress.XtraEditors.ButtonEdit txtAdjaX1;
-        private DevExpress.XtraEditors.ButtonEdit txtAdjaZ1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem5;
         private DevExpress.XtraEditors.ButtonEdit txtYbAdja1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private DevExpress.XtraEditors.SimpleButton btnEphCalc;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+        private UserControl.UCEphXYZ ucEphXYZAdja2;
+        private UserControl.UCEphXYZ ucEphXYZAdja1;
+        private UserControl.UCEphXYZ ucEphXYZMain;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
     }
 }

+ 62 - 23
XdCxRhDW.App/EditForms/X3DTOParamEditor.cs

@@ -29,7 +29,6 @@ namespace XdCxRhDW.App.EditForms
             this.Text = $"{info.PosResType.GetEnumDisplayName()}时差参数";
             this.info = info;
             this.mapControl1 = mapControl;
-            //this.StartPosition = FormStartPosition.CenterParent;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
         }
@@ -69,15 +68,15 @@ namespace XdCxRhDW.App.EditForms
                     this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value:f3}";
                 }
                 this.sigTime.EditValue = info.SigTime;
-                this.txtMainX.Text = $"{cg.MainX.Value:f3}";
-                this.txtMainY.Text = $"{cg.MainY.Value:f3}";
-                this.txtMainZ.Text = $"{cg.MainZ.Value:f3}";
-                this.txtAdjaX.Text = $"{cg.Adja1X.Value:f3}";
-                this.txtAdjaY.Text = $"{cg.Adja1Y.Value:f3}";
-                this.txtAdjaZ.Text = $"{cg.Adja1Z.Value:f3}";
-                this.txtAdjaX1.Text = $"{cg.Adja2X.Value:f3}";
-                this.txtAdjaY1.Text = $"{cg.Adja2Y.Value:f3}";
-                this.txtAdjaZ1.Text = $"{cg.Adja2Z.Value:f3}";
+
+                var mainEph = (cg.MainX, cg.MainY, cg.MainZ);
+                ucEphXYZMain.SetXYZ($"主星", cg.MainCode, mainEph, Color.Black);
+
+                var adja1Eph = (cg.Adja1X, cg.Adja1Y, cg.Adja1Z);
+                ucEphXYZAdja1.SetXYZ($"邻星1", cg.Adja1Code, adja1Eph, Color.Black);
+
+                var adja2Eph = (cg.Adja2X, cg.Adja2Y, cg.Adja2Z);
+                ucEphXYZAdja2.SetXYZ($"邻星2", cg.Adja2Code, adja2Eph, Color.Black);
             }
             if (station != null)
             {
@@ -92,7 +91,7 @@ namespace XdCxRhDW.App.EditForms
                 txtRefLocation.Properties.ReadOnly = true;
                 this.txtRefLocation.Text = $"{0},{0}";
             }
-           
+
         }
 
         public bool CheckParam()
@@ -123,19 +122,10 @@ namespace XdCxRhDW.App.EditForms
                 var YbAdja1Dto = info.PosResType == EnumPosResType.X3 ? Convert.ToDouble(this.txtYbAdja.Text) : 0;
                 var YbAdja2Dto = info.PosResType == EnumPosResType.X3 ? Convert.ToDouble(this.txtYbAdja1.Text) : 0;
 
-                var MainX = Convert.ToDouble(this.txtMainX.Text);
-                var MainY = Convert.ToDouble(this.txtMainY.Text);
-                var MainZ = Convert.ToDouble(this.txtMainZ.Text);
-                var AdjaX = Convert.ToDouble(this.txtAdjaX.Text);
-                var AdjaY = Convert.ToDouble(this.txtAdjaY.Text);
-                var AdjaZ = Convert.ToDouble(this.txtAdjaZ.Text);
 
-                var AdjaX2 = Convert.ToDouble(this.txtAdjaX1.Text);
-                var AdjaY2 = Convert.ToDouble(this.txtAdjaY1.Text);
-                var AdjaZ2 = Convert.ToDouble(this.txtAdjaZ1.Text);
-                double[] msEph = new double[] { MainX, MainY, MainZ, 0, 0, 0 };
-                double[] Ns1Eph = new double[] { AdjaX, AdjaY, AdjaZ, 0, 0, 0 };
-                double[] Ns2Eph = new double[] { AdjaX2, AdjaY2, AdjaZ2, 0, 0, 0 };
+                double[] msEph = ucEphXYZMain.EphXYZ();
+                double[] Ns1Eph = ucEphXYZAdja1.EphXYZ();
+                double[] Ns2Eph = ucEphXYZAdja2.EphXYZ();
 
 
                 DtoLineTwoStartOption twoStartOption = new DtoLineTwoStartOption();
@@ -183,5 +173,54 @@ namespace XdCxRhDW.App.EditForms
             }
         }
 
+        private async void btnEphCalc_Click(object sender, EventArgs e)
+        {
+            if (this.sigTime.DateTime == DateTime.MinValue)
+            {
+                DxHelper.MsgBoxHelper.ShowWarning("信号时间不能为空!");
+                return;
+            }
+            var sigTime = this.sigTime.DateTime;
+            try
+            {
+
+                var xlInfo = await XlRepository.GetLatestAsync(cg.MainCode.Value, sigTime);
+                if (xlInfo == null)
+                {
+                    DxHelper.MsgBoxHelper.ShowWarning($"卫星:{cg.MainCode.Value}未找到对应的星历信息,请导入星历");
+                    return;
+                }
+                var xlInfo1 = await XlRepository.GetLatestAsync(cg.Adja1Code.Value, sigTime);
+                if (xlInfo1 == null)
+                {
+                    DxHelper.MsgBoxHelper.ShowWarning($"卫星:{cg.Adja1Code.Value}未找到对应的星历信息,请导入星历");
+                    return;
+                }
+                var xlInfo2 = await XlRepository.GetLatestAsync(cg.Adja2Code.Value, sigTime);
+                if (xlInfo2 == null)
+                {
+                    DxHelper.MsgBoxHelper.ShowWarning($"卫星:{cg.Adja2Code.Value}未找到对应的星历信息,请导入星历");
+                    return;
+                }
+                var mEph = EphHelper.Calc(xlInfo.TwoLine, sigTime);
+                var nEph1 = EphHelper.Calc(xlInfo1.TwoLine, sigTime);
+                var nEph2 = EphHelper.Calc(xlInfo2.TwoLine, sigTime);
+
+                var mainEph = (mEph.X, mEph.Y, mEph.Z);
+                ucEphXYZMain.SetXYZ($"主星", cg.MainCode, mainEph, Color.Red);
+
+                var adja1Eph = (nEph1.X, nEph1.Y, nEph1.Z);
+                ucEphXYZAdja1.SetXYZ($"邻星1", cg.Adja1Code, adja1Eph, Color.Red);
+
+                var adja2Eph = (nEph2.X, nEph2.Y, nEph2.Z);
+                ucEphXYZAdja2.SetXYZ($"邻星2", cg.Adja2Code, adja2Eph, Color.Red);
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Error(ex, $"手动{info.PosResType.GetEnumDisplayName()}推算星历失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"手动{info.PosResType.GetEnumDisplayName()}推算星历失败");
+            }
+
+        }
     }
 }

Разница между файлами не показана из-за своего большого размера
+ 113 - 605
XdCxRhDW.App/EditForms/X3DfoPosParamEditor.Designer.cs


+ 49 - 54
XdCxRhDW.App/EditForms/X3DfoPosParamEditor.cs

@@ -23,16 +23,14 @@ namespace XdCxRhDW.App.EditForms
 {
     public partial class X3DfoPosParamEditor : DevExpress.XtraEditors.XtraUserControl
     {
-        private MapControl mapControl1;
         private PosRes info;
         private CgRes cg;
-        private List<SatInfo> listSat;
-        public X3DfoPosParamEditor(PosRes info, MapControl mapControl)
+        private SysSetings settings = new SysSetings();
+        public X3DfoPosParamEditor(PosRes info)
         {
             InitializeComponent();
             this.info = info;
             this.labelControl1.Text = $"";
-            this.mapControl1 = mapControl;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
         }
@@ -54,7 +52,7 @@ namespace XdCxRhDW.App.EditForms
             StationRes station;
             using (RHDWContext db = new RHDWContext())
             {
-                listSat = await db.SatInfos.ToListAsync();
+                settings = await db.SysSetings.FirstOrDefaultAsync();
             }
             using (RHDWPartContext db = RHDWPartContext.GetContext(info.SigTime))
             {
@@ -69,26 +67,14 @@ namespace XdCxRhDW.App.EditForms
                 this.txtYbAdja.Text = $"{cg.YbAdja1Dfo.Value:f3}";
                 this.txtYbAdja1.Text = $"{cg.YbAdja2Dfo.Value:f3}";
                 this.sigTime.EditValue = info.SigTime;
-                this.txtMainX.Text = $"{cg.MainX.Value:f3}";
-                this.txtMainY.Text = $"{cg.MainY.Value:f3}";
-                this.txtMainZ.Text = $"{cg.MainZ.Value:f3}";
-                this.txtMainVX.Text = $"{cg.MainVx.Value:f3}";
-                this.txtMainVY.Text = $"{cg.MainVy.Value:f3}";
-                this.txtMainVZ.Text = $"{cg.MainVz.Value:f3}";
-
-                this.txtAdjaX.Text = $"{cg.Adja1X.Value:f3}";
-                this.txtAdjaY.Text = $"{cg.Adja1Y.Value:f3}";
-                this.txtAdjaZ.Text = $"{cg.Adja1Z.Value:f3}";
-                this.txtAdjaVX.Text = $"{cg.Adja1Vx.Value:f3}";
-                this.txtAdjaVY.Text = $"{cg.Adja1Vy.Value:f3}";
-                this.txtAdjaVZ.Text = $"{cg.Adja1Vz.Value:f3}";
-
-                this.txtAdjaX1.Text = $"{cg.Adja2X.Value:f3}";
-                this.txtAdjaY1.Text = $"{cg.Adja2Y.Value:f3}";
-                this.txtAdjaZ1.Text = $"{cg.Adja2Z.Value:f3}";
-                this.txtAdjaVX1.Text = $"{cg.Adja2Vx.Value:f3}";
-                this.txtAdjaVY1.Text = $"{cg.Adja2Vy.Value:f3}";
-                this.txtAdjaVZ1.Text = $"{cg.Adja2Vz.Value:f3}";
+                var mainEph = (cg.MainX, cg.MainY, cg.MainZ, cg.MainVx, cg.MainVy, cg.MainVz);
+                ucEphXYZMain.SetParam($"主星", cg.MainCode, mainEph, Color.Black);
+
+                var adja1Eph = (cg.Adja1X, cg.Adja1Y, cg.Adja1Z, cg.Adja1Vx, cg.Adja1Vy, cg.Adja1Vz);
+                ucEphXYZAdja1.SetParam($"邻星1", cg.Adja1Code, adja1Eph, Color.Black);
+
+                var adja2Eph = (cg.Adja2X, cg.Adja2Y, cg.Adja2Z, cg.Adja2Vx, cg.Adja2Vy, cg.Adja2Vz);
+                ucEphXYZAdja2.SetParam($"邻星2", cg.Adja2Code, adja2Eph, Color.Black);
 
                 this.txtTargetFreq.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 950;
                 this.txtTargetDFreq.EditValue = cg.TarFreqDown.HasValue ? cg.TarFreqDown.Value * 1e-6 : 950;
@@ -145,6 +131,10 @@ namespace XdCxRhDW.App.EditForms
                 var rFreq = Convert.ToDouble(this.txtRefFreq.Text) * 1e6;
                 var rdFreq = Convert.ToDouble(this.txtRefDFreq.Text) * 1e6;
 
+                var msEph = ucEphXYZMain.EphParam();
+                var ns1Eph = ucEphXYZAdja1.EphParam();
+                var ns2Eph = ucEphXYZAdja2.EphParam();
+
                 var StationRes = new StationRes()
                 {
                     SatTxLon = MsAnt[0],
@@ -165,24 +155,25 @@ namespace XdCxRhDW.App.EditForms
                     TarFreqDown = tdFreq,
                     RefFreqUp = rFreq,
                     RefFreqDown = rdFreq,
-                    MainX = Convert.ToDouble(this.txtMainX.Text),
-                    MainY = Convert.ToDouble(this.txtMainY.Text),
-                    MainZ = Convert.ToDouble(this.txtMainZ.Text),
-                    MainVx = Convert.ToDouble(this.txtMainVX.Text),
-                    MainVy = Convert.ToDouble(this.txtMainVY.Text),
-                    MainVz = Convert.ToDouble(this.txtMainVZ.Text),
-                    Adja1X = Convert.ToDouble(this.txtAdjaX.Text),
-                    Adja1Y = Convert.ToDouble(this.txtAdjaY.Text),
-                    Adja1Z = Convert.ToDouble(this.txtAdjaZ.Text),
-                    Adja1Vx = Convert.ToDouble(this.txtAdjaVX.Text),
-                    Adja1Vy = Convert.ToDouble(this.txtAdjaVY.Text),
-                    Adja1Vz = Convert.ToDouble(this.txtAdjaVZ.Text),
-                    Adja2X = Convert.ToDouble(this.txtAdjaX1.Text),
-                    Adja2Y = Convert.ToDouble(this.txtAdjaY1.Text),
-                    Adja2Z = Convert.ToDouble(this.txtAdjaZ1.Text),
-                    Adja2Vx = Convert.ToDouble(this.txtAdjaVX1.Text),
-                    Adja2Vy = Convert.ToDouble(this.txtAdjaVY1.Text),
-                    Adja2Vz = Convert.ToDouble(this.txtAdjaVZ1.Text),
+                    MainX = msEph[0],
+                    MainY = msEph[1],
+                    MainZ = msEph[2],
+                    MainVx = msEph[3],
+                    MainVy = msEph[4],
+                    MainVz = msEph[5],
+                    Adja1X = ns1Eph[0],
+                    Adja1Y = ns1Eph[1],
+                    Adja1Z = ns1Eph[2],
+                    Adja1Vx = ns1Eph[3],
+                    Adja1Vy = ns1Eph[4],
+                    Adja1Vz = ns1Eph[5],
+                    Adja2X = ns2Eph[0],
+                    Adja2Y = ns2Eph[1],
+                    Adja2Z = ns2Eph[2],
+                    Adja2Vx = ns2Eph[3],
+                    Adja2Vy = ns2Eph[4],
+                    Adja2Vz = ns2Eph[5],
+
                 };
                 var res = PosApi.X3_PosTwoDfo(cgRes, StationRes);
 
@@ -197,9 +188,15 @@ namespace XdCxRhDW.App.EditForms
 
         private async void btnXl_Click(object sender, EventArgs e)
         {
+            if (this.sigTime.DateTime == DateTime.MinValue)
+            {
+                DxHelper.MsgBoxHelper.ShowWarning("信号时间不能为空!");
+                return;
+            }
+            var sigTime = this.sigTime.DateTime;
             try
             {
-                var sigTime = this.sigTime.DateTime;
+
                 var xlInfo = await XlRepository.GetLatestAsync(cg.MainCode.Value, sigTime);
                 if (xlInfo == null)
                 {
@@ -219,19 +216,17 @@ namespace XdCxRhDW.App.EditForms
                     return;
                 }
                 var mEph = EphHelper.Calc(xlInfo.TwoLine, sigTime);
-
-                this.txtMainX.Text = $"{mEph.X:f3}";
-                this.txtMainY.Text = $"{mEph.Y:f3}";
-                this.txtMainZ.Text = $"{mEph.Z:f3}";
                 var nEph1 = EphHelper.Calc(xlInfo1.TwoLine, sigTime);
-                this.txtAdjaX.Text = $"{nEph1.X:f3}";
-                this.txtAdjaY.Text = $"{nEph1.Y:f3}";
-                this.txtAdjaZ.Text = $"{nEph1.Z:f3}";
                 var nEph2 = EphHelper.Calc(xlInfo2.TwoLine, sigTime);
-                this.txtAdjaX1.Text = $"{nEph2.X:f3}";
-                this.txtAdjaY1.Text = $"{nEph2.Y:f3}";
-                this.txtAdjaZ1.Text = $"{nEph2.Z:f3}";
 
+                var mainEph = (mEph.X, mEph.Y, mEph.Z, mEph.VX, mEph.VY, mEph.VZ);
+                ucEphXYZMain.SetParam($"主星", cg.MainCode, mainEph, Color.Red);
+
+                var adja1Eph = (nEph1.X, nEph1.Y, nEph1.Z, nEph1.VX, nEph1.VY, nEph1.VZ);
+                ucEphXYZAdja1.SetParam($"邻星1", cg.Adja1Code, adja1Eph, Color.Red);
+
+                var adja2Eph = (nEph2.X, nEph2.Y, nEph2.Z, nEph2.VX, nEph2.VY, nEph2.VZ);
+                ucEphXYZAdja2.SetParam($"邻星2", cg.Adja2Code, adja2Eph, Color.Red);
             }
             catch (Exception ex)
             {

Разница между файлами не показана из-за своего большого размера
+ 192 - 503
XdCxRhDW.App/EditForms/X3PosParamEditor.Designer.cs


+ 35 - 43
XdCxRhDW.App/EditForms/X3PosParamEditor.cs

@@ -19,16 +19,13 @@ namespace XdCxRhDW.App.EditForms
 {
     public partial class X3PosParamEditor : DevExpress.XtraEditors.XtraUserControl
     {
-        private MapControl mapControl1;
         private PosRes info;
         private CgRes cg;
-        private List<SatInfo> listSat;
         public X3PosParamEditor(PosRes info, MapControl mapControl)
         {
             InitializeComponent();
             this.info = info;
             this.labelControl1.Text = $"";
-            this.mapControl1 = mapControl;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
         }
@@ -48,10 +45,6 @@ namespace XdCxRhDW.App.EditForms
         {
 
             StationRes station;
-            using (RHDWContext db = new RHDWContext())
-            {
-                listSat = await db.SatInfos.ToListAsync();
-            }
             using (RHDWPartContext db = RHDWPartContext.GetContext(info.SigTime))
             {
                 cg = await db.CgRes.Where(m => m.ID == info.CgResID).FirstOrDefaultAsync();
@@ -68,15 +61,14 @@ namespace XdCxRhDW.App.EditForms
                     this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value:f3}";
                 }
                 this.sigTime.EditValue = info.SigTime;
-                this.txtMainX.Text = $"{cg.MainX.Value:f3}";
-                this.txtMainY.Text = $"{cg.MainY.Value:f3}";
-                this.txtMainZ.Text = $"{cg.MainZ.Value:f3}";
-                this.txtAdjaX.Text = $"{cg.Adja1X.Value:f3}";
-                this.txtAdjaY.Text = $"{cg.Adja1Y.Value:f3}";
-                this.txtAdjaZ.Text = $"{cg.Adja1Z.Value:f3}";
-                this.txtAdjaX1.Text = $"{cg.Adja2X.Value:f3}";
-                this.txtAdjaY1.Text = $"{cg.Adja2Y.Value:f3}";
-                this.txtAdjaZ1.Text = $"{cg.Adja2Z.Value:f3}";
+                var mainEph = (cg.MainX, cg.MainY, cg.MainZ);
+                ucEphXYZMain.SetXYZ($"主星", cg.MainCode, mainEph, Color.Black);
+
+                var adja1Eph = (cg.Adja1X, cg.Adja1Y, cg.Adja1Z);
+                ucEphXYZAdja1.SetXYZ($"邻星1", cg.Adja1Code, adja1Eph, Color.Black);
+
+                var adja2Eph = (cg.Adja2X, cg.Adja2Y, cg.Adja2Z);
+                ucEphXYZAdja2.SetXYZ($"邻星2", cg.Adja2Code, adja2Eph, Color.Black);
             }
             if (station != null)
             {
@@ -123,16 +115,10 @@ namespace XdCxRhDW.App.EditForms
                 var YbAdja1Dto = info.PosResType == EnumPosResType.X3 ? Convert.ToDouble(this.txtYbAdja.Text) : 0;
                 var YbAdja2Dto = info.PosResType == EnumPosResType.X3 ? Convert.ToDouble(this.txtYbAdja1.Text) : 0;
 
-                var MainX = Convert.ToDouble(this.txtMainX.Text);
-                var MainY = Convert.ToDouble(this.txtMainY.Text);
-                var MainZ = Convert.ToDouble(this.txtMainZ.Text);
-                var AdjaX = Convert.ToDouble(this.txtAdjaX.Text);
-                var AdjaY = Convert.ToDouble(this.txtAdjaY.Text);
-                var AdjaZ = Convert.ToDouble(this.txtAdjaZ.Text);
+                double[] msEph = ucEphXYZMain.EphXYZ();
+                double[] Ns1Eph = ucEphXYZAdja1.EphXYZ();
+                double[] Ns2Eph = ucEphXYZAdja2.EphXYZ();
 
-                var AdjaX2 = Convert.ToDouble(this.txtAdjaX1.Text);
-                var AdjaY2 = Convert.ToDouble(this.txtAdjaY1.Text);
-                var AdjaZ2 = Convert.ToDouble(this.txtAdjaZ1.Text);
 
                 var StationRes = new StationRes()
                 {
@@ -150,15 +136,15 @@ namespace XdCxRhDW.App.EditForms
                     YbMainDto = YbMainDto,
                     YbAdja1Dto = YbAdja1Dto,
                     YbAdja2Dto = YbAdja2Dto,
-                    MainX = MainX,
-                    MainY = MainY,
-                    MainZ = MainZ,
-                    Adja1X = AdjaX,
-                    Adja1Y = AdjaY,
-                    Adja1Z = AdjaZ,
-                    Adja2X = AdjaX2,
-                    Adja2Y = AdjaY2,
-                    Adja2Z = AdjaZ2,
+                    MainX = msEph[0],
+                    MainY = msEph[1],
+                    MainZ = msEph[2],
+                    Adja1X = Ns1Eph[0],
+                    Adja1Y = Ns1Eph[1],
+                    Adja1Z = Ns1Eph[2],
+                    Adja2X = Ns2Eph[0],
+                    Adja2Y = Ns2Eph[1],
+                    Adja2Z = Ns2Eph[2],
                 };
                 var res = info.PosResType == EnumPosResType.X3 ? PosApi.X3_Pos(cgRes, StationRes) : PosApi.X3_PosNoRef(cgRes, StationRes);
 
@@ -173,6 +159,11 @@ namespace XdCxRhDW.App.EditForms
 
         private async void btnXl_Click(object sender, EventArgs e)
         {
+            if (this.sigTime.DateTime == DateTime.MinValue)
+            {
+                DxHelper.MsgBoxHelper.ShowWarning("信号时间不能为空!");
+                return;
+            }
             try
             {
                 var sigTime = this.sigTime.DateTime;
@@ -196,18 +187,19 @@ namespace XdCxRhDW.App.EditForms
                 }
                 var mEph = EphHelper.Calc(xlInfo.TwoLine, sigTime);
 
-                this.txtMainX.Text = $"{mEph.X:f3}";
-                this.txtMainY.Text = $"{mEph.Y:f3}";
-                this.txtMainZ.Text = $"{mEph.Z:f3}";
                 var nEph1 = EphHelper.Calc(xlInfo1.TwoLine, sigTime);
-                this.txtAdjaX.Text = $"{nEph1.X:f3}";
-                this.txtAdjaY.Text = $"{nEph1.Y:f3}";
-                this.txtAdjaZ.Text = $"{nEph1.Z:f3}";
+               
                 var nEph2 = EphHelper.Calc(xlInfo2.TwoLine, sigTime);
-                this.txtAdjaX1.Text = $"{nEph2.X:f3}";
-                this.txtAdjaY1.Text = $"{nEph2.Y:f3}";
-                this.txtAdjaZ1.Text = $"{nEph2.Z:f3}";
 
+
+                var mainEph = (mEph.X, mEph.Y, mEph.Z);
+                ucEphXYZMain.SetXYZ($"主星", cg.MainCode, mainEph, Color.Red);
+
+                var adja1Eph = (nEph1.X, nEph1.Y, nEph1.Z);
+                ucEphXYZAdja1.SetXYZ($"邻星1", cg.Adja1Code, adja1Eph, Color.Red);
+
+                var adja2Eph = (nEph2.X, nEph2.Y, nEph2.Z);
+                ucEphXYZAdja2.SetXYZ($"邻星2", cg.Adja2Code, adja2Eph, Color.Red);
             }
             catch (Exception ex)
             {

+ 1 - 1
XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -1111,7 +1111,7 @@ namespace XdCxRhDW.App.UserControl
                     DxHelper.PopupHelper.ShowPopup(X3frm, layoutControl1, 500);
                     break;
                 case EnumPosResType.X3TwoDfo:
-                    X3DfoPosParamEditor X3df0frm = new X3DfoPosParamEditor(item, mapControl1);
+                    X3DfoPosParamEditor X3df0frm = new X3DfoPosParamEditor(item);
                     DxHelper.PopupHelper.ShowPopup(X3df0frm, layoutControl1, 500);
                     break;
                 case EnumPosResType.X2Dfo:

+ 6 - 3
XdCxRhDW.App/UserControl/UCEphXYZ.Designer.cs

@@ -71,8 +71,9 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephX.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephX.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephX.Properties.MaskSettings.Set("mask", "f");
+            this.ephX.Properties.MaskSettings.Set("mask", "f3");
             this.ephX.Properties.MaxLength = 10;
+            this.ephX.Properties.UseMaskAsDisplayFormat = true;
             this.ephX.Size = new System.Drawing.Size(169, 20);
             this.ephX.StyleController = this.layoutControl1;
             this.ephX.TabIndex = 4;
@@ -85,8 +86,9 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephY.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephY.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephY.Properties.MaskSettings.Set("mask", "f");
+            this.ephY.Properties.MaskSettings.Set("mask", "f3");
             this.ephY.Properties.MaxLength = 10;
+            this.ephY.Properties.UseMaskAsDisplayFormat = true;
             this.ephY.Size = new System.Drawing.Size(146, 20);
             this.ephY.StyleController = this.layoutControl1;
             this.ephY.TabIndex = 4;
@@ -99,8 +101,9 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephZ.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephZ.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephZ.Properties.MaskSettings.Set("mask", "f");
+            this.ephZ.Properties.MaskSettings.Set("mask", "f3");
             this.ephZ.Properties.MaxLength = 10;
+            this.ephZ.Properties.UseMaskAsDisplayFormat = true;
             this.ephZ.Size = new System.Drawing.Size(143, 20);
             this.ephZ.StyleController = this.layoutControl1;
             this.ephZ.TabIndex = 4;

+ 12 - 6
XdCxRhDW.App/UserControl/UCEphXYZParam.Designer.cs

@@ -101,8 +101,9 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephX.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephX.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephX.Properties.MaskSettings.Set("mask", "f");
+            this.ephX.Properties.MaskSettings.Set("mask", "f3");
             this.ephX.Properties.MaxLength = 10;
+            this.ephX.Properties.UseMaskAsDisplayFormat = true;
             this.ephX.Size = new System.Drawing.Size(169, 20);
             this.ephX.StyleController = this.layoutControl1;
             this.ephX.TabIndex = 4;
@@ -115,8 +116,9 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephY.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephY.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephY.Properties.MaskSettings.Set("mask", "f");
+            this.ephY.Properties.MaskSettings.Set("mask", "f3");
             this.ephY.Properties.MaxLength = 10;
+            this.ephY.Properties.UseMaskAsDisplayFormat = true;
             this.ephY.Size = new System.Drawing.Size(146, 20);
             this.ephY.StyleController = this.layoutControl1;
             this.ephY.TabIndex = 4;
@@ -129,8 +131,9 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephZ.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephZ.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephZ.Properties.MaskSettings.Set("mask", "f");
+            this.ephZ.Properties.MaskSettings.Set("mask", "f3");
             this.ephZ.Properties.MaxLength = 10;
+            this.ephZ.Properties.UseMaskAsDisplayFormat = true;
             this.ephZ.Size = new System.Drawing.Size(143, 20);
             this.ephZ.StyleController = this.layoutControl1;
             this.ephZ.TabIndex = 4;
@@ -144,8 +147,9 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -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.ephVX.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephVX.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephVX.Properties.MaskSettings.Set("mask", "f");
+            this.ephVX.Properties.MaskSettings.Set("mask", "f3");
             this.ephVX.Properties.MaxLength = 10;
+            this.ephVX.Properties.UseMaskAsDisplayFormat = true;
             this.ephVX.Size = new System.Drawing.Size(169, 20);
             this.ephVX.StyleController = this.layoutControl1;
             this.ephVX.TabIndex = 4;
@@ -159,8 +163,9 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -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.ephVY.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephVY.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephVY.Properties.MaskSettings.Set("mask", "f");
+            this.ephVY.Properties.MaskSettings.Set("mask", "f3");
             this.ephVY.Properties.MaxLength = 10;
+            this.ephVY.Properties.UseMaskAsDisplayFormat = true;
             this.ephVY.Size = new System.Drawing.Size(146, 20);
             this.ephVY.StyleController = this.layoutControl1;
             this.ephVY.TabIndex = 4;
@@ -174,8 +179,9 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -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.ephVZ.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephVZ.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephVZ.Properties.MaskSettings.Set("mask", "f");
+            this.ephVZ.Properties.MaskSettings.Set("mask", "f3");
             this.ephVZ.Properties.MaxLength = 10;
+            this.ephVZ.Properties.UseMaskAsDisplayFormat = true;
             this.ephVZ.Size = new System.Drawing.Size(143, 20);
             this.ephVZ.StyleController = this.layoutControl1;
             this.ephVZ.TabIndex = 4;

Некоторые файлы не были показаны из-за большого количества измененных файлов