修改天线

XdCxRhDW.App/MainForm.Designer.cs

@@ -30,8 +30,8 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
-            DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
-            DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
+            DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
             this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
             this.skinPaletteDropDownButtonItem1 = new DevExpress.XtraBars.SkinPaletteDropDownButtonItem();
             this.btnOpenApi = new DevExpress.XtraBars.BarButtonItem();
@@ -44,7 +44,6 @@
             this.btnXl = new DevExpress.XtraBars.BarButtonItem();
             this.btnSat = new DevExpress.XtraBars.BarButtonItem();
             this.btnCocTool = new DevExpress.XtraBars.BarButtonItem();
-            this.btnErrFx = new DevExpress.XtraBars.BarButtonItem();
             this.btnDetectTool = new DevExpress.XtraBars.BarButtonItem();
             this.btnXlCalculate = new DevExpress.XtraBars.BarButtonItem();
             this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
@@ -80,7 +79,6 @@
             this.btnXl,
             this.btnSat,
             this.btnCocTool,
-            this.btnErrFx,
             this.btnDetectTool,
             this.btnXlCalculate});
             this.ribbon.Location = new System.Drawing.Point(0, 0);
@@ -111,9 +109,9 @@
             this.btnOpenApi.Id = 21;
             this.btnOpenApi.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnOpenApi.ImageOptions.SvgImage")));
             this.btnOpenApi.Name = "btnOpenApi";
-            toolTipItem2.Text = "查看接口文档";
-            superToolTip2.Items.Add(toolTipItem2);
-            this.btnOpenApi.SuperTip = superToolTip2;
+            toolTipItem1.Text = "查看接口文档";
+            superToolTip1.Items.Add(toolTipItem1);
+            this.btnOpenApi.SuperTip = superToolTip1;
             this.btnOpenApi.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnOpenApi_ItemClick);
             // 
             // btnTask
@@ -191,13 +189,6 @@
             this.btnCocTool.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             this.btnCocTool.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_ItemClick);
             // 
-            // btnErrFx
-            // 
-            this.btnErrFx.Caption = "误差分析";
-            this.btnErrFx.Id = 19;
-            this.btnErrFx.ImageOptions.ImageUri.Uri = "spreadsheet/errorbarsnone";
-            this.btnErrFx.Name = "btnErrFx";
-            // 
             // btnDetectTool
             // 
             this.btnDetectTool.Caption = "检测参估工具";
@@ -255,7 +246,6 @@
             // 
             this.ribbonPageGroup3.ItemLinks.Add(this.btnCocTool);
             this.ribbonPageGroup3.ItemLinks.Add(this.btnDetectTool);
-            this.ribbonPageGroup3.ItemLinks.Add(this.btnErrFx);
             this.ribbonPageGroup3.ItemLinks.Add(this.btnXlCalculate);
             this.ribbonPageGroup3.Name = "ribbonPageGroup3";
             this.ribbonPageGroup3.Text = "手动工具";
@@ -326,7 +316,6 @@
         private DevExpress.XtraBars.Docking.DockManager dockManager1;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
         private DevExpress.XtraBars.BarButtonItem btnCocTool;
-        private DevExpress.XtraBars.BarButtonItem btnErrFx;
         private DevExpress.XtraBars.BarButtonItem btnOpenApi;
         private DevExpress.XtraBars.BarButtonItem btnDetectTool;
         private DevExpress.XtraBars.BarButtonItem btnXlCalculate;

XdCxRhDW.App/Properties/licenses.licx

@@ -1,12 +1,15 @@
+DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v23.2.UI, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v23.2.UI, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

XdCxRhDW.App/UserControl/CtrlTx.Designer.cs

