111

Service/Test/Program.cs

@@ -18,7 +18,7 @@ namespace Test
             Directory.CreateDirectory("tmp2");
             int count = 0;
             var copyFreqsArr = ConfigurationManager.AppSettings["CopyFreqs"].Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
-            List<double> listFreqs=copyFreqsArr.Select(p=>Convert.ToDouble(p.Trim())).ToList();
+            List<double> listFreqs = copyFreqsArr.Select(p => Convert.ToDouble(p.Trim())).ToList();
             foreach (var dir in dirs)
             {
                 bool contains = false;
@@ -26,7 +26,7 @@ namespace Test
                 {
                     if (dir.Contains(item.ToString()))
                     {
-                        contains= true;
+                        contains = true;
                         break;
                     }
                 }
@@ -43,8 +43,9 @@ namespace Test
                     if (File.Exists(adFile1))
                     {
                         if (File.Exists($"tmp1\\{Path.GetFileName(dir)}")) continue;
-                        Console.WriteLine($"正在拷贝第{count+1}组文件...");
+                        Console.WriteLine($"正在拷贝第{count + 1}组文件...");
                         File.Copy(dir, $"tmp1\\{Path.GetFileName(dir)}");
+                        if (File.Exists($"tmp2\\{Path.GetFileName(adFile1)}")) continue;
                         File.Copy(adFile1, $"tmp2\\{Path.GetFileName(adFile1)}");
                         File.Copy(adFile2, $"tmp2\\{Path.GetFileName(adFile2)}");
                         File.Copy(adFile3, $"tmp2\\{Path.GetFileName(adFile3)}");

Service/X1LeoTaskServer54/Service/TaskService.cs

@@ -381,7 +381,14 @@ namespace X1LeoTaskServer54.Service
             {
                
                 var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X1Leo", dto);
-                errRes = errResRsp.data;
+                if (errResRsp.code != 200)
+                {
+                    await LogHelper.Error(errResRsp.msg);
+                }
+                else
+                {
+                    errRes = errResRsp.data;
+                }
             }
             return errRes;
         }

Service/X2D1TaskServer54/Service/TaskService.cs

@@ -1,4 +1,5 @@
-using System;
+using DPP_YH_Core.Extensions;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Diagnostics;
@@ -338,8 +339,15 @@ namespace X2D1NoRefTaskServer54.Service
                                                         DtoErrus = DtoErrus,
                                                         EphErr = EphErrm,
                                                     };
-                                                    var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X2D1", errDto);
-                                                    errRes = errResRsp.data;
+                                                    var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X2D1NoRef", errDto);
+                                                    if (errResRsp.code != 200)
+                                                    {
+                                                        await LogHelper.Error(errResRsp.msg);
+                                                    }
+                                                    else
+                                                    {
+                                                        errRes = errResRsp.data;
+                                                    }
                                                 }
                                                 StringBuilder sb = new StringBuilder();
                                                 sb.Append($"{x21d.SigTime:yyyy}\t");

Service/X2LeoTaskServer54/Service/TaskService.cs

@@ -422,7 +422,14 @@ namespace X2LeoTaskServer54.Service
             {
 
                 var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X2Leo", dto);
-                errRes = errResRsp.data;
+                if (errResRsp.code != 200)
+                {
+                    await LogHelper.Error(errResRsp.msg);
+                }
+                else
+                {
+                    errRes = errResRsp.data;
+                }
             }
             return errRes;
         }

Service/X3LeoTaskServer54/Service/TaskService.cs

@@ -381,7 +381,14 @@ namespace X3LeoTaskServer54.Service
             {
 
                 var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X3Leo", dto);
-                errRes = errResRsp.data;
+                if (errResRsp.code != 200)
+                {
+                    await LogHelper.Error(errResRsp.msg);
+                }
+                else
+                {
+                    errRes = errResRsp.data;
+                }
             }
             return errRes;
         }

Service/X3TaskServer54/Service/TaskService.cs

@@ -315,7 +315,14 @@ namespace X3TaskServer54.Service
                                                     //{
                                                     //};
                                                     //var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X3", errDto);
