wyq 1 yıl önce
ebeveyn
işleme
48cc704584

+ 1 - 1
XdCxRhDW.App/EditForms/RHDTOParamEditor.cs

@@ -42,7 +42,7 @@ namespace XdCxRhDW.App.EditForms
 
 
         private void TxtCxLocation_EditValueChanged(object sender, EventArgs e)
         private void TxtCxLocation_EditValueChanged(object sender, EventArgs e)
         {
         {
-            txtCxLocation.CheckLonLat(dxErrorProvider, "向站");
+            txtCxLocation.CheckLonLat(dxErrorProvider, "向站");
         }
         }
 
 
         private void TxtRefLocation_EditValueChanged(object sender, EventArgs e)
         private void TxtRefLocation_EditValueChanged(object sender, EventArgs e)

+ 118 - 79
XdCxRhDW.App/EditForms/X1D1DTOParamEditor.Designer.cs

@@ -29,6 +29,11 @@
         private void InitializeComponent()
         private void InitializeComponent()
         {
         {
             this.components = new System.ComponentModel.Container();
             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 editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -39,15 +44,10 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = 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.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.ucEphXYZMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
             this.sigTime = new DevExpress.XtraEditors.DateEdit();
             this.sigTime = new DevExpress.XtraEditors.DateEdit();
             this.txtDtoCdb = new DevExpress.XtraEditors.ButtonEdit();
             this.txtDtoCdb = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtYbMain = new DevExpress.XtraEditors.ButtonEdit();
             this.txtsatStation = new DevExpress.XtraEditors.TextEdit();
             this.txtsatStation = new DevExpress.XtraEditors.TextEdit();
             this.txtcdbStation = new DevExpress.XtraEditors.TextEdit();
             this.txtcdbStation = new DevExpress.XtraEditors.TextEdit();
             this.txtRefLocation = new DevExpress.XtraEditors.TextEdit();
             this.txtRefLocation = new DevExpress.XtraEditors.TextEdit();
@@ -56,7 +56,6 @@
             this.btnPos = new DevExpress.XtraEditors.SimpleButton();
             this.btnPos = new DevExpress.XtraEditors.SimpleButton();
             this.txtCxLocation = new DevExpress.XtraEditors.TextEdit();
             this.txtCxLocation = new DevExpress.XtraEditors.TextEdit();
             this.txtcxFx = new DevExpress.XtraEditors.ButtonEdit();
             this.txtcxFx = new DevExpress.XtraEditors.ButtonEdit();
-            this.btnCxLine = new DevExpress.XtraEditors.SimpleButton();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -64,6 +63,7 @@
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.txtPosRes = new DevExpress.XtraLayout.SimpleLabelItem();
             this.txtPosRes = new DevExpress.XtraLayout.SimpleLabelItem();
@@ -72,14 +72,15 @@
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
-            this.ucEphXYZMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.btnCxLin = new DevExpress.XtraEditors.SimpleButton();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtYbMain = new DevExpress.XtraEditors.ButtonEdit();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.sigTime.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.sigTime.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.sigTime.Properties.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.sigTime.Properties.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDtoCdb.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDtoCdb.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYbMain.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtsatStation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtsatStation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcdbStation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcdbStation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation.Properties)).BeginInit();
@@ -92,6 +93,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).BeginInit();
@@ -100,7 +102,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYbMain.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             this.SuspendLayout();
             this.SuspendLayout();
             // 
             // 
             // layoutControl1
             // layoutControl1
@@ -108,7 +112,6 @@
             this.layoutControl1.Controls.Add(this.ucEphXYZMain);
             this.layoutControl1.Controls.Add(this.ucEphXYZMain);
             this.layoutControl1.Controls.Add(this.sigTime);
             this.layoutControl1.Controls.Add(this.sigTime);
             this.layoutControl1.Controls.Add(this.txtDtoCdb);
             this.layoutControl1.Controls.Add(this.txtDtoCdb);
-            this.layoutControl1.Controls.Add(this.txtYbMain);
             this.layoutControl1.Controls.Add(this.txtsatStation);
             this.layoutControl1.Controls.Add(this.txtsatStation);
             this.layoutControl1.Controls.Add(this.txtcdbStation);
             this.layoutControl1.Controls.Add(this.txtcdbStation);
             this.layoutControl1.Controls.Add(this.txtRefLocation);
             this.layoutControl1.Controls.Add(this.txtRefLocation);
@@ -117,7 +120,8 @@
             this.layoutControl1.Controls.Add(this.btnPos);
             this.layoutControl1.Controls.Add(this.btnPos);
             this.layoutControl1.Controls.Add(this.txtCxLocation);
             this.layoutControl1.Controls.Add(this.txtCxLocation);
             this.layoutControl1.Controls.Add(this.txtcxFx);
             this.layoutControl1.Controls.Add(this.txtcxFx);
-            this.layoutControl1.Controls.Add(this.btnCxLine);
+            this.layoutControl1.Controls.Add(this.btnCxLin);
+            this.layoutControl1.Controls.Add(this.txtYbMain);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Name = "layoutControl1";
@@ -127,10 +131,17 @@
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             this.layoutControl1.Text = "layoutControl1";
             // 
             // 
