cherry 1 gadu atpakaļ
vecāks
revīzija
3f7b9ebad7

+ 7 - 0
XzDw.App/Properties/licenses.licx

@@ -0,0 +1,7 @@
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

+ 6 - 34
XzDw.App/UserControl/CtrlPosSingle.cs

@@ -44,6 +44,7 @@ namespace XzXdDw.App.UserControl
     public partial class CtrlPosSingle : DevExpress.XtraEditors.XtraUserControl
     {
         DtXDParam dtxdctrl = null;
+        DXGDOPParam dxGdopParam = null;
         double MBfu;
         TcpServer tcpServer;
         public CtrlPosSingle()
@@ -136,41 +137,12 @@ namespace XzXdDw.App.UserControl
                     .AddMapMenu("停止加载", SvgHelper.LoadFromFile("Image\\Stop.svg"), (lon, lat) => stoped = true)
                     .AddMapMenu("GDOP分析", SvgHelper.LoadFromFile("Image\\GDOP.svg"), (lon, lat) =>
                     {
-                        var ctrl = new DXGDOPParam(MBfu);
-                        PopupHelper.ShowPopup(ctrl, mapControl1, mapControl1.Width / 4, onHide: hideReason =>
+                        if (dxGdopParam == null)
                         {
-                            if (hideReason == HideReason.Defalut) return;
-                            var model = ctrl.Model;
-                            var (listSat, data) = GdopHelper.GdopSingleSatDRef(
-                            model.TleLeo1, model.CapTime1, model.CapTime2, model.CapTime3, model.DfoErr, model.SatLocErr, model.EphVelErr, model.fu);
-                            if (data == null)
-                            {
-                                return;
-                            }
-                            if (listSat != null)//画卫星
-                            {
-                                foreach (var sat in listSat)
-                                {
-                                    mapControl1.Invoke(new Action(() =>
-                                    {
-                                        string satCode = sat.SatCode == null ? "未知" : sat.SatCode.ToString();
-                                        mapControl1.DrawFixedImg("sat", sat.SatLat, sat.SatLon, DxHelper.SvgHelper.CreateSat(), new Size(32, 32), $"卫星编号:{satCode}\r\n轨道经度:{sat.SatLon}°\r\n轨道纬度:{sat.SatLat}°");
-                                    }));
-                                }
-                            }
-                            foreach (var errLins in data)//画GDOP
-                            {
-                                foreach (var line in errLins.MapLines)
-                                {
-                                    var newLine = SampleDots(line);
-                                    mapControl1.Invoke(new Action(() =>
-                                    {
-                                        var mapLines = newLine.Line.Select(p => (errLins.ErrDistanceKm, p.Lon, p.Lat));
-                                        mapControl1.DrawGdopLine(mapLines);
-                                    }));
-                                }
-                            }
-                        });
+                            dxGdopParam = new DXGDOPParam(MBfu);
+                        }
+                        dxGdopParam.mapControl1 = mapControl1;
+                        PopupHelper.ShowPopup(dxGdopParam, mapControl1, mapControl1.Width / 4);
                     })
 
                     .AddPosMenu<PosRes>("误差椭圆", SvgHelper.LoadFromFile("Image\\误差椭圆.svg"), item =>

+ 1 - 0
XzDw.App/UserControl/DXGDOPParam.cs

@@ -46,6 +46,7 @@ namespace XdCxRhDW.App.UserControl
         }
         private void btnOK_Click(object sender, EventArgs e)
         {
+            mapControl1.ClearMap();
             var (listSat, data) = GdopHelper.GdopSingleSatDRef(
                              txtTleLeo1.Text, txtCapTime1.DateTime, txtCapTime2.DateTime, txtCapTime3.DateTime, Convert.ToDouble(txtDfoErr1.Text), Convert.ToDouble(txtSatLocErr1.Text), Convert.ToDouble(txtEphVelErr1.Text), Convert.ToDouble(txtFu1.Text) * 1e6);
             if (data == null)

+ 113 - 94
XzDw.App/UserControl/XZGDOPParam .Designer.cs

@@ -86,6 +86,8 @@
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
+            this.btnClose = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties)).BeginInit();
@@ -115,6 +117,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.btnClose)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -130,22 +133,23 @@
             this.layoutControl1.Controls.Add(this.txtEphVelErr1);
             this.layoutControl1.Controls.Add(this.txtFu1);
             this.layoutControl1.Controls.Add(this.txtFu2);
+            this.layoutControl1.Controls.Add(this.simpleButton1);
             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, 272);
-            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,30 +158,28 @@
             // txtCapTime
             // 
             this.txtCapTime.EditValue = null;
