gongqiuhong 1 ano atrás
pai
commit
1f1bafdc82

+ 9 - 9
XdCxRhDW.App/EditForms/EditorTar.Designer.cs

@@ -61,7 +61,7 @@
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(831, 101, 650, 400);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(258, 151);
+            this.layoutControl1.Size = new System.Drawing.Size(259, 152);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -69,7 +69,7 @@
             // 
             this.btnOk.Location = new System.Drawing.Point(131, 90);
             this.btnOk.Name = "btnOk";
-            this.btnOk.Size = new System.Drawing.Size(105, 22);
+            this.btnOk.Size = new System.Drawing.Size(106, 22);
             this.btnOk.StyleController = this.layoutControl1;
             this.btnOk.TabIndex = 8;
             this.btnOk.Text = "确定";
@@ -93,7 +93,7 @@
             this.searchLookUpEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.searchLookUpEdit1.Properties.PopupView = this.searchLookUpEdit1View;
-            this.searchLookUpEdit1.Size = new System.Drawing.Size(214, 23);
+            this.searchLookUpEdit1.Size = new System.Drawing.Size(215, 23);
             this.searchLookUpEdit1.StyleController = this.layoutControl1;
             this.searchLookUpEdit1.TabIndex = 4;
             // 
@@ -116,7 +116,7 @@
             this.emptySpaceItem2});
             this.Root.Name = "Root";
             this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 20, 20, 20);
-            this.Root.Size = new System.Drawing.Size(258, 151);
+            this.Root.Size = new System.Drawing.Size(259, 152);
             this.Root.TextVisible = false;
             // 
             // emptySpaceItem1
@@ -124,7 +124,7 @@
             this.emptySpaceItem1.AllowHotTrack = false;
             this.emptySpaceItem1.Location = new System.Drawing.Point(0, 94);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(218, 17);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(219, 18);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem1
@@ -134,7 +134,7 @@
             this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 44);
             this.layoutControlItem1.MinSize = new System.Drawing.Size(54, 44);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(218, 44);
+            this.layoutControlItem1.Size = new System.Drawing.Size(219, 44);
             this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem1.Text = "目标名称";
             this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
@@ -154,7 +154,7 @@
             this.layoutControlItem5.Control = this.btnOk;
             this.layoutControlItem5.Location = new System.Drawing.Point(109, 68);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(109, 26);
+            this.layoutControlItem5.Size = new System.Drawing.Size(110, 26);
             this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem5.TextVisible = false;
             // 
@@ -165,7 +165,7 @@
             this.emptySpaceItem2.MaxSize = new System.Drawing.Size(0, 24);
             this.emptySpaceItem2.MinSize = new System.Drawing.Size(104, 24);
             this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(218, 24);
+            this.emptySpaceItem2.Size = new System.Drawing.Size(219, 24);
             this.emptySpaceItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
@@ -173,7 +173,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(258, 151);
+            this.ClientSize = new System.Drawing.Size(259, 152);
             this.Controls.Add(this.layoutControl1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             this.Name = "EditorTar";

+ 2 - 0
XdCxRhDW.App/EditForms/EditorTar.cs

@@ -39,7 +39,9 @@ namespace XdCxRhDW.App.EditForms
             this.searchLookUpEdit1.UseDefault().SetData(infos,nameof(TargetInfo.TargetName)).UseDoubleClickToSelectAll();
             this.searchLookUpEdit1.Properties.View.RowCellStyle += View_RowCellStyle;
             if (info != null)
+            {
                 this.searchLookUpEdit1.Text = info.TargetName;
+            }
         }
 
         private void View_RowCellStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowCellStyleEventArgs e)

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

@@ -137,7 +137,7 @@ namespace XdCxRhDW.App.EditForms
                 var nsat = listSat.FirstOrDefault(m => m.SatCode == cg.Adja1Code.Value)?.Sat;
                 if (string.IsNullOrWhiteSpace(nsat)) nsat = cg.Adja1Code.Value.ToString();
                 var tsDtoLine = DrawDtoLineHelper.DtoLine2XStart(twoStartOption);
-                mapControl1.DrawDtoPonit($"[{msat},[{nsat}]]时差线", tsDtoLine);
+                mapControl1.DrawDtoPonit($"[{msat},{nsat}]时差线", tsDtoLine);
 
             }
             catch (Exception ex)

+ 2 - 2
XdCxRhDW.App/EditForms/X3DTOParamEditor.cs

@@ -157,7 +157,7 @@ namespace XdCxRhDW.App.EditForms
                 if (info.PosResType == EnumPosResType.X3)
                 {
                     var tsDtoLine = DrawDtoLineHelper.DtoLine2XStart(twoStartOption);
-                    mapControl1.DrawDtoPonit($"[{msat},[{nsat}]]带参时差线", tsDtoLine);
+                    mapControl1.DrawDtoPonit($"[{msat},{nsat}]带参时差线", tsDtoLine);
 
                     twoStartOption.NsEph = Ns2Eph;
                     twoStartOption.RefDto = YbMainDto - YbAdja2Dto;
@@ -169,7 +169,7 @@ namespace XdCxRhDW.App.EditForms
                 else
                 {
                     var tsDtoLine = DrawDtoLineHelper.DtoLine2XNoRefStart(twoStartOption);
-                    mapControl1.DrawDtoPonit($"[{msat},[{nsat}]]无参时差线", tsDtoLine);
+                    mapControl1.DrawDtoPonit($"[{msat},{nsat}]无参时差线", tsDtoLine);
                     twoStartOption.NsEph = Ns2Eph;
                     twoStartOption.TargetDto = DtoSx1;
                     var tsDtoLine1 = DrawDtoLineHelper.DtoLine2XNoRefStart(twoStartOption);

+ 7 - 0
XdCxRhDW.App/Model/ModelPosRes.cs

@@ -11,10 +11,17 @@ namespace XdCxRhDW.App.Model
 {
     public class ModelPosRes : PosRes
     {
+        public ModelPosRes()
+        {
+            if (TargetInfo != null && !string.IsNullOrWhiteSpace(TargetInfo.TargeColor))
+                ColorKey = this.TargetInfo?.TargeColor;
+        }
         [Display(Name = "目标名称")]
+        [ToolTip]
         public string TargetName => TargetInfo?.TargetName;
 
         [Display(Name = "检测方式")]
+        [ToolTip]
         public EnumPosCheckType? CheckType => CheckRes?.PosCheckType;
     }
 }

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

@@ -25,7 +25,7 @@ namespace XdCxRhDW.App.UserControl
         public CtrlSvrs()
         {
             InitializeComponent();
-            gridSvrs.DataSource = list;//.UseFilter().UseGroup().UseRowNumber().UseSort().DataSource = list;
+            gridSvrs.Init<ModelSvrs>().UseFilter().UseGroup().UseRowNumber().UseSort().DataSource = list;
             gridSvrs.UseEdit();
             var linkEdit = new DevExpress.XtraEditors.Repository.RepositoryItemHyperLinkEdit();
             this.gridSvrs.RepositoryItems.Add(linkEdit);

+ 88 - 54
XdCxRhDW.App/UserControl/X1D1GDOPParam.Designer.cs

@@ -67,6 +67,8 @@
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtMainSat = new DevExpress.XtraLayout.SimpleLabelItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties)).BeginInit();
@@ -91,6 +93,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -109,18 +113,18 @@
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
             this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.layoutControl1.Name = "layoutControl1";
-            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(993, 379, 650, 400);
+            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(845, 426, 650, 400);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(345, 414);
+            this.layoutControl1.Size = new System.Drawing.Size(372, 655);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(174, 361);
+            this.btnOK.Location = new System.Drawing.Point(188, 356);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(169, 22);
+            this.btnOK.Size = new System.Drawing.Size(182, 22);
             this.btnOK.StyleController = this.layoutControl1;
             this.btnOK.TabIndex = 12;
             this.btnOK.Text = "确定";
@@ -129,7 +133,7 @@
             // txtCapTime
             // 
             this.txtCapTime.EditValue = null;
-            this.txtCapTime.Location = new System.Drawing.Point(2, 64);
+            this.txtCapTime.Location = new System.Drawing.Point(2, 62);
             this.txtCapTime.Margin = new System.Windows.Forms.Padding(2);
             this.txtCapTime.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtCapTime.MinimumSize = new System.Drawing.Size(0, 22);
@@ -139,20 +143,20 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txtCapTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtCapTime.Size = new System.Drawing.Size(341, 22);
+            this.txtCapTime.Size = new System.Drawing.Size(368, 22);
             this.txtCapTime.StyleController = this.layoutControl1;
             this.txtCapTime.TabIndex = 8;
             // 
             // txtStationLocation1
             // 
             this.txtStationLocation1.EditValue = "";
-            this.txtStationLocation1.Location = new System.Drawing.Point(2, 108);
+            this.txtStationLocation1.Location = new System.Drawing.Point(2, 105);
             this.txtStationLocation1.Margin = new System.Windows.Forms.Padding(2);
             this.txtStationLocation1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtStationLocation1.MinimumSize = new System.Drawing.Size(0, 22);
             this.txtStationLocation1.Name = "txtStationLocation1";
             this.txtStationLocation1.Properties.AutoHeight = false;
-            this.txtStationLocation1.Size = new System.Drawing.Size(341, 22);
+            this.txtStationLocation1.Size = new System.Drawing.Size(368, 22);
             this.txtStationLocation1.StyleController = this.layoutControl1;
             this.txtStationLocation1.TabIndex = 11;
             this.txtStationLocation1.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -160,13 +164,13 @@
             // txtRefLocation1
             // 
             this.txtRefLocation1.EditValue = "";
-            this.txtRefLocation1.Location = new System.Drawing.Point(2, 196);
+            this.txtRefLocation1.Location = new System.Drawing.Point(2, 191);
             this.txtRefLocation1.Margin = new System.Windows.Forms.Padding(2);
             this.txtRefLocation1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtRefLocation1.MinimumSize = new System.Drawing.Size(0, 22);
             this.txtRefLocation1.Name = "txtRefLocation1";
             this.txtRefLocation1.Properties.AutoHeight = false;
-            this.txtRefLocation1.Size = new System.Drawing.Size(341, 22);
+            this.txtRefLocation1.Size = new System.Drawing.Size(368, 22);
             this.txtRefLocation1.StyleController = this.layoutControl1;
             this.txtRefLocation1.TabIndex = 10;
             this.txtRefLocation1.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -174,7 +178,7 @@
             // txtTleMain
             // 
             this.txtTleMain.EditValue = "";
-            this.txtTleMain.Location = new System.Drawing.Point(2, 20);
+            this.txtTleMain.Location = new System.Drawing.Point(2, 19);
             this.txtTleMain.Margin = new System.Windows.Forms.Padding(2);
             this.txtTleMain.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtTleMain.MinimumSize = new System.Drawing.Size(0, 22);
@@ -185,7 +189,7 @@
             this.txtTleMain.Properties.NullText = "";
             this.txtTleMain.Properties.PopupSizeable = false;
             this.txtTleMain.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtTleMain.Size = new System.Drawing.Size(341, 22);
+            this.txtTleMain.Size = new System.Drawing.Size(368, 22);
             this.txtTleMain.StyleController = this.layoutControl1;
             this.txtTleMain.TabIndex = 4;
             this.txtTleMain.ToolTip = "填写卫星的双行根数";
@@ -201,7 +205,7 @@
             // txtDtousErr1
             // 
             this.txtDtousErr1.EditValue = "";
-            this.txtDtousErr1.Location = new System.Drawing.Point(2, 240);
+            this.txtDtousErr1.Location = new System.Drawing.Point(2, 234);
             this.txtDtousErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtDtousErr1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtDtousErr1.MinimumSize = new System.Drawing.Size(0, 22);
@@ -212,7 +216,7 @@
             this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtDtousErr1.Properties.MaskSettings.Set("mask", "f");
-            this.txtDtousErr1.Size = new System.Drawing.Size(341, 22);
+            this.txtDtousErr1.Size = new System.Drawing.Size(368, 22);
             this.txtDtousErr1.StyleController = this.layoutControl1;
             this.txtDtousErr1.TabIndex = 6;
             this.txtDtousErr1.ToolTip = "时差误差";
@@ -220,7 +224,7 @@
             // txtSatLocErr1
             // 
             this.txtSatLocErr1.EditValue = "";
-            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 284);
+            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 278);
             this.txtSatLocErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtSatLocErr1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtSatLocErr1.MinimumSize = new System.Drawing.Size(0, 22);