+            // ucEphXYZMain
+            // 
+            this.ucEphXYZMain.Location = new System.Drawing.Point(12, 150);
+            this.ucEphXYZMain.Name = "ucEphXYZMain";
+            this.ucEphXYZMain.Size = new System.Drawing.Size(514, 44);
+            this.ucEphXYZMain.TabIndex = 13;
+            // 
             // sigTime
             // sigTime
             // 
             // 
             this.sigTime.EditValue = null;
             this.sigTime.EditValue = null;
-            this.sigTime.Location = new System.Drawing.Point(271, 121);
+            this.sigTime.Location = new System.Drawing.Point(200, 121);
             this.sigTime.Name = "sigTime";
             this.sigTime.Name = "sigTime";
             this.sigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             this.sigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -141,7 +152,7 @@
             this.sigTime.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
             this.sigTime.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
             this.sigTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.sigTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.sigTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
             this.sigTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
-            this.sigTime.Size = new System.Drawing.Size(253, 20);
+            this.sigTime.Size = new System.Drawing.Size(324, 20);
             this.sigTime.StyleController = this.layoutControl1;
             this.sigTime.StyleController = this.layoutControl1;
             this.sigTime.TabIndex = 9;
             this.sigTime.TabIndex = 9;
             // 
             // 
@@ -151,23 +162,12 @@
             this.txtDtoCdb.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtDtoCdb.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtDtoCdb.Name = "txtDtoCdb";
             this.txtDtoCdb.Name = "txtDtoCdb";
             this.txtDtoCdb.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             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, 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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtDtoCdb.Properties.NullValuePrompt = "必需";
             this.txtDtoCdb.Properties.NullValuePrompt = "必需";
-            this.txtDtoCdb.Size = new System.Drawing.Size(253, 20);
+            this.txtDtoCdb.Size = new System.Drawing.Size(182, 20);
             this.txtDtoCdb.StyleController = this.layoutControl1;
             this.txtDtoCdb.StyleController = this.layoutControl1;
             this.txtDtoCdb.TabIndex = 6;
             this.txtDtoCdb.TabIndex = 6;
             // 
             // 
-            // txtYbMain
-            // 
-            this.txtYbMain.Location = new System.Drawing.Point(357, 75);
-            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, 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(169, 20);
-            this.txtYbMain.StyleController = this.layoutControl1;
-            this.txtYbMain.TabIndex = 6;
-            // 
             // txtsatStation
             // txtsatStation
             // 
             // 
             this.txtsatStation.EditValue = "";
             this.txtsatStation.EditValue = "";