@@ -29,8 +29,12 @@
         private void InitializeComponent()
         {
             this.tablePanel2 = new DevExpress.Utils.Layout.TablePanel();
-            this.layoutControl5 = new DevExpress.XtraLayout.LayoutControl();
+            this.layoutControl6 = new DevExpress.XtraLayout.LayoutControl();
             this.btnSave = new DevExpress.XtraEditors.SimpleButton();
+            this.layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControl5 = new DevExpress.XtraLayout.LayoutControl();
             this.txtRefLat = new DevExpress.XtraEditors.TextEdit();
             this.txtRefLon = new DevExpress.XtraEditors.TextEdit();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -56,9 +60,7 @@
             this.txtAdjaTxLat = new DevExpress.XtraEditors.TextEdit();
             this.txtAdjaTxLon = new DevExpress.XtraEditors.TextEdit();
             this.txtAdjaTxName = new DevExpress.XtraEditors.TextEdit();
-            this.txtAdjaSat = new DevExpress.XtraEditors.ImageComboBoxEdit();
             this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -66,18 +68,17 @@
             this.txtMainTxLat = new DevExpress.XtraEditors.TextEdit();
             this.txtMainTxLon = new DevExpress.XtraEditors.TextEdit();
             this.txtMainTxName = new DevExpress.XtraEditors.TextEdit();
-            this.txtMainSat = new DevExpress.XtraEditors.ImageComboBoxEdit();
             this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControl6 = new DevExpress.XtraLayout.LayoutControl();
-            this.layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
             ((System.ComponentModel.ISupportInitialize)(this.tablePanel2)).BeginInit();
             this.tablePanel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl6)).BeginInit();
+            this.layoutControl6.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl5)).BeginInit();
             this.layoutControl5.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLat.Properties)).BeginInit();
@@ -108,9 +109,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaTxLat.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaTxLon.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaTxName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
@@ -119,17 +118,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtMainTxLat.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtMainTxLon.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtMainTxName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl6)).BeginInit();
-            this.layoutControl6.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
             this.SuspendLayout();
             // 
             // tablePanel2
@@ -151,7 +143,7 @@
             this.tablePanel2.Name = "tablePanel2";
             this.tablePanel2.Rows.AddRange(new DevExpress.Utils.Layout.TablePanelRow[] {
             new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 0.8F),
-            new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 254F),
+            new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 199F),
             new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Separator, 1F),
             new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 200F),
             new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 74F),
@@ -160,18 +152,19 @@
             this.tablePanel2.TabIndex = 2;
             this.tablePanel2.UseSkinIndents = true;
             // 
-            // layoutControl5
+            // layoutControl6
             // 
-            this.tablePanel2.SetColumn(this.layoutControl5, 1);
-            this.layoutControl5.Controls.Add(this.txtRefLat);
-            this.layoutControl5.Controls.Add(this.txtRefLon);
-            this.layoutControl5.Location = new System.Drawing.Point(195, 513);
-            this.layoutControl5.Name = "layoutControl5";
-            this.layoutControl5.Root = this.Root;
-            this.tablePanel2.SetRow(this.layoutControl5, 4);
-            this.layoutControl5.Size = new System.Drawing.Size(269, 70);
-            this.layoutControl5.TabIndex = 4;
-            this.layoutControl5.Text = "layoutControl5";
+            this.tablePanel2.SetColumn(this.layoutControl6, 3);
+            this.layoutControl6.Controls.Add(this.btnSave);
+            this.layoutControl6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutControl6.Location = new System.Drawing.Point(494, 482);
+            this.layoutControl6.Name = "layoutControl6";
+            this.layoutControl6.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1159, 294, 650, 400);
+            this.layoutControl6.Root = this.layoutControlGroup5;
+            this.tablePanel2.SetRow(this.layoutControl6, 4);
+            this.layoutControl6.Size = new System.Drawing.Size(269, 70);
+            this.layoutControl6.TabIndex = 7;
+            this.layoutControl6.Text = "layoutControl6";
             // 
             // btnSave
             // 
@@ -185,6 +178,52 @@
             this.btnSave.Text = "保存";
             this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
             // 