-                                                    //errRes = errResRsp.data;
+                                                    //if (errResRsp.code != 200)
+                                                    //{
+                                                    //    await LogHelper.Error(errResRsp.msg);
+                                                    //}
+                                                    //else
+                                                    //{
+                                                    //    errRes = errResRsp.data;
+                                                    //}
                                                 }
                                                 StringBuilder sb = new StringBuilder();
                                                 sb.Append($"{x3.SigTime:yyyy}\t");

XdCxRhDW.Api/AddIns/定位/PosApi.cs

@@ -204,8 +204,25 @@ namespace XdCxRhDW.Api
             double[] zone = new double[] { -85, 85, -180, 180 }; //定位区域
             double[] res = new double[6];
             X2D1_Pos20240305_Core(mainSat, adjaSat, cdbStation, satStation, satStation, satStation, satStation, satStation, refStation, zone, dto1, dtoCdb, ybDto1, ybDto2, res);
-            ConvertToGeoPoint(res);
             var posRes = ConvertToGeoPoint(res);//精确搜索值
+            if (HasMirror(res))
+            {
+                var d1 = PhysicsHelper.DistanceArcGeo((cdbStation[0], cdbStation[1]), (posRes[0], posRes[1]));
+                var d2 = PhysicsHelper.DistanceArcGeo((cdbStation[0], cdbStation[1]), (posRes[3], posRes[4]));
+                if (d2 < 500 && d1 > 500)
+                {
+                    var p0 = posRes[0];
+                    var p1 = posRes[1];
+                    var p2 = posRes[2];
+                    posRes[0] = posRes[3];
+                    posRes[1] = posRes[4];
+                    posRes[2] = posRes[5];
+                    posRes[3] = p0;
+                    posRes[4] = p1;
+                    posRes[5] = p2;
+
+                }
+            }
             if (CalcConfidence && IsGeoPoint2(posRes))
             {
                 var posResGz = X2D1_GzPos(cgRes, sRes);
@@ -268,8 +285,25 @@ namespace XdCxRhDW.Api
             double[] zone = new double[] { -85, 85, -180, 180 }; //定位区域
             double[] res = new double[6];
             X2D1_PosNoRef20240305_Core(mainSat, adjaSat, cdbStation, satStation, satStation, satStation, zone, dto1, dtoCdb, res);
-            ConvertToGeoPoint(res);
             var posRes = ConvertToGeoPoint(res);
+            if (HasMirror(res))
+            {
+                var d1 = PhysicsHelper.DistanceArcGeo((cdbStation[0], cdbStation[1]), (posRes[0], posRes[1]));
+                var d2 = PhysicsHelper.DistanceArcGeo((cdbStation[0], cdbStation[1]), (posRes[3], posRes[4]));
+                if (d2 < 500 && d1 > 500)
+                {
+                    var p0 = posRes[0];
+                    var p1 = posRes[1];
+                    var p2 = posRes[2];
+                    posRes[0] = posRes[3];
+                    posRes[1] = posRes[4];
+                    posRes[2] = posRes[5];
+                    posRes[3] = p0;
+                    posRes[4] = p1;
+                    posRes[5] = p2;
+
+                }
+            }
             if (CalcConfidence && IsGeoPoint2(posRes))
             {
                 int succeedCount = 0;
@@ -783,7 +817,11 @@ namespace XdCxRhDW.Api
             return posRes;
         }
 
-
+        private static bool HasMirror(double[] res)
+        {
+            if (res.Contains(999)) return false;
+            return true;
+        }
         private static double[] ConvertToGeoPoint(double[] res)
         {
             if (res == null || res.Length == 0)
@@ -832,6 +870,8 @@ namespace XdCxRhDW.Api
                 listNew.Add(-1);
                 list = listNew.ToArray();
             }
+
+
             return list;
         }
 

XdCxRhDW.App/App.config

@@ -18,7 +18,7 @@
 		<add key="UseMapCluster" value="0" />
 
 		<!--两星一地无参定位算法使用新算法-->