@@ -175,7 +175,7 @@
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Size = new System.Drawing.Size(167, 20);
+            this.txtsatStation.Size = new System.Drawing.Size(182, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
             this.txtsatStation.TabIndex = 10;
             this.txtsatStation.ToolTip = "经度纬度之间用英文逗号隔开";
             this.txtsatStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -183,11 +183,11 @@
             // txtcdbStation
             // txtcdbStation
             // 
             // 
             this.txtcdbStation.EditValue = "";
             this.txtcdbStation.EditValue = "";
-            this.txtcdbStation.Location = new System.Drawing.Point(185, 29);
+            this.txtcdbStation.Location = new System.Drawing.Point(200, 29);
             this.txtcdbStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtcdbStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtcdbStation.Name = "txtcdbStation";
             this.txtcdbStation.Name = "txtcdbStation";
             this.txtcdbStation.Properties.AutoHeight = false;
             this.txtcdbStation.Properties.AutoHeight = false;
-            this.txtcdbStation.Size = new System.Drawing.Size(168, 20);
+            this.txtcdbStation.Size = new System.Drawing.Size(170, 20);
             this.txtcdbStation.StyleController = this.layoutControl1;
             this.txtcdbStation.StyleController = this.layoutControl1;
             this.txtcdbStation.TabIndex = 10;
             this.txtcdbStation.TabIndex = 10;
             this.txtcdbStation.ToolTip = "经度纬度之间用英文逗号隔开";
             this.txtcdbStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -195,11 +195,11 @@
             // txtRefLocation
             // txtRefLocation
             // 
             // 
             this.txtRefLocation.EditValue = "";
             this.txtRefLocation.EditValue = "";
-            this.txtRefLocation.Location = new System.Drawing.Point(357, 29);
+            this.txtRefLocation.Location = new System.Drawing.Point(374, 29);
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Size = new System.Drawing.Size(167, 20);
+            this.txtRefLocation.Size = new System.Drawing.Size(150, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
             this.txtRefLocation.TabIndex = 10;
             this.txtRefLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             this.txtRefLocation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -245,32 +245,22 @@
             this.txtCxLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtCxLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtCxLocation.Name = "txtCxLocation";
             this.txtCxLocation.Name = "txtCxLocation";
             this.txtCxLocation.Properties.AutoHeight = false;
             this.txtCxLocation.Properties.AutoHeight = false;
-            this.txtCxLocation.Size = new System.Drawing.Size(167, 20);
+            this.txtCxLocation.Size = new System.Drawing.Size(182, 20);
             this.txtCxLocation.StyleController = this.layoutControl1;
             this.txtCxLocation.StyleController = this.layoutControl1;
             this.txtCxLocation.TabIndex = 10;
             this.txtCxLocation.TabIndex = 10;
             this.txtCxLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             this.txtCxLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             // 
             // 
             // txtcxFx
             // txtcxFx
             // 
             // 
-            this.txtcxFx.Location = new System.Drawing.Point(185, 75);
+            this.txtcxFx.Location = new System.Drawing.Point(200, 75);
             this.txtcxFx.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtcxFx.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtcxFx.Name = "txtcxFx";
             this.txtcxFx.Name = "txtcxFx";
             this.txtcxFx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             this.txtcxFx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "°", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtcxFx.Size = new System.Drawing.Size(168, 20);
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "°", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtcxFx.Size = new System.Drawing.Size(170, 20);
+            this.txtcxFx.StyleController = this.layoutControl1;
             this.txtcxFx.TabIndex = 6;
             this.txtcxFx.TabIndex = 6;
             // 
             // 
-            // btnCxLine
-            // 
-            this.btnCxLine.Location = new System.Drawing.Point(208, 205);
-            this.btnCxLine.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.btnCxLine.Name = "btnCxLine";
-            this.btnCxLine.Size = new System.Drawing.Size(98, 22);
-            this.btnCxLine.StyleController = this.layoutControl1;
-            this.btnCxLine.TabIndex = 12;
-            this.btnCxLine.Text = "测向线";
-            this.btnCxLine.Click += new System.EventHandler(this.btnCxLine_Click);
-            // 
             // Root
             // Root
             // 
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -313,7 +303,7 @@
             this.layoutControlItem14.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem14.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem14.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem14.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(173, 46);
+            this.layoutControlItem14.Size = new System.Drawing.Size(188, 46);
             this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem14.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
             this.layoutControlItem14.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
             this.layoutControlItem14.Text = "接收站经纬度";
             this.layoutControlItem14.Text = "接收站经纬度";
@@ -325,11 +315,11 @@
             this.layoutControlItem9.Control = this.txtcdbStation;
             this.layoutControlItem9.Control = this.txtcdbStation;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem9.CustomizationFormText = "参考站经纬度";
             this.layoutControlItem9.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem9.Location = new System.Drawing.Point(173, 0);
+            this.layoutControlItem9.Location = new System.Drawing.Point(188, 0);
             this.layoutControlItem9.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem9.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem9.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem9.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(172, 46);
+            this.layoutControlItem9.Size = new System.Drawing.Size(174, 46);
             this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem9.Text = "超短波经纬度";
             this.layoutControlItem9.Text = "超短波经纬度";
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
@@ -340,11 +330,11 @@
             this.layoutControlItem10.Control = this.txtRefLocation;
             this.layoutControlItem10.Control = this.txtRefLocation;
             this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem10.CustomizationFormText = "参考站经纬度";
             this.layoutControlItem10.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem10.Location = new System.Drawing.Point(345, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(362, 0);
             this.layoutControlItem10.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem10.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem10.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem10.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(173, 46);
+            this.layoutControlItem10.Size = new System.Drawing.Size(156, 46);
             this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem10.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.layoutControlItem10.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.layoutControlItem10.Text = "参考站经纬度";
             this.layoutControlItem10.Text = "参考站经纬度";
@@ -375,6 +365,18 @@
             this.emptySpaceItem2.Size = new System.Drawing.Size(518, 57);
             this.emptySpaceItem2.Size = new System.Drawing.Size(518, 57);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.ucEphXYZMain;
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 138);
+            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 48);
+            this.layoutControlItem2.MinSize = new System.Drawing.Size(166, 48);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(518, 48);
+            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem2.TextVisible = false;
+            // 
             // layoutControlItem3
             // layoutControlItem3
             // 
             // 
             this.layoutControlItem3.Control = this.btnEphCalc;
             this.layoutControlItem3.Control = this.btnEphCalc;
@@ -427,7 +429,7 @@
             this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem4.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem4.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(173, 46);
+            this.layoutControlItem4.Size = new System.Drawing.Size(188, 46);
             this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem4.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.layoutControlItem4.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.layoutControlItem4.Text = "测向站经纬度";
             this.layoutControlItem4.Text = "测向站经纬度";
@@ -437,11 +439,11 @@
             // itemSigTime
             // itemSigTime
             // 
             // 
             this.itemSigTime.Control = this.sigTime;
             this.itemSigTime.Control = this.sigTime;
-            this.itemSigTime.Location = new System.Drawing.Point(259, 92);
+            this.itemSigTime.Location = new System.Drawing.Point(188, 92);
             this.itemSigTime.MaxSize = new System.Drawing.Size(0, 46);
             this.itemSigTime.MaxSize = new System.Drawing.Size(0, 46);
             this.itemSigTime.MinSize = new System.Drawing.Size(76, 46);
             this.itemSigTime.MinSize = new System.Drawing.Size(76, 46);
             this.itemSigTime.Name = "itemSigTime";
             this.itemSigTime.Name = "itemSigTime";
-            this.itemSigTime.Size = new System.Drawing.Size(259, 46);
+            this.itemSigTime.Size = new System.Drawing.Size(330, 46);
             this.itemSigTime.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.itemSigTime.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.itemSigTime.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.itemSigTime.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.itemSigTime.Text = "信号时间";
             this.itemSigTime.Text = "信号时间";
@@ -457,7 +459,7 @@
             this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem6.MinSize = new System.Drawing.Size(54, 46);
             this.layoutControlItem6.MinSize = new System.Drawing.Size(54, 46);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(259, 46);
+            this.layoutControlItem6.Size = new System.Drawing.Size(188, 46);
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
             this.layoutControlItem6.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
             this.layoutControlItem6.Text = "主星超短时差";
             this.layoutControlItem6.Text = "主星超短时差";
@@ -469,11 +471,11 @@
             this.layoutControlItem5.Control = this.txtcxFx;
             this.layoutControlItem5.Control = this.txtcxFx;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "轨道经度";
             this.layoutControlItem5.CustomizationFormText = "轨道经度";
-            this.layoutControlItem5.Location = new System.Drawing.Point(173, 46);
+            this.layoutControlItem5.Location = new System.Drawing.Point(188, 46);
             this.layoutControlItem5.MaxSize = new System.Drawing.Size(0, 51);
             this.layoutControlItem5.MaxSize = new System.Drawing.Size(0, 51);
             this.layoutControlItem5.MinSize = new System.Drawing.Size(54, 46);
             this.layoutControlItem5.MinSize = new System.Drawing.Size(54, 46);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(172, 46);
+            this.layoutControlItem5.Size = new System.Drawing.Size(174, 46);
             this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem5.Text = "测向方向值";
             this.layoutControlItem5.Text = "测向方向值";
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
@@ -483,24 +485,59 @@
             // 
             // 
             this.dxErrorProvider.ContainerControl = this;
             this.dxErrorProvider.ContainerControl = this;
             // 
             // 
-            // ucEphXYZMain
+            // btnCxLin
+            // 
+            this.btnCxLin.Location = new System.Drawing.Point(208, 205);
+            this.btnCxLin.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.btnCxLin.Name = "btnCxLin";
+            this.btnCxLin.Size = new System.Drawing.Size(98, 22);
+            this.btnCxLin.StyleController = this.layoutControl1;
+            this.btnCxLin.TabIndex = 12;
+            this.btnCxLin.Text = "测向线";
+            this.btnCxLin.Click += new System.EventHandler(this.btnCxLine_Click);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.btnCxLin;
+            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem7.CustomizationFormText = "layoutControlItem1";
+            this.layoutControlItem7.Location = new System.Drawing.Point(188, 186);
+            this.layoutControlItem7.MaxSize = new System.Drawing.Size(110, 33);
+            this.layoutControlItem7.MinSize = new System.Drawing.Size(110, 33);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.Padding = new DevExpress.XtraLayout.Utils.Padding(10, 2, 9, 2);
+            this.layoutControlItem7.Size = new System.Drawing.Size(110, 33);
+            this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem7.Text = "layoutControlItem1";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem7.TextVisible = false;
             // 
             // 
-            this.ucEphXYZMain.Location = new System.Drawing.Point(12, 150);
-            this.ucEphXYZMain.Name = "ucEphXYZMain";
-            this.ucEphXYZMain.Size = new System.Drawing.Size(514, 44);
-            this.ucEphXYZMain.TabIndex = 13;
+            // txtYbMain
             // 
             // 
-            // layoutControlItem2
+            this.txtYbMain.Location = new System.Drawing.Point(374, 75);
+            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, 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(150, 20);
+            this.txtYbMain.StyleController = this.layoutControl1;
+            this.txtYbMain.TabIndex = 6;
             // 
             // 
-            this.layoutControlItem2.Control = this.ucEphXYZMain;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 138);
-            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 48);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(166, 48);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(518, 48);
-            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem2.TextVisible = false;
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txtYbMain;
+            this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem8.CustomizationFormText = "轨道经度";
+            this.layoutControlItem8.Location = new System.Drawing.Point(362, 46);
+            this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 46);
+            this.layoutControlItem8.MinSize = new System.Drawing.Size(54, 46);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.Size = new System.Drawing.Size(156, 46);
+            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem8.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
+            this.layoutControlItem8.Text = "样本主星时差";
+            this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
             // 
             // 
             // X1D1DTOParamEditor
             // X1D1DTOParamEditor
             // 
             // 
