11

Service/X1LeoTaskServer54/Service/TaskService.cs

@@ -380,7 +380,7 @@ namespace X1LeoTaskServer54.Service
             if (posLon != 0 && posLat != 0 && posLon != 999 && posLat != 999)
             {
                
-                var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "DetectCg/ErrorEllipseX1Leo", dto);
+                var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X1Leo", dto);
                 errRes = errResRsp.data;
             }
             return errRes;

Service/X2D1TaskServer54/Service/TaskService.cs

@@ -338,7 +338,7 @@ namespace X2D1NoRefTaskServer54.Service
                                                         DtoErrus = DtoErrus,
                                                         EphErr = EphErrm,
                                                     };
-                                                    var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "DetectCg/ErrorEllipse2X1DNoRef", errDto);
+                                                    var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X2D1", errDto);
                                                     errRes = errResRsp.data;
                                                 }
                                                 StringBuilder sb = new StringBuilder();

Service/X2LeoTaskServer54/Service/TaskService.cs

@@ -421,7 +421,7 @@ namespace X2LeoTaskServer54.Service
             if (posLon != 0 && posLat != 0 && posLon != 999 && posLat != 999)
             {
 
-                var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "DetectCg/ErrorEllipseX2Leo", dto);
+                var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X2Leo", dto);
                 errRes = errResRsp.data;
             }
             return errRes;

Service/X3LeoTaskServer54/Service/TaskService.cs

@@ -380,7 +380,7 @@ namespace X3LeoTaskServer54.Service
             if (posLon != 0 && posLat != 0 && posLon != 999 && posLat != 999)
             {
 
-                var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "DetectCg/ErrorEllipseX1Leo", dto);
+                var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X3Leo", dto);
                 errRes = errResRsp.data;
             }
             return errRes;

Service/X3TaskServer54/Service/TaskService.cs

@@ -308,6 +308,15 @@ namespace X3TaskServer54.Service
                                                     posLon = 0;
                                                     posLat = 0;
                                                 }
+                                                ErrEllipseResDto errRes = new ErrEllipseResDto();
+                                                if (posLon != 0 && posLat != 0 && posLon != 999 && posLat != 999)
+                                                {
+                                                    //var errDto = new ErrorEllipseLeoX3Dto()
+                                                    //{
+                                                    //};
+                                                    //var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X3", errDto);
+                                                    //errRes = errResRsp.data;
+                                                }
                                                 StringBuilder sb = new StringBuilder();
                                                 sb.Append($"{x3.SigTime:yyyy}\t");
                                                 sb.Append($"{x3.SigTime:MM}\t");

XdCxRhDW.Api/AddIns/GDOP误差椭圆/ErrEllipseHepler.cs

@@ -20,8 +20,8 @@ namespace XdCxRhDW.Api
         /// <summary>
         /// 两星一地带参误差椭圆
         /// </summary>
-        /// <param name="main_eph">主星星历 长度6</param>
-        /// <param name="neigh_eph">邻星星历 长度6</param>
+        /// <param name="main_eph">主星星历 长度3</param>
+        /// <param name="neigh_eph">邻星星历 长度3</param>
         /// <param name="cdbAnt">超短站位置 长度3</param>
         /// <param name="refStation">参考站位置 长度3</param>
         /// <param name="Select_Point">定位点经纬高 长度3</param>
@@ -37,8 +37,8 @@ namespace XdCxRhDW.Api
         /// <summary>
         /// 两星一地误差椭圆
         /// </summary>
-        /// <param name="main_eph">主星位置 长度6</param>
-        /// <param name="neigh_eph">邻星位置 长度6</param>
+        /// <param name="main_eph">主星位置 长度3</param>
+        /// <param name="neigh_eph">邻星位置 长度3</param>
         /// <param name="cdbAnt">超短波 长度3</param>
         /// <param name="refStation">参考站 长度3</param>
         /// <param name="Select_Point">定位点 长度3</param>
@@ -48,27 +48,34 @@ namespace XdCxRhDW.Api
         /// <param name="LOP_Len"></param>
         /// <returns></returns>
         [DllImport(ErrellipDll, EntryPoint = "Error_Ellipse_2X1D_NoRef", CallingConvention = CallingConvention.Cdecl)]