-		<add key="UseNewPosX2D1NoRef" value="1" />
+		<add key="UseNewPosX2D1NoRef" value="0" />
 
 		<!--GDOP使用最新的版本  1:使用-->
 		<add key="UseNewGDOP" value="1" />

XdCxRhDW.App/EditForms/X2D1EllipesEditor.Designer.cs

@@ -29,16 +29,21 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.txtSigTime = new DevExpress.XtraEditors.DateEdit();
             this.txtsatStation = new DevExpress.XtraEditors.TextEdit();
@@ -48,10 +53,7 @@
             this.btnEphCalc = new DevExpress.XtraEditors.SimpleButton();
             this.txtDtousErr1 = new DevExpress.XtraEditors.ButtonEdit();
             this.txtSatLocErr1 = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtPE = new DevExpress.XtraEditors.TextEdit();
             this.txtPosLocation = new DevExpress.XtraEditors.TextEdit();
-            this.txtEphMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
-            this.txtEphAdja = new XdCxRhDW.App.UserControl.UCEphXYZ();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -63,12 +65,15 @@
             this.txtPosRes = new DevExpress.XtraLayout.SimpleLabelItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
+            this.txtEphMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
+            this.txtEphAdja = new XdCxRhDW.App.UserControl.UCEphXYZ();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
+            this.txtPe = new DevExpress.XtraEditors.ButtonEdit();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtSigTime.Properties)).BeginInit();
@@ -78,7 +83,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtPE.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosLocation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
@@ -91,12 +95,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtPe.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -109,16 +114,16 @@
             this.layoutControl1.Controls.Add(this.btnEphCalc);
             this.layoutControl1.Controls.Add(this.txtDtousErr1);
             this.layoutControl1.Controls.Add(this.txtSatLocErr1);
-            this.layoutControl1.Controls.Add(this.txtPE);
             this.layoutControl1.Controls.Add(this.txtPosLocation);
             this.layoutControl1.Controls.Add(this.txtEphMain);
             this.layoutControl1.Controls.Add(this.txtEphAdja);
+            this.layoutControl1.Controls.Add(this.txtPe);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(831, 101, 650, 400);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(444, 349);
+            this.layoutControl1.Size = new System.Drawing.Size(462, 358);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -136,7 +141,7 @@
             this.txtSigTime.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
             this.txtSigTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.txtSigTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
-            this.txtSigTime.Size = new System.Drawing.Size(418, 20);
+            this.txtSigTime.Size = new System.Drawing.Size(436, 20);
             this.txtSigTime.StyleController = this.layoutControl1;
             this.txtSigTime.TabIndex = 9;
             // 