-            this.txtCapTime.Location = new System.Drawing.Point(2, 108);
-            this.txtCapTime.Margin = new System.Windows.Forms.Padding(2);
-            this.txtCapTime.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtCapTime.MinimumSize = new System.Drawing.Size(0, 22);
+            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(168, 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(174, 108);
-            this.txtRefLocation1.Margin = new System.Windows.Forms.Padding(2);
-            this.txtRefLocation1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtRefLocation1.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtRefLocation1.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(169, 22);
+            this.txtRefLocation1.Size = new System.Drawing.Size(241, 35);
             this.txtRefLocation1.StyleController = this.layoutControl1;
             this.txtRefLocation1.TabIndex = 10;
             this.txtRefLocation1.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -185,10 +187,9 @@
             // txtTleLeo1
             // 
             this.txtTleLeo1.EditValue = "";
-            this.txtTleLeo1.Location = new System.Drawing.Point(2, 20);
-            this.txtTleLeo1.Margin = new System.Windows.Forms.Padding(2);
-            this.txtTleLeo1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtTleLeo1.MinimumSize = new System.Drawing.Size(0, 22);
+            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[] {
@@ -196,26 +197,26 @@
             this.txtTleLeo1.Properties.NullText = "";
             this.txtTleLeo1.Properties.PopupSizeable = false;
             this.txtTleLeo1.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtTleLeo1.Size = new System.Drawing.Size(341, 22);
+            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;
             // 
             // txtTleLeo2
             // 
             this.txtTleLeo2.EditValue = "";
-            this.txtTleLeo2.Location = new System.Drawing.Point(2, 64);
-            this.txtTleLeo2.Margin = new System.Windows.Forms.Padding(2);
-            this.txtTleLeo2.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtTleLeo2.MinimumSize = new System.Drawing.Size(0, 22);
+            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[] {
@@ -223,31 +224,31 @@
             this.txtTleLeo2.Properties.NullText = "";
             this.txtTleLeo2.Properties.PopupSizeable = false;
             this.txtTleLeo2.Properties.PopupView = this.gridView1;
-            this.txtTleLeo2.Size = new System.Drawing.Size(341, 22);
+            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(2, 152);
-            this.txtDtousErr1.Margin = new System.Windows.Forms.Padding(2);
-            this.txtDtousErr1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtDtousErr1.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtDtousErr1.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, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtousErr1.Size = new System.Drawing.Size(168, 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 +256,59 @@
             // txtSatLocErr1
             // 
             this.txtSatLocErr1.EditValue = "";
-            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 196);
-            this.txtSatLocErr1.Margin = new System.Windows.Forms.Padding(2);
-            this.txtSatLocErr1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtSatLocErr1.MinimumSize = new System.Drawing.Size(0, 22);
+            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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSatLocErr1.Size = new System.Drawing.Size(168, 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(174, 152);
-            this.txtDfoErr1.Margin = new System.Windows.Forms.Padding(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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDfoErr1.Size = new System.Drawing.Size(169, 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(174, 196);
-            this.txtEphVelErr1.Margin = new System.Windows.Forms.Padding(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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtEphVelErr1.Size = new System.Drawing.Size(169, 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(2, 240);
-            this.txtFu1.Margin = new System.Windows.Forms.Padding(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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtFu1.Size = new System.Drawing.Size(168, 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(174, 240);
-            this.txtFu2.Margin = new System.Windows.Forms.Padding(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, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtFu2.Size = new System.Drawing.Size(169, 22);
+            this.txtFu2.Size = new System.Drawing.Size(241, 34);
             this.txtFu2.StyleController = this.layoutControl1;
             this.txtFu2.TabIndex = 16;
             // 
@@ -332,9 +328,10 @@
             this.layoutControlItem14,
             this.layoutControlItem6,
             this.layoutControlItem7,
-            this.layoutControlItem12});
+            this.layoutControlItem12,
+            this.btnClose});
             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
@@ -343,69 +340,69 @@
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(345, 44);
+            this.layoutControlItem8.Size = new System.Drawing.Size(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.txtTleLeo2;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 44);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 70);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(345, 44);
+            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, 88);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 140);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(172, 44);
+            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, 176);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 280);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(172, 44);
+            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, 264);
+            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, 296);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 467);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(345, 261);
+            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, 264);
+            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, 10);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem4
@@ -413,74 +410,93 @@
             this.layoutControlItem4.Control = this.txtDtousErr1;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 132);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 210);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(172, 44);
+            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.CustomizationFormText = "目标上行频点";
-            this.layoutControlItem10.Location = new System.Drawing.Point(0, 220);
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 350);
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(172, 44);
+            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, 88);
+            this.layoutControlItem14.Location = new System.Drawing.Point(246, 140);
             this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(173, 44);
+            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, 132);
+            this.layoutControlItem6.Location = new System.Drawing.Point(246, 210);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(173, 44);
+            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, 176);
+            this.layoutControlItem7.Location = new System.Drawing.Point(246, 280);
             this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(173, 44);
+            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.CustomizationFormText = "参考上行频点";
-            this.layoutControlItem12.Location = new System.Drawing.Point(172, 220);
+            this.layoutControlItem12.Location = new System.Drawing.Point(246, 350);
             this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(173, 44);
+            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);
+            // 
+            // simpleButton1
+            // 
+            this.simpleButton1.Location = new System.Drawing.Point(3, 432);
+            this.simpleButton1.Name = "simpleButton1";
+            this.simpleButton1.Size = new System.Drawing.Size(240, 32);
+            this.simpleButton1.StyleController = this.layoutControl1;
+            this.simpleButton1.TabIndex = 17;
+            this.simpleButton1.Text = "simpleButton1";
+            // 
+            // btnClose
+            // 
+            this.btnClose.Control = this.simpleButton1;
+            this.btnClose.Location = new System.Drawing.Point(0, 429);
+            this.btnClose.Name = "btnClose";
+            this.btnClose.Size = new System.Drawing.Size(246, 38);
+            this.btnClose.Text = "关闭";
+            this.btnClose.TextSize = new System.Drawing.Size(0, 0);
+            this.btnClose.TextVisible = false;
             // 
             // 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);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties.CalendarTimeProperties)).EndInit();
@@ -510,6 +526,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.btnClose)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -543,5 +560,7 @@
         private DevExpress.XtraEditors.ButtonEdit txtFu2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraEditors.SimpleButton simpleButton1;
+        private DevExpress.XtraLayout.LayoutControlItem btnClose;
     }
 }

+ 1 - 0
XzDw.App/XzDw.App.csproj

@@ -281,6 +281,7 @@
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="UserControl\CtrlPosSingle.resx">
       <DependentUpon>CtrlPosSingle.cs</DependentUpon>
     </EmbeddedResource>