-        private extern static IntPtr Error_Ellipse_2X1D_NoRef(double[] main_eph, double[] neigh_eph, double[] cdbAnt,  double[] Select_Point, double dto_err,
+        private extern static IntPtr Error_Ellipse_2X1D_NoRef(double[] main_eph, double[] neigh_eph, double[] cdbAnt, double[] Select_Point, double dto_err,
         double eph_err, double Pe, ref int LOP_Len);
 
         /// <summary>
         /// 两星一地带参误差椭圆
         /// </summary>
-        /// <param name="posLon"></param>
-        /// <param name="posLat"></param>
-        /// <param name="mainEph"></param>
-        /// <param name="adajEph"></param>
-        /// <param name="cdbPos"></param>
-        /// <param name="RefGeod"></param>
-        /// <param name="DtoErrus"></param>
-        /// <param name="EphErrm"></param>
-        /// <param name="outputErrPoint"></param>
+        /// <param name="posLon">定位点经度</param>
+        /// <param name="posLat">定位点纬度</param>
+        /// <param name="mainEph">主星xyz,长度=3</param>
+        /// <param name="adajEph">邻星xyz,长度=3</param>
+        /// <param name="cdbPos">超短波位置(长度=2或3)</param>
+        /// <param name="RefGeod">参考站位置(长度=2或3)</param>
+        /// <param name="DtoErrus">时差误差(us)</param>
+        /// <param name="EphErrm">星历误差(m)</param>
+        /// <param name="outputErrPoint">是否输出椭圆Geo点</param>
+        /// <param name="pe">概率(范围0-1，默认0.5)</param>
         /// <returns></returns>
-        public static ErrEllipseResDto ErrorEllipse2X1D(double posLon, double posLat, double[] mainEph, double[] adajEph, double[] cdbPos, double[] RefGeod, double DtoErrus, double EphErrm, bool outputErrPoint)
+        public static ErrEllipseResDto ErrorEllipse2X1D(double posLon, double posLat, double[] mainEph, double[] adajEph, double[] cdbPos, double[] RefGeod, double DtoErrus, double EphErrm, bool outputErrPoint, double pe = 0.5)
         {
-            //IEnumerable<double> res = new List<double>();
+            if (cdbPos.Length == 2)
+            {
+                cdbPos = cdbPos.Concat(new double[1] { 0 }).ToArray();
+            }
+            if (RefGeod.Length == 2)
+            {
+                RefGeod = RefGeod.Concat(new double[1] { 0 }).ToArray();
+            }
             int LOP_Len = 0;
-            double Pe = 0.5;
             IntPtr LOP_ValuePtr = Error_Ellipse_2X1D(
                    mainEph,
                    adajEph,
@@ -77,7 +84,7 @@ namespace XdCxRhDW.Api
                     new double[3] { posLon, posLat, 0 },
                     DtoErrus * 1e-6,
                     EphErrm,//单位m
-                    Pe, ref LOP_Len);
+                    pe, ref LOP_Len);
             double[] LOP_Value = new double[LOP_Len];
             if (LOP_Len > 0)
             {
@@ -106,18 +113,22 @@ namespace XdCxRhDW.Api
         /// <summary>
         /// 两星一地无参误差椭圆
         /// </summary>
-        /// <param name="posLon"></param>
-        /// <param name="posLat"></param>
-        /// <param name="mainEph"></param>
-        /// <param name="adajEph"></param>
-        /// <param name="cdbPos"></param>
-        /// <param name="DtoErrus"></param>
-        /// <param name="EphErrm"></param>
-        /// <param name="outputErrPoint"></param>
+        /// <param name="posLon">定位点经度</param>
+        /// <param name="posLat">定位点纬度</param>
+        /// <param name="mainEph">主星xyz,长度=3</param>
+        /// <param name="adajEph">邻星xyz,长度=3</param>
+        /// <param name="cdbPos">超短波位置(长度=2或3)</param>
+        /// <param name="DtoErrus">时差误差(us)</param>
+        /// <param name="EphErrm">星历误差(m)</param>
+        /// <param name="outputErrPoint">是否输出椭圆Geo点</param>
+        /// <param name="pe">概率(范围0-1，默认0.5)</param>
         /// <returns></returns>
-        public static ErrEllipseResDto ErrorEllipse2X1DNoRef(double posLon, double posLat, double[] mainEph, double[] adajEph, double[] cdbPos,  double DtoErrus, double EphErrm, bool outputErrPoint)
+        public static ErrEllipseResDto ErrorEllipse2X1DNoRef(double posLon, double posLat, double[] mainEph, double[] adajEph, double[] cdbPos, double DtoErrus, double EphErrm, bool outputErrPoint,double pe = 0.5)
         {
-            //IEnumerable<double> res = new List<double>();
+            if (cdbPos.Length == 2)
+            {
+                cdbPos = cdbPos.Concat(new double[1] { 0 }).ToArray();
+            }
             int LOP_Len = 0;
             double Pe = 0.5;
             IntPtr LOP_ValuePtr = Error_Ellipse_2X1D_NoRef(

XdCxRhDW.App/Controllers/DetectCgController.cs

@@ -139,118 +139,6 @@ namespace XdCxRhDW.App.Controllers
             await HttpHelper.DownloadFileAsync(svr.BaseHttpAddr, res.data.File, GetLocalFile(res.data.File), dto.TimeoutSeconds);
             return res;
         }
-
-
-        /// <summary>
-        /// 两星一地误差椭圆(带参)
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        public async Task<AjaxResult<ErrEllipseResDto>> ErrorEllipse2X1D(ErrEllipseX2D1Dto dto)
-        {
-            return await Task.Run(() =>
-            {
-                double[] mainEcef = new double[3] { dto.MainX, dto.MainY, dto.MainZ };
-                double[] adjaEcef = new double[3] { dto.AdjaX, dto.AdjaY, dto.AdjaZ };
-                double[] cdbLoc = new double[3] { dto.CdbLon, dto.CdbLat, 0 };
-                double[] refLoc = new double[3] { dto.RefLon, dto.RefLat, 0 };
-                var res = ErrEllipseHepler.ErrorEllipse2X1D(dto.PosLon, dto.PosLat, mainEcef, adjaEcef, cdbLoc, refLoc, dto.DtoErrus, dto.EphErr, dto.OutputErrPoint);
-                return Success(res);
-            });
-        }
-        /// <summary>
-        /// 两星一地误差椭圆(无参)
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        public async Task<AjaxResult<ErrEllipseResDto>> ErrorEllipse2X1DNoRef(ErrEllipseX2D1NoRefDto dto)
-        {
-            return await Task.Run(() =>
-            {
-                double[] mainEcef = new double[3] { dto.MainX, dto.MainY, dto.MainZ };
-                double[] adjaEcef = new double[3] { dto.AdjaX, dto.AdjaY, dto.AdjaZ };
-                double[] cdbLoc = new double[3] { dto.CdbLon, dto.CdbLat, 0 };
-                var res = ErrEllipseHepler.ErrorEllipse2X1DNoRef(dto.PosLon, dto.PosLat, mainEcef, adjaEcef, cdbLoc, dto.DtoErrus, dto.EphErr, dto.OutputErrPoint);
-                return Success(res);
-            });
-        }
-
-        /// <summary>
-        /// 低轨单星带参误差椭圆
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        public async Task<AjaxResult<ErrEllipseResDto>> ErrorEllipseX1Leo(ErrorEllipseLeoX1Dto dto)
-        {
-            return await Task.Run(() =>
-            {
-                ErrorEllipseX1Option option = new ErrorEllipseX1Option();
-                option.MsEph = dto.MsEph;
-                option.NsEph1 = dto.NsEph1;
-                option.NsEph2 = dto.NsEph2;
-                option.SelectPoint = dto.SelectPoint;
-                option.DfoErr = dto.DfoErr;
-                option.EphPosErr = dto.EphPosErr;
-                option.EphVelErr = dto.EphVelErr;
-                option.fu = dto.fu;
-                option.Pe = dto.Pe;
-                var res = LeoErrorEllipseHelper.ErrorEllipseLeoX1(option,dto.OutputErrPoint);
-                return Success(res);
-            });
-        }
-
-        /// <summary>
-        /// 低轨双星带参误差椭圆
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        public async Task<AjaxResult<ErrEllipseResDto>> ErrorEllipseX2Leo(ErrorEllipseLeoX2Dto dto)
-        {
-            return await Task.Run(() =>
-            {
-                ErrorEllipseX2Option option = new ErrorEllipseX2Option();
-                option.MsEph = dto.MsEph;
-                option.NsEph = dto.NsEph;
-                option.RefGeod = dto.RefGeod;
-                option.SelectPoint = dto.SelectPoint;
-                option.DtoErr = dto.DtoErr;
-                option.DfoErr = dto.DfoErr;
-                option.EphPosErr = dto.EphPosErr;
-                option.EphVelErr = dto.EphVelErr;
-                option.fu1 = dto.fu1;
-                option.fu2 = dto.fu2;
-                option.Pe = dto.Pe;
-                var res = LeoErrorEllipseHelper.ErrorEllipseLeoX2(option, dto.OutputErrPoint);
-                return Success(res);
-            });
-        }
-
-
-        /// <summary>
-        /// 低轨三星带参误差椭圆
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        public async Task<AjaxResult<ErrEllipseResDto>> ErrorEllipseX3Leo(ErrorEllipseLeoX3Dto dto)
-        {
-            return await Task.Run(() =>
-            {
-                ErrorEllipseX3Option option = new ErrorEllipseX3Option();
-                option.MsEph = dto.MsEph;
-                option.NsEph1 = dto.NsEph1;
-                option.NsEph2 = dto.NsEph2;
-                option.RefGeod = dto.RefGeod;
-                option.SelectPoint = dto.SelectPoint;
-                option.DtoErr = dto.DtoErr;
-                option.DfoErr = dto.DfoErr;
-                option.EphPosErr = dto.EphPosErr;
-                option.EphVelErr = dto.EphVelErr;
-                option.fu1 = dto.fu1;
-                option.fu2 = dto.fu2;
-                option.Pe = dto.Pe;
-                var res = LeoErrorEllipseHelper.ErrorEllipseLeoX3(option, dto.OutputErrPoint);
-                return Success(res);
-            });
-        }
+       
     }
 }

XdCxRhDW.App/Controllers/EllipseController.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web.Http;
+using DevExpress.Data.Svg;
+using XdCxRhDW.Api;
+using XdCxRhDW.Dto;
+using XdCxRhDW.Entity;
+using XdCxRhDW.Repostory;
+using XdCxRhDW.WebApi;
+
+namespace XdCxRhDW.App.Controllers
+{
+    /// <summary>
+    /// 误差椭圆相关接口
+    /// </summary>
+    public class EllipseController : BaseController
+    {
+        /// <summary>
+        /// 两星一地误差椭圆(带参)
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<AjaxResult<ErrEllipseResDto>> X2D1(ErrEllipseX2D1Dto dto)
+        {
+            return await Task.Run(() =>
+            {
+                double[] mainEcef = new double[3] { dto.MainX, dto.MainY, dto.MainZ };
+                double[] adjaEcef = new double[3] { dto.AdjaX, dto.AdjaY, dto.AdjaZ };
+                double[] cdbLoc = new double[2] { dto.CdbLon, dto.CdbLat };
+                double[] refLoc = new double[2] { dto.RefLon, dto.RefLat };
+                var res = ErrEllipseHepler.ErrorEllipse2X1D(dto.PosLon, dto.PosLat, mainEcef, adjaEcef, cdbLoc, refLoc, dto.DtoErrus, dto.EphErr, dto.OutputErrPoint,dto.Pe);
+                return Success(res);
+            });
+        }
+        /// <summary>
+        /// 两星一地误差椭圆(无参)
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<AjaxResult<ErrEllipseResDto>> X2D1NoRef(ErrEllipseX2D1NoRefDto dto)
+        {
+            return await Task.Run(() =>
+            {
+                double[] mainEcef = new double[3] { dto.MainX, dto.MainY, dto.MainZ };
+                double[] adjaEcef = new double[3] { dto.AdjaX, dto.AdjaY, dto.AdjaZ };
+                double[] cdbLoc = new double[2] { dto.CdbLon, dto.CdbLat };
+                var res = ErrEllipseHepler.ErrorEllipse2X1DNoRef(dto.PosLon, dto.PosLat, mainEcef, adjaEcef, cdbLoc, dto.DtoErrus, dto.EphErr, dto.OutputErrPoint,dto.Pe);
+                return Success(res);
+            });
+        }
+
+        /// <summary>
+        /// 低轨单星带参误差椭圆
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<AjaxResult<ErrEllipseResDto>> X1Leo(ErrorEllipseLeoX1Dto dto)
+        {
+            return await Task.Run(() =>
+            {
+                ErrorEllipseX1Option option = new ErrorEllipseX1Option();
+                option.MsEph = dto.MsEph;
+                option.NsEph1 = dto.NsEph1;
+                option.NsEph2 = dto.NsEph2;
+                option.SelectPoint = dto.SelectPoint;
+                option.DfoErr = dto.DfoErr;
+                option.EphPosErr = dto.EphPosErr;
+                option.EphVelErr = dto.EphVelErr;
+                option.fu = dto.fu;
+                option.Pe = dto.Pe;
+                var res = LeoErrorEllipseHelper.ErrorEllipseLeoX1(option, dto.OutputErrPoint);
+                return Success(res);
+            });
+        }
+
+        /// <summary>
+        /// 低轨双星带参误差椭圆
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<AjaxResult<ErrEllipseResDto>> X2Leo(ErrorEllipseLeoX2Dto dto)
+        {
+            return await Task.Run(() =>
+            {
+                ErrorEllipseX2Option option = new ErrorEllipseX2Option();
+                option.MsEph = dto.MsEph;
+                option.NsEph = dto.NsEph;
+                option.RefGeod = dto.RefGeod;
+                option.SelectPoint = dto.SelectPoint;
+                option.DtoErr = dto.DtoErr;
+                option.DfoErr = dto.DfoErr;
+                option.EphPosErr = dto.EphPosErr;
+                option.EphVelErr = dto.EphVelErr;
+                option.fu1 = dto.fu1;
+                option.fu2 = dto.fu2;
+                option.Pe = dto.Pe;
+                var res = LeoErrorEllipseHelper.ErrorEllipseLeoX2(option, dto.OutputErrPoint);
+                return Success(res);
+            });
+        }
+
+
+        /// <summary>
+        /// 低轨三星带参误差椭圆
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<AjaxResult<ErrEllipseResDto>> X3Leo(ErrorEllipseLeoX3Dto dto)
+        {
+            return await Task.Run(() =>
+            {
+                ErrorEllipseX3Option option = new ErrorEllipseX3Option();
+                option.MsEph = dto.MsEph;
+                option.NsEph1 = dto.NsEph1;
+                option.NsEph2 = dto.NsEph2;
+                option.RefGeod = dto.RefGeod;
+                option.SelectPoint = dto.SelectPoint;
+                option.DtoErr = dto.DtoErr;
+                option.DfoErr = dto.DfoErr;
+                option.EphPosErr = dto.EphPosErr;
+                option.EphVelErr = dto.EphVelErr;
+                option.fu1 = dto.fu1;
+                option.fu2 = dto.fu2;
+                option.Pe = dto.Pe;
+                var res = LeoErrorEllipseHelper.ErrorEllipseLeoX3(option, dto.OutputErrPoint);
+                return Success(res);
+            });
+        }
+    }
+}

XdCxRhDW.App/EditForms/X2D1DTOParamEditor.Designer.cs

@@ -50,8 +50,6 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.ucEphXYZAdaj = new XdCxRhDW.App.UserControl.UCEphXYZ();
-            this.ucEphXYZMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
             this.txtSigTime = new DevExpress.XtraEditors.DateEdit();
             this.txtDtoSx = new DevExpress.XtraEditors.ButtonEdit();
             this.txtDtoCdb = new DevExpress.XtraEditors.ButtonEdit();
@@ -74,13 +72,15 @@
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.txtPosRes = new DevExpress.XtraLayout.SimpleLabelItem();
             this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
+            this.ucEphXYZAdaj = new XdCxRhDW.App.UserControl.UCEphXYZ();
+            this.ucEphXYZMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtSigTime.Properties)).BeginInit();
@@ -103,13 +103,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -136,21 +136,6 @@
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
-            // ucEphXYZAdaj
-            // 
-            this.ucEphXYZAdaj.Location = new System.Drawing.Point(12, 198);
-            this.ucEphXYZAdaj.Name = "ucEphXYZAdaj";
-            this.ucEphXYZAdaj.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
-            this.ucEphXYZAdaj.Size = new System.Drawing.Size(618, 44);
-            this.ucEphXYZAdaj.TabIndex = 14;
-            // 
-            // ucEphXYZMain
-            // 
-            this.ucEphXYZMain.Location = new System.Drawing.Point(12, 150);
-            this.ucEphXYZMain.Name = "ucEphXYZMain";
-            this.ucEphXYZMain.Size = new System.Drawing.Size(618, 44);
-            this.ucEphXYZMain.TabIndex = 13;
-            // 
             // txtSigTime
             // 
             this.txtSigTime.EditValue = null;