@@ -147,7 +152,7 @@
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Size = new System.Drawing.Size(100, 20);
+            this.txtsatStation.Size = new System.Drawing.Size(104, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
             this.txtsatStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -155,11 +160,11 @@
             // txtcdbStation
             // 
             this.txtcdbStation.EditValue = "";
-            this.txtcdbStation.Location = new System.Drawing.Point(118, 29);
+            this.txtcdbStation.Location = new System.Drawing.Point(122, 29);
             this.txtcdbStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtcdbStation.Name = "txtcdbStation";
             this.txtcdbStation.Properties.AutoHeight = false;
-            this.txtcdbStation.Size = new System.Drawing.Size(102, 20);
+            this.txtcdbStation.Size = new System.Drawing.Size(107, 20);
             this.txtcdbStation.StyleController = this.layoutControl1;
             this.txtcdbStation.TabIndex = 10;
             this.txtcdbStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -167,18 +172,18 @@
             // txtRefLocation
             // 
             this.txtRefLocation.EditValue = "";
-            this.txtRefLocation.Location = new System.Drawing.Point(330, 29);
+            this.txtRefLocation.Location = new System.Drawing.Point(343, 29);
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Size = new System.Drawing.Size(100, 20);
+            this.txtRefLocation.Size = new System.Drawing.Size(105, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
             this.txtRefLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             // 
             // btnEllipes
             // 
-            this.btnEllipes.Location = new System.Drawing.Point(334, 253);
+            this.btnEllipes.Location = new System.Drawing.Point(352, 252);
             this.btnEllipes.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnEllipes.Name = "btnEllipes";
             this.btnEllipes.Size = new System.Drawing.Size(96, 22);
@@ -189,7 +194,7 @@
             // 
             // btnEphCalc
             // 
-            this.btnEphCalc.Location = new System.Drawing.Point(226, 253);
+            this.btnEphCalc.Location = new System.Drawing.Point(244, 252);
             this.btnEphCalc.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnEphCalc.Name = "btnEphCalc";
             this.btnEphCalc.Size = new System.Drawing.Size(96, 22);
@@ -209,8 +214,8 @@
             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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtousErr1.Size = new System.Drawing.Size(99, 22);
+            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(139, 22);
             this.txtDtousErr1.StyleController = this.layoutControl1;
             this.txtDtousErr1.TabIndex = 6;
             this.txtDtousErr1.ToolTip = "时差误差";
@@ -218,87 +223,63 @@
             // txtSatLocErr1
             // 
             this.txtSatLocErr1.EditValue = "10000";
-            this.txtSatLocErr1.Location = new System.Drawing.Point(121, 217);
+            this.txtSatLocErr1.Location = new System.Drawing.Point(161, 217);
             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.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(99, 22);
+            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(139, 22);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
             this.txtSatLocErr1.ToolTip = "星历位置误差";
             // 
-            // txtPE
-            // 
-            this.txtPE.EditValue = "0.5";
-            this.txtPE.Location = new System.Drawing.Point(228, 217);
-            this.txtPE.MaximumSize = new System.Drawing.Size(0, 20);
-            this.txtPE.Name = "txtPE";
-            this.txtPE.Properties.AutoHeight = false;
-            this.txtPE.Size = new System.Drawing.Size(204, 20);
-            this.txtPE.StyleController = this.layoutControl1;
-            this.txtPE.TabIndex = 10;
-            this.txtPE.ToolTip = "范围0-1";
-            // 
             // txtPosLocation
             // 
             this.txtPosLocation.EditValue = "";
-            this.txtPosLocation.Location = new System.Drawing.Point(224, 29);
+            this.txtPosLocation.Location = new System.Drawing.Point(233, 29);
             this.txtPosLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtPosLocation.Name = "txtPosLocation";
             this.txtPosLocation.Properties.AutoHeight = false;
-            this.txtPosLocation.Size = new System.Drawing.Size(100, 20);
+            this.txtPosLocation.Size = new System.Drawing.Size(104, 20);
             this.txtPosLocation.StyleController = this.layoutControl1;
             this.txtPosLocation.TabIndex = 10;
             this.txtPosLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             // 
-            // txtEphMain
-            // 
-            this.txtEphMain.Location = new System.Drawing.Point(12, 104);
-            this.txtEphMain.Name = "txtEphMain";
-            this.txtEphMain.Size = new System.Drawing.Size(420, 44);
-            this.txtEphMain.TabIndex = 13;
-            // 
-            // txtEphAdja
-            // 
-            this.txtEphAdja.Location = new System.Drawing.Point(12, 152);
-            this.txtEphAdja.Name = "txtEphAdja";
-            this.txtEphAdja.Size = new System.Drawing.Size(420, 44);
-            this.txtEphAdja.TabIndex = 13;
-            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.emptySpaceItem3,
             this.layoutControlItem14,
             this.layoutControlItem9,
             this.layoutControlItem10,
             this.itemSigTime,
-            this.layoutControlItem17,
-            this.layoutControlItem5,
             this.txtPosRes,
             this.layoutControlItem2,
             this.layoutControlItem6,
-            this.layoutControlItem7,
             this.emptySpaceItem1,
             this.layoutControlItem4,
             this.layoutControlItem1,
-            this.layoutControlItem8});
+            this.layoutControlItem8,
+            this.emptySpaceItem3,
+            this.layoutControlItem5,
+            this.layoutControlItem17,
+            this.layoutControlItem3});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(444, 349);
+            this.Root.Size = new System.Drawing.Size(462, 358);
             this.Root.TextVisible = false;
             // 
             // emptySpaceItem3
             // 
             this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 234);