@@ -515,7 +552,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.sigTime.Properties.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.sigTime.Properties.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.sigTime.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.sigTime.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDtoCdb.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDtoCdb.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYbMain.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtsatStation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtsatStation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcdbStation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcdbStation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation.Properties)).EndInit();
@@ -528,6 +564,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).EndInit();
@@ -536,7 +573,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYbMain.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             this.ResumeLayout(false);
             this.ResumeLayout(false);
 
 
         }
         }
@@ -549,8 +588,6 @@
         private DevExpress.XtraLayout.LayoutControlItem itemSigTime;
         private DevExpress.XtraLayout.LayoutControlItem itemSigTime;
         private DevExpress.XtraEditors.ButtonEdit txtDtoCdb;
         private DevExpress.XtraEditors.ButtonEdit txtDtoCdb;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraEditors.ButtonEdit txtYbMain;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraEditors.TextEdit txtsatStation;
         private DevExpress.XtraEditors.TextEdit txtsatStation;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraEditors.TextEdit txtcdbStation;
         private DevExpress.XtraEditors.TextEdit txtcdbStation;
@@ -573,7 +610,9 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraEditors.ButtonEdit txtcxFx;
         private DevExpress.XtraEditors.ButtonEdit txtcxFx;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraEditors.SimpleButton btnCxLine;