@@ -450,30 +435,6 @@
             this.emptySpaceItem2.Size = new System.Drawing.Size(622, 46);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.ucEphXYZMain;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 138);
-            this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 48);
-            this.layoutControlItem4.MinSize = new System.Drawing.Size(166, 48);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(622, 48);
-            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem4.TextVisible = false;
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.ucEphXYZAdaj;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 186);
-            this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 48);
-            this.layoutControlItem3.MinSize = new System.Drawing.Size(166, 48);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(622, 48);
-            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem3.TextVisible = false;
-            // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.btnEphCalc;
@@ -538,6 +499,45 @@
             // 
             this.dxErrorProvider.ContainerControl = this;
             // 
+            // ucEphXYZAdaj
+            // 
+            this.ucEphXYZAdaj.Location = new System.Drawing.Point(12, 198);
+            this.ucEphXYZAdaj.Name = "ucEphXYZAdaj";
+            this.ucEphXYZAdaj.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.ucEphXYZAdaj.Size = new System.Drawing.Size(618, 44);
+            this.ucEphXYZAdaj.TabIndex = 14;
+            // 
+            // ucEphXYZMain
+            // 
+            this.ucEphXYZMain.Location = new System.Drawing.Point(12, 150);
+            this.ucEphXYZMain.Name = "ucEphXYZMain";
+            this.ucEphXYZMain.Size = new System.Drawing.Size(618, 44);
+            this.ucEphXYZMain.TabIndex = 13;
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.ucEphXYZMain;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 138);
+            this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 48);
+            this.layoutControlItem4.MinSize = new System.Drawing.Size(166, 48);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(622, 48);
+            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem4.TextVisible = false;
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.ucEphXYZAdaj;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 186);
+            this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 48);
+            this.layoutControlItem3.MinSize = new System.Drawing.Size(166, 48);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(622, 48);
+            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem3.TextVisible = false;
+            // 
             // X2D1DTOParamEditor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -568,13 +568,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             this.ResumeLayout(false);
 
         }