@@ -231,17 +235,17 @@
             this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
-            this.txtSatLocErr1.Size = new System.Drawing.Size(341, 22);
+            this.txtSatLocErr1.Size = new System.Drawing.Size(368, 22);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
             this.txtSatLocErr1.ToolTip = "星历位置误差";
             // 
             // btnClose
             // 
-            this.btnClose.Location = new System.Drawing.Point(2, 361);
+            this.btnClose.Location = new System.Drawing.Point(2, 356);
             this.btnClose.Margin = new System.Windows.Forms.Padding(2);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Size = new System.Drawing.Size(168, 22);
+            this.btnClose.Size = new System.Drawing.Size(182, 22);
             this.btnClose.StyleController = this.layoutControl1;
             this.btnClose.TabIndex = 13;
             this.btnClose.Text = "关闭";
@@ -250,7 +254,7 @@
             // txtCxErr
             // 
             this.txtCxErr.EditValue = "";
-            this.txtCxErr.Location = new System.Drawing.Point(2, 328);
+            this.txtCxErr.Location = new System.Drawing.Point(2, 322);
             this.txtCxErr.Margin = new System.Windows.Forms.Padding(2);
             this.txtCxErr.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtCxErr.MinimumSize = new System.Drawing.Size(0, 22);
@@ -262,7 +266,7 @@
             this.txtCxErr.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtCxErr.Properties.MaskSettings.Set("mask", "f4");
             this.txtCxErr.Properties.MaxLength = 10;
-            this.txtCxErr.Size = new System.Drawing.Size(341, 22);
+            this.txtCxErr.Size = new System.Drawing.Size(368, 22);
             this.txtCxErr.StyleController = this.layoutControl1;
             this.txtCxErr.TabIndex = 6;
             this.txtCxErr.ToolTip = "测向误差(°)";
@@ -270,13 +274,13 @@
             // txtCXStation
             // 
             this.txtCXStation.EditValue = "";
-            this.txtCXStation.Location = new System.Drawing.Point(2, 152);
+            this.txtCXStation.Location = new System.Drawing.Point(2, 148);
             this.txtCXStation.Margin = new System.Windows.Forms.Padding(2);
             this.txtCXStation.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtCXStation.MinimumSize = new System.Drawing.Size(0, 22);
             this.txtCXStation.Name = "txtCXStation";
             this.txtCXStation.Properties.AutoHeight = false;
-            this.txtCXStation.Size = new System.Drawing.Size(341, 22);
+            this.txtCXStation.Size = new System.Drawing.Size(368, 22);
             this.txtCXStation.StyleController = this.layoutControl1;
             this.txtCXStation.TabIndex = 11;
             this.txtCXStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -295,9 +299,11 @@
             this.emptySpaceItem1,
             this.layoutControlItem2,
             this.layoutControlItem3,
-            this.layoutControlItem6});
+            this.layoutControlItem6,
+            this.txtMainSat,
+            this.emptySpaceItem2});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(345, 414);
+            this.Root.Size = new System.Drawing.Size(372, 655);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem8
@@ -306,93 +312,93 @@
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem8.Size = new System.Drawing.Size(372, 43);
             this.layoutControlItem8.Text = "主星星历";
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txtCapTime;
             this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 44);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 43);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem11.Size = new System.Drawing.Size(372, 43);
             this.layoutControlItem11.Text = "采集时刻";
             this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txtRefLocation1;
             this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem14.Location = new System.Drawing.Point(0, 176);
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 172);
             this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem14.Size = new System.Drawing.Size(372, 43);
             this.layoutControlItem14.Text = "参考站经纬度";
             this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txtStationLocation1;
             this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 88);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 86);
             this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem13.Size = new System.Drawing.Size(372, 43);
             this.layoutControlItem13.Text = "超短站经纬度";
             this.layoutControlItem13.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txtDtousErr1;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 220);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 215);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem4.Size = new System.Drawing.Size(372, 44);
             this.layoutControlItem4.Text = "时差误差";
             this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtSatLocErr1;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 264);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 259);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem5.Size = new System.Drawing.Size(372, 44);
             this.layoutControlItem5.Text = "星历位置误差";
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.btnOK;
-            this.layoutControlItem1.Location = new System.Drawing.Point(172, 352);
+            this.layoutControlItem1.Location = new System.Drawing.Point(186, 347);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(173, 33);
+            this.layoutControlItem1.Size = new System.Drawing.Size(186, 33);
             this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem1.TextVisible = false;
             // 
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 385);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 380);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(345, 29);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(372, 229);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.btnClose;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 352);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 347);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem2.Size = new System.Drawing.Size(172, 33);
+            this.layoutControlItem2.Size = new System.Drawing.Size(186, 33);
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem2.TextVisible = false;
             // 
@@ -401,24 +407,48 @@
             this.layoutControlItem3.Control = this.txtCxErr;
             this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem3.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 308);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 303);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem3.Size = new System.Drawing.Size(372, 44);
             this.layoutControlItem3.Text = "测向误差";
             this.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txtCXStation;
             this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem6.CustomizationFormText = "超短站经纬度";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 132);
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 129);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem6.Size = new System.Drawing.Size(372, 43);
             this.layoutControlItem6.Text = "测向站经纬度";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(86, 14);
+            // 
+            // txtMainSat
+            // 
+            this.txtMainSat.AllowHotTrack = false;
+            this.txtMainSat.AppearanceItemCaption.ForeColor = System.Drawing.Color.SteelBlue;
+            this.txtMainSat.AppearanceItemCaption.Options.UseForeColor = true;
+            this.txtMainSat.Location = new System.Drawing.Point(0, 609);
+            this.txtMainSat.MaxSize = new System.Drawing.Size(0, 22);
+            this.txtMainSat.MinSize = new System.Drawing.Size(126, 22);
+            this.txtMainSat.Name = "txtMainSat";
+            this.txtMainSat.Size = new System.Drawing.Size(372, 22);
+            this.txtMainSat.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.txtMainSat.TextSize = new System.Drawing.Size(86, 14);
+            // 
+            // emptySpaceItem2
+            // 
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 631);
+            this.emptySpaceItem2.MaxSize = new System.Drawing.Size(0, 24);
+            this.emptySpaceItem2.MinSize = new System.Drawing.Size(104, 24);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(372, 24);
+            this.emptySpaceItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // X1D1GDOPParam
             // 
@@ -427,7 +457,7 @@
             this.Controls.Add(this.layoutControl1);
             this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "X1D1GDOPParam";
-            this.Size = new System.Drawing.Size(345, 414);
+            this.Size = new System.Drawing.Size(372, 655);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties.CalendarTimeProperties)).EndInit();
@@ -452,6 +482,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -481,5 +513,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraEditors.TextEdit txtCXStation;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.SimpleLabelItem txtMainSat;
+        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
     }
 }

+ 2 - 3
XdCxRhDW.App/UserControl/X1D1GDOPParam.cs

@@ -60,10 +60,9 @@ namespace XdCxRhDW.App.UserControl
                 {
                     mainTle = xlList.First(m => m.SatCode == cg.MainCode.Value).TwoLine;
                 }
-
+                txtMainSat.Text = "主星:" + cg.MainCode;
             }
 
-
             txtTleMain.UseDefault().SetStringData(xlall).Text = mainTle;
 
         }
@@ -74,7 +73,7 @@ namespace XdCxRhDW.App.UserControl
             {
                 return (false, "主星星历不能为空!");
             }
-            if (txtCapTime.DateTime==DateTime.MinValue)
+            if (txtCapTime.DateTime == DateTime.MinValue)
             {
                 return (false, "采集时刻不能为空!");
             }

+ 97 - 48
XdCxRhDW.App/UserControl/X2D1GDOPParam.Designer.cs

@@ -61,6 +61,9 @@
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtMainSat = new DevExpress.XtraLayout.SimpleLabelItem();
+            this.txtAdjaSat = new DevExpress.XtraLayout.SimpleLabelItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties)).BeginInit();
@@ -84,6 +87,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -103,16 +109,16 @@
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(993, 379, 650, 400);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(345, 390);
+            this.layoutControl1.Size = new System.Drawing.Size(340, 452);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(174, 317);
+            this.btnOK.Location = new System.Drawing.Point(172, 312);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(169, 22);
+            this.btnOK.Size = new System.Drawing.Size(166, 22);
             this.btnOK.StyleController = this.layoutControl1;
             this.btnOK.TabIndex = 12;
             this.btnOK.Text = "确定";
@@ -121,7 +127,7 @@
             // txtCapTime
             // 
             this.txtCapTime.EditValue = null;
-            this.txtCapTime.Location = new System.Drawing.Point(2, 108);
+            this.txtCapTime.Location = new System.Drawing.Point(2, 105);
             this.txtCapTime.Margin = new System.Windows.Forms.Padding(2);
             this.txtCapTime.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtCapTime.MinimumSize = new System.Drawing.Size(0, 22);
@@ -131,20 +137,20 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txtCapTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtCapTime.Size = new System.Drawing.Size(341, 22);
+            this.txtCapTime.Size = new System.Drawing.Size(336, 22);
             this.txtCapTime.StyleController = this.layoutControl1;
             this.txtCapTime.TabIndex = 8;
             // 
             // txtStationLocation1
             // 
             this.txtStationLocation1.EditValue = "";
-            this.txtStationLocation1.Location = new System.Drawing.Point(2, 152);
+            this.txtStationLocation1.Location = new System.Drawing.Point(2, 148);
             this.txtStationLocation1.Margin = new System.Windows.Forms.Padding(2);
             this.txtStationLocation1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtStationLocation1.MinimumSize = new System.Drawing.Size(0, 22);
             this.txtStationLocation1.Name = "txtStationLocation1";
             this.txtStationLocation1.Properties.AutoHeight = false;
-            this.txtStationLocation1.Size = new System.Drawing.Size(341, 22);
+            this.txtStationLocation1.Size = new System.Drawing.Size(336, 22);
             this.txtStationLocation1.StyleController = this.layoutControl1;
             this.txtStationLocation1.TabIndex = 11;
             this.txtStationLocation1.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -152,13 +158,13 @@
             // txtRefLocation1
             // 
             this.txtRefLocation1.EditValue = "";
-            this.txtRefLocation1.Location = new System.Drawing.Point(2, 196);
+            this.txtRefLocation1.Location = new System.Drawing.Point(2, 191);
             this.txtRefLocation1.Margin = new System.Windows.Forms.Padding(2);
             this.txtRefLocation1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtRefLocation1.MinimumSize = new System.Drawing.Size(0, 22);
             this.txtRefLocation1.Name = "txtRefLocation1";
             this.txtRefLocation1.Properties.AutoHeight = false;