+        private DevExpress.XtraEditors.SimpleButton btnCxLin;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraEditors.ButtonEdit txtYbMain;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
     }
     }
 }
 }

+ 12 - 0
XdCxRhDW.App/EditForms/X1D1DTOParamEditor.cs

@@ -106,6 +106,18 @@ namespace XdCxRhDW.App.EditForms
             {
             {
                 return false;
                 return false;
             }
             }
+            if (!txtDtoCdb.CheckDouble(dxErrorProvider, "主星超短时差"))
+            {
+                return false;
+            }
+            if (!txtYbMain.CheckDouble(dxErrorProvider, "样本主星时差"))
+            {
+                return false;
+            }
+            if (!ucEphXYZMain.CheckEphXYZ(dxErrorProvider))
+            {
+                return false;
+            }
             return true;
             return true;
         }
         }
 
 

+ 47 - 47
XdCxRhDW.App/EditForms/X2D1DTOParamEditor.Designer.cs

@@ -50,6 +50,8 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.ucEphXYZAdaj = new XdCxRhDW.App.UserControl.UCEphXYZ();
+            this.ucEphXYZMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
             this.txtSigTime = new DevExpress.XtraEditors.DateEdit();
             this.txtSigTime = new DevExpress.XtraEditors.DateEdit();
             this.txtDtoSx = new DevExpress.XtraEditors.ButtonEdit();
             this.txtDtoSx = new DevExpress.XtraEditors.ButtonEdit();
             this.txtDtoCdb = new DevExpress.XtraEditors.ButtonEdit();
             this.txtDtoCdb = new DevExpress.XtraEditors.ButtonEdit();
@@ -72,15 +74,13 @@
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.txtPosRes = new DevExpress.XtraLayout.SimpleLabelItem();
             this.txtPosRes = new DevExpress.XtraLayout.SimpleLabelItem();
             this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
-            this.ucEphXYZAdaj = new XdCxRhDW.App.UserControl.UCEphXYZ();
-            this.ucEphXYZMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtSigTime.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSigTime.Properties)).BeginInit();
@@ -103,13 +103,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             this.SuspendLayout();
             this.SuspendLayout();
             // 
             // 
             // layoutControl1
             // layoutControl1
@@ -136,6 +136,21 @@
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             this.layoutControl1.Text = "layoutControl1";
             // 
             // 
+            // ucEphXYZAdaj
+            // 
+            this.ucEphXYZAdaj.Location = new System.Drawing.Point(12, 198);
+            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;
+            // 
+            // 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;
+            // 
             // txtSigTime
             // txtSigTime
             // 
             // 
             this.txtSigTime.EditValue = null;
             this.txtSigTime.EditValue = null;
@@ -435,6 +450,30 @@
             this.emptySpaceItem2.Size = new System.Drawing.Size(622, 46);
             this.emptySpaceItem2.Size = new System.Drawing.Size(622, 46);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.ucEphXYZMain;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 138);
+            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;
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.ucEphXYZAdaj;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 186);
+            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;
+            // 
             // layoutControlItem5
             // layoutControlItem5
             // 
             // 
             this.layoutControlItem5.Control = this.btnEphCalc;
             this.layoutControlItem5.Control = this.btnEphCalc;
@@ -499,45 +538,6 @@
             // 
             // 
             this.dxErrorProvider.ContainerControl = this;
             this.dxErrorProvider.ContainerControl = this;
             // 
             // 
-            // ucEphXYZAdaj
-            // 
-            this.ucEphXYZAdaj.Location = new System.Drawing.Point(12, 198);
-            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;
-            // 
-            // 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;
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.ucEphXYZMain;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 138);
-            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;
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.ucEphXYZAdaj;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 186);
-            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;
-            // 
             // X2D1DTOParamEditor
             // X2D1DTOParamEditor
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -568,13 +568,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             this.ResumeLayout(false);
             this.ResumeLayout(false);
 
 
         }
         }