XdCxRhDW.App/EditForms/X2D1EllipesEditor.Designer.cs

@@ -44,8 +44,14 @@
             this.txtsatStation = new DevExpress.XtraEditors.TextEdit();
             this.txtcdbStation = new DevExpress.XtraEditors.TextEdit();
             this.txtRefLocation = new DevExpress.XtraEditors.TextEdit();
-            this.btnDtoLine = new DevExpress.XtraEditors.SimpleButton();
+            this.btnEllipes = new DevExpress.XtraEditors.SimpleButton();
             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();
@@ -55,20 +61,14 @@
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.txtPosRes = new DevExpress.XtraLayout.SimpleLabelItem();
-            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
-            this.txtDtousErr1 = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtSatLocErr1 = new DevExpress.XtraEditors.ButtonEdit();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtPE = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtEphMain = new XdCxRhDW.App.UserControl.UCEphXYZParam();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtEphAdja = new XdCxRhDW.App.UserControl.UCEphXYZParam();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.txtPosLocation = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtSigTime.Properties)).BeginInit();
@@ -76,6 +76,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtsatStation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcdbStation.Properties)).BeginInit();
             ((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();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
@@ -85,18 +89,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtPE.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtPosLocation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -105,20 +105,20 @@
             this.layoutControl1.Controls.Add(this.txtsatStation);
             this.layoutControl1.Controls.Add(this.txtcdbStation);
             this.layoutControl1.Controls.Add(this.txtRefLocation);
-            this.layoutControl1.Controls.Add(this.btnDtoLine);
+            this.layoutControl1.Controls.Add(this.btnEllipes);
             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.txtPosLocation);
             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(648, 428);
+            this.layoutControl1.Size = new System.Drawing.Size(444, 349);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -136,7 +136,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(622, 20);
+            this.txtSigTime.Size = new System.Drawing.Size(418, 20);
             this.txtSigTime.StyleController = this.layoutControl1;
             this.txtSigTime.TabIndex = 9;
             // 
@@ -147,7 +147,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(151, 20);
+            this.txtsatStation.Size = new System.Drawing.Size(100, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
             this.txtsatStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -155,11 +155,11 @@
             // txtcdbStation
             // 
             this.txtcdbStation.EditValue = "";
-            this.txtcdbStation.Location = new System.Drawing.Point(169, 29);
+            this.txtcdbStation.Location = new System.Drawing.Point(118, 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(153, 20);
+            this.txtcdbStation.Size = new System.Drawing.Size(102, 20);
             this.txtcdbStation.StyleController = this.layoutControl1;
             this.txtcdbStation.TabIndex = 10;
             this.txtcdbStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -167,29 +167,29 @@
             // txtRefLocation
             // 
             this.txtRefLocation.EditValue = "";
-            this.txtRefLocation.Location = new System.Drawing.Point(483, 29);
+            this.txtRefLocation.Location = new System.Drawing.Point(330, 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(151, 20);
+            this.txtRefLocation.Size = new System.Drawing.Size(100, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
             this.txtRefLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             // 
-            // btnDtoLine
+            // btnEllipes
             // 
-            this.btnDtoLine.Location = new System.Drawing.Point(538, 341);
-            this.btnDtoLine.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.btnDtoLine.Name = "btnDtoLine";
-            this.btnDtoLine.Size = new System.Drawing.Size(96, 22);
-            this.btnDtoLine.StyleController = this.layoutControl1;
-            this.btnDtoLine.TabIndex = 12;
-            this.btnDtoLine.Text = "误差椭圆";
-            this.btnDtoLine.Click += new System.EventHandler(this.btnDtoLine_Click);
+            this.btnEllipes.Location = new System.Drawing.Point(334, 253);
+            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);
+            this.btnEllipes.StyleController = this.layoutControl1;
+            this.btnEllipes.TabIndex = 12;
+            this.btnEllipes.Text = "误差椭圆";
+            this.btnEllipes.Click += new System.EventHandler(this.btnEllipes_Click);
             // 
             // btnEphCalc
             // 
-            this.btnEphCalc.Location = new System.Drawing.Point(430, 341);
+            this.btnEphCalc.Location = new System.Drawing.Point(226, 253);
             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);
@@ -199,6 +199,76 @@
             this.btnEphCalc.ToolTip = "根据信号时间使用匹配的双行根重新推算星历";
             this.btnEphCalc.Click += new System.EventHandler(this.btnEphCalc_Click);
             // 
+            // txtDtousErr1
+            // 
+            this.txtDtousErr1.EditValue = "10";
+            this.txtDtousErr1.Location = new System.Drawing.Point(14, 217);
+            this.txtDtousErr1.Margin = new System.Windows.Forms.Padding(2);
+            this.txtDtousErr1.MaximumSize = new System.Drawing.Size(0, 22);
+            this.txtDtousErr1.MinimumSize = new System.Drawing.Size(0, 22);
+            this.txtDtousErr1.Name = "txtDtousErr1";
+            this.txtDtousErr1.Properties.AutoHeight = false;
+            this.txtDtousErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, 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);
+            this.txtDtousErr1.StyleController = this.layoutControl1;
+            this.txtDtousErr1.TabIndex = 6;
+            this.txtDtousErr1.ToolTip = "时差误差";
+            // 
+            // txtSatLocErr1
+            // 
+            this.txtSatLocErr1.EditValue = "10000";
+            this.txtSatLocErr1.Location = new System.Drawing.Point(121, 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);
+            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.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.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;
@@ -215,20 +285,20 @@
             this.layoutControlItem2,
             this.layoutControlItem6,
             this.layoutControlItem7,
-            this.layoutControlItem8,
-            this.layoutControlItem3,
             this.emptySpaceItem1,
-            this.layoutControlItem4});
+            this.layoutControlItem4,
+            this.layoutControlItem1,
+            this.layoutControlItem8});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(648, 428);
+            this.Root.Size = new System.Drawing.Size(444, 349);
             this.Root.TextVisible = false;
             // 
             // emptySpaceItem3
             // 
             this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 322);