+            // layoutControlGroup5
+            // 
+            this.layoutControlGroup5.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup5.GroupBordersVisible = false;
+            this.layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.emptySpaceItem1});
+            this.layoutControlGroup5.Name = "Root";
+            this.layoutControlGroup5.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 24, 0);
+            this.layoutControlGroup5.Size = new System.Drawing.Size(269, 70);
+            this.layoutControlGroup5.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.btnSave;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.MinSize = new System.Drawing.Size(35, 26);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(130, 46);
+            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            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(130, 0);
+            this.emptySpaceItem1.MinSize = new System.Drawing.Size(104, 24);
+            this.emptySpaceItem1.Name = "emptySpaceItem1";
+            this.emptySpaceItem1.Size = new System.Drawing.Size(139, 46);
+            this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // layoutControl5
+            // 
+            this.tablePanel2.SetColumn(this.layoutControl5, 1);
+            this.layoutControl5.Controls.Add(this.txtRefLat);
+            this.layoutControl5.Controls.Add(this.txtRefLon);
+            this.layoutControl5.Location = new System.Drawing.Point(195, 482);
+            this.layoutControl5.Name = "layoutControl5";
+            this.layoutControl5.Root = this.Root;
+            this.tablePanel2.SetRow(this.layoutControl5, 4);
+            this.layoutControl5.Size = new System.Drawing.Size(269, 70);
+            this.layoutControl5.TabIndex = 4;
+            this.layoutControl5.Text = "layoutControl5";
+            // 
             // txtRefLat
             // 
             this.txtRefLat.Location = new System.Drawing.Point(196, 32);
@@ -243,7 +282,7 @@
             this.layoutControl4.Controls.Add(this.txtCxLat);
             this.layoutControl4.Controls.Add(this.txtCxLon);
             this.layoutControl4.Controls.Add(this.txtCxName);
-            this.layoutControl4.Location = new System.Drawing.Point(494, 313);
+            this.layoutControl4.Location = new System.Drawing.Point(494, 282);
             this.layoutControl4.Name = "layoutControl4";
             this.layoutControl4.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(335, 406, 650, 400);
             this.layoutControl4.Root = this.layoutControlGroup4;
@@ -340,7 +379,7 @@
             this.layoutControl3.Controls.Add(this.txtCdbLat);
             this.layoutControl3.Controls.Add(this.txtCdbLon);
             this.layoutControl3.Controls.Add(this.txtCdbName);
-            this.layoutControl3.Location = new System.Drawing.Point(195, 313);
+            this.layoutControl3.Location = new System.Drawing.Point(195, 282);
             this.layoutControl3.Name = "layoutControl3";
             this.layoutControl3.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(335, 406, 650, 400);
             this.layoutControl3.Root = this.layoutControlGroup3;
@@ -437,14 +476,13 @@
             this.layoutControl1.Controls.Add(this.txtAdjaTxLat);
             this.layoutControl1.Controls.Add(this.txtAdjaTxLon);
             this.layoutControl1.Controls.Add(this.txtAdjaTxName);
-            this.layoutControl1.Controls.Add(this.txtAdjaSat);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(494, 41);
+            this.layoutControl1.Location = new System.Drawing.Point(494, 65);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(335, 406, 650, 400);
             this.layoutControl1.Root = this.layoutControlGroup2;
             this.tablePanel2.SetRow(this.layoutControl1, 1);
-            this.layoutControl1.Size = new System.Drawing.Size(269, 250);
+            this.layoutControl1.Size = new System.Drawing.Size(269, 195);
             this.layoutControl1.TabIndex = 1;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -478,22 +516,9 @@
             this.txtAdjaTxName.StyleController = this.layoutControl1;
             this.txtAdjaTxName.TabIndex = 4;
             // 