+ 20 - 0
XdCxRhDW.App/ExtensionsDev/BaseEditExtension.cs

@@ -21,6 +21,26 @@ namespace ExtensionsDev
             var ctrl = (BaseEdit)sender;
             var ctrl = (BaseEdit)sender;
             ctrl.SelectAll();
             ctrl.SelectAll();
         }
         }
+        public static bool CheckDouble(this ButtonEdit @this, DXErrorProvider dxErrorProvider, string msg)
+        {
+            dxErrorProvider.ClearErrors();
+            if (string.IsNullOrWhiteSpace(@this.Text.Trim()))
+            {
+                dxErrorProvider.SetError(@this, $"{msg}值不能为空!");
+                return false;
+            }
+           
+            double val;
+            bool isDoubleLon = Double.TryParse(@this.Text.Trim(), out val);
+            if (!isDoubleLon)
+            {
+                dxErrorProvider.SetError(@this, $"{msg}值应为数字!");
+                return false;
+            }
+            dxErrorProvider.SetError(@this, string.Empty);
+            return true;
+
+        }
         public static bool CheckLonLat(this TextEdit @this, DXErrorProvider dxErrorProvider, string msg)
         public static bool CheckLonLat(this TextEdit @this, DXErrorProvider dxErrorProvider, string msg)
         {
         {
             dxErrorProvider.ClearErrors();
             dxErrorProvider.ClearErrors();

+ 3 - 2
XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -1400,6 +1400,7 @@ public static class MapControlEx
                 }
                 }
                 gc.Visible = false;
                 gc.Visible = false;
                 gc.Parent = ctrl.Parent;
                 gc.Parent = ctrl.Parent;
+                gc.Width = view.Columns.Count * 120;
                 using (var dialog = new SaveFileDialog())
                 using (var dialog = new SaveFileDialog())
                 {
                 {
                     dialog.Filter = "Excel文件|*.xlsx";
                     dialog.Filter = "Excel文件|*.xlsx";
@@ -1915,8 +1916,8 @@ public static class MapControlEx
         double dy = dis * Math.Cos(rad);
         double dy = dis * Math.Cos(rad);
 
 
         MyLatLng A = new MyLatLng(lon, lat);
         MyLatLng A = new MyLatLng(lon, lat);
-        double bjd = (dx / A.Ed + A.m_RadLo) * 180/ Math.PI;
-        double bwd = (dy / A.Ec + A.m_RadLa) * 180/ Math.PI;
+        double bjd = (dx / A.Ed + A.m_RadLo) * 180 / Math.PI;
+        double bwd = (dy / A.Ec + A.m_RadLa) * 180 / Math.PI;
         return (bjd, bwd);
         return (bjd, bwd);
     }
     }
 
 

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

@@ -78,7 +78,7 @@ namespace XdCxRhDW.App.UserControl
             gridHomeTask.UseDefault(list, showScrollH: true).UseEmptyText("点击+创建任务");
             gridHomeTask.UseDefault(list, showScrollH: true).UseEmptyText("点击+创建任务");
             gridView1.BestFitColumns();
             gridView1.BestFitColumns();
             gridHomePosRes.UseDefault(new List<ModelPosRes>()).UseMultiSelect().UseRowNumber().UseNullValueText()
             gridHomePosRes.UseDefault(new List<ModelPosRes>()).UseMultiSelect().UseRowNumber().UseNullValueText()
-                .AddRowMenu<ModelPosRes>("绘制时差线", SvgHelper.CreateDtoLine(), DrawDtoLine, item => item.PosResType != EnumPosResType.RH)
+                .AddRowMenu<ModelPosRes>("绘制时差线", SvgHelper.CreateDtoLine(), DrawDtoLine)
                 .AddRowMenu<ModelPosRes>("GDOP分析", SvgHelper.CreateGDOP(), DrawGdopLine, item => item.PosResType != EnumPosResType.RH)
                 .AddRowMenu<ModelPosRes>("GDOP分析", SvgHelper.CreateGDOP(), DrawGdopLine, item => item.PosResType != EnumPosResType.RH)
                 .AddRowMenu<ModelPosRes>("查看参估", SvgHelper.CreateShowCafRes(), ShowCafRes)
                 .AddRowMenu<ModelPosRes>("查看参估", SvgHelper.CreateShowCafRes(), ShowCafRes)
                 .AddRowMenu<ModelPosRes>("查看测向", SvgHelper.CreateShowCxRes(), ShowCxRes)
                 .AddRowMenu<ModelPosRes>("查看测向", SvgHelper.CreateShowCxRes(), ShowCxRes)
@@ -863,6 +863,10 @@ namespace XdCxRhDW.App.UserControl
                     X2DTOParamEditor X2Dfofrm = new X2DTOParamEditor(item, mapControl1);
                     X2DTOParamEditor X2Dfofrm = new X2DTOParamEditor(item, mapControl1);
                     DxHelper.PopupHelper.ShowPopup(X2Dfofrm, layoutControl1, 600);
                     DxHelper.PopupHelper.ShowPopup(X2Dfofrm, layoutControl1, 600);
                     break;
                     break;