+            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 234);
             this.emptySpaceItem3.Name = "emptySpaceItem3";
-            this.emptySpaceItem3.Size = new System.Drawing.Size(418, 33);
+            this.emptySpaceItem3.Size = new System.Drawing.Size(214, 33);
             this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem14
@@ -240,7 +310,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(157, 46);
+            this.layoutControlItem14.Size = new System.Drawing.Size(106, 46);
             this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem14.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
             this.layoutControlItem14.Text = "接收站经纬度";
@@ -252,11 +322,11 @@
             this.layoutControlItem9.Control = this.txtcdbStation;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem9.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem9.Location = new System.Drawing.Point(157, 0);
+            this.layoutControlItem9.Location = new System.Drawing.Point(106, 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(157, 46);
+            this.layoutControlItem9.Size = new System.Drawing.Size(106, 46);
             this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem9.Text = "超短波经纬度";
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
@@ -267,11 +337,11 @@
             this.layoutControlItem10.Control = this.txtRefLocation;
             this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem10.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem10.Location = new System.Drawing.Point(471, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(318, 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(157, 46);
+            this.layoutControlItem10.Size = new System.Drawing.Size(106, 46);
             this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem10.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.layoutControlItem10.Text = "参考站经纬度";
@@ -285,7 +355,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(628, 46);
+            this.itemSigTime.Size = new System.Drawing.Size(424, 46);
             this.itemSigTime.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.itemSigTime.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.itemSigTime.Text = "信号时间";
@@ -294,10 +364,10 @@
             // 
             // layoutControlItem17
             // 
-            this.layoutControlItem17.Control = this.btnDtoLine;
+            this.layoutControlItem17.Control = this.btnEllipes;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(518, 322);
+            this.layoutControlItem17.Location = new System.Drawing.Point(314, 234);
             this.layoutControlItem17.MaxSize = new System.Drawing.Size(110, 0);
             this.layoutControlItem17.MinSize = new System.Drawing.Size(110, 33);
             this.layoutControlItem17.Name = "layoutControlItem17";
@@ -314,7 +384,7 @@
             this.layoutControlItem5.Control = this.btnEphCalc;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem5.Location = new System.Drawing.Point(418, 322);
+            this.layoutControlItem5.Location = new System.Drawing.Point(214, 234);
             this.layoutControlItem5.MaxSize = new System.Drawing.Size(100, 33);
             this.layoutControlItem5.MinSize = new System.Drawing.Size(100, 33);
             this.layoutControlItem5.Name = "layoutControlItem5";
@@ -328,59 +398,23 @@
             // txtPosRes
             // 
             this.txtPosRes.AllowHotTrack = false;
-            this.txtPosRes.Location = new System.Drawing.Point(0, 355);
+            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.Name = "txtPosRes";
-            this.txtPosRes.Size = new System.Drawing.Size(628, 24);
+            this.txtPosRes.Size = new System.Drawing.Size(424, 24);
             this.txtPosRes.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.txtPosRes.Text = " ";
             this.txtPosRes.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // dxErrorProvider
-            // 
-            this.dxErrorProvider.ContainerControl = this;
-            // 
-            // txtDtousErr1
-            // 
-            this.txtDtousErr1.EditValue = "10";
-            this.txtDtousErr1.Location = new System.Drawing.Point(14, 305);
-            this.txtDtousErr1.Margin = new System.Windows.Forms.Padding(2);
-            this.txtDtousErr1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtDtousErr1.MinimumSize = new System.Drawing.Size(0, 22);
-            this.txtDtousErr1.Name = "txtDtousErr1";
-            this.txtDtousErr1.Properties.AutoHeight = false;
-            this.txtDtousErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, 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(201, 22);
-            this.txtDtousErr1.StyleController = this.layoutControl1;
-            this.txtDtousErr1.TabIndex = 6;
-            this.txtDtousErr1.ToolTip = "时差误差";
-            // 
-            // txtSatLocErr1
-            // 
-            this.txtSatLocErr1.EditValue = "10000";
-            this.txtSatLocErr1.Location = new System.Drawing.Point(223, 305);
-            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(201, 22);
-            this.txtSatLocErr1.StyleController = this.layoutControl1;
-            this.txtSatLocErr1.TabIndex = 6;
-            this.txtSatLocErr1.ToolTip = "星历位置误差";
-            // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txtDtousErr1;
             this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem2.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 276);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 188);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(209, 46);
+            this.layoutControlItem2.Size = new System.Drawing.Size(107, 46);
             this.layoutControlItem2.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
             this.layoutControlItem2.Text = "时差误差";
             this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
@@ -391,32 +425,20 @@
             this.layoutControlItem6.Control = this.txtSatLocErr1;
             this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem6.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem6.Location = new System.Drawing.Point(209, 276);
+            this.layoutControlItem6.Location = new System.Drawing.Point(107, 188);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(209, 46);
+            this.layoutControlItem6.Size = new System.Drawing.Size(107, 46);
             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);
             // 
-            // txtPE
-            // 
-            this.txtPE.EditValue = "0.5";
-            this.txtPE.Location = new System.Drawing.Point(432, 305);
-            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";
-            // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txtPE;
             this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem7.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem7.Location = new System.Drawing.Point(418, 276);
+            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";
@@ -427,95 +449,73 @@
             this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // txtEphMain
-            // 
-            this.txtEphMain.Location = new System.Drawing.Point(12, 104);
-            this.txtEphMain.Name = "txtEphMain";
-            this.txtEphMain.Size = new System.Drawing.Size(624, 88);
-            this.txtEphMain.TabIndex = 14;
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txtEphMain;
-            this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem8.CustomizationFormText = "layoutControlItem3";
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 92);
-            this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 92);
-            this.layoutControlItem8.MinSize = new System.Drawing.Size(190, 92);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(628, 92);
-            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem8.Text = "layoutControlItem3";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem8.TextVisible = false;
-            // 
-            // txtEphAdja
-            // 
-            this.txtEphAdja.Location = new System.Drawing.Point(12, 196);
-            this.txtEphAdja.Name = "txtEphAdja";
-            this.txtEphAdja.Size = new System.Drawing.Size(624, 88);
-            this.txtEphAdja.TabIndex = 14;
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txtEphAdja;
-            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem3.CustomizationFormText = "layoutControlItem3";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 184);
-            this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 92);
-            this.layoutControlItem3.MinSize = new System.Drawing.Size(190, 92);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(628, 92);
-            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem3.Text = "layoutControlItem3";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem3.TextVisible = false;
-            // 
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 379);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 291);
             this.emptySpaceItem1.MinSize = new System.Drawing.Size(104, 24);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(628, 29);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(424, 38);
             this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