-            this.txtRefLocation1.Size = new System.Drawing.Size(341, 22);
+            this.txtRefLocation1.Size = new System.Drawing.Size(336, 22);
             this.txtRefLocation1.StyleController = this.layoutControl1;
             this.txtRefLocation1.TabIndex = 10;
             this.txtRefLocation1.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -166,7 +172,7 @@
             // txtTleMain
             // 
             this.txtTleMain.EditValue = "";
-            this.txtTleMain.Location = new System.Drawing.Point(2, 20);
+            this.txtTleMain.Location = new System.Drawing.Point(2, 19);
             this.txtTleMain.Margin = new System.Windows.Forms.Padding(2);
             this.txtTleMain.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtTleMain.MinimumSize = new System.Drawing.Size(0, 22);
@@ -177,7 +183,7 @@
             this.txtTleMain.Properties.NullText = "";
             this.txtTleMain.Properties.PopupSizeable = false;
             this.txtTleMain.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtTleMain.Size = new System.Drawing.Size(341, 22);
+            this.txtTleMain.Size = new System.Drawing.Size(336, 22);
             this.txtTleMain.StyleController = this.layoutControl1;
             this.txtTleMain.TabIndex = 4;
             this.txtTleMain.ToolTip = "填写卫星的双行根数";
@@ -193,7 +199,7 @@
             // txtTleAdja
             // 
             this.txtTleAdja.EditValue = "";
-            this.txtTleAdja.Location = new System.Drawing.Point(2, 64);
+            this.txtTleAdja.Location = new System.Drawing.Point(2, 62);
             this.txtTleAdja.Margin = new System.Windows.Forms.Padding(2);
             this.txtTleAdja.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtTleAdja.MinimumSize = new System.Drawing.Size(0, 22);
@@ -204,7 +210,7 @@
             this.txtTleAdja.Properties.NullText = "";
             this.txtTleAdja.Properties.PopupSizeable = false;
             this.txtTleAdja.Properties.PopupView = this.gridView1;
-            this.txtTleAdja.Size = new System.Drawing.Size(341, 22);
+            this.txtTleAdja.Size = new System.Drawing.Size(336, 22);
             this.txtTleAdja.StyleController = this.layoutControl1;
             this.txtTleAdja.TabIndex = 5;
             this.txtTleAdja.ToolTip = "填写卫星的双行根数";
@@ -220,7 +226,7 @@
             // txtDtousErr1
             // 
             this.txtDtousErr1.EditValue = "";
-            this.txtDtousErr1.Location = new System.Drawing.Point(2, 240);
+            this.txtDtousErr1.Location = new System.Drawing.Point(2, 234);
             this.txtDtousErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtDtousErr1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtDtousErr1.MinimumSize = new System.Drawing.Size(0, 22);
@@ -231,7 +237,7 @@
             this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtDtousErr1.Properties.MaskSettings.Set("mask", "f");
-            this.txtDtousErr1.Size = new System.Drawing.Size(341, 22);
+            this.txtDtousErr1.Size = new System.Drawing.Size(336, 22);
             this.txtDtousErr1.StyleController = this.layoutControl1;
             this.txtDtousErr1.TabIndex = 6;
             this.txtDtousErr1.ToolTip = "时差误差";
@@ -239,7 +245,7 @@
             // txtSatLocErr1
             // 
             this.txtSatLocErr1.EditValue = "";
-            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 284);
+            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 278);
             this.txtSatLocErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtSatLocErr1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtSatLocErr1.MinimumSize = new System.Drawing.Size(0, 22);
@@ -250,17 +256,17 @@
             this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
-            this.txtSatLocErr1.Size = new System.Drawing.Size(341, 22);
+            this.txtSatLocErr1.Size = new System.Drawing.Size(336, 22);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
             this.txtSatLocErr1.ToolTip = "星历位置误差";
             // 
             // btnClose
             // 
-            this.btnClose.Location = new System.Drawing.Point(2, 317);
+            this.btnClose.Location = new System.Drawing.Point(2, 312);
             this.btnClose.Margin = new System.Windows.Forms.Padding(2);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Size = new System.Drawing.Size(168, 22);
+            this.btnClose.Size = new System.Drawing.Size(166, 22);
             this.btnClose.StyleController = this.layoutControl1;
             this.btnClose.TabIndex = 13;
             this.btnClose.Text = "关闭";
@@ -279,9 +285,12 @@
             this.layoutControlItem5,
             this.layoutControlItem1,
             this.emptySpaceItem1,
-            this.layoutControlItem2});
+            this.layoutControlItem2,
+            this.txtMainSat,
+            this.emptySpaceItem2,
+            this.txtAdjaSat});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(345, 390);
+            this.Root.Size = new System.Drawing.Size(340, 452);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem8
@@ -290,107 +299,141 @@
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem8.Size = new System.Drawing.Size(340, 43);
             this.layoutControlItem8.Text = "主星星历";
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txtTleAdja;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 44);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 43);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem9.Size = new System.Drawing.Size(340, 43);
             this.layoutControlItem9.Text = "邻星星历";
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txtCapTime;
             this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 88);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 86);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem11.Size = new System.Drawing.Size(340, 43);
             this.layoutControlItem11.Text = "采集时刻";
             this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txtRefLocation1;
             this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem14.Location = new System.Drawing.Point(0, 176);
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 172);
             this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem14.Size = new System.Drawing.Size(340, 43);
             this.layoutControlItem14.Text = "参考站经纬度";
             this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txtStationLocation1;
             this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 132);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 129);
             this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem13.Size = new System.Drawing.Size(340, 43);
             this.layoutControlItem13.Text = "超短站经纬度";
             this.layoutControlItem13.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txtDtousErr1;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 220);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 215);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem4.Size = new System.Drawing.Size(340, 44);
             this.layoutControlItem4.Text = "时差误差";
             this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtSatLocErr1;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 264);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 259);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem5.Size = new System.Drawing.Size(340, 44);
             this.layoutControlItem5.Text = "星历位置误差";
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.btnOK;
-            this.layoutControlItem1.Location = new System.Drawing.Point(172, 308);
+            this.layoutControlItem1.Location = new System.Drawing.Point(170, 303);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(173, 33);
+            this.layoutControlItem1.Size = new System.Drawing.Size(170, 33);
             this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem1.TextVisible = false;
             // 
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 341);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 336);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(345, 49);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(340, 70);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.btnClose;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 308);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 303);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem2.Size = new System.Drawing.Size(172, 33);
+            this.layoutControlItem2.Size = new System.Drawing.Size(170, 33);
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem2.TextVisible = false;
             // 
+            // txtMainSat
+            // 
+            this.txtMainSat.AllowHotTrack = false;
+            this.txtMainSat.AppearanceItemCaption.ForeColor = System.Drawing.Color.SteelBlue;
+            this.txtMainSat.AppearanceItemCaption.Options.UseForeColor = true;
+            this.txtMainSat.Location = new System.Drawing.Point(0, 406);
+            this.txtMainSat.MaxSize = new System.Drawing.Size(0, 22);
+            this.txtMainSat.MinSize = new System.Drawing.Size(126, 22);
+            this.txtMainSat.Name = "txtMainSat";
+            this.txtMainSat.Size = new System.Drawing.Size(170, 22);
+            this.txtMainSat.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.txtMainSat.TextSize = new System.Drawing.Size(86, 14);
+            // 
+            // txtAdjaSat
+            // 
+            this.txtAdjaSat.AllowHotTrack = false;
+            this.txtAdjaSat.AppearanceItemCaption.ForeColor = System.Drawing.Color.SteelBlue;
+            this.txtAdjaSat.AppearanceItemCaption.Options.UseForeColor = true;
+            this.txtAdjaSat.Location = new System.Drawing.Point(170, 406);
+            this.txtAdjaSat.Name = "txtAdjaSat";
+            this.txtAdjaSat.Size = new System.Drawing.Size(170, 22);
+            this.txtAdjaSat.TextSize = new System.Drawing.Size(86, 14);
+            // 
+            // emptySpaceItem2
+            // 
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 428);
+            this.emptySpaceItem2.MaxSize = new System.Drawing.Size(0, 24);
+            this.emptySpaceItem2.MinSize = new System.Drawing.Size(104, 24);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(340, 24);
+            this.emptySpaceItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+            // 
             // X2D1GDOPParam
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -398,7 +441,7 @@
             this.Controls.Add(this.layoutControl1);
             this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "X2D1GDOPParam";
-            this.Size = new System.Drawing.Size(345, 390);
+            this.Size = new System.Drawing.Size(340, 452);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties.CalendarTimeProperties)).EndInit();
@@ -422,6 +465,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -450,5 +496,8 @@
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
         private DevExpress.XtraEditors.SimpleButton btnClose;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.SimpleLabelItem txtMainSat;
+        private DevExpress.XtraLayout.SimpleLabelItem txtAdjaSat;
+        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
     }
 }

+ 2 - 0
XdCxRhDW.App/UserControl/X2D1GDOPParam.cs

@@ -75,6 +75,8 @@ namespace XdCxRhDW.App.UserControl
                 {
                     adjaTle = xlList.First(m => m.SatCode == cg.Adja1Code.Value).TwoLine;
                 }
+                txtMainSat.Text = "主星:" + cg.MainCode;
+                txtAdjaSat.Text = "邻星:" + cg.Adja1Code;
             }
 
             txtTleMain.UseDefault().SetStringData(xlall).Text = mainTle;

+ 145 - 93
XdCxRhDW.App/UserControl/X2DFGDOPParam.Designer.cs

@@ -28,11 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            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 editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -58,6 +53,11 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.btnOK = new DevExpress.XtraEditors.SimpleButton();
             this.txtCapTime = new DevExpress.XtraEditors.DateEdit();
@@ -72,6 +72,7 @@
             this.txtFu1 = new DevExpress.XtraEditors.ButtonEdit();
             this.txtFu2 = new DevExpress.XtraEditors.ButtonEdit();
             this.btnClose = new DevExpress.XtraEditors.SimpleButton();
+            this.txtDtousErr1 = new DevExpress.XtraEditors.ButtonEdit();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -85,8 +86,10 @@
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtDtousErr1 = new DevExpress.XtraEditors.ButtonEdit();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtMainSat = new DevExpress.XtraLayout.SimpleLabelItem();
+            this.txtAdjaSat = new DevExpress.XtraLayout.SimpleLabelItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties)).BeginInit();
@@ -101,6 +104,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtEphVelErr1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtFu1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtFu2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
@@ -114,8 +118,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -138,16 +144,16 @@
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(993, 379, 650, 400);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(345, 399);
+            this.layoutControl1.Size = new System.Drawing.Size(375, 533);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(174, 278);
+            this.btnOK.Location = new System.Drawing.Point(189, 273);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(169, 22);
+            this.btnOK.Size = new System.Drawing.Size(184, 22);
             this.btnOK.StyleController = this.layoutControl1;
             this.btnOK.TabIndex = 12;
             this.btnOK.Text = "确定";
@@ -156,7 +162,7 @@
             // txtCapTime
             // 
             this.txtCapTime.EditValue = null;
-            this.txtCapTime.Location = new System.Drawing.Point(2, 110);
+            this.txtCapTime.Location = new System.Drawing.Point(2, 107);
             this.txtCapTime.Margin = new System.Windows.Forms.Padding(2);
             this.txtCapTime.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtCapTime.MinimumSize = new System.Drawing.Size(0, 23);