+            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 233);
+            this.emptySpaceItem3.MinSize = new System.Drawing.Size(104, 24);
             this.emptySpaceItem3.Name = "emptySpaceItem3";
-            this.emptySpaceItem3.Size = new System.Drawing.Size(214, 33);
+            this.emptySpaceItem3.Size = new System.Drawing.Size(232, 33);
+            this.emptySpaceItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem14
@@ -310,7 +291,7 @@
             this.layoutControlItem14.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem14.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(106, 46);
+            this.layoutControlItem14.Size = new System.Drawing.Size(110, 46);
             this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem14.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
             this.layoutControlItem14.Text = "接收站经纬度";
@@ -322,11 +303,11 @@
             this.layoutControlItem9.Control = this.txtcdbStation;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem9.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem9.Location = new System.Drawing.Point(106, 0);
+            this.layoutControlItem9.Location = new System.Drawing.Point(110, 0);
             this.layoutControlItem9.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem9.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(106, 46);
+            this.layoutControlItem9.Size = new System.Drawing.Size(111, 46);
             this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem9.Text = "超短波经纬度";
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
@@ -337,11 +318,11 @@
             this.layoutControlItem10.Control = this.txtRefLocation;
             this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem10.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem10.Location = new System.Drawing.Point(318, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(331, 0);
             this.layoutControlItem10.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem10.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(106, 46);
+            this.layoutControlItem10.Size = new System.Drawing.Size(111, 46);
             this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem10.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.layoutControlItem10.Text = "参考站经纬度";
@@ -355,7 +336,7 @@
             this.itemSigTime.MaxSize = new System.Drawing.Size(0, 46);
             this.itemSigTime.MinSize = new System.Drawing.Size(76, 46);
             this.itemSigTime.Name = "itemSigTime";
-            this.itemSigTime.Size = new System.Drawing.Size(424, 46);
+            this.itemSigTime.Size = new System.Drawing.Size(442, 46);
             this.itemSigTime.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.itemSigTime.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.itemSigTime.Text = "信号时间";
@@ -367,7 +348,7 @@
             this.layoutControlItem17.Control = this.btnEllipes;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(314, 234);
+            this.layoutControlItem17.Location = new System.Drawing.Point(332, 233);
             this.layoutControlItem17.MaxSize = new System.Drawing.Size(110, 0);
             this.layoutControlItem17.MinSize = new System.Drawing.Size(110, 33);
             this.layoutControlItem17.Name = "layoutControlItem17";
@@ -384,7 +365,7 @@
             this.layoutControlItem5.Control = this.btnEphCalc;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem5.Location = new System.Drawing.Point(214, 234);
+            this.layoutControlItem5.Location = new System.Drawing.Point(232, 233);
             this.layoutControlItem5.MaxSize = new System.Drawing.Size(100, 33);
             this.layoutControlItem5.MinSize = new System.Drawing.Size(100, 33);
             this.layoutControlItem5.Name = "layoutControlItem5";
@@ -398,11 +379,11 @@
             // txtPosRes
             // 
             this.txtPosRes.AllowHotTrack = false;
-            this.txtPosRes.Location = new System.Drawing.Point(0, 267);
-            this.txtPosRes.MaxSize = new System.Drawing.Size(0, 24);
-            this.txtPosRes.MinSize = new System.Drawing.Size(126, 24);
+            this.txtPosRes.Location = new System.Drawing.Point(0, 266);
+            this.txtPosRes.MaxSize = new System.Drawing.Size(0, 30);
+            this.txtPosRes.MinSize = new System.Drawing.Size(113, 30);
             this.txtPosRes.Name = "txtPosRes";
-            this.txtPosRes.Size = new System.Drawing.Size(424, 24);
+            this.txtPosRes.Size = new System.Drawing.Size(442, 30);
             this.txtPosRes.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.txtPosRes.Text = " ";
             this.txtPosRes.TextSize = new System.Drawing.Size(72, 14);
@@ -413,8 +394,11 @@
             this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem2.CustomizationFormText = "低轨卫星X";
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 188);
+            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 45);
+            this.layoutControlItem2.MinSize = new System.Drawing.Size(117, 45);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(107, 46);
+            this.layoutControlItem2.Size = new System.Drawing.Size(147, 45);
+            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem2.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
             this.layoutControlItem2.Text = "时差误差";
             this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