-            // txtPosLocation
-            // 
-            this.txtPosLocation.EditValue = "";
-            this.txtPosLocation.Location = new System.Drawing.Point(326, 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(151, 20);
-            this.txtPosLocation.StyleController = this.layoutControl1;
-            this.txtPosLocation.TabIndex = 10;
-            this.txtPosLocation.ToolTip = "经度纬度之间用英文逗号隔开";
-            // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txtPosLocation;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "定位点";
-            this.layoutControlItem4.Location = new System.Drawing.Point(314, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(212, 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(157, 46);
+            this.layoutControlItem4.Size = new System.Drawing.Size(106, 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);
             // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txtEphMain;
+            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem1.CustomizationFormText = "layoutControlItem4";
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 92);
+            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.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem1.Text = "layoutControlItem4";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem1.TextVisible = false;
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txtEphAdja;
+            this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem8.CustomizationFormText = "layoutControlItem4";
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 140);
+            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.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;
+            // 
             // X2D1EllipesEditor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.layoutControl1);
             this.Name = "X2D1EllipesEditor";
-            this.Size = new System.Drawing.Size(648, 428);
+            this.Size = new System.Drawing.Size(444, 349);
             this.Load += new System.EventHandler(this.X2D1DTOParamEditor_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
@@ -524,6 +524,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtsatStation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcdbStation.Properties)).EndInit();
             ((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();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
@@ -533,18 +537,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtPE.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtPosLocation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -563,7 +563,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3;
-        private DevExpress.XtraEditors.SimpleButton btnDtoLine;
+        private DevExpress.XtraEditors.SimpleButton btnEllipes;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
         private DevExpress.XtraEditors.SimpleButton btnEphCalc;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
@@ -574,12 +574,12 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraEditors.TextEdit txtPE;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private UserControl.UCEphXYZParam txtEphMain;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private UserControl.UCEphXYZParam txtEphAdja;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
         private DevExpress.XtraEditors.TextEdit txtPosLocation;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private UserControl.UCEphXYZ txtEphMain;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private UserControl.UCEphXYZ txtEphAdja;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
     }
 }

XdCxRhDW.App/EditForms/X2D1EllipesEditor.cs

@@ -24,7 +24,6 @@ namespace XdCxRhDW.App.EditForms
         private MapControl mapControl1;
         private PosRes info;
         private CgRes cg;
-        private List<SatInfo> listSat;
         public X2D1EllipesEditor(PosRes info, MapControl mapControl)
         {
             InitializeComponent();
@@ -32,7 +31,6 @@ namespace XdCxRhDW.App.EditForms
             itemSigTime.Text = $"{itemSigTime.Text}({SysConfig.Config.TimeZoneUTC})";
             this.layoutControl1.UseDefault();
             txtSigTime.UseDefault();
-            this.listSat = new List<SatInfo>();
             this.mapControl1 = mapControl;
         }
 
@@ -41,10 +39,6 @@ namespace XdCxRhDW.App.EditForms
         {
             this.layoutControl1.BestFit();
             StationRes station = null;
-            using (RHDWContext db = new RHDWContext())
-            {
-                listSat = await db.SatInfos.ToListAsync();
-            }
             using (RHDWPartContext db = RHDWPartContext.GetContext(info.SigTime))
             {
                 cg = await db?.CgRes.Where(m => m.ID == info.CgResID).FirstOrDefaultAsync();
@@ -53,8 +47,8 @@ namespace XdCxRhDW.App.EditForms
             if (cg != null)
             {
                 this.txtSigTime.EditValue = info.SigTime;
-                txtEphMain.SetParam("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ, cg.MainVx, cg.MainVy, cg.MainVz), Color.Black);
-                txtEphAdja.SetParam("邻星", cg.Adja1Code, (cg.Adja1X, cg.Adja1Y, cg.Adja1Z, cg.Adja1Vx, cg.Adja1Vy, cg.Adja1Vz), Color.Black);
+                txtEphMain.SetXYZ("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ), Color.Black);
+                txtEphAdja.SetXYZ("邻星", cg.Adja1Code, (cg.Adja1X, cg.Adja1Y, cg.Adja1Z), Color.Black);
             }
             if (station != null)
             {
@@ -83,18 +77,18 @@ namespace XdCxRhDW.App.EditForms
             {
                 return false;
             }
-            if (!txtEphMain.CheckEph(dxErrorProvider))
+            if (!txtEphMain.CheckEphXYZ(dxErrorProvider))
             {
                 return false;
             }
-            if (!txtEphAdja.CheckEph(dxErrorProvider))
+            if (!txtEphAdja.CheckEphXYZ(dxErrorProvider))
             {
                 return false;
             }
             return true;
         }
 
-        private async void btnDtoLine_Click(object sender, EventArgs e)
+        private async void btnEllipes_Click(object sender, EventArgs e)
         {
             if (!CheckParam()) { return; }
             try
@@ -103,8 +97,8 @@ namespace XdCxRhDW.App.EditForms
                 var CDBAnt = txtcdbStation.GetLonLat();
                 var pos = txtPosLocation.GetLonLat();
                 var RefGeod = txtRefLocation.GetLonLat();
-                double[] ephMain = txtEphMain.EphParam();
-                double[] ephAdja = txtEphAdja.EphParam();
+                double[] ephMain = txtEphMain.EphXYZ();
+                double[] ephAdja = txtEphAdja.EphXYZ();
                 var dto = new ErrEllipseX2D1Dto()
                 {
                     MainX = ephMain[0],
@@ -121,13 +115,19 @@ namespace XdCxRhDW.App.EditForms
                     PosLat = pos[1],
                     DtoErrus = Convert.ToDouble(txtDtousErr1.Text),
                     EphErr = Convert.ToDouble(txtSatLocErr1.Text),
+                    Pe = Convert.ToDouble(txtPE.Text),
                     OutputErrPoint = true,
                 };
-                if (info.PosResType == EnumPosResType.X2D1)
+                AjaxResult<ErrEllipseResDto> rsp;
+                if (info.PosResType != EnumPosResType.X2D1)
+                {
+                    dto = dto.WithRef(112, 11);
+                    rsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(SysConfig.GetUrl("Ellipse/X2D1"), dto, 30);
+                }
+                else
                 {
-                    dto = dto.WithRef(RefGeod[0], RefGeod[1]);
+                    rsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(SysConfig.GetUrl("Ellipse/X2D1NoRef"), dto, 30);
                 }
-                var rsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(SysConfig.GetUrl("DetectCg/ErrorEllipse2X1D"), dto, 30);
                 if (rsp.code != 200)
                 {
                     await LogHelper.Error($"绘制{info.PosResType.GetEnumDisplayName()}误差椭圆失败,{rsp.msg}");
@@ -135,8 +135,8 @@ namespace XdCxRhDW.App.EditForms
                 }
                 else
                 {
-                    this.mapControl1.DrawErrEllipse(rsp.data.LongRadius, rsp.data.ShortRadius, rsp.data.GeoPoints.Select(t => (t.Lon, t.Lat)));
-                    this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}误差椭圆.长半轴={rsp.data.LongRadius:f1},短半轴={rsp.data.ShortRadius:f1},倾角={rsp.data.DipAngle:f2}";
+                    this.mapControl1.DrawErrEllipse(rsp.data.LongRadius / 1e3, rsp.data.ShortRadius / 1e3, rsp.data.GeoPoints.Select(t => (t.Lon, t.Lat)));
+                    this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}误差椭圆.长半轴={rsp.data.LongRadius:f0}m,短半轴={rsp.data.ShortRadius:f0}m,倾角={rsp.data.DipAngle:f1}°";
                 }
             }
             catch (Exception ex)
@@ -166,7 +166,7 @@ namespace XdCxRhDW.App.EditForms
                 }
                 var XlCalcDto = new XlCalcDto() { tleStr = mainxlInfo.TwoLine, SigTime = sigTime };
                 var maineph = await HttpHelper.PostRequestAsync<SatEphResDto>(SysConfig.GetUrl("Xl/Calc"), XlCalcDto);
-                txtEphMain.SetParam("主星", cg.MainCode.Value, (maineph.data.X, maineph.data.Y, maineph.data.Z, maineph.data.VX, maineph.data.VY, maineph.data.VZ), Color.Red);
+                txtEphMain.SetXYZ("主星", cg.MainCode.Value, (maineph.data.X, maineph.data.Y, maineph.data.Z), Color.Red);
 
                 var adjaxlInfo = await XlRepository.GetLatestAsync(cg.Adja1Code.Value, sigTime);
                 if (adjaxlInfo == null)
@@ -176,7 +176,7 @@ namespace XdCxRhDW.App.EditForms
                 }
                 XlCalcDto = new XlCalcDto() { tleStr = adjaxlInfo.TwoLine, SigTime = sigTime };
                 var adjaeph = await HttpHelper.PostRequestAsync<SatEphResDto>(SysConfig.GetUrl("Xl/Calc"), XlCalcDto);