-            // txtAdjaSat
-            // 
-            this.txtAdjaSat.EditValue = "";
-            this.txtAdjaSat.Location = new System.Drawing.Point(12, 212);
-            this.txtAdjaSat.Name = "txtAdjaSat";
-            this.txtAdjaSat.Properties.AutoHeight = false;
-            this.txtAdjaSat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtAdjaSat.Size = new System.Drawing.Size(245, 25);
-            this.txtAdjaSat.StyleController = this.layoutControl1;
-            this.txtAdjaSat.TabIndex = 5;
-            // 
             // layoutControlGroup2
             // 
             this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem4,
             this.layoutControlItem5,
             this.layoutControlItem6,
             this.layoutControlItem9});
@@ -501,21 +526,6 @@
             this.layoutControlGroup2.Size = new System.Drawing.Size(269, 250);
             this.layoutControlGroup2.Text = "邻星天线信息";
             // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txtAdjaSat;
-            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 154);
-            this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 54);
-            this.layoutControlItem4.MinSize = new System.Drawing.Size(54, 54);
-            this.layoutControlItem4.Name = "layoutControlItem9";
-            this.layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 10, 1);
-            this.layoutControlItem4.Size = new System.Drawing.Size(249, 56);
-            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem4.Text = "卫星";
-            this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
-            // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtAdjaTxName;
@@ -552,7 +562,7 @@
             this.layoutControlItem9.MinSize = new System.Drawing.Size(76, 54);
             this.layoutControlItem9.Name = "layoutControlItem16";
             this.layoutControlItem9.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 10, 2);
-            this.layoutControlItem9.Size = new System.Drawing.Size(249, 54);
+            this.layoutControlItem9.Size = new System.Drawing.Size(249, 55);
             this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem9.Text = "天线纬度";
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
@@ -564,13 +574,12 @@
             this.layoutControl2.Controls.Add(this.txtMainTxLat);
             this.layoutControl2.Controls.Add(this.txtMainTxLon);
             this.layoutControl2.Controls.Add(this.txtMainTxName);
-            this.layoutControl2.Controls.Add(this.txtMainSat);
-            this.layoutControl2.Location = new System.Drawing.Point(195, 41);
+            this.layoutControl2.Location = new System.Drawing.Point(195, 65);
             this.layoutControl2.Name = "layoutControl2";
             this.layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(335, 406, 650, 400);
             this.layoutControl2.Root = this.layoutControlGroup1;
             this.tablePanel2.SetRow(this.layoutControl2, 1);
-            this.layoutControl2.Size = new System.Drawing.Size(269, 250);
+            this.layoutControl2.Size = new System.Drawing.Size(269, 195);
             this.layoutControl2.TabIndex = 0;
             this.layoutControl2.Text = "layoutControl1";
             // 
@@ -604,22 +613,9 @@
             this.txtMainTxName.StyleController = this.layoutControl2;
             this.txtMainTxName.TabIndex = 4;
             // 
-            // txtMainSat
-            // 
-            this.txtMainSat.EditValue = "";
-            this.txtMainSat.Location = new System.Drawing.Point(12, 212);
-            this.txtMainSat.Name = "txtMainSat";
-            this.txtMainSat.Properties.AutoHeight = false;
-            this.txtMainSat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtMainSat.Size = new System.Drawing.Size(245, 25);
-            this.txtMainSat.StyleController = this.layoutControl2;
-            this.txtMainSat.TabIndex = 5;
-            // 
             // layoutControlGroup1
             // 
             this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem2,
             this.layoutControlItem8,
             this.layoutControlItem15,
             this.layoutControlItem16});
@@ -627,21 +623,6 @@
             this.layoutControlGroup1.Size = new System.Drawing.Size(269, 250);
             this.layoutControlGroup1.Text = "主星天线信息";
             // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txtMainSat;
-            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 154);
-            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 54);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 54);
-            this.layoutControlItem2.Name = "layoutControlItem9";
-            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 10, 1);
-            this.layoutControlItem2.Size = new System.Drawing.Size(249, 56);
-            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem2.Text = "卫星";
-            this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14);
-            // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txtMainTxName;
@@ -678,59 +659,12 @@
             this.layoutControlItem16.MinSize = new System.Drawing.Size(76, 54);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 10, 2);