@@ -425,37 +409,24 @@
             this.layoutControlItem6.Control = this.txtSatLocErr1;
             this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem6.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem6.Location = new System.Drawing.Point(107, 188);
+            this.layoutControlItem6.Location = new System.Drawing.Point(147, 188);
+            this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 45);
+            this.layoutControlItem6.MinSize = new System.Drawing.Size(117, 45);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(107, 46);
+            this.layoutControlItem6.Size = new System.Drawing.Size(147, 45);
+            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
             this.layoutControlItem6.Text = "星历误差";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txtPE;
-            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem7.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem7.Location = new System.Drawing.Point(214, 188);
-            this.layoutControlItem7.MaxSize = new System.Drawing.Size(0, 46);
-            this.layoutControlItem7.MinSize = new System.Drawing.Size(77, 46);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(210, 46);
-            this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem7.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
-            this.layoutControlItem7.Text = "概率";
-            this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
-            // 
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 291);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 296);
             this.emptySpaceItem1.MinSize = new System.Drawing.Size(104, 24);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(424, 38);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(442, 42);
             this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
@@ -464,17 +435,35 @@
             this.layoutControlItem4.Control = this.txtPosLocation;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "定位点";
-            this.layoutControlItem4.Location = new System.Drawing.Point(212, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(221, 0);
             this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem4.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(106, 46);
+            this.layoutControlItem4.Size = new System.Drawing.Size(110, 46);
             this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem4.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.layoutControlItem4.Text = "定位点";
             this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
             // 
+            // dxErrorProvider
+            // 
+            this.dxErrorProvider.ContainerControl = this;
+            // 
+            // txtEphMain
+            // 
+            this.txtEphMain.Location = new System.Drawing.Point(12, 104);
+            this.txtEphMain.Name = "txtEphMain";
+            this.txtEphMain.Size = new System.Drawing.Size(438, 44);
+            this.txtEphMain.TabIndex = 13;
+            // 
+            // txtEphAdja
+            // 
+            this.txtEphAdja.Location = new System.Drawing.Point(12, 152);
+            this.txtEphAdja.Name = "txtEphAdja";
+            this.txtEphAdja.Size = new System.Drawing.Size(438, 44);
+            this.txtEphAdja.TabIndex = 13;
+            // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.txtEphMain;
@@ -484,7 +473,7 @@
             this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 48);
             this.layoutControlItem1.MinSize = new System.Drawing.Size(166, 48);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(424, 48);
+            this.layoutControlItem1.Size = new System.Drawing.Size(442, 48);
             this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem1.Text = "layoutControlItem4";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
@@ -499,15 +488,43 @@
             this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 48);
             this.layoutControlItem8.MinSize = new System.Drawing.Size(166, 48);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(424, 48);
+            this.layoutControlItem8.Size = new System.Drawing.Size(442, 48);
             this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem8.Text = "layoutControlItem4";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem8.TextVisible = false;
             // 
-            // dxErrorProvider
-            // 
-            this.dxErrorProvider.ContainerControl = this;
+            // txtPe
+            // 
+            this.txtPe.EditValue = "0.5";
+            this.txtPe.Location = new System.Drawing.Point(308, 217);
+            this.txtPe.Margin = new System.Windows.Forms.Padding(2);
+            this.txtPe.MaximumSize = new System.Drawing.Size(0, 22);
+            this.txtPe.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtPe.Name = "txtPe";
+            this.txtPe.Properties.AutoHeight = false;
+            this.txtPe.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtPe.Size = new System.Drawing.Size(140, 22);
+            this.txtPe.StyleController = this.layoutControl1;
+            this.txtPe.TabIndex = 6;
+            this.txtPe.ToolTip = "范围(0-1)";
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txtPe;
+            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem3.CustomizationFormText = "概率";
+            this.layoutControlItem3.Location = new System.Drawing.Point(294, 188);
+            this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 45);
+            this.layoutControlItem3.MinSize = new System.Drawing.Size(117, 45);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(148, 45);
+            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem3.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
+            this.layoutControlItem3.Text = "概率";
+            this.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
             // 
             // X2D1EllipesEditor
             // 