-                txtEphAdja.SetParam("邻星", cg.Adja1Code.Value, (adjaeph.data.X, adjaeph.data.Y, adjaeph.data.Z, adjaeph.data.VX, adjaeph.data.VY, adjaeph.data.VZ), Color.Red);
+                txtEphAdja.SetXYZ("邻星", cg.Adja1Code.Value, (adjaeph.data.X, adjaeph.data.Y, adjaeph.data.Z), Color.Red);
             }
             catch (Exception ex)
             {

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -1932,6 +1932,13 @@ public static class MapControlEx
         if (!polyLine.Points.Any()) return;
         innerData.mMapStorage.Items.Add(polyLine);
     }
+    /// <summary>
+    /// 误差椭圆
+    /// </summary>
+    /// <param name="ctrl"></param>
+    /// <param name="r1">长半轴(km)</param>
+    /// <param name="r2">短半轴(km)</param>
+    /// <param name="lines"></param>
     public static void DrawErrEllipse(this MapControl ctrl, double r1, double r2, IEnumerable<(double lon, double lat)> lines)
     {
         if (lines == null || !lines.Any()) return;

XdCxRhDW.App/LogHelper.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using XdCxRhDW.Dto;
+using XdCxRhDW.Entity;
 using XdCxRhDW.Repostory;
 
 namespace XdCxRhDW.App
@@ -16,16 +17,22 @@ namespace XdCxRhDW.App
             var pro = Process.GetCurrentProcess();
             try
             {
-                await HttpHelper.PostRequestAsync<List<LogModulesResDto>>(SysConfig.GetUrl("Log/Add"), new LogInfoDto()
+                using (RHDWContext db = new RHDWContext())
                 {
-                    LogTime = DateTime.Now,
-                    LogType = EnumLogTypeDto.Info,
-                    Module = pro.ProcessName,
-                    Msg = msg
-                }, 5);
+                    LogRes res = new LogRes()
+                    {
+                        LogTime = DateTime.Now,
+                        Module = pro.ProcessName,
+                        LogType = EnumLogType.Info,
+                        Msg = msg,
+                    };
+                    db.LogRes.Add(res);
+                    await db.SaveChangesAsync();
+                }
             }
-            catch
+            catch (Exception ex)
             {
+                Serilog.Log.Error(ex, "日志信息写入异常");
             }
             Serilog.Log.Information(msg);
         }
@@ -34,16 +41,22 @@ namespace XdCxRhDW.App
             var pro = Process.GetCurrentProcess();
             try
             {
-                await HttpHelper.PostRequestAsync<List<LogModulesResDto>>(SysConfig.GetUrl("Log/Add"), new LogInfoDto()
+                using (RHDWContext db = new RHDWContext())
                 {
-                    LogTime = DateTime.Now,
-                    LogType = EnumLogTypeDto.Warning,
-                    Module = pro.ProcessName,
-                    Msg = msg
-                }, 5);
+                    LogRes res = new LogRes()
+                    {
+                        LogTime = DateTime.Now,
+                        Module = pro.ProcessName,
+                        LogType = EnumLogType.Warning,
+                        Msg = msg,
+                    };
+                    db.LogRes.Add(res);
+                    await db.SaveChangesAsync();
+                }
             }
-            catch
+            catch (Exception arg)
             {
+                Serilog.Log.Error(arg, "日志信息写入异常");
             }
             Serilog.Log.Warning(ex, msg);
         }
@@ -58,18 +71,24 @@ namespace XdCxRhDW.App
             var pro = Process.GetCurrentProcess();
             try
             {
-                await HttpHelper.PostRequestAsync<List<LogModulesResDto>>(SysConfig.GetUrl("Log/Add"), new LogInfoDto()
+                using (RHDWContext db = new RHDWContext())
                 {
-                    LogTime = DateTime.Now,
-                    LogType = EnumLogTypeDto.Error,
-                    Module = pro.ProcessName,
-                    Msg = msg
-                }, 5);
+                    LogRes res = new LogRes()
+                    {
+                        LogTime = DateTime.Now,
+                        Module = pro.ProcessName,
+                        LogType = EnumLogType.Error,
+                        Msg = msg,
+                    };
+                    db.LogRes.Add(res);
+                    await db.SaveChangesAsync();
+                }
             }
-            catch
+            catch (Exception arg)
             {
+                Serilog.Log.Error(arg, "日志信息写入异常");
             }
-            await LogHelper.Error(msg,ex);
+            Serilog.Log.Error(ex, msg);
         }
     }
 }

XdCxRhDW.App/UserControl/UCEphXYZ.Designer.cs

@@ -56,7 +56,7 @@
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(470, 47);
+            this.layoutControl1.Size = new System.Drawing.Size(471, 47);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -70,29 +70,29 @@
             this.ephX.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephX.Properties.UseMaskAsDisplayFormat = true;
-            this.ephX.Size = new System.Drawing.Size(169, 20);
+            this.ephX.Size = new System.Drawing.Size(153, 20);
             this.ephX.StyleController = this.layoutControl1;
             this.ephX.TabIndex = 4;
             // 
             // ephY
             // 
-            this.ephY.Location = new System.Drawing.Point(175, 19);
+            this.ephY.Location = new System.Drawing.Point(159, 19);
             this.ephY.Name = "ephY";
             this.ephY.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephY.Properties.UseMaskAsDisplayFormat = true;
-            this.ephY.Size = new System.Drawing.Size(146, 20);
+            this.ephY.Size = new System.Drawing.Size(153, 20);
             this.ephY.StyleController = this.layoutControl1;
             this.ephY.TabIndex = 4;
             // 
             // ephZ
             // 
-            this.ephZ.Location = new System.Drawing.Point(325, 19);
+            this.ephZ.Location = new System.Drawing.Point(316, 19);
             this.ephZ.Name = "ephZ";
             this.ephZ.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephZ.Properties.UseMaskAsDisplayFormat = true;
-            this.ephZ.Size = new System.Drawing.Size(143, 20);
+            this.ephZ.Size = new System.Drawing.Size(153, 20);
             this.ephZ.StyleController = this.layoutControl1;
             this.ephZ.TabIndex = 4;
             // 
@@ -106,7 +106,7 @@
             this.layoutControlItemz});
             this.Root.Name = "Root";
             this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.Root.Size = new System.Drawing.Size(470, 47);
+            this.Root.Size = new System.Drawing.Size(471, 47);
             this.Root.TextVisible = false;
             // 
             // layoutControlItemx
@@ -116,7 +116,7 @@
             this.layoutControlItemx.MaxSize = new System.Drawing.Size(0, 41);
             this.layoutControlItemx.MinSize = new System.Drawing.Size(54, 41);
             this.layoutControlItemx.Name = "layoutControlItemx";
-            this.layoutControlItemx.Size = new System.Drawing.Size(173, 47);
+            this.layoutControlItemx.Size = new System.Drawing.Size(157, 47);
             this.layoutControlItemx.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItemx.Text = "坐标X";
             this.layoutControlItemx.TextLocation = DevExpress.Utils.Locations.Top;
@@ -127,11 +127,11 @@
             this.layoutControlItemy.Control = this.ephY;
             this.layoutControlItemy.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItemy.CustomizationFormText = "坐标X";
-            this.layoutControlItemy.Location = new System.Drawing.Point(173, 0);
+            this.layoutControlItemy.Location = new System.Drawing.Point(157, 0);
             this.layoutControlItemy.MaxSize = new System.Drawing.Size(0, 41);
             this.layoutControlItemy.MinSize = new System.Drawing.Size(54, 41);
             this.layoutControlItemy.Name = "layoutControlItemy";
-            this.layoutControlItemy.Size = new System.Drawing.Size(150, 47);
+            this.layoutControlItemy.Size = new System.Drawing.Size(157, 47);
             this.layoutControlItemy.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItemy.Text = "坐标Y";
             this.layoutControlItemy.TextLocation = DevExpress.Utils.Locations.Top;
@@ -142,11 +142,11 @@
             this.layoutControlItemz.Control = this.ephZ;
             this.layoutControlItemz.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItemz.CustomizationFormText = "坐标X";
-            this.layoutControlItemz.Location = new System.Drawing.Point(323, 0);
+            this.layoutControlItemz.Location = new System.Drawing.Point(314, 0);
             this.layoutControlItemz.MaxSize = new System.Drawing.Size(0, 41);
             this.layoutControlItemz.MinSize = new System.Drawing.Size(54, 41);
             this.layoutControlItemz.Name = "layoutControlItemz";
-            this.layoutControlItemz.Size = new System.Drawing.Size(147, 47);
+            this.layoutControlItemz.Size = new System.Drawing.Size(157, 47);
             this.layoutControlItemz.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItemz.Text = "坐标Z";
             this.layoutControlItemz.TextLocation = DevExpress.Utils.Locations.Top;
@@ -158,7 +158,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.layoutControl1);
             this.Name = "UCEphXYZ";
-            this.Size = new System.Drawing.Size(470, 47);
+            this.Size = new System.Drawing.Size(471, 47);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.ephX.Properties)).EndInit();

XdCxRhDW.App/UserControl/UCEphXYZParam.Designer.cs

@@ -86,7 +86,7 @@
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(470, 86);
+            this.layoutControl1.Size = new System.Drawing.Size(471, 86);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -122,7 +122,7 @@
             this.ephZ.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephZ.Properties.UseMaskAsDisplayFormat = true;
-            this.ephZ.Size = new System.Drawing.Size(153, 20);
+            this.ephZ.Size = new System.Drawing.Size(154, 20);
             this.ephZ.StyleController = this.layoutControl1;
             this.ephZ.TabIndex = 4;
             // 
@@ -158,7 +158,7 @@
             this.ephVZ.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.ephVZ.Properties.UseMaskAsDisplayFormat = true;
-            this.ephVZ.Size = new System.Drawing.Size(153, 20);
+            this.ephVZ.Size = new System.Drawing.Size(154, 20);
             this.ephVZ.StyleController = this.layoutControl1;
             this.ephVZ.TabIndex = 4;
             // 
@@ -175,7 +175,7 @@
             this.layoutControlItemvy});
             this.Root.Name = "Root";
             this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.Root.Size = new System.Drawing.Size(470, 86);
+            this.Root.Size = new System.Drawing.Size(471, 86);
             this.Root.TextVisible = false;
             // 
             // layoutControlItemx
@@ -231,7 +231,7 @@
             this.layoutControlItemz.MaxSize = new System.Drawing.Size(0, 41);
             this.layoutControlItemz.MinSize = new System.Drawing.Size(54, 41);
             this.layoutControlItemz.Name = "layoutControlItemz";
-            this.layoutControlItemz.Size = new System.Drawing.Size(157, 41);
+            this.layoutControlItemz.Size = new System.Drawing.Size(158, 41);
             this.layoutControlItemz.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItemz.Text = "坐标Z";
             this.layoutControlItemz.TextLocation = DevExpress.Utils.Locations.Top;
@@ -246,7 +246,7 @@
             this.layoutControlItemvz.MaxSize = new System.Drawing.Size(0, 41);
             this.layoutControlItemvz.MinSize = new System.Drawing.Size(62, 41);
             this.layoutControlItemvz.Name = "layoutControlItemvz";
-            this.layoutControlItemvz.Size = new System.Drawing.Size(157, 45);
+            this.layoutControlItemvz.Size = new System.Drawing.Size(158, 45);
             this.layoutControlItemvz.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItemvz.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 4, 0);
             this.layoutControlItemvz.Text = "坐标VZ";
@@ -275,7 +275,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.layoutControl1);
             this.Name = "UCEphXYZParam";
-            this.Size = new System.Drawing.Size(470, 86);
+            this.Size = new System.Drawing.Size(471, 86);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.ephX.Properties)).EndInit();

XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -157,6 +157,7 @@
     <Compile Include="Basic\BaseVm.cs" />
     <Compile Include="Basic\BindingData.cs" />
     <Compile Include="Basic\IOverlayFormService.cs" />
+    <Compile Include="Controllers\EllipseController.cs" />
     <Compile Include="Controllers\DetectCgController.cs" />
     <Compile Include="Controllers\LogController.cs" />
     <Compile Include="Controllers\ResultController.cs" />

XdCxRhDw.Dto/ErrEllipseX2D1Dto.cs

@@ -53,6 +53,7 @@ namespace XdCxRhDW.Dto
                 OutputErrPoint = OutputErrPoint,
                 PosLat = PosLat,
                 PosLon = PosLon,
+                Pe = Pe
             };
 
         }
@@ -117,6 +118,12 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double EphErr { get; set; }
 
+        /// <summary>
+        /// 概率(0-1)
+        /// </summary>
+        [RangeDouble(0, 1)]
+        public double Pe { get; set; }
+
         /// <summary>
         /// 是否输出椭圆位置信息
         /// </summary>