-            this.layoutControlItem16.Size = new System.Drawing.Size(249, 54);
+            this.layoutControlItem16.Size = new System.Drawing.Size(249, 55);
             this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem16.Text = "天线纬度";
             this.layoutControlItem16.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem16.TextSize = new System.Drawing.Size(48, 14);
             // 
-            // layoutControl6
-            // 
-            this.tablePanel2.SetColumn(this.layoutControl6, 3);
-            this.layoutControl6.Controls.Add(this.btnSave);
-            this.layoutControl6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl6.Location = new System.Drawing.Point(494, 513);
-            this.layoutControl6.Name = "layoutControl6";
-            this.layoutControl6.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1159, 294, 650, 400);
-            this.layoutControl6.Root = this.layoutControlGroup5;
-            this.tablePanel2.SetRow(this.layoutControl6, 4);
-            this.layoutControl6.Size = new System.Drawing.Size(269, 70);
-            this.layoutControl6.TabIndex = 7;
-            this.layoutControl6.Text = "layoutControl6";
-            // 
-            // layoutControlGroup5
-            // 
-            this.layoutControlGroup5.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup5.GroupBordersVisible = false;
-            this.layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
-            this.emptySpaceItem1});
-            this.layoutControlGroup5.Name = "Root";
-            this.layoutControlGroup5.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 24, 0);
-            this.layoutControlGroup5.Size = new System.Drawing.Size(269, 70);
-            this.layoutControlGroup5.TextVisible = false;
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.btnSave;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem1.MinSize = new System.Drawing.Size(35, 26);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(130, 46);
-            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            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(130, 0);
-            this.emptySpaceItem1.MinSize = new System.Drawing.Size(104, 24);
-            this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(139, 46);
-            this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
-            // 
             // CtrlTx
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -741,6 +675,11 @@
             this.Load += new System.EventHandler(this.CtrlTx_Load);
             ((System.ComponentModel.ISupportInitialize)(this.tablePanel2)).EndInit();
             this.tablePanel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl6)).EndInit();
+            this.layoutControl6.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl5)).EndInit();
             this.layoutControl5.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLat.Properties)).EndInit();
@@ -771,9 +710,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaTxLat.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaTxLon.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaTxName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtAdjaSat.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
@@ -782,17 +719,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtMainTxLat.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtMainTxLon.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtMainTxName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl6)).EndInit();
-            this.layoutControl6.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -805,20 +735,16 @@
         private DevExpress.XtraEditors.TextEdit txtMainTxLon;
         private DevExpress.XtraEditors.TextEdit txtMainTxName;
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraEditors.ImageComboBoxEdit txtMainSat;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControl layoutControl1;
         private DevExpress.XtraEditors.TextEdit txtAdjaTxLat;
         private DevExpress.XtraEditors.TextEdit txtAdjaTxLon;
         private DevExpress.XtraEditors.TextEdit txtAdjaTxName;
-        private DevExpress.XtraEditors.ImageComboBoxEdit txtAdjaSat;
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;

XdCxRhDW.App/UserControl/CtrlTx.cs