@@ -515,7 +532,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.layoutControl1);
             this.Name = "X2D1EllipesEditor";
-            this.Size = new System.Drawing.Size(444, 349);
+            this.Size = new System.Drawing.Size(462, 358);
             this.Load += new System.EventHandler(this.X2D1DTOParamEditor_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
@@ -526,7 +543,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtPE.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosLocation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
@@ -539,12 +555,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtPe.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -572,8 +589,6 @@
         private DevExpress.XtraEditors.ButtonEdit txtSatLocErr1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraEditors.TextEdit txtPE;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
         private DevExpress.XtraEditors.TextEdit txtPosLocation;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
@@ -581,5 +596,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private UserControl.UCEphXYZ txtEphAdja;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraEditors.ButtonEdit txtPe;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
     }
 }

XdCxRhDW.App/EditForms/X2D1EllipesEditor.cs

@@ -61,6 +61,7 @@ namespace XdCxRhDW.App.EditForms
                 txtRefLocation.Properties.ReadOnly = true;
                 this.txtRefLocation.Text = $"{0},{0}";
             }
+            this.txtPosLocation.Text = $"{info.PosLon},{info.PosLat}";
 
         }
 
@@ -115,7 +116,7 @@ namespace XdCxRhDW.App.EditForms
                     PosLat = pos[1],
                     DtoErrus = Convert.ToDouble(txtDtousErr1.Text),
                     EphErr = Convert.ToDouble(txtSatLocErr1.Text),
-                    Pe = Convert.ToDouble(txtPE.Text),
+                    Pe = Convert.ToDouble(txtPe.Text),
                     OutputErrPoint = true,
                 };
                 AjaxResult<ErrEllipseResDto> rsp;
@@ -141,8 +142,8 @@ namespace XdCxRhDW.App.EditForms
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"绘制{info.PosResType.GetEnumDisplayName()}时差线失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"绘制{info.PosResType.GetEnumDisplayName()}时差线失败,{ex.Message}");
+                Serilog.Log.Error(ex, $"绘制{info.PosResType.GetEnumDisplayName()}误差椭圆失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"绘制{info.PosResType.GetEnumDisplayName()}误差椭圆失败,{ex.Message}");
             }
         }
 

XdCxRhDW.DataEmulation/Form1.cs

@@ -71,8 +71,12 @@ namespace XdCxRhDW.DataEmulation
             btnBuilder.Enabled = false;
             await Task.Run(() =>
             {
-                DataEmulationHelper.GenSignalsFile(file1, file2, fsHz, (int)(sigTimeLen * 1000), dt / 1e6, df, (int)snr1, (int)snr2);
-                DataEmulationHelper.GenNoizesFile(Path.GetFileNameWithoutExtension(file1) + "_Noize.dat", fsHz, (int)(sigTimeLen * 1000), 400);
+                DataEmulationHelper.GenSignalsFile(file1, file2, fsHz, 100, dt / 1e6, df, (int)snr1, (int)snr2);
+                DataEmulationHelper.GenNoizesFile(Path.GetFileNameWithoutExtension(file1) + "_Noize.dat", fsHz, 1000, 400);
+                File.ReadAllBytes(file1);
+                var data1 = File.ReadAllBytes(file1);
+                var data2 = File.ReadAllBytes(file2);
+                var dataNoize
             });
             btnBuilder.Enabled = true;
         }

XdCxRhDw.Dto/ErrEllipseX2D1Dto.cs

@@ -122,7 +122,7 @@ namespace XdCxRhDW.Dto
         /// 概率(0-1)
         /// </summary>
         [RangeDouble(0, 1)]
-        public double Pe { get; set; }
+        public double Pe { get; set; } = 0.5;
 
         /// <summary>
         /// 是否输出椭圆位置信息