@@ -166,20 +172,20 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txtCapTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtCapTime.Size = new System.Drawing.Size(168, 23);
+            this.txtCapTime.Size = new System.Drawing.Size(183, 23);
             this.txtCapTime.StyleController = this.layoutControl1;
             this.txtCapTime.TabIndex = 8;
             // 
             // txtRefLocation1
             // 
             this.txtRefLocation1.EditValue = "";
-            this.txtRefLocation1.Location = new System.Drawing.Point(174, 110);
+            this.txtRefLocation1.Location = new System.Drawing.Point(189, 107);
             this.txtRefLocation1.Margin = new System.Windows.Forms.Padding(2);
             this.txtRefLocation1.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtRefLocation1.MinimumSize = new System.Drawing.Size(0, 23);
             this.txtRefLocation1.Name = "txtRefLocation1";
             this.txtRefLocation1.Properties.AutoHeight = false;
-            this.txtRefLocation1.Size = new System.Drawing.Size(169, 23);
+            this.txtRefLocation1.Size = new System.Drawing.Size(184, 23);
             this.txtRefLocation1.StyleController = this.layoutControl1;
             this.txtRefLocation1.TabIndex = 10;
             this.txtRefLocation1.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -187,7 +193,7 @@
             // txtTleLeo1
             // 
             this.txtTleLeo1.EditValue = "";
-            this.txtTleLeo1.Location = new System.Drawing.Point(2, 20);
+            this.txtTleLeo1.Location = new System.Drawing.Point(2, 19);
             this.txtTleLeo1.Margin = new System.Windows.Forms.Padding(2);
             this.txtTleLeo1.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtTleLeo1.MinimumSize = new System.Drawing.Size(0, 23);
@@ -198,7 +204,7 @@
             this.txtTleLeo1.Properties.NullText = "";
             this.txtTleLeo1.Properties.PopupSizeable = false;
             this.txtTleLeo1.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtTleLeo1.Size = new System.Drawing.Size(341, 23);
+            this.txtTleLeo1.Size = new System.Drawing.Size(371, 23);
             this.txtTleLeo1.StyleController = this.layoutControl1;
             this.txtTleLeo1.TabIndex = 4;
             this.txtTleLeo1.ToolTip = "填写卫星的双行根数";
@@ -214,7 +220,7 @@
             // txtTleLeo2
             // 
             this.txtTleLeo2.EditValue = "";
-            this.txtTleLeo2.Location = new System.Drawing.Point(2, 65);
+            this.txtTleLeo2.Location = new System.Drawing.Point(2, 63);
             this.txtTleLeo2.Margin = new System.Windows.Forms.Padding(2);
             this.txtTleLeo2.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtTleLeo2.MinimumSize = new System.Drawing.Size(0, 23);
@@ -225,7 +231,7 @@
             this.txtTleLeo2.Properties.NullText = "";
             this.txtTleLeo2.Properties.PopupSizeable = false;
             this.txtTleLeo2.Properties.PopupView = this.gridView1;
-            this.txtTleLeo2.Size = new System.Drawing.Size(341, 23);
+            this.txtTleLeo2.Size = new System.Drawing.Size(371, 23);
             this.txtTleLeo2.StyleController = this.layoutControl1;
             this.txtTleLeo2.TabIndex = 5;
             this.txtTleLeo2.ToolTip = "填写卫星的双行根数";
@@ -241,92 +247,111 @@
             // txtSatLocErr1
             // 
             this.txtSatLocErr1.EditValue = "";
-            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 200);
+            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 195);
             this.txtSatLocErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtSatLocErr1.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtSatLocErr1.MinimumSize = new System.Drawing.Size(0, 23);
             this.txtSatLocErr1.Name = "txtSatLocErr1";
             this.txtSatLocErr1.Properties.AutoHeight = false;
             this.txtSatLocErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -1, false, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -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.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
-            this.txtSatLocErr1.Size = new System.Drawing.Size(168, 23);
+            this.txtSatLocErr1.Size = new System.Drawing.Size(183, 23);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
             // 
             // txtDfoErr1
             // 
-            this.txtDfoErr1.Location = new System.Drawing.Point(174, 155);
+            this.txtDfoErr1.Location = new System.Drawing.Point(189, 151);
             this.txtDfoErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtDfoErr1.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtDfoErr1.MinimumSize = new System.Drawing.Size(0, 23);
             this.txtDfoErr1.Name = "txtDfoErr1";
             this.txtDfoErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -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.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtDfoErr1.Properties.MaskSettings.Set("mask", "f");
-            this.txtDfoErr1.Size = new System.Drawing.Size(169, 23);
+            this.txtDfoErr1.Size = new System.Drawing.Size(184, 23);
             this.txtDfoErr1.StyleController = this.layoutControl1;
             this.txtDfoErr1.TabIndex = 13;
             // 
             // txtEphVelErr1
             // 
-            this.txtEphVelErr1.Location = new System.Drawing.Point(174, 200);
+            this.txtEphVelErr1.Location = new System.Drawing.Point(189, 195);
             this.txtEphVelErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtEphVelErr1.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtEphVelErr1.MinimumSize = new System.Drawing.Size(0, 23);
             this.txtEphVelErr1.Name = "txtEphVelErr1";
             this.txtEphVelErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            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)});
+            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.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtEphVelErr1.Properties.MaskSettings.Set("mask", "f");
-            this.txtEphVelErr1.Size = new System.Drawing.Size(169, 23);
+            this.txtEphVelErr1.Size = new System.Drawing.Size(184, 23);
             this.txtEphVelErr1.StyleController = this.layoutControl1;
             this.txtEphVelErr1.TabIndex = 14;
             // 
             // txtFu1
             // 
-            this.txtFu1.Location = new System.Drawing.Point(2, 245);
+            this.txtFu1.Location = new System.Drawing.Point(2, 239);
             this.txtFu1.Margin = new System.Windows.Forms.Padding(2);
             this.txtFu1.Name = "txtFu1";
             this.txtFu1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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, "MHz", -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.txtFu1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtFu1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtFu1.Properties.MaskSettings.Set("mask", "f");
-            this.txtFu1.Size = new System.Drawing.Size(168, 22);
+            this.txtFu1.Size = new System.Drawing.Size(183, 23);
             this.txtFu1.StyleController = this.layoutControl1;
             this.txtFu1.TabIndex = 15;
             // 
             // txtFu2
             // 
-            this.txtFu2.Location = new System.Drawing.Point(174, 245);
+            this.txtFu2.Location = new System.Drawing.Point(189, 239);
             this.txtFu2.Margin = new System.Windows.Forms.Padding(2);
             this.txtFu2.Name = "txtFu2";
             this.txtFu2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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, "MHz", -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.txtFu2.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtFu2.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtFu2.Properties.MaskSettings.Set("mask", "f");
-            this.txtFu2.Size = new System.Drawing.Size(169, 22);
+            this.txtFu2.Size = new System.Drawing.Size(184, 23);
             this.txtFu2.StyleController = this.layoutControl1;
             this.txtFu2.TabIndex = 16;
             // 
             // btnClose
             // 
-            this.btnClose.Location = new System.Drawing.Point(2, 278);
+            this.btnClose.Location = new System.Drawing.Point(2, 273);
             this.btnClose.Margin = new System.Windows.Forms.Padding(2);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Size = new System.Drawing.Size(168, 22);
+            this.btnClose.Size = new System.Drawing.Size(183, 22);
             this.btnClose.StyleController = this.layoutControl1;
             this.btnClose.TabIndex = 17;
             this.btnClose.Text = "关闭";
             this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
             // 
+            // txtDtousErr1
+            // 
+            this.txtDtousErr1.EditValue = "";
+            this.txtDtousErr1.Location = new System.Drawing.Point(2, 151);
+            this.txtDtousErr1.Margin = new System.Windows.Forms.Padding(2);
+            this.txtDtousErr1.MaximumSize = new System.Drawing.Size(0, 22);
+            this.txtDtousErr1.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtDtousErr1.Name = "txtDtousErr1";
+            this.txtDtousErr1.Properties.AutoHeight = false;
+            this.txtDtousErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+            this.txtDtousErr1.Properties.MaskSettings.Set("mask", "f");
+            this.txtDtousErr1.Size = new System.Drawing.Size(183, 22);
+            this.txtDtousErr1.StyleController = this.layoutControl1;
+            this.txtDtousErr1.TabIndex = 6;
+            this.txtDtousErr1.ToolTip = "时差误差";
+            // 
             // Root
             // 
             this.Root.GroupBordersVisible = false;
@@ -343,9 +368,12 @@
             this.layoutControlItem1,
             this.layoutControlItem2,
             this.layoutControlItem14,
-            this.layoutControlItem4});
+            this.layoutControlItem4,
+            this.txtMainSat,
+            this.emptySpaceItem2,
+            this.txtAdjaSat});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(345, 399);
+            this.Root.Size = new System.Drawing.Size(375, 533);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem8
@@ -354,112 +382,112 @@
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(345, 45);
+            this.layoutControlItem8.Size = new System.Drawing.Size(375, 44);
             this.layoutControlItem8.Text = "主星星历";
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txtTleLeo2;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 45);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 44);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(345, 45);
+            this.layoutControlItem9.Size = new System.Drawing.Size(375, 44);
             this.layoutControlItem9.Text = "邻星星历";
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txtCapTime;
             this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 90);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 88);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(172, 45);
+            this.layoutControlItem11.Size = new System.Drawing.Size(187, 44);
             this.layoutControlItem11.Text = "采集时刻";
             this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtSatLocErr1;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 180);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 176);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(172, 45);
+            this.layoutControlItem5.Size = new System.Drawing.Size(187, 44);
             this.layoutControlItem5.Text = "星历位置误差";
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(86, 14);
             // 
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 302);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 297);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(345, 97);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(375, 190);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txtFu1;
             this.layoutControlItem10.CustomizationFormText = "目标上行频点";
-            this.layoutControlItem10.Location = new System.Drawing.Point(0, 225);
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 220);
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(172, 44);
+            this.layoutControlItem10.Size = new System.Drawing.Size(187, 44);
             this.layoutControlItem10.Text = "目标上行频点";
             this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txtDfoErr1;
-            this.layoutControlItem6.Location = new System.Drawing.Point(172, 135);
+            this.layoutControlItem6.Location = new System.Drawing.Point(187, 132);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(173, 45);
+            this.layoutControlItem6.Size = new System.Drawing.Size(188, 44);
             this.layoutControlItem6.Text = "频差误差";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txtEphVelErr1;
-            this.layoutControlItem7.Location = new System.Drawing.Point(172, 180);
+            this.layoutControlItem7.Location = new System.Drawing.Point(187, 176);
             this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(173, 45);
+            this.layoutControlItem7.Size = new System.Drawing.Size(188, 44);
             this.layoutControlItem7.Text = "星历速度误差";
             this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txtFu2;
             this.layoutControlItem12.CustomizationFormText = "参考上行频点";
-            this.layoutControlItem12.Location = new System.Drawing.Point(172, 225);
+            this.layoutControlItem12.Location = new System.Drawing.Point(187, 220);
             this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(173, 44);
+            this.layoutControlItem12.Size = new System.Drawing.Size(188, 44);
             this.layoutControlItem12.Text = "参考上行频点";
             this.layoutControlItem12.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.btnOK;
-            this.layoutControlItem1.Location = new System.Drawing.Point(172, 269);
+            this.layoutControlItem1.Location = new System.Drawing.Point(187, 264);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(173, 33);
+            this.layoutControlItem1.Size = new System.Drawing.Size(188, 33);
             this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem1.TextVisible = false;
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.btnClose;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 269);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 264);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem2.Size = new System.Drawing.Size(172, 33);
+            this.layoutControlItem2.Size = new System.Drawing.Size(187, 33);
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem2.TextVisible = false;
             // 
@@ -467,43 +495,61 @@
             // 
             this.layoutControlItem14.Control = this.txtRefLocation1;
             this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem14.Location = new System.Drawing.Point(172, 90);
+            this.layoutControlItem14.Location = new System.Drawing.Point(187, 88);
             this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(173, 45);
+            this.layoutControlItem14.Size = new System.Drawing.Size(188, 44);
             this.layoutControlItem14.Text = "参考站经纬度";
             this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // txtDtousErr1
-            // 
-            this.txtDtousErr1.EditValue = "";
-            this.txtDtousErr1.Location = new System.Drawing.Point(2, 155);
-            this.txtDtousErr1.Margin = new System.Windows.Forms.Padding(2);
-            this.txtDtousErr1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtDtousErr1.MinimumSize = new System.Drawing.Size(0, 22);
-            this.txtDtousErr1.Name = "txtDtousErr1";
-            this.txtDtousErr1.Properties.AutoHeight = false;
-            this.txtDtousErr1.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)});
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDtousErr1.Properties.MaskSettings.Set("mask", "f");
-            this.txtDtousErr1.Size = new System.Drawing.Size(168, 22);
-            this.txtDtousErr1.StyleController = this.layoutControl1;
-            this.txtDtousErr1.TabIndex = 6;
-            this.txtDtousErr1.ToolTip = "时差误差";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(86, 14);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txtDtousErr1;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 135);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 132);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(172, 45);
+            this.layoutControlItem4.Size = new System.Drawing.Size(187, 44);
             this.layoutControlItem4.Text = "时差误差";
             this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(86, 14);
+            // 
+            // txtMainSat
+            // 
+            this.txtMainSat.AllowHotTrack = false;
+            this.txtMainSat.AppearanceItemCaption.ForeColor = System.Drawing.Color.SteelBlue;
+            this.txtMainSat.AppearanceItemCaption.Options.UseForeColor = true;
+            this.txtMainSat.Location = new System.Drawing.Point(0, 487);
+            this.txtMainSat.MaxSize = new System.Drawing.Size(0, 22);
+            this.txtMainSat.MinSize = new System.Drawing.Size(126, 22);
+            this.txtMainSat.Name = "txtMainSat";
+            this.txtMainSat.Size = new System.Drawing.Size(187, 22);
+            this.txtMainSat.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.txtMainSat.TextSize = new System.Drawing.Size(86, 14);
+            // 
+            // txtAdjaSat
+            // 
+            this.txtAdjaSat.AllowHotTrack = false;
+            this.txtAdjaSat.AppearanceItemCaption.ForeColor = System.Drawing.Color.SteelBlue;
+            this.txtAdjaSat.AppearanceItemCaption.Options.UseForeColor = true;
+            this.txtAdjaSat.Location = new System.Drawing.Point(187, 487);
+            this.txtAdjaSat.MaxSize = new System.Drawing.Size(0, 22);
+            this.txtAdjaSat.MinSize = new System.Drawing.Size(126, 22);
+            this.txtAdjaSat.Name = "txtAdjaSat";
+            this.txtAdjaSat.Size = new System.Drawing.Size(188, 22);
+            this.txtAdjaSat.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.txtAdjaSat.TextSize = new System.Drawing.Size(86, 14);
+            // 
+            // emptySpaceItem2
+            // 
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 509);
+            this.emptySpaceItem2.MaxSize = new System.Drawing.Size(0, 24);
+            this.emptySpaceItem2.MinSize = new System.Drawing.Size(104, 24);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(375, 24);
+            this.emptySpaceItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // X2DFGDOPParam
             // 
@@ -512,7 +558,7 @@
             this.Controls.Add(this.layoutControl1);
             this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "X2DFGDOPParam";
-            this.Size = new System.Drawing.Size(345, 399);
+            this.Size = new System.Drawing.Size(375, 533);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties.CalendarTimeProperties)).EndInit();
@@ -527,6 +573,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtEphVelErr1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtFu1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtFu2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
@@ -540,8 +587,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -576,5 +625,8 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraEditors.ButtonEdit txtDtousErr1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.SimpleLabelItem txtMainSat;
+        private DevExpress.XtraLayout.SimpleLabelItem txtAdjaSat;
+        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
     }
 }

+ 2 - 0
XdCxRhDW.App/UserControl/X2DFGDOPParam.cs

@@ -71,6 +71,8 @@ namespace XdCxRhDW.App.UserControl
                 {
                     adjaTle1 = xlList.First(m => m.SatCode == cg.Adja1Code.Value).TwoLine;
                 }
+                txtMainSat.Text = "主星:" + cg.MainCode;
+                txtAdjaSat.Text = "邻星:" + cg.Adja1Code;
             }
             txtTleLeo1.UseDefault().SetStringData(xlall).Text = mainTle;
             txtTleLeo2.UseDefault().SetStringData(xlall).Text = adjaTle1;

+ 148 - 78
XdCxRhDW.App/UserControl/X3DFGDOPParam .Designer.cs

@@ -28,16 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            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();
@@ -53,6 +43,16 @@
             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 editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.btnOK = new DevExpress.XtraEditors.SimpleButton();
             this.txtCapTime = new DevExpress.XtraEditors.DateEdit();
@@ -83,6 +83,10 @@
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtAdjaSat2 = new DevExpress.XtraLayout.SimpleLabelItem();
+            this.txtAdjaSat1 = new DevExpress.XtraLayout.SimpleLabelItem();
+            this.txtMainSat = new DevExpress.XtraLayout.SimpleLabelItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties)).BeginInit();
@@ -113,6 +117,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -135,16 +143,16 @@
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(993, 379, 650, 400);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(345, 399);
+            this.layoutControl1.Size = new System.Drawing.Size(367, 556);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(174, 323);
+            this.btnOK.Location = new System.Drawing.Point(185, 317);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(169, 22);
+            this.btnOK.Size = new System.Drawing.Size(180, 22);
             this.btnOK.StyleController = this.layoutControl1;
             this.btnOK.TabIndex = 12;
             this.btnOK.Text = "确定";
@@ -153,7 +161,7 @@
             // txtCapTime
             // 
             this.txtCapTime.EditValue = null;
-            this.txtCapTime.Location = new System.Drawing.Point(2, 155);
+            this.txtCapTime.Location = new System.Drawing.Point(2, 151);
             this.txtCapTime.Margin = new System.Windows.Forms.Padding(2);
             this.txtCapTime.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtCapTime.MinimumSize = new System.Drawing.Size(0, 23);
@@ -163,20 +171,20 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txtCapTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtCapTime.Size = new System.Drawing.Size(341, 23);
+            this.txtCapTime.Size = new System.Drawing.Size(363, 23);
             this.txtCapTime.StyleController = this.layoutControl1;
             this.txtCapTime.TabIndex = 8;
             // 
             // txtRefLocation1
             // 
             this.txtRefLocation1.EditValue = "";
-            this.txtRefLocation1.Location = new System.Drawing.Point(2, 200);
+            this.txtRefLocation1.Location = new System.Drawing.Point(2, 195);
             this.txtRefLocation1.Margin = new System.Windows.Forms.Padding(2);
             this.txtRefLocation1.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtRefLocation1.MinimumSize = new System.Drawing.Size(0, 23);
             this.txtRefLocation1.Name = "txtRefLocation1";
             this.txtRefLocation1.Properties.AutoHeight = false;
-            this.txtRefLocation1.Size = new System.Drawing.Size(168, 23);
+            this.txtRefLocation1.Size = new System.Drawing.Size(179, 23);
             this.txtRefLocation1.StyleController = this.layoutControl1;
             this.txtRefLocation1.TabIndex = 10;
             this.txtRefLocation1.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -184,7 +192,7 @@
             // txtTleLeo1
             // 
             this.txtTleLeo1.EditValue = "";
-            this.txtTleLeo1.Location = new System.Drawing.Point(2, 20);
+            this.txtTleLeo1.Location = new System.Drawing.Point(2, 19);
             this.txtTleLeo1.Margin = new System.Windows.Forms.Padding(2);
             this.txtTleLeo1.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtTleLeo1.MinimumSize = new System.Drawing.Size(0, 23);
@@ -195,7 +203,7 @@
             this.txtTleLeo1.Properties.NullText = "";
             this.txtTleLeo1.Properties.PopupSizeable = false;
             this.txtTleLeo1.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtTleLeo1.Size = new System.Drawing.Size(341, 23);
+            this.txtTleLeo1.Size = new System.Drawing.Size(363, 23);
             this.txtTleLeo1.StyleController = this.layoutControl1;
             this.txtTleLeo1.TabIndex = 4;
             this.txtTleLeo1.ToolTip = "填写卫星的双行根数";
@@ -211,7 +219,7 @@
             // txtTleLeo2
             // 
             this.txtTleLeo2.EditValue = "";
-            this.txtTleLeo2.Location = new System.Drawing.Point(2, 65);
+            this.txtTleLeo2.Location = new System.Drawing.Point(2, 63);
             this.txtTleLeo2.Margin = new System.Windows.Forms.Padding(2);
             this.txtTleLeo2.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtTleLeo2.MinimumSize = new System.Drawing.Size(0, 23);
@@ -222,7 +230,7 @@
             this.txtTleLeo2.Properties.NullText = "";
             this.txtTleLeo2.Properties.PopupSizeable = false;
             this.txtTleLeo2.Properties.PopupView = this.gridView1;
-            this.txtTleLeo2.Size = new System.Drawing.Size(341, 23);
+            this.txtTleLeo2.Size = new System.Drawing.Size(363, 23);
             this.txtTleLeo2.StyleController = this.layoutControl1;
             this.txtTleLeo2.TabIndex = 5;
             this.txtTleLeo2.ToolTip = "填写卫星的双行根数";
@@ -238,87 +246,87 @@
             // txtSatLocErr1
             // 
             this.txtSatLocErr1.EditValue = "";
-            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 245);
+            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 239);
             this.txtSatLocErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtSatLocErr1.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtSatLocErr1.MinimumSize = new System.Drawing.Size(0, 23);
             this.txtSatLocErr1.Name = "txtSatLocErr1";
             this.txtSatLocErr1.Properties.AutoHeight = false;
             this.txtSatLocErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -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, "m", -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.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
-            this.txtSatLocErr1.Size = new System.Drawing.Size(168, 23);
+            this.txtSatLocErr1.Size = new System.Drawing.Size(179, 23);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
             // 
             // txtDfoErr1
             // 
-            this.txtDfoErr1.Location = new System.Drawing.Point(174, 200);
+            this.txtDfoErr1.Location = new System.Drawing.Point(185, 195);
             this.txtDfoErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtDfoErr1.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtDfoErr1.MinimumSize = new System.Drawing.Size(0, 23);
             this.txtDfoErr1.Name = "txtDfoErr1";
             this.txtDfoErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -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, "Hz", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtDfoErr1.Properties.MaskSettings.Set("mask", "f");