@@ -31,12 +31,6 @@ namespace XdCxRhDW.App.UserControl
 
                 using (RHDWContext db = new RHDWContext())
                 {
-                    var sats = await db.SatInfos.ToListAsync();
-                    foreach (var item in sats)
-                    {
-                        this.txtMainSat.Properties.Items.Add(new ImageComboBoxItem(item.Sat, item));
-                        this.txtAdjaSat.Properties.Items.Add(new ImageComboBoxItem(item.Sat, item));
-                    }
                     list = await db.TxInfos.ToListAsync();
                     var mainTx = list.Find(p => p.TxType == EnumTxType.MainSat);
                     var adjaTx = list.Find(p => p.TxType == EnumTxType.AdjaSat);
@@ -49,14 +43,12 @@ namespace XdCxRhDW.App.UserControl
                         this.txtMainTxName.Text = mainTx.Name;
                         this.txtMainTxLon.Text = mainTx.Lon.ToString();
                         this.txtMainTxLat.Text = mainTx.Lat.ToString();
-                        this.txtMainSat.EditValue = mainTx.SatInfo;
                     }
                     if (adjaTx != null)
                     {
                         this.txtAdjaTxName.Text = adjaTx.Name;
                         this.txtAdjaTxLon.Text = adjaTx.Lon.ToString();
                         this.txtAdjaTxLat.Text = adjaTx.Lat.ToString();
-                        this.txtAdjaSat.EditValue = adjaTx.SatInfo;
                     }
                     if (cdbTx != null)
                     {
@@ -108,7 +100,6 @@ namespace XdCxRhDW.App.UserControl
                     throw new Exception("主星天线纬度格式错误!");
                 txMain.Lon = lon;
                 txMain.Lat = lat;
-                txMain.SatInfoID = (txtMainSat.EditValue as SatInfo)?.ID;
                 tmp.Add(txMain);
 
                 txAdja.Name = txtAdjaTxName.Text;
@@ -120,7 +111,6 @@ namespace XdCxRhDW.App.UserControl
                     throw new Exception("邻星天线纬度格式错误!");
                 txAdja.Lon = adjaLon;
                 txAdja.Lat = adjaLat;
-                txAdja.SatInfoID = (txtAdjaSat.EditValue as SatInfo)?.ID;
                 tmp.Add(txAdja);
 
                 txCdb.Name = txtCdbName.Text;
@@ -131,7 +121,6 @@ namespace XdCxRhDW.App.UserControl
                     throw new Exception("超短站位置纬度格式错误!");
                 txCdb.Lon = cdbLon;
                 txCdb.Lat = cdbLat;
-                txCdb.SatInfoID = null;
                 tmp.Add(txCdb);
 
                 txCx.Name = txtCxName.Text;
@@ -142,7 +131,6 @@ namespace XdCxRhDW.App.UserControl
                     throw new Exception("测向站位置纬度格式错误!");
                 txCx.Lon = cxLon;
                 txCx.Lat = cxLat;
-                txCx.SatInfoID = null;
                 tmp.Add(txCx);
 
                 txRef.TxType = EnumTxType.Ref;
@@ -152,7 +140,6 @@ namespace XdCxRhDW.App.UserControl
                     throw new Exception("参考站位置纬度格式错误!");
                 txRef.Lon = refLon;
                 txRef.Lat = refLat;
-                txRef.SatInfoID = null;
                 tmp.Add(txRef);
 
                 using (RHDWContext db = new RHDWContext())

XdCxRhDW.Repostory/Model/TxInfo.cs

@@ -25,9 +25,5 @@ namespace XdCxRhDW.Repostory.Model
         /// 卫星编号
         /// </summary>
         public int? SatInfoID { get; set; }
-
-        [Display(AutoGenerateField = false)]
-        public virtual SatInfo SatInfo { get; set; }
-
     }
 }

XdCxRhDw.Dto/PosDto/X1D1PosDto.cs

@@ -25,7 +25,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标星地时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000,IncludeMin =true,IncludeMax =true)]
         public double XdDto { get; set; }
 
         /// <summary>
@@ -41,7 +41,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 样本主星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true, IncludeMax = true)]
         public double MainYbDto { get; set; }
 
         /// <summary>

XdCxRhDw.Dto/PosDto/X2D1PosDto.cs

@@ -31,7 +31,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标双星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000)]
         public double SxDto { get; set; }
 
         /// <summary>
@@ -47,7 +47,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标星地时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true, IncludeMax = true)]
         public double XdDto { get; set; }
 
         /// <summary>
@@ -63,13 +63,13 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 样本主星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true, IncludeMax = true)]
         public double MainYbDto { get; set; }
 
         /// <summary>
         /// 样本邻星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true, IncludeMax = true)]
         public double AdjaYbDto { get; set; }
 
         /// <summary>