Эх сурвалжийг харах

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

wyq 1 жил өмнө
parent
commit
e64851febb

+ 2 - 0
XzXdDw.App/TestData.cs

@@ -33,6 +33,8 @@ namespace XzXdDw.App
                 else
                     sb.Append(lines[i]);
             }
+            AllTle.Add(tleleo1);
+            AllTle.Add(tleleo2);
         }
 
         public static string tleleo1 = "1 43170U 18011B   24009.70815711  .00003439  00000-0  32010-3 0  9999;2 43170  34.9959 138.8050 0005557 135.6481 224.4670 14.93841912324625";

+ 1 - 1
XzXdDw.App/UserControl/CtrlPosSingle.cs

@@ -140,7 +140,7 @@ namespace XzXdDw.App.UserControl
                             if (hideReason == HideReason.Defalut) return;
                             var model = ctrl.Model;
                             var (listSat, data) = GdopHelper.GdopSingleSatDRef(
-                            model.TleMain, model.CapTime1, model.CapTime2, model.CapTime3, model.DfoErr, model.SatLocErr, model.EphVelErr, model.fu);
+                            model.TleLeo1, model.CapTime1, model.CapTime2, model.CapTime3, model.DfoErr, model.SatLocErr, model.EphVelErr, model.fu);
                             if (data == null)
                             {
                                 return;

+ 1 - 1
XzXdDw.App/UserControl/CtrlPosXz.cs

@@ -152,7 +152,7 @@ namespace XzXdDw.App.UserControl
                             if (hideReason == HideReason.Defalut) return;
                             var model = ctrl.Model;
                             var (listSat, data) = GdopHelper.GdopLeoTowSatDRef(
-                              new double[] { model.RefLon, model.RefLat }, model.TleMain, model.TleAdja, model.CapTime, model.DtousErr, model.DfoErr, model.SatLocErr, model.EphVelErr, model.fu1, model.fu2);
+                              new double[] { model.RefLon, model.RefLat }, model.TleLeo1, model.TleLeo2, model.CapTime, model.DtousErr, model.DfoErr, model.SatLocErr, model.EphVelErr, model.fu1, model.fu2);
                             if (data == null)
                             {
                                 return;

+ 75 - 71
XzXdDw.App/UserControl/DXGDOPParam.Designer.cs

@@ -50,13 +50,15 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.btnOK = new DevExpress.XtraEditors.SimpleButton();
-            this.txtTleMain = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.txtTleLeo1 = new DevExpress.XtraEditors.SearchLookUpEdit();
             this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.txtDfoErr1 = new DevExpress.XtraEditors.ButtonEdit();
             this.txtSatLocErr1 = new DevExpress.XtraEditors.ButtonEdit();
             this.txtEphVelErr1 = new DevExpress.XtraEditors.ButtonEdit();
             this.txtFu1 = new DevExpress.XtraEditors.ButtonEdit();
             this.txtCapTime3 = new DevExpress.XtraEditors.DateEdit();
+            this.txtCapTime2 = new DevExpress.XtraEditors.DateEdit();
+            this.txtCapTime1 = new DevExpress.XtraEditors.DateEdit();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -69,11 +71,9 @@
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtCapTime2 = new DevExpress.XtraEditors.DateEdit();
-            this.txtCapTime1 = new DevExpress.XtraEditors.DateEdit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTleMain.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTleLeo1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDfoErr1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).BeginInit();
@@ -81,6 +81,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtFu1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime3.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime3.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime2.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime1.Properties.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -93,16 +97,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime2.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime2.Properties.CalendarTimeProperties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime1.Properties.CalendarTimeProperties)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
             // 
             this.layoutControl1.Controls.Add(this.btnOK);
-            this.layoutControl1.Controls.Add(this.txtTleMain);
+            this.layoutControl1.Controls.Add(this.txtTleLeo1);
             this.layoutControl1.Controls.Add(this.txtDfoErr1);
             this.layoutControl1.Controls.Add(this.txtSatLocErr1);
             this.layoutControl1.Controls.Add(this.txtEphVelErr1);
@@ -131,23 +131,23 @@
             this.btnOK.Text = "确定";
             this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
             // 
-            // txtTleMain
+            // txtTleLeo1
             // 