-            this.txtDfoErr1.Size = new System.Drawing.Size(169, 23);
+            this.txtDfoErr1.Size = new System.Drawing.Size(180, 23);
             this.txtDfoErr1.StyleController = this.layoutControl1;
             this.txtDfoErr1.TabIndex = 13;
             // 
             // txtEphVelErr1
             // 
-            this.txtEphVelErr1.Location = new System.Drawing.Point(174, 245);
+            this.txtEphVelErr1.Location = new System.Drawing.Point(185, 239);
             this.txtEphVelErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtEphVelErr1.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtEphVelErr1.MinimumSize = new System.Drawing.Size(0, 23);
             this.txtEphVelErr1.Name = "txtEphVelErr1";
             this.txtEphVelErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            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)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -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.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtEphVelErr1.Properties.MaskSettings.Set("mask", "f");
-            this.txtEphVelErr1.Size = new System.Drawing.Size(169, 23);
+            this.txtEphVelErr1.Size = new System.Drawing.Size(180, 23);
             this.txtEphVelErr1.StyleController = this.layoutControl1;
             this.txtEphVelErr1.TabIndex = 14;
             // 
             // txtFu1
             // 
-            this.txtFu1.Location = new System.Drawing.Point(2, 290);
+            this.txtFu1.Location = new System.Drawing.Point(2, 283);
             this.txtFu1.Margin = new System.Windows.Forms.Padding(2);
             this.txtFu1.Name = "txtFu1";
             this.txtFu1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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, "MHz", -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.txtFu1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtFu1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtFu1.Properties.MaskSettings.Set("mask", "f");
-            this.txtFu1.Size = new System.Drawing.Size(168, 22);
+            this.txtFu1.Size = new System.Drawing.Size(179, 23);
             this.txtFu1.StyleController = this.layoutControl1;
             this.txtFu1.TabIndex = 15;
             // 
             // txtFu2
             // 
-            this.txtFu2.Location = new System.Drawing.Point(174, 290);
+            this.txtFu2.Location = new System.Drawing.Point(185, 283);
             this.txtFu2.Margin = new System.Windows.Forms.Padding(2);
             this.txtFu2.Name = "txtFu2";
             this.txtFu2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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, "MHz", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtFu2.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtFu2.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtFu2.Properties.MaskSettings.Set("mask", "f");
-            this.txtFu2.Size = new System.Drawing.Size(169, 22);
+            this.txtFu2.Size = new System.Drawing.Size(180, 23);
             this.txtFu2.StyleController = this.layoutControl1;
             this.txtFu2.TabIndex = 16;
             // 
             // btnClose
             // 
-            this.btnClose.Location = new System.Drawing.Point(2, 323);
+            this.btnClose.Location = new System.Drawing.Point(2, 317);
             this.btnClose.Margin = new System.Windows.Forms.Padding(2);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Size = new System.Drawing.Size(168, 22);
+            this.btnClose.Size = new System.Drawing.Size(179, 22);
             this.btnClose.StyleController = this.layoutControl1;
             this.btnClose.TabIndex = 17;
             this.btnClose.Text = "关闭";
@@ -327,7 +335,7 @@
             // txtTleLeo3
             // 
             this.txtTleLeo3.EditValue = "";
-            this.txtTleLeo3.Location = new System.Drawing.Point(2, 110);
+            this.txtTleLeo3.Location = new System.Drawing.Point(2, 107);
             this.txtTleLeo3.Margin = new System.Windows.Forms.Padding(2);
             this.txtTleLeo3.MaximumSize = new System.Drawing.Size(0, 23);
             this.txtTleLeo3.MinimumSize = new System.Drawing.Size(0, 23);
@@ -338,7 +346,7 @@
             this.txtTleLeo3.Properties.NullText = "";
             this.txtTleLeo3.Properties.PopupSizeable = false;
             this.txtTleLeo3.Properties.PopupView = this.gridView11;
-            this.txtTleLeo3.Size = new System.Drawing.Size(341, 23);
+            this.txtTleLeo3.Size = new System.Drawing.Size(363, 23);
             this.txtTleLeo3.StyleController = this.layoutControl1;
             this.txtTleLeo3.TabIndex = 5;
             this.txtTleLeo3.ToolTip = "填写卫星的双行根数";
@@ -367,9 +375,13 @@
             this.layoutControlItem1,
             this.layoutControlItem2,
             this.layoutControlItem3,
-            this.layoutControlItem14});
+            this.layoutControlItem14,
+            this.txtAdjaSat2,
+            this.txtAdjaSat1,
+            this.txtMainSat,
+            this.emptySpaceItem2});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(345, 399);
+            this.Root.Size = new System.Drawing.Size(367, 556);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem8
@@ -378,112 +390,112 @@
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(345, 45);
+            this.layoutControlItem8.Size = new System.Drawing.Size(367, 44);
             this.layoutControlItem8.Text = "主星星历";
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txtTleLeo2;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 45);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 44);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(345, 45);
+            this.layoutControlItem9.Size = new System.Drawing.Size(367, 44);
             this.layoutControlItem9.Text = "邻星1星历";
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txtCapTime;
             this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 135);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 132);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(345, 45);
+            this.layoutControlItem11.Size = new System.Drawing.Size(367, 44);
             this.layoutControlItem11.Text = "采集时刻";
             this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtSatLocErr1;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 225);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 220);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(172, 45);
+            this.layoutControlItem5.Size = new System.Drawing.Size(183, 44);
             this.layoutControlItem5.Text = "星历位置误差";
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(93, 14);
             // 
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 347);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 341);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(345, 52);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(367, 125);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txtFu1;
             this.layoutControlItem10.CustomizationFormText = "目标上行频点";
-            this.layoutControlItem10.Location = new System.Drawing.Point(0, 270);
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 264);
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(172, 44);
+            this.layoutControlItem10.Size = new System.Drawing.Size(183, 44);
             this.layoutControlItem10.Text = "目标上行频点";
             this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txtDfoErr1;
-            this.layoutControlItem6.Location = new System.Drawing.Point(172, 180);
+            this.layoutControlItem6.Location = new System.Drawing.Point(183, 176);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(173, 45);
+            this.layoutControlItem6.Size = new System.Drawing.Size(184, 44);
             this.layoutControlItem6.Text = "频差误差";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txtEphVelErr1;
-            this.layoutControlItem7.Location = new System.Drawing.Point(172, 225);
+            this.layoutControlItem7.Location = new System.Drawing.Point(183, 220);
             this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(173, 45);
+            this.layoutControlItem7.Size = new System.Drawing.Size(184, 44);
             this.layoutControlItem7.Text = "星历速度误差";
             this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txtFu2;
             this.layoutControlItem12.CustomizationFormText = "参考上行频点";
-            this.layoutControlItem12.Location = new System.Drawing.Point(172, 270);
+            this.layoutControlItem12.Location = new System.Drawing.Point(183, 264);
             this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(173, 44);
+            this.layoutControlItem12.Size = new System.Drawing.Size(184, 44);
             this.layoutControlItem12.Text = "参考上行频点";
             this.layoutControlItem12.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.btnOK;
-            this.layoutControlItem1.Location = new System.Drawing.Point(172, 314);
+            this.layoutControlItem1.Location = new System.Drawing.Point(183, 308);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(173, 33);
+            this.layoutControlItem1.Size = new System.Drawing.Size(184, 33);
             this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem1.TextVisible = false;
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.btnClose;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 314);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 308);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem2.Size = new System.Drawing.Size(172, 33);
+            this.layoutControlItem2.Size = new System.Drawing.Size(183, 33);
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem2.TextVisible = false;
             // 
@@ -492,23 +504,73 @@
             this.layoutControlItem3.Control = this.txtTleLeo3;
             this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem3.CustomizationFormText = "邻星星历";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 90);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 88);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(345, 45);
+            this.layoutControlItem3.Size = new System.Drawing.Size(367, 44);
             this.layoutControlItem3.Text = "邻星2星历";
             this.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txtRefLocation1;
             this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem14.Location = new System.Drawing.Point(0, 180);
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 176);
             this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(172, 45);
+            this.layoutControlItem14.Size = new System.Drawing.Size(183, 44);
             this.layoutControlItem14.Text = "参考站经纬度";
             this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(93, 14);
+            // 
+            // txtAdjaSat2
+            // 
+            this.txtAdjaSat2.AllowHotTrack = false;
+            this.txtAdjaSat2.AppearanceItemCaption.ForeColor = System.Drawing.Color.SteelBlue;
+            this.txtAdjaSat2.AppearanceItemCaption.Options.UseForeColor = true;
+            this.txtAdjaSat2.Location = new System.Drawing.Point(0, 510);
+            this.txtAdjaSat2.MaxSize = new System.Drawing.Size(0, 22);
+            this.txtAdjaSat2.MinSize = new System.Drawing.Size(126, 22);
+            this.txtAdjaSat2.Name = "txtAdjaSat2";
+            this.txtAdjaSat2.Size = new System.Drawing.Size(367, 22);
+            this.txtAdjaSat2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.txtAdjaSat2.TextSize = new System.Drawing.Size(93, 14);
+            // 
+            // txtAdjaSat1
+            // 
+            this.txtAdjaSat1.AllowHotTrack = false;
+            this.txtAdjaSat1.AppearanceItemCaption.ForeColor = System.Drawing.Color.SteelBlue;
+            this.txtAdjaSat1.AppearanceItemCaption.Options.UseForeColor = true;
+            this.txtAdjaSat1.Location = new System.Drawing.Point(0, 488);
+            this.txtAdjaSat1.MaxSize = new System.Drawing.Size(0, 22);
+            this.txtAdjaSat1.MinSize = new System.Drawing.Size(126, 22);
+            this.txtAdjaSat1.Name = "txtAdjaSat1";
+            this.txtAdjaSat1.Size = new System.Drawing.Size(367, 22);
+            this.txtAdjaSat1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.txtAdjaSat1.TextSize = new System.Drawing.Size(93, 14);
+            // 
+            // txtMainSat
+            // 
+            this.txtMainSat.AllowHotTrack = false;
+            this.txtMainSat.AppearanceItemCaption.ForeColor = System.Drawing.Color.SteelBlue;
+            this.txtMainSat.AppearanceItemCaption.Options.UseForeColor = true;
+            this.txtMainSat.Location = new System.Drawing.Point(0, 466);
+            this.txtMainSat.MaxSize = new System.Drawing.Size(0, 22);
+            this.txtMainSat.MinSize = new System.Drawing.Size(126, 22);
+            this.txtMainSat.Name = "txtMainSat";
+            this.txtMainSat.Size = new System.Drawing.Size(367, 22);
+            this.txtMainSat.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.txtMainSat.TextSize = new System.Drawing.Size(93, 14);
+            // 
+            // emptySpaceItem2
+            // 
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 532);
+            this.emptySpaceItem2.MaxSize = new System.Drawing.Size(0, 24);
+            this.emptySpaceItem2.MinSize = new System.Drawing.Size(104, 24);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(367, 24);
+            this.emptySpaceItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // X3DFGDOPParam
             // 
@@ -517,7 +579,7 @@
             this.Controls.Add(this.layoutControl1);
             this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "X3DFGDOPParam";
-            this.Size = new System.Drawing.Size(345, 399);
+            this.Size = new System.Drawing.Size(367, 556);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties.CalendarTimeProperties)).EndInit();
@@ -548,6 +610,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -583,5 +649,9 @@
         private DevExpress.XtraEditors.SearchLookUpEdit txtTleLeo3;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.SimpleLabelItem txtAdjaSat2;
+        private DevExpress.XtraLayout.SimpleLabelItem txtAdjaSat1;
+        private DevExpress.XtraLayout.SimpleLabelItem txtMainSat;
+        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
     }
 }

+ 3 - 0
XdCxRhDW.App/UserControl/X3DFGDOPParam .cs

@@ -77,6 +77,9 @@ namespace XdCxRhDW.App.UserControl
                 {
                     adjaTle2 = xlList.First(m => m.SatCode == cg.Adja2Code.Value).TwoLine;
                 }
+                txtMainSat.Text = "主星:" + cg.MainCode;
+                txtAdjaSat1.Text = "邻1星:" + cg.Adja1Code;
+                txtAdjaSat2.Text = "邻2星:" + cg.Adja1Code;
             }
             txtTleLeo1.UseDefault().SetStringData(xlall).Text = mainTle;
             txtTleLeo2.UseDefault().SetStringData(xlall).Text = adjaTle1;

+ 137 - 67
XdCxRhDW.App/UserControl/X3GDOPParam.Designer.cs

@@ -49,6 +49,8 @@
             this.txtSatLocErr1 = new DevExpress.XtraEditors.ButtonEdit();
             this.btnClose = new DevExpress.XtraEditors.SimpleButton();
             this.btnOk = new DevExpress.XtraEditors.SimpleButton();
+            this.txtTleAdja2 = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.gridView11 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -59,9 +61,11 @@
             this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtTleAdja2 = new DevExpress.XtraEditors.SearchLookUpEdit();
-            this.gridView11 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtAdjaSat2 = new DevExpress.XtraLayout.SimpleLabelItem();
+            this.txtAdjaSat1 = new DevExpress.XtraLayout.SimpleLabelItem();
+            this.txtMainSat = new DevExpress.XtraLayout.SimpleLabelItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties)).BeginInit();
@@ -73,6 +77,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTleAdja2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
@@ -83,9 +89,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTleAdja2.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -105,14 +113,14 @@
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(993, 379, 650, 400);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(345, 381);
+            this.layoutControl1.Size = new System.Drawing.Size(345, 601);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // txtCapTime
             // 
             this.txtCapTime.EditValue = null;
-            this.txtCapTime.Location = new System.Drawing.Point(2, 152);
+            this.txtCapTime.Location = new System.Drawing.Point(2, 148);
             this.txtCapTime.Margin = new System.Windows.Forms.Padding(2);
             this.txtCapTime.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtCapTime.MinimumSize = new System.Drawing.Size(0, 22);
@@ -129,7 +137,7 @@
             // txtRefLocation1
             // 
             this.txtRefLocation1.EditValue = "";
-            this.txtRefLocation1.Location = new System.Drawing.Point(2, 196);
+            this.txtRefLocation1.Location = new System.Drawing.Point(2, 191);
             this.txtRefLocation1.Margin = new System.Windows.Forms.Padding(2);
             this.txtRefLocation1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtRefLocation1.MinimumSize = new System.Drawing.Size(0, 22);
@@ -143,7 +151,7 @@
             // txtTleMain
             // 
             this.txtTleMain.EditValue = "";
-            this.txtTleMain.Location = new System.Drawing.Point(2, 20);
+            this.txtTleMain.Location = new System.Drawing.Point(2, 19);
             this.txtTleMain.Margin = new System.Windows.Forms.Padding(2);
             this.txtTleMain.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtTleMain.MinimumSize = new System.Drawing.Size(0, 22);
@@ -170,7 +178,7 @@
             // txtTleAdja1
             // 
             this.txtTleAdja1.EditValue = "";
-            this.txtTleAdja1.Location = new System.Drawing.Point(2, 64);
+            this.txtTleAdja1.Location = new System.Drawing.Point(2, 62);
             this.txtTleAdja1.Margin = new System.Windows.Forms.Padding(2);
             this.txtTleAdja1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtTleAdja1.MinimumSize = new System.Drawing.Size(0, 22);
@@ -197,7 +205,7 @@
             // txtDtousErr1
             // 
             this.txtDtousErr1.EditValue = "";
-            this.txtDtousErr1.Location = new System.Drawing.Point(2, 240);
+            this.txtDtousErr1.Location = new System.Drawing.Point(2, 234);
             this.txtDtousErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtDtousErr1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtDtousErr1.MinimumSize = new System.Drawing.Size(0, 22);
@@ -216,7 +224,7 @@
             // txtSatLocErr1
             // 
             this.txtSatLocErr1.EditValue = "";
-            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 284);
+            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 278);
             this.txtSatLocErr1.Margin = new System.Windows.Forms.Padding(2);
             this.txtSatLocErr1.MaximumSize = new System.Drawing.Size(0, 22);
             this.txtSatLocErr1.MinimumSize = new System.Drawing.Size(0, 22);
@@ -234,7 +242,7 @@
             // 
             // btnClose
             // 
-            this.btnClose.Location = new System.Drawing.Point(2, 317);
+            this.btnClose.Location = new System.Drawing.Point(2, 312);
             this.btnClose.Margin = new System.Windows.Forms.Padding(2);
             this.btnClose.Name = "btnClose";
             this.btnClose.Size = new System.Drawing.Size(172, 22);
@@ -245,7 +253,7 @@
             // 
             // btnOk
             // 
-            this.btnOk.Location = new System.Drawing.Point(178, 317);
+            this.btnOk.Location = new System.Drawing.Point(178, 312);
             this.btnOk.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOk.Name = "btnOk";
             this.btnOk.Size = new System.Drawing.Size(165, 22);
@@ -254,6 +262,33 @@
             this.btnOk.Text = "确定";
             this.btnOk.Click += new System.EventHandler(this.btnX1D2_Click);
             // 
+            // txtTleAdja2
+            // 
+            this.txtTleAdja2.EditValue = "";
+            this.txtTleAdja2.Location = new System.Drawing.Point(2, 105);
+            this.txtTleAdja2.Margin = new System.Windows.Forms.Padding(2);
+            this.txtTleAdja2.MaximumSize = new System.Drawing.Size(0, 22);
+            this.txtTleAdja2.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtTleAdja2.Name = "txtTleAdja2";
+            this.txtTleAdja2.Properties.AutoHeight = false;
+            this.txtTleAdja2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtTleAdja2.Properties.NullText = "";
+            this.txtTleAdja2.Properties.PopupSizeable = false;
+            this.txtTleAdja2.Properties.PopupView = this.gridView11;
+            this.txtTleAdja2.Size = new System.Drawing.Size(341, 22);
+            this.txtTleAdja2.StyleController = this.layoutControl1;
+            this.txtTleAdja2.TabIndex = 5;
+            this.txtTleAdja2.ToolTip = "填写卫星的双行根数";
+            // 
+            // gridView11
+            // 
+            this.gridView11.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.gridView11.Name = "gridView11";
+            this.gridView11.OptionsEditForm.PopupEditFormWidth = 430;
+            this.gridView11.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.gridView11.OptionsView.ShowGroupPanel = false;
+            // 
             // Root
             // 
             this.Root.GroupBordersVisible = false;
@@ -267,9 +302,13 @@
             this.emptySpaceItem1,
             this.layoutControlItem2,
             this.layoutControlItem3,
-            this.layoutControlItem6});
+            this.layoutControlItem6,
+            this.txtAdjaSat2,
+            this.txtAdjaSat1,
+            this.txtMainSat,
+            this.emptySpaceItem2});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(345, 381);
+            this.Root.Size = new System.Drawing.Size(345, 601);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem8
@@ -278,80 +317,80 @@
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem8.Size = new System.Drawing.Size(345, 43);
             this.layoutControlItem8.Text = "主星星历";
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txtTleAdja1;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 44);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 43);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem9.Size = new System.Drawing.Size(345, 43);
             this.layoutControlItem9.Text = "邻星1星历";
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txtCapTime;
             this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 132);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 129);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem11.Size = new System.Drawing.Size(345, 43);
             this.layoutControlItem11.Text = "采集时刻";
             this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txtRefLocation1;
             this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem14.Location = new System.Drawing.Point(0, 176);
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 172);
             this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem14.Size = new System.Drawing.Size(345, 43);
             this.layoutControlItem14.Text = "参考站经纬度";
             this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txtDtousErr1;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 220);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 215);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.Size = new System.Drawing.Size(345, 44);
             this.layoutControlItem4.Text = "时差误差";
             this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(93, 14);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtSatLocErr1;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 264);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 259);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.Size = new System.Drawing.Size(345, 44);
             this.layoutControlItem5.Text = "星历位置误差";
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(93, 14);
             // 
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 341);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 336);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(345, 40);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(345, 175);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.btnClose;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 308);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 303);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
             this.layoutControlItem2.Size = new System.Drawing.Size(176, 33);
@@ -363,7 +402,7 @@
             this.layoutControlItem3.Control = this.btnOk;
             this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem3.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem3.Location = new System.Drawing.Point(176, 308);
+            this.layoutControlItem3.Location = new System.Drawing.Point(176, 303);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
             this.layoutControlItem3.Size = new System.Drawing.Size(169, 33);
@@ -371,44 +410,67 @@
             this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem3.TextVisible = false;
             // 
-            // txtTleAdja2
-            // 
-            this.txtTleAdja2.EditValue = "";
-            this.txtTleAdja2.Location = new System.Drawing.Point(2, 108);
-            this.txtTleAdja2.Margin = new System.Windows.Forms.Padding(2);
-            this.txtTleAdja2.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtTleAdja2.MinimumSize = new System.Drawing.Size(0, 22);
-            this.txtTleAdja2.Name = "txtTleAdja2";
-            this.txtTleAdja2.Properties.AutoHeight = false;
-            this.txtTleAdja2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtTleAdja2.Properties.NullText = "";
-            this.txtTleAdja2.Properties.PopupSizeable = false;
-            this.txtTleAdja2.Properties.PopupView = this.gridView11;
-            this.txtTleAdja2.Size = new System.Drawing.Size(341, 22);
-            this.txtTleAdja2.StyleController = this.layoutControl1;
-            this.txtTleAdja2.TabIndex = 5;
-            this.txtTleAdja2.ToolTip = "填写卫星的双行根数";
-            // 
-            // gridView11
-            // 
-            this.gridView11.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
-            this.gridView11.Name = "gridView11";
-            this.gridView11.OptionsEditForm.PopupEditFormWidth = 430;
-            this.gridView11.OptionsSelection.EnableAppearanceFocusedCell = false;
-            this.gridView11.OptionsView.ShowGroupPanel = false;
-            // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txtTleAdja2;
             this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem6.CustomizationFormText = "邻星星历";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 88);
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 86);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem6.Size = new System.Drawing.Size(345, 43);
             this.layoutControlItem6.Text = "邻星2星历";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(93, 14);
+            // 
+            // txtAdjaSat2
+            // 
+            this.txtAdjaSat2.AllowHotTrack = false;
+            this.txtAdjaSat2.AppearanceItemCaption.ForeColor = System.Drawing.Color.SteelBlue;
+            this.txtAdjaSat2.AppearanceItemCaption.Options.UseForeColor = true;
+            this.txtAdjaSat2.Location = new System.Drawing.Point(0, 555);
+            this.txtAdjaSat2.MaxSize = new System.Drawing.Size(0, 22);
+            this.txtAdjaSat2.MinSize = new System.Drawing.Size(126, 22);
+            this.txtAdjaSat2.Name = "txtAdjaSat2";
+            this.txtAdjaSat2.Size = new System.Drawing.Size(345, 22);
+            this.txtAdjaSat2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.txtAdjaSat2.TextSize = new System.Drawing.Size(93, 14);
+            // 
+            // txtAdjaSat1
+            // 
+            this.txtAdjaSat1.AllowHotTrack = false;
+            this.txtAdjaSat1.AppearanceItemCaption.ForeColor = System.Drawing.Color.SteelBlue;
+            this.txtAdjaSat1.AppearanceItemCaption.Options.UseForeColor = true;
+            this.txtAdjaSat1.Location = new System.Drawing.Point(0, 533);
+            this.txtAdjaSat1.MaxSize = new System.Drawing.Size(0, 22);
+            this.txtAdjaSat1.MinSize = new System.Drawing.Size(126, 22);
+            this.txtAdjaSat1.Name = "txtAdjaSat1";
+            this.txtAdjaSat1.Size = new System.Drawing.Size(345, 22);
+            this.txtAdjaSat1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.txtAdjaSat1.TextSize = new System.Drawing.Size(93, 14);
+            // 
+            // txtMainSat
+            // 
+            this.txtMainSat.AllowHotTrack = false;
+            this.txtMainSat.AppearanceItemCaption.ForeColor = System.Drawing.Color.SteelBlue;
+            this.txtMainSat.AppearanceItemCaption.Options.UseForeColor = true;
+            this.txtMainSat.Location = new System.Drawing.Point(0, 511);
+            this.txtMainSat.MaxSize = new System.Drawing.Size(0, 22);
+            this.txtMainSat.MinSize = new System.Drawing.Size(126, 22);
+            this.txtMainSat.Name = "txtMainSat";
+            this.txtMainSat.Size = new System.Drawing.Size(345, 22);
+            this.txtMainSat.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.txtMainSat.TextSize = new System.Drawing.Size(93, 14);
+            // 
+            // emptySpaceItem2
+            // 
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 577);
+            this.emptySpaceItem2.MaxSize = new System.Drawing.Size(0, 24);
+            this.emptySpaceItem2.MinSize = new System.Drawing.Size(104, 24);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(345, 24);
+            this.emptySpaceItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // X3GDOPParam
             // 
@@ -417,7 +479,7 @@
             this.Controls.Add(this.layoutControl1);
             this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "X3GDOPParam";
-            this.Size = new System.Drawing.Size(345, 381);
+            this.Size = new System.Drawing.Size(345, 601);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties.CalendarTimeProperties)).EndInit();
@@ -429,6 +491,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTleAdja2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
@@ -439,9 +503,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTleAdja2.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -471,5 +537,9 @@
         private DevExpress.XtraEditors.SearchLookUpEdit txtTleAdja2;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.SimpleLabelItem txtAdjaSat2;
+        private DevExpress.XtraLayout.SimpleLabelItem txtAdjaSat1;
+        private DevExpress.XtraLayout.SimpleLabelItem txtMainSat;
+        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
     }
 }

+ 3 - 0
XdCxRhDW.App/UserControl/X3GDOPParam.cs

@@ -70,6 +70,9 @@ namespace XdCxRhDW.App.UserControl
                 {
                     adjaTle2 = xlList.First(m => m.SatCode == cg.Adja2Code.Value).TwoLine;
                 }
+                txtMainSat.Text = "主星:" + cg.MainCode;
+                txtAdjaSat1.Text = "邻1星:" + cg.Adja1Code;
+                txtAdjaSat2.Text = "邻2星:" + cg.Adja2Code;
             }
             txtTleMain.UseDefault().SetStringData(xlall).Text = mainTle;
             txtTleAdja1.UseDefault().SetStringData(xlall).Text = adjaTle1;

+ 6 - 0
XdCxRhDW.Entity/03.XdCxRhDW.Entity.csproj

@@ -31,6 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -60,5 +63,8 @@
     <Compile Include="TxInfo.cs" />
     <Compile Include="XlInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 6 - 4
XdCxRhDW.Entity/PosRes.cs

@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -24,33 +25,34 @@ namespace XdCxRhDW.Entity
         public long StationResID { get; set; }
 
         [Display(AutoGenerateField = false)]
+        [JsonIgnore]
         public virtual StationRes StationRes { get; set; }
 
         [Display(Name = "测向编号")]
         public long? CxResID { get; set; }
 
         [Display(AutoGenerateField = false)]
+        [JsonIgnore]
         public virtual CxRes CxRes { get; set; }
 
         [Display(Name = "参估编号")]
         public long CgResID { get; set; }
 
         [Display(AutoGenerateField = false)]
+        [JsonIgnore]
         public virtual CgRes CgRes { get; set; }
 
         [Display(AutoGenerateField = false)]
         public int? TargetInfoID { get; set; }
-
         public TargetInfo TargetInfo;
 
         [Display(Name = "检测编号")]
         public long? CheckResID { get; set; }
 
         [Display(AutoGenerateField = false)]
+        [JsonIgnore]
         public virtual CheckRes CheckRes { get; set; }
 
-        //public CheckRes CheckRes;
-
         [Display(Name = "定位点")]
         public string LonLat
         {

+ 4 - 0
XdCxRhDW.Entity/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
+</packages>

+ 18 - 32
XdCxRhDW.TaskServer/Controllers/HistoryTaskProcessingController.cs

@@ -1,7 +1,9 @@
-using System;
+using DevExpress.Utils.Extensions;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
+using System.Linq;
 using System.Web.Http;
 using XdCxRhDW.Dto;
 using XdCxRhDW.TaskServer.Service;
@@ -20,11 +22,10 @@ namespace XdCxRhDW.TaskServer.Controllers
          * !!!不要在Controller写太复杂的业务逻辑
          * Controller主要就是调用Service层的东西。Service层执行业务逻辑和调用Repository层操作数据库
          * ********************/
-        public List<HistoryTaskI> allTask = new List<HistoryTaskI>();
-        private readonly TestService _testService;
-        public HistoryTaskProcessingController(TestService testService)
+        private readonly HistoryTaskService _service;
+        public HistoryTaskProcessingController(HistoryTaskService service)
         {
-            _testService = testService;
+            _service = service;
         }
 
 
@@ -38,22 +39,15 @@ namespace XdCxRhDW.TaskServer.Controllers
         {
             try
             {
-                //方式1:从构造函数注入
-                var service1 = _testService;
-
-                //方式2:从容器中主动获取
-                var service2 = AutofacUtil.GetService<TestService>();
-
-
-                //选一种简单的方式就行
 
+                _service.allTask.RemoveAll(a => a.IsRuning == false);
                 LogHelper.Info($"接收到历史任务编号:{dto.ID}");
-                dto.StartTime = new DateTime(2024, 03, 24, 12, 00, 00);
-                dto.DateDirFormat = "yyyyMMddHH";
-                dto.CapDir = @"D:\\data";
-                dto.SigType = EnumSigTypeDto.SX;
-                dto.PosType = EnumPosTypeDto.X2D1;
-                dto.TaskCheckType = EnumTaskCheckTypeDto.DAMA;
+                //dto.StartTime = new DateTime(2024, 03, 24, 12, 00, 00);
+                //dto.DateDirFormat = "yyyyMMddHH";
+                //dto.CapDir = @"D:\\data";
+                //dto.SigType = EnumSigTypeDto.SX;
+                //dto.PosType = EnumPosTypeDto.X2D1;
+                //dto.TaskCheckType = EnumTaskCheckTypeDto.DAMA;
                 if (!Directory.Exists(dto.CapDir))
                 {
                     LogHelper.Error($"采集路径:{dto.CapDir}不存在");
@@ -64,7 +58,7 @@ namespace XdCxRhDW.TaskServer.Controllers
                 {
                     X2D1Task x2D1 = new X2D1Task();
                     x2D1.Start(dto);
-                    allTask.Add(x2D1);
+                    _service.allTask.Add(x2D1);
                 }
                 else
                 {
@@ -91,21 +85,13 @@ namespace XdCxRhDW.TaskServer.Controllers
         {
             try
             {
-                //方式1:从构造函数注入
-                var service1 = _testService;
-
-                //方式2:从容器中主动获取
-                var service2 = AutofacUtil.GetService<TestService>();
-
-
-                //选一种简单的方式就行
 
                 LogHelper.Info($"接收停止历史任务编号:{TaskId}");
-                var history = allTask.Find(t => t.TaskDto.ID == TaskId);
-                if (history != null)
+                var historys = _service.allTask.Where(t => t.TaskDto.ID == TaskId);
+                foreach (var item in historys)
                 {
-                    history.Stop();
-                    allTask.Remove(history);
+                    item.Stop();
+                    _service.allTask.Remove(item);
                 }
                 return Success();
             }

+ 1 - 1
XdCxRhDW.TaskServer/MainForm.cs

@@ -33,7 +33,7 @@ namespace XdCxRhDW.TaskServer
         private async void MainForm_LoadAsync(object sender, EventArgs e)
         {
 
-            //HistoryTaskProcessingController historyTask = new HistoryTaskProcessingController();
+            //HistoryTaskProcessingController historyTask = new HistoryTaskProcessingController(new Service.HistoryTaskService());
             //historyTask.Run(new HistoryTaskProcessingDto());
             var port = Convert.ToInt32(ConfigurationManager.AppSettings["LocalHttpPort"].Trim());
             var svrID = ConfigurationManager.AppSettings["SvrID"].Trim();

+ 4 - 1
XdCxRhDW.TaskServer/Service/TestService.cs → XdCxRhDW.TaskServer/Service/HistoryTaskService.cs

@@ -3,10 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using XdCxRhDW.TaskServer.Task;
 
 namespace XdCxRhDW.TaskServer.Service
 {
-    public class TestService
+    public class HistoryTaskService
     {
+
+        public List<HistoryTaskI> allTask = new List<HistoryTaskI>();
     }
 }

+ 11 - 3
XdCxRhDW.TaskServer/Task/X2D1Task.cs

@@ -30,9 +30,17 @@ namespace XdCxRhDW.TaskServer.Task
                 while (IsRuning || dto.EndTime.HasValue && dto.EndTime <= DateTime.Now)
                 {
                     string capfile = Path.Combine(dto.CapDir, $"{preTime.ToString(dto.DateDirFormat)}");
-
-                    var files = Directory.EnumerateFiles(capfile, "*.dat");
-
+                    IEnumerable<string> files;
+                    try
+                    {
+                        files = Directory.EnumerateFiles(capfile, "*.dat");
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.Info($"查询历史任务:{dto.ID}采集数据异常:{ex.Message}");
+                        Thread.Sleep(1000);
+                        continue;
+                    }
                     var groups = files.Select(f => FileToHistoryFile(f)).GroupBy(m => m.CapTime).OrderBy(m => m.Key);
                     foreach (var item in groups)
                     {

+ 1 - 1
XdCxRhDW.TaskServer/XdCxRhDW.TaskServer.csproj

@@ -158,7 +158,7 @@
     <Compile Include="MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Service\TestService.cs" />
+    <Compile Include="Service\HistoryTaskService.cs" />
     <Compile Include="Task\HistoryFile.cs" />
     <Compile Include="Task\HistoryTaskI.cs" />
     <Compile Include="Task\TxInfo.cs" />

+ 6 - 0
XdCxRhDw.Dto/02.XdCxRhDW.Dto.csproj

@@ -35,6 +35,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -94,5 +97,8 @@
     <Compile Include="XlCalcDto\XlCalcMultDto.cs" />
     <Compile Include="XlCalcDto\XlCalcDto.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 4 - 0
XdCxRhDw.Dto/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
+</packages>