+                case EnumPosResType.RH:
+                    RHDTOParamEditor Rhfrm = new RHDTOParamEditor(item, mapControl1);
+                    DxHelper.PopupHelper.ShowPopup(Rhfrm, layoutControl1, 600);
+                    break;
                 default:
                 default:
                     break;
                     break;
             }
             }

+ 28 - 3
XdCxRhDW.App/UserControl/UCEphXYZ.cs

@@ -1,5 +1,7 @@
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.DXErrorProvider;
 using DevExpress.XtraLayout;
 using DevExpress.XtraLayout;
+using ExtensionsDev;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel;
@@ -16,6 +18,7 @@ namespace XdCxRhDW.App.UserControl
     public partial class UCEphXYZ : DevExpress.XtraEditors.XtraUserControl
     public partial class UCEphXYZ : DevExpress.XtraEditors.XtraUserControl
     {
     {
         private int? SatCode;
         private int? SatCode;
+        private string _title;
         public UCEphXYZ()
         public UCEphXYZ()
         {
         {
             InitializeComponent();
             InitializeComponent();
@@ -24,6 +27,8 @@ namespace XdCxRhDW.App.UserControl
         public void SetXYZ(string title, int? satCode, (double? x, double? y, double? z) eph, Color color)
         public void SetXYZ(string title, int? satCode, (double? x, double? y, double? z) eph, Color color)
         {
         {
             SatCode = satCode;
             SatCode = satCode;
+
+            _title = $"{title}[{SatCode}]";
             layoutControlItemx.AllowHtmlStringInCaption = true;
             layoutControlItemx.AllowHtmlStringInCaption = true;
             double.TryParse(ephX.EditValue?.ToString(), out double x);
             double.TryParse(ephX.EditValue?.ToString(), out double x);
             double.TryParse(ephY.EditValue?.ToString(), out double y);
             double.TryParse(ephY.EditValue?.ToString(), out double y);
@@ -51,18 +56,38 @@ namespace XdCxRhDW.App.UserControl
         {
         {
             if (!double.TryParse(ephX.Text, out double _))
             if (!double.TryParse(ephX.Text, out double _))
             {
             {
-                return (false, $"{layoutControlItemx.Text}星历X格式错误!");
+                return (false, $"{_title}星历X格式错误!");
             }
             }
             if (!double.TryParse(ephY.Text, out double _))
             if (!double.TryParse(ephY.Text, out double _))
             {
             {
-                return (false, $"{layoutControlItemx.Text}星历Y格式错误!");
+                return (false, $"{_title}星历Y格式错误!");
             }
             }
             if (!double.TryParse(ephZ.Text, out double _))
             if (!double.TryParse(ephZ.Text, out double _))
             {
             {
-                return (false, $"{layoutControlItemx.Text}星历Z格式错误!");
+                return (false, $"{_title}星历Z格式错误!");
             }
             }
             return (true, string.Empty);
             return (true, string.Empty);
         }
         }
+        public bool CheckEphXYZ(DXErrorProvider dxErrorProvider)
+        {
+            if (!ephX.CheckDouble(dxErrorProvider, $"{_title}星历X"))
+            {
+                return false;
+            }
+
+            if (!ephY.CheckDouble(dxErrorProvider, $"{_title}星历Y"))
+            {
+                return false;
+            }
+
+            if (!ephZ.CheckDouble(dxErrorProvider, $"{_title}星历Z"))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         public double[] EphXYZ()
         public double[] EphXYZ()
         {
         {
             var x = Convert.ToDouble(ephX.EditValue);
             var x = Convert.ToDouble(ephX.EditValue);

+ 47 - 7
XdCxRhDW.App/UserControl/UCEphXYZParam.cs

@@ -1,5 +1,7 @@
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.DXErrorProvider;
 using DevExpress.XtraLayout;
 using DevExpress.XtraLayout;
+using ExtensionsDev;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel;
@@ -16,6 +18,8 @@ namespace XdCxRhDW.App.UserControl
     public partial class UCEphXYZParam : DevExpress.XtraEditors.XtraUserControl
     public partial class UCEphXYZParam : DevExpress.XtraEditors.XtraUserControl
     {
     {
         private int? SatCode;
         private int? SatCode;
+
+        private string _title;
         public UCEphXYZParam()
         public UCEphXYZParam()
         {
         {
             InitializeComponent();
             InitializeComponent();
@@ -25,7 +29,7 @@ namespace XdCxRhDW.App.UserControl
         {
         {
 
 
             SatCode = satCode;
             SatCode = satCode;
-
+            _title = $"{title}[{SatCode}]";
             layoutControlItemx.AllowHtmlStringInCaption = true;
             layoutControlItemx.AllowHtmlStringInCaption = true;
             ephX.EditValue = eph.x.HasValue ? eph.x.Value : 0;
             ephX.EditValue = eph.x.HasValue ? eph.x.Value : 0;
             layoutControlItemx.Text = $"{title}<size=12><color=0,103,192> [{satCode}]</color></size>星历X";
             layoutControlItemx.Text = $"{title}<size=12><color=0,103,192> [{satCode}]</color></size>星历X";
@@ -49,30 +53,66 @@ namespace XdCxRhDW.App.UserControl
         {
         {
             if (!double.TryParse(ephX.Text, out double _))
             if (!double.TryParse(ephX.Text, out double _))
             {
             {
-                return (false, $"{layoutControlItemx.Text}星历X格式错误!");
+                return (false, $"{_title}星历X格式错误!");
             }
             }
             if (!double.TryParse(ephY.Text, out double _))
             if (!double.TryParse(ephY.Text, out double _))
             {
             {
-                return (false, $"{layoutControlItemx.Text}星历Y格式错误!");
+                return (false, $"{_title}星历Y格式错误!");
             }
             }
             if (!double.TryParse(ephZ.Text, out double _))
             if (!double.TryParse(ephZ.Text, out double _))
             {
             {
-                return (false, $"{layoutControlItemx.Text}星历Z格式错误!");
+                return (false, $"{_title}星历Z格式错误!");
             }
             }
             if (!double.TryParse(ephVX.Text, out double _))
             if (!double.TryParse(ephVX.Text, out double _))
             {
             {
-                return (false, $"{layoutControlItemx.Text}星历VX格式错误!");
+                return (false, $"{_title}星历VX格式错误!");
             }
             }
             if (!double.TryParse(ephVY.Text, out double _))
             if (!double.TryParse(ephVY.Text, out double _))
             {
             {
-                return (false, $"{layoutControlItemx.Text}星历VY格式错误!");
+                return (false, $"{_title}星历VY格式错误!");
             }
             }
             if (!double.TryParse(ephVZ.Text, out double _))
             if (!double.TryParse(ephVZ.Text, out double _))
             {
             {
-                return (false, $"{layoutControlItemx.Text}星历VZ格式错误!");
+                return (false, $"{_title}星历VZ格式错误!");
             }
             }
             return (true, string.Empty);
             return (true, string.Empty);
         }
         }
+
+        public bool CheckEphXYZ(DXErrorProvider dxErrorProvider)
+        {
+            if (!ephX.CheckDouble(dxErrorProvider, $"{_title}星历X"))
+            {
+                return false;
+            }
+
+            if (!ephY.CheckDouble(dxErrorProvider, $"{_title}星历Y"))
+            {
+                return false;
+            }
+
+            if (!ephZ.CheckDouble(dxErrorProvider, $"{_title}星历Z"))
+            {
+                return false;
+            }
+
+            if (!ephVX.CheckDouble(dxErrorProvider, $"{_title}星历VX"))
+            {
+                return false;
+            }
+
+            if (!ephVY.CheckDouble(dxErrorProvider, $"{_title}星历VY"))
+            {
+                return false;
+            }
+
+            if (!ephVZ.CheckDouble(dxErrorProvider, $"{_title}星历VZ"))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         public double[] EphParam()
         public double[] EphParam()
         {
         {
             var x = Convert.ToDouble(ephX.EditValue);
             var x = Convert.ToDouble(ephX.EditValue);

+ 9 - 1
XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -197,6 +197,12 @@
     <Compile Include="EditForms\PosTimeEditor.Designer.cs">
     <Compile Include="EditForms\PosTimeEditor.Designer.cs">
       <DependentUpon>PosTimeEditor.cs</DependentUpon>
       <DependentUpon>PosTimeEditor.cs</DependentUpon>
     </Compile>
     </Compile>
+    <Compile Include="EditForms\RHDTOParamEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EditForms\RHDTOParamEditor.Designer.cs">
+      <DependentUpon>RHDTOParamEditor.cs</DependentUpon>
+    </Compile>
     <Compile Include="EditForms\SigDelayEditor.cs">
     <Compile Include="EditForms\SigDelayEditor.cs">
       <SubType>Form</SubType>
       <SubType>Form</SubType>
     </Compile>
     </Compile>
@@ -440,6 +446,9 @@
     <EmbeddedResource Include="EditForms\PosTimeEditor.resx">
     <EmbeddedResource Include="EditForms\PosTimeEditor.resx">
       <DependentUpon>PosTimeEditor.cs</DependentUpon>
       <DependentUpon>PosTimeEditor.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
+    <EmbeddedResource Include="EditForms\RHDTOParamEditor.resx">
+      <DependentUpon>RHDTOParamEditor.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="EditForms\SigDelayEditor.resx">
     <EmbeddedResource Include="EditForms\SigDelayEditor.resx">
       <DependentUpon>SigDelayEditor.cs</DependentUpon>
       <DependentUpon>SigDelayEditor.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
@@ -499,7 +508,6 @@
     <EmbeddedResource Include="PopupControl\ShowCxCtrl.resx">
     <EmbeddedResource Include="PopupControl\ShowCxCtrl.resx">
       <DependentUpon>ShowCxCtrl.cs</DependentUpon>
       <DependentUpon>ShowCxCtrl.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>