-            this.txtTleMain.EditValue = "";
-            this.txtTleMain.Location = new System.Drawing.Point(2, 29);
-            this.txtTleMain.MaximumSize = new System.Drawing.Size(0, 34);
-            this.txtTleMain.MinimumSize = new System.Drawing.Size(0, 34);
-            this.txtTleMain.Name = "txtTleMain";
-            this.txtTleMain.Properties.AutoHeight = false;
-            this.txtTleMain.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txtTleLeo1.EditValue = "";
+            this.txtTleLeo1.Location = new System.Drawing.Point(2, 29);
+            this.txtTleLeo1.MaximumSize = new System.Drawing.Size(0, 34);
+            this.txtTleLeo1.MinimumSize = new System.Drawing.Size(0, 34);
+            this.txtTleLeo1.Name = "txtTleLeo1";
+            this.txtTleLeo1.Properties.AutoHeight = false;
+            this.txtTleLeo1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtTleMain.Properties.NullText = "";
-            this.txtTleMain.Properties.PopupSizeable = false;
-            this.txtTleMain.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtTleMain.Size = new System.Drawing.Size(489, 34);
-            this.txtTleMain.StyleController = this.layoutControl1;
-            this.txtTleMain.TabIndex = 4;
-            this.txtTleMain.ToolTip = "填写卫星的双行根数";
+            this.txtTleLeo1.Properties.NullText = "";
+            this.txtTleLeo1.Properties.PopupSizeable = false;
+            this.txtTleLeo1.Properties.PopupView = this.searchLookUpEdit1View;
+            this.txtTleLeo1.Size = new System.Drawing.Size(489, 34);
+            this.txtTleLeo1.StyleController = this.layoutControl1;
+            this.txtTleLeo1.TabIndex = 4;
+            this.txtTleLeo1.ToolTip = "填写卫星的双行根数";
             // 
             // searchLookUpEdit1View
             // 
@@ -234,6 +234,50 @@
             this.txtCapTime3.StyleController = this.layoutControl1;
             this.txtCapTime3.TabIndex = 8;
             // 
+            // txtCapTime2
+            // 
+            this.txtCapTime2.EditValue = "";
+            this.txtCapTime2.Location = new System.Drawing.Point(2, 159);
+            this.txtCapTime2.MaximumSize = new System.Drawing.Size(0, 34);
+            this.txtCapTime2.MinimumSize = new System.Drawing.Size(0, 34);
+            this.txtCapTime2.Name = "txtCapTime2";
+            this.txtCapTime2.Properties.AutoHeight = false;
+            this.txtCapTime2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtCapTime2.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtCapTime2.Properties.DisplayFormat.FormatString = "";
+            this.txtCapTime2.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtCapTime2.Properties.EditFormat.FormatString = "";
+            this.txtCapTime2.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtCapTime2.Properties.MaskSettings.Set("mask", "");
+            this.txtCapTime2.Size = new System.Drawing.Size(489, 34);
+            this.txtCapTime2.StyleController = this.layoutControl1;
+            this.txtCapTime2.TabIndex = 5;
+            this.txtCapTime2.ToolTip = "填写卫星的双行根数";
+            // 
+            // txtCapTime1
+            // 
+            this.txtCapTime1.EditValue = "";
+            this.txtCapTime1.Location = new System.Drawing.Point(2, 94);
+            this.txtCapTime1.MaximumSize = new System.Drawing.Size(0, 34);
+            this.txtCapTime1.MinimumSize = new System.Drawing.Size(0, 34);
+            this.txtCapTime1.Name = "txtCapTime1";
+            this.txtCapTime1.Properties.AutoHeight = false;
+            this.txtCapTime1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtCapTime1.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtCapTime1.Properties.DisplayFormat.FormatString = "";
+            this.txtCapTime1.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtCapTime1.Properties.EditFormat.FormatString = "";
+            this.txtCapTime1.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtCapTime1.Properties.MaskSettings.Set("mask", "");
+            this.txtCapTime1.Size = new System.Drawing.Size(489, 34);
+            this.txtCapTime1.StyleController = this.layoutControl1;
+            this.txtCapTime1.TabIndex = 5;
+            this.txtCapTime1.ToolTip = "填写卫星的双行根数";
+            // 
             // Root
             // 
             this.Root.GroupBordersVisible = false;
@@ -255,7 +299,7 @@
             // 
             // layoutControlItem8
             // 
-            this.layoutControlItem8.Control = this.txtTleMain;
+            this.layoutControlItem8.Control = this.txtTleLeo1;
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
@@ -374,46 +418,6 @@
             this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem11.TextSize = new System.Drawing.Size(108, 22);
             // 
-            // txtCapTime2
-            // 
-            this.txtCapTime2.EditValue = "";
-            this.txtCapTime2.Location = new System.Drawing.Point(2, 159);
-            this.txtCapTime2.MaximumSize = new System.Drawing.Size(0, 34);
-            this.txtCapTime2.MinimumSize = new System.Drawing.Size(0, 34);
-            this.txtCapTime2.Name = "txtCapTime2";
-            this.txtCapTime2.Properties.AutoHeight = false;
-            this.txtCapTime2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtCapTime2.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtCapTime2.Properties.DisplayFormat.FormatString = "";
-            this.txtCapTime2.Properties.EditFormat.FormatString = "";
-            this.txtCapTime2.Properties.MaskSettings.Set("mask", "");
-            this.txtCapTime2.Size = new System.Drawing.Size(489, 34);
-            this.txtCapTime2.StyleController = this.layoutControl1;
-            this.txtCapTime2.TabIndex = 5;
-            this.txtCapTime2.ToolTip = "填写卫星的双行根数";
-            // 
-            // txtCapTime1
-            // 
-            this.txtCapTime1.EditValue = "";
-            this.txtCapTime1.Location = new System.Drawing.Point(2, 94);
-            this.txtCapTime1.MaximumSize = new System.Drawing.Size(0, 34);
-            this.txtCapTime1.MinimumSize = new System.Drawing.Size(0, 34);
-            this.txtCapTime1.Name = "txtCapTime1";
-            this.txtCapTime1.Properties.AutoHeight = false;
-            this.txtCapTime1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtCapTime1.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtCapTime1.Properties.DisplayFormat.FormatString = "";
-            this.txtCapTime1.Properties.EditFormat.FormatString = "";
-            this.txtCapTime1.Properties.MaskSettings.Set("mask", "");
-            this.txtCapTime1.Size = new System.Drawing.Size(489, 34);
-            this.txtCapTime1.StyleController = this.layoutControl1;
-            this.txtCapTime1.TabIndex = 5;
-            this.txtCapTime1.ToolTip = "填写卫星的双行根数";
-            // 
             // DXGDOPParam
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
@@ -425,7 +429,7 @@
             this.Load += new System.EventHandler(this.DXGDOPParam_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txtTleMain.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTleLeo1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDfoErr1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).EndInit();
@@ -433,6 +437,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtFu1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime3.Properties.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime3.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime2.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime1.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -445,17 +453,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime2.Properties.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime2.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime1.Properties.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime1.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
 
         #endregion
         private DevExpress.XtraLayout.LayoutControl layoutControl1;
-        private DevExpress.XtraEditors.SearchLookUpEdit txtTleMain;
+        private DevExpress.XtraEditors.SearchLookUpEdit txtTleLeo1;
         private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
         private DevExpress.XtraEditors.ButtonEdit txtDfoErr1;
         private DevExpress.XtraEditors.ButtonEdit txtSatLocErr1;

+ 7 - 7
XzXdDw.App/UserControl/DXGDOPParam.cs

@@ -19,7 +19,7 @@ namespace XdCxRhDW.App.UserControl
     {
         public GDOP单星协同接口 Model => new GDOP单星协同接口()
         {
-            TleMain = txtTleMain.Text.Trim(),
+            TleLeo1 = txtTleLeo1.Text.Trim(),
             CapTime1 = txtCapTime1.DateTime,
             CapTime2 = txtCapTime2.DateTime,
             CapTime3 = txtCapTime3.DateTime,
@@ -35,11 +35,11 @@ namespace XdCxRhDW.App.UserControl
 
         private void DXGDOPParam_Load(object sender, EventArgs e)
         {
-            txtTleMain.UseDoubleClickToSelectAll();
-            txtTleMain.UseDefault().SetStringData(TestData.AllTle).Text = TestData.TleMain;
-            this.txtCapTime1.DateTime = TestData.Time;
-            this.txtCapTime2.DateTime = TestData.Time;
-            this.txtCapTime3.DateTime = TestData.Time;
+            txtTleLeo1.UseDoubleClickToSelectAll();
+            txtTleLeo1.UseDefault().SetStringData(TestData.AllTle).Text = TestData.tleleo1;
+            this.txtCapTime1.DateTime = TestData.leoTime;
+            this.txtCapTime2.DateTime = TestData.leoTime;
+            this.txtCapTime3.DateTime = TestData.leoTime;
             this.txtDfoErr1.EditValue = TestData.DtousErr;
             this.txtSatLocErr1.EditValue = TestData.SatLocErr;
             this.txtEphVelErr1.EditValue = TestData.EphVelErr;
@@ -56,7 +56,7 @@ namespace XdCxRhDW.App.UserControl
         /// <summary>
         /// 主星星历
         /// </summary>
-        public string TleMain { get; set; }
+        public string TleLeo1 { get; set; }
 
         /// <summary>
         ///采集时刻1

+ 119 - 127
XzXdDw.App/UserControl/XZGDOPParam .Designer.cs

@@ -62,9 +62,9 @@
             this.btnOK = new DevExpress.XtraEditors.SimpleButton();
             this.txtCapTime = new DevExpress.XtraEditors.DateEdit();
             this.txtRefLocation1 = new DevExpress.XtraEditors.TextEdit();
-            this.txtTleMain = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.txtTleLeo1 = new DevExpress.XtraEditors.SearchLookUpEdit();
             this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.txtTleAdja = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.txtTleLeo2 = new DevExpress.XtraEditors.SearchLookUpEdit();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.txtDtousErr1 = new DevExpress.XtraEditors.ButtonEdit();
             this.txtSatLocErr1 = new DevExpress.XtraEditors.ButtonEdit();
@@ -91,9 +91,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTleMain.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTleLeo1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTleAdja.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTleLeo2.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).BeginInit();
@@ -122,8 +122,8 @@
             this.layoutControl1.Controls.Add(this.btnOK);
             this.layoutControl1.Controls.Add(this.txtCapTime);
             this.layoutControl1.Controls.Add(this.txtRefLocation1);
-            this.layoutControl1.Controls.Add(this.txtTleMain);
-            this.layoutControl1.Controls.Add(this.txtTleAdja);
+            this.layoutControl1.Controls.Add(this.txtTleLeo1);
+            this.layoutControl1.Controls.Add(this.txtTleLeo2);
             this.layoutControl1.Controls.Add(this.txtDtousErr1);
             this.layoutControl1.Controls.Add(this.txtSatLocErr1);
             this.layoutControl1.Controls.Add(this.txtDfoErr1);
@@ -132,20 +132,20 @@
             this.layoutControl1.Controls.Add(this.txtFu2);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.layoutControl1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             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, 557);
+            this.layoutControl1.Size = new System.Drawing.Size(493, 875);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(174, 254);
-            this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.btnOK.Location = new System.Drawing.Point(249, 432);
+            this.btnOK.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(169, 22);
+            this.btnOK.Size = new System.Drawing.Size(241, 32);
             this.btnOK.StyleController = this.layoutControl1;
             this.btnOK.TabIndex = 12;
             this.btnOK.Text = "确定";
@@ -154,100 +154,97 @@
             // txtCapTime
             // 
             this.txtCapTime.EditValue = null;
-            this.txtCapTime.Location = new System.Drawing.Point(1, 100);
-            this.txtCapTime.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.txtCapTime.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtCapTime.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtCapTime.Location = new System.Drawing.Point(3, 172);
+            this.txtCapTime.MaximumSize = new System.Drawing.Size(0, 35);
+            this.txtCapTime.MinimumSize = new System.Drawing.Size(0, 35);
             this.txtCapTime.Name = "txtCapTime";
             this.txtCapTime.Properties.AutoHeight = false;
             this.txtCapTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             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(170, 22);
+            this.txtCapTime.Size = new System.Drawing.Size(240, 35);
             this.txtCapTime.StyleController = this.layoutControl1;
             this.txtCapTime.TabIndex = 8;
             // 
             // txtRefLocation1
             // 
             this.txtRefLocation1.EditValue = "";
-            this.txtRefLocation1.Location = new System.Drawing.Point(173, 100);
-            this.txtRefLocation1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.txtRefLocation1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtRefLocation1.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtRefLocation1.Location = new System.Drawing.Point(249, 172);
+            this.txtRefLocation1.MaximumSize = new System.Drawing.Size(0, 35);
+            this.txtRefLocation1.MinimumSize = new System.Drawing.Size(0, 35);
             this.txtRefLocation1.Name = "txtRefLocation1";
             this.txtRefLocation1.Properties.AutoHeight = false;
-            this.txtRefLocation1.Size = new System.Drawing.Size(171, 22);
+            this.txtRefLocation1.Size = new System.Drawing.Size(241, 35);
             this.txtRefLocation1.StyleController = this.layoutControl1;
             this.txtRefLocation1.TabIndex = 10;
             this.txtRefLocation1.ToolTip = "经度纬度之间用英文逗号隔开";
             // 
-            // txtTleMain
+            // txtTleLeo1
             // 
-            this.txtTleMain.EditValue = "";
-            this.txtTleMain.Location = new System.Drawing.Point(1, 18);
-            this.txtTleMain.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.txtTleMain.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtTleMain.MinimumSize = new System.Drawing.Size(0, 22);
-            this.txtTleMain.Name = "txtTleMain";
-            this.txtTleMain.Properties.AutoHeight = false;
-            this.txtTleMain.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txtTleLeo1.EditValue = "";
+            this.txtTleLeo1.Location = new System.Drawing.Point(3, 32);
+            this.txtTleLeo1.MaximumSize = new System.Drawing.Size(0, 35);
+            this.txtTleLeo1.MinimumSize = new System.Drawing.Size(0, 35);
+            this.txtTleLeo1.Name = "txtTleLeo1";
+            this.txtTleLeo1.Properties.AutoHeight = false;
+            this.txtTleLeo1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtTleMain.Properties.NullText = "";
-            this.txtTleMain.Properties.PopupSizeable = false;
-            this.txtTleMain.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtTleMain.Size = new System.Drawing.Size(343, 22);
-            this.txtTleMain.StyleController = this.layoutControl1;
-            this.txtTleMain.TabIndex = 4;
-            this.txtTleMain.ToolTip = "填写卫星的双行根数";
+            this.txtTleLeo1.Properties.NullText = "";
+            this.txtTleLeo1.Properties.PopupSizeable = false;
+            this.txtTleLeo1.Properties.PopupView = this.searchLookUpEdit1View;
+            this.txtTleLeo1.Size = new System.Drawing.Size(487, 35);
+            this.txtTleLeo1.StyleController = this.layoutControl1;
+            this.txtTleLeo1.TabIndex = 4;
+            this.txtTleLeo1.ToolTip = "填写卫星的双行根数";
             // 
             // searchLookUpEdit1View
             // 
+            this.searchLookUpEdit1View.DetailHeight = 550;
             this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
             this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
-            this.searchLookUpEdit1View.OptionsEditForm.PopupEditFormWidth = 430;
+            this.searchLookUpEdit1View.OptionsEditForm.PopupEditFormWidth = 614;
             this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
             this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
             // 
-            // txtTleAdja
+            // txtTleLeo2
             // 
-            this.txtTleAdja.EditValue = "";
-            this.txtTleAdja.Location = new System.Drawing.Point(1, 59);
-            this.txtTleAdja.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.txtTleAdja.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtTleAdja.MinimumSize = new System.Drawing.Size(0, 22);
-            this.txtTleAdja.Name = "txtTleAdja";
-            this.txtTleAdja.Properties.AutoHeight = false;
-            this.txtTleAdja.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txtTleLeo2.EditValue = "";
+            this.txtTleLeo2.Location = new System.Drawing.Point(3, 102);
+            this.txtTleLeo2.MaximumSize = new System.Drawing.Size(0, 35);
+            this.txtTleLeo2.MinimumSize = new System.Drawing.Size(0, 35);
+            this.txtTleLeo2.Name = "txtTleLeo2";
+            this.txtTleLeo2.Properties.AutoHeight = false;
+            this.txtTleLeo2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtTleAdja.Properties.NullText = "";
-            this.txtTleAdja.Properties.PopupSizeable = false;
-            this.txtTleAdja.Properties.PopupView = this.gridView1;
-            this.txtTleAdja.Size = new System.Drawing.Size(343, 22);
-            this.txtTleAdja.StyleController = this.layoutControl1;
-            this.txtTleAdja.TabIndex = 5;
-            this.txtTleAdja.ToolTip = "填写卫星的双行根数";
+            this.txtTleLeo2.Properties.NullText = "";
+            this.txtTleLeo2.Properties.PopupSizeable = false;
+            this.txtTleLeo2.Properties.PopupView = this.gridView1;
+            this.txtTleLeo2.Size = new System.Drawing.Size(487, 35);
+            this.txtTleLeo2.StyleController = this.layoutControl1;
+            this.txtTleLeo2.TabIndex = 5;
+            this.txtTleLeo2.ToolTip = "填写卫星的双行根数";
             // 
             // gridView1
             // 
+            this.gridView1.DetailHeight = 550;
             this.gridView1.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
             this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsEditForm.PopupEditFormWidth = 430;
+            this.gridView1.OptionsEditForm.PopupEditFormWidth = 614;
             this.gridView1.OptionsSelection.EnableAppearanceFocusedCell = false;
             this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
             // txtDtousErr1
             // 
             this.txtDtousErr1.EditValue = "";
-            this.txtDtousErr1.Location = new System.Drawing.Point(1, 141);
-            this.txtDtousErr1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.txtDtousErr1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtDtousErr1.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtDtousErr1.Location = new System.Drawing.Point(3, 242);
+            this.txtDtousErr1.MaximumSize = new System.Drawing.Size(0, 35);
+            this.txtDtousErr1.MinimumSize = new System.Drawing.Size(0, 35);
             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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtousErr1.Size = new System.Drawing.Size(170, 22);
+            this.txtDtousErr1.Size = new System.Drawing.Size(240, 35);
             this.txtDtousErr1.StyleController = this.layoutControl1;
             this.txtDtousErr1.TabIndex = 6;
             this.txtDtousErr1.ToolTip = "ECEF坐标X";
@@ -255,64 +252,59 @@
             // txtSatLocErr1
             // 
             this.txtSatLocErr1.EditValue = "";
-            this.txtSatLocErr1.Location = new System.Drawing.Point(1, 182);
-            this.txtSatLocErr1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.txtSatLocErr1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtSatLocErr1.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtSatLocErr1.Location = new System.Drawing.Point(3, 312);
+            this.txtSatLocErr1.MaximumSize = new System.Drawing.Size(0, 35);
+            this.txtSatLocErr1.MinimumSize = new System.Drawing.Size(0, 35);
             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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSatLocErr1.Size = new System.Drawing.Size(170, 22);
+            this.txtSatLocErr1.Size = new System.Drawing.Size(240, 35);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
             this.txtSatLocErr1.ToolTip = "ECEF坐标X";
             // 
             // txtDfoErr1
             // 
-            this.txtDfoErr1.Location = new System.Drawing.Point(173, 141);
-            this.txtDfoErr1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.txtDfoErr1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtDfoErr1.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtDfoErr1.Location = new System.Drawing.Point(249, 242);
+            this.txtDfoErr1.MaximumSize = new System.Drawing.Size(0, 35);
+            this.txtDfoErr1.MinimumSize = new System.Drawing.Size(0, 35);
             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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDfoErr1.Size = new System.Drawing.Size(171, 22);
+            this.txtDfoErr1.Size = new System.Drawing.Size(241, 35);
             this.txtDfoErr1.StyleController = this.layoutControl1;
             this.txtDfoErr1.TabIndex = 13;
             // 
             // txtEphVelErr1
             // 
-            this.txtEphVelErr1.Location = new System.Drawing.Point(173, 182);
-            this.txtEphVelErr1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.txtEphVelErr1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtEphVelErr1.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtEphVelErr1.Location = new System.Drawing.Point(249, 312);
+            this.txtEphVelErr1.MaximumSize = new System.Drawing.Size(0, 35);
+            this.txtEphVelErr1.MinimumSize = new System.Drawing.Size(0, 35);
             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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtEphVelErr1.Size = new System.Drawing.Size(171, 22);
+            this.txtEphVelErr1.Size = new System.Drawing.Size(241, 35);
             this.txtEphVelErr1.StyleController = this.layoutControl1;
             this.txtEphVelErr1.TabIndex = 14;
             // 
             // txtFu1
             // 
-            this.txtFu1.Location = new System.Drawing.Point(1, 223);
-            this.txtFu1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.txtFu1.Location = new System.Drawing.Point(3, 382);
             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, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtFu1.Size = new System.Drawing.Size(170, 22);
+            this.txtFu1.Size = new System.Drawing.Size(240, 34);
             this.txtFu1.StyleController = this.layoutControl1;
             this.txtFu1.TabIndex = 15;
             // 
             // txtFu2
             // 
-            this.txtFu2.Location = new System.Drawing.Point(173, 223);
-            this.txtFu2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.txtFu2.Location = new System.Drawing.Point(249, 382);
             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, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtFu2.Size = new System.Drawing.Size(171, 22);
+            this.txtFu2.Size = new System.Drawing.Size(241, 34);
             this.txtFu2.StyleController = this.layoutControl1;
             this.txtFu2.TabIndex = 16;
             // 
@@ -334,78 +326,78 @@
             this.layoutControlItem7,
             this.layoutControlItem12});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(345, 557);
+            this.Root.Size = new System.Drawing.Size(493, 875);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem8
             // 
-            this.layoutControlItem8.Control = this.txtTleMain;
+            this.layoutControlItem8.Control = this.txtTleLeo1;
             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, 41);
+            this.layoutControlItem8.Size = new System.Drawing.Size(493, 70);
             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(108, 22);
             // 
             // layoutControlItem9
             // 
-            this.layoutControlItem9.Control = this.txtTleAdja;
+            this.layoutControlItem9.Control = this.txtTleLeo2;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 41);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 70);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(345, 41);
+            this.layoutControlItem9.Size = new System.Drawing.Size(493, 70);
             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(108, 22);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txtCapTime;
             this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 82);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 140);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(172, 41);
+            this.layoutControlItem11.Size = new System.Drawing.Size(246, 70);
             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(108, 22);
             // 
             // 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, 164);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 280);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(172, 41);
+            this.layoutControlItem5.Size = new System.Drawing.Size(246, 70);
             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(108, 22);
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.btnOK;
-            this.layoutControlItem1.Location = new System.Drawing.Point(172, 246);
+            this.layoutControlItem1.Location = new System.Drawing.Point(246, 419);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(173, 32);
+            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 3, 13, 3);
+            this.layoutControlItem1.Size = new System.Drawing.Size(247, 48);
             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, 278);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 467);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(345, 279);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(493, 408);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // emptySpaceItem2
             // 
             this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 246);
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 419);
             this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(172, 32);
+            this.emptySpaceItem2.Size = new System.Drawing.Size(246, 48);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem4
@@ -413,81 +405,81 @@
             this.layoutControlItem4.Control = this.txtDtousErr1;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 123);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 210);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(172, 41);
+            this.layoutControlItem4.Size = new System.Drawing.Size(246, 70);
             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(108, 22);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txtFu1;
-            this.layoutControlItem10.Location = new System.Drawing.Point(0, 205);
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 350);
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(172, 41);
+            this.layoutControlItem10.Size = new System.Drawing.Size(246, 69);
             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(108, 22);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txtRefLocation1;
             this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem14.Location = new System.Drawing.Point(172, 82);
+            this.layoutControlItem14.Location = new System.Drawing.Point(246, 140);
             this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(173, 41);
+            this.layoutControlItem14.Size = new System.Drawing.Size(247, 70);
             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(108, 22);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txtDfoErr1;
-            this.layoutControlItem6.Location = new System.Drawing.Point(172, 123);
+            this.layoutControlItem6.Location = new System.Drawing.Point(246, 210);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(173, 41);
+            this.layoutControlItem6.Size = new System.Drawing.Size(247, 70);
             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(108, 22);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txtEphVelErr1;
-            this.layoutControlItem7.Location = new System.Drawing.Point(172, 164);
+            this.layoutControlItem7.Location = new System.Drawing.Point(246, 280);
             this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(173, 41);
+            this.layoutControlItem7.Size = new System.Drawing.Size(247, 70);
             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(108, 22);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txtFu2;
-            this.layoutControlItem12.Location = new System.Drawing.Point(172, 205);
+            this.layoutControlItem12.Location = new System.Drawing.Point(246, 350);
             this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(173, 41);
+            this.layoutControlItem12.Size = new System.Drawing.Size(247, 69);
             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(108, 22);
             // 
             // XZGDOPParam
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.layoutControl1);
-            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.Name = "XZGDOPParam";
-            this.Size = new System.Drawing.Size(345, 557);
+            this.Size = new System.Drawing.Size(493, 875);
             this.Load += new System.EventHandler(this.XZGDOPParam_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTleMain.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTleLeo1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTleAdja.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTleLeo2.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).EndInit();
@@ -517,9 +509,9 @@
         private DevExpress.XtraLayout.LayoutControl layoutControl1;
         private DevExpress.XtraEditors.DateEdit txtCapTime;
         private DevExpress.XtraEditors.TextEdit txtRefLocation1;
-        private DevExpress.XtraEditors.SearchLookUpEdit txtTleMain;
+        private DevExpress.XtraEditors.SearchLookUpEdit txtTleLeo1;
         private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
-        private DevExpress.XtraEditors.SearchLookUpEdit txtTleAdja;
+        private DevExpress.XtraEditors.SearchLookUpEdit txtTleLeo2;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraEditors.ButtonEdit txtDtousErr1;
         private DevExpress.XtraEditors.ButtonEdit txtSatLocErr1;

+ 10 - 10
XzXdDw.App/UserControl/XZGDOPParam .cs

@@ -19,8 +19,8 @@ namespace XdCxRhDW.App.UserControl
     {
         public GDOP星座协同接口 Model => new GDOP星座协同接口()
         {
-            TleMain = txtTleMain.Text.Trim(),
-            TleAdja = txtTleAdja.Text.Trim(),
+            TleLeo1 = txtTleLeo1.Text.Trim(),
+            TleLeo2 = txtTleLeo2.Text.Trim(),
             CapTime = txtCapTime.DateTime,
             RefLon = Convert.ToDouble(txtRefLocation1.Text.Replace(",", ",").Split(',')[0].Trim()),
             RefLat = Convert.ToDouble(txtRefLocation1.Text.Replace(",", ",").Split(',')[1].Trim()),
@@ -39,15 +39,15 @@ namespace XdCxRhDW.App.UserControl
         private void XZGDOPParam_Load(object sender, EventArgs e)
         {
             txtCapTime.UseDefault();
-            txtCapTime.DateTime = TestData.Time;
-            txtTleMain.UseDoubleClickToSelectAll();
-            txtTleAdja.UseDoubleClickToSelectAll();
+            txtCapTime.DateTime = TestData.leoTime;
+            txtTleLeo1.UseDoubleClickToSelectAll();
+            txtTleLeo2.UseDoubleClickToSelectAll();
             txtRefLocation1.UseDoubleClickToSelectAll();
 
-            this.txtCapTime.DateTime = TestData.Time;
+            this.txtCapTime.DateTime = TestData.leoTime;
             this.txtRefLocation1.Text = TestData.RefLoc;
-            txtTleMain.UseDefault().SetStringData(TestData.AllTle).Text = TestData.TleMain;
-            txtTleAdja.UseDefault().SetStringData(TestData.AllTle).Text = TestData.TleAdja1;
+            txtTleLeo1.UseDefault().SetStringData(TestData.AllTle).Text = TestData.tleleo1;
+            txtTleLeo2.UseDefault().SetStringData(TestData.AllTle).Text = TestData.tleleo2;
             this.txtDtousErr1.EditValue = TestData.DtousErr;
             this.txtDfoErr1.EditValue = TestData.DfoHzErr;
             this.txtSatLocErr1.EditValue = TestData.SatLocErr;
@@ -66,12 +66,12 @@ namespace XdCxRhDW.App.UserControl
         /// <summary>
         /// 主星星历(Tle)
         /// </summary>
-        public string TleMain { get; set; }
+        public string TleLeo1 { get; set; }
 
         /// <summary>
         /// 邻星星历(Tle)
         /// </summary>
-        public string TleAdja { get; set; }
+        public string TleLeo2 { get; set; }
 
         /// <summary>
         /// 采集时刻