11

Service/X2D1NoRefTaskServer/Service/TaskService.cs

@@ -236,11 +236,6 @@ namespace X2D1NoRefTaskServer.Service
                                                 SigTime = minfo.CapTime.AddSeconds(data1[i].Smpstart / minfo.FsHz),
                                                 MainCode = minfo.SatId,
                                                 AdjaCode = ninfo.SatId,
-                                                //卫星转发某些频点可能有时延,无参定位由于不能抵消需要减去这个时延
-                                                SxDto = data1[i].Dt * posDtoFactor - data2[i].Dt * posDtoFactor - delay1.Value + delay2.Value,
-                                                SxDfo = data1[i].Df,
-                                                SxSnr = data1[i].Snr,
-                                                XdDto = data1[i].Dt * posDtoFactor - delay1.Value,
                                                 XdDfo = data2[i].Df,
                                                 XdSnr = data2[i].Snr,
                                                 SatTxLon = dto.CapLon,
@@ -260,6 +255,14 @@ namespace X2D1NoRefTaskServer.Service
                                                     PosCheckType = deteResp.data[i].DmcType.GetEnumByDisplayName<EnumPosCheckTypeDto>(),
                                                 }
                                             };
+                                            if (data1[i].Snr > 0 && data2[i].Snr > 0)
+                                            {
+                                                //卫星转发某些频点可能有时延,无参定位由于不能抵消需要减去这个时延
+                                                x2D1.SxDto = data1[i].Dt * posDtoFactor - data2[i].Dt * posDtoFactor - delay1.Value + delay2.Value;
+                                                x2D1.SxDfo = data1[i].Df - data2[i].Df;
+                                                x2D1.SxSnr = Math.Min(data1[i].Snr, data2[i].Snr);
+                                                x2D1.XdDto = data1[i].Dt * posDtoFactor - delay1.Value;
+                                            }
                                             var result = await HttpHelper.PostRequestAsync<PosResDto>(baseUrl + "Pos/PosX2D1NoXlNoParAsync", x2D1);
                                             if (result.code != 200)
                                             {
@@ -390,201 +393,181 @@ namespace X2D1NoRefTaskServer.Service
 
                         IOrderedEnumerable<IGrouping<DateTime, HistoryFile>> groups = null;
                         groups = files.Select(f => FileToHistoryFile(dto, f, canConnected)).GroupBy(m => m.CapTime).OrderBy(m => m.Key);
-                        TimeSpan span = abs(groups.First().Key - preTime);
-                        var closesData = groups.First();
-                        foreach (var item in groups.Skip(1))
-                        {
-                            if (abs(preTime - item.Key) < span)
-                            {
-                                span = abs(preTime - item.Key);
-                                closesData = item;
-                            }
-                        }
-                        //if (cts.IsCancellationRequested) break;
-                        var xdgbInfos = closesData.GroupBy(m => m.XdIndex);
-                        foreach (var xdInfos in xdgbInfos)
+                        foreach (var item in groups)
                         {
-                            var finfos = xdInfos.ToList();
-                            var capTime = finfos.First().CapTime;
-                            //if (capTime < dto.StartTime) continue;
-                            //if (capTime > dto.EndTime) break;
-                            if (finfos.Count < 3)
-                            {
-                                LogHelper.Warning($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻文件数量只有{finfos.Count}个,跳过此组数据");
-                                continue;
-                            }
-                            //超短波信号
-                            var dinfo = finfos.FirstOrDefault(m => m.Ch == 1);
-                            if (dinfo == null)
-                            {
-                                LogHelper.Warning($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻未找到超短波信号ch1文件,跳过此组数据");
-                                continue;
-                            }
-                            var taskSig = dto.Sigs.FirstOrDefault(p => p.FreqUp == dinfo.FreqHz);
-                            if (taskSig == null)
-                            {
-                                continue;//跳过不是任务处理的频点
-                            }
-                            //主星
-                            var minfo = finfos.FirstOrDefault(m => m.Ch == 2);
-                            if (minfo == null)
-                            {
-                                LogHelper.Warning($"【任务{dto.ID}】信号[{taskSig.FreqUp / 1e6}],{capTime:yyyyMMddHHmmss}时刻未找到主星信号ch2文件,跳过此组数据");
-                                continue;
-                            }
-                            //邻1
-                            var ninfo = finfos.FirstOrDefault(m => m.Ch == 3);
-                            if (ninfo == null)
-                            {
-                                LogHelper.Info($"【任务{dto.ID}】信号[{taskSig.FreqUp / 1e6}],{capTime:yyyyMMddHHmmss}时刻未找到邻星信号ch3文件,跳过此组数据");
-                                continue;
-                            }
-                            try
-                            {
-                                var delay1 = taskSig.SigDelay.FirstOrDefault(p => p.SatInfoSatCode == minfo.SatId)?.Delay;
-                                var delay2 = taskSig.SigDelay.FirstOrDefault(p => p.SatInfoSatCode == ninfo.SatId)?.Delay;
-                                if (delay1 == null) delay1 = 0;
-                                if (delay2 == null) delay2 = 0;
-                                LogHelper.Info($"【任务{dto.ID}】信号[{taskSig.FreqUp / 1e6}],主星[{minfo.SatId}],转发时延{delay1}us");
-                                LogHelper.Info($"【任务{dto.ID}】信号[{taskSig.FreqUp / 1e6}],邻星[{ninfo.SatId}],转发时延{delay2}us");
-
-                                while (true)
-                                {
-                                    if (!IsFileInUse(minfo.FilePath))
-                                        break;
-                                }
-                                string mainFile = await HttpHelper.UploadFileAsync(minfo.FilePath, baseUrl + "File/UploadFileAsync", token: cts.Token);//主星文件
-                                while (true)
-                                {
-                                    if (!IsFileInUse(ninfo.FilePath))
-                                        break;
-                                }
-                                string adjaFile = await HttpHelper.UploadFileAsync(ninfo.FilePath, baseUrl + "File/UploadFileAsync", token: cts.Token);//邻星文件
-                                while (true)
-                                {
-                                    if (!IsFileInUse(dinfo.FilePath))
-                                        break;
-                                }
-                                string cdbFile = await HttpHelper.UploadFileAsync(dinfo.FilePath, baseUrl + "File/UploadFileAsync", token: cts.Token);//超短文件
+                            if (cts.IsCancellationRequested) break;
 
-                                DetectDto detectDto = new DetectDto()
-                                {
-                                    file1 = cdbFile,//11局使用上行泄露信号进行检测
-                                    dmcType = taskSig.SigType,//上行信号检测目前的算法只能使用基于能量的KY或IBS检测
-                                    fsHz = minfo.FsHz,
-                                };
-                                detectDto.dmcType = detectDto.dmcType & ~EnumSigCheckTypeDto.DAMA;//DAMA不支持上行信号检测,在这里移除掉
-                                if (detectDto.dmcType == EnumSigCheckTypeDto.DAMA)
+                            var xdgbInfos = item.GroupBy(m => m.XdIndex);
+                            foreach (var xdInfos in xdgbInfos)
+                            {
+                                var finfos = xdInfos.ToList();
+                                var capTime = finfos.First().CapTime;
+                                if (capTime < dto.StartTime) continue;
+                                if (capTime > dto.EndTime) break;
+                                if (finfos.Count < 3)
                                 {
-                                    LogHelper.Warning($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},上行信号不支持DAMA检测");
+                                    LogHelper.Warning($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻文件数量只有{finfos.Count}个,跳过此组数据");
                                     continue;
                                 }
-                                var deteResp = await HttpHelper.PostRequestAsync<List<DetectResDto>>(baseUrl + "DetectCg/DetectCalc", detectDto, token: cts.Token);
-                                if (deteResp.code != 200)
+                                //超短波信号
+                                var dinfo = finfos.FirstOrDefault(m => m.Ch == 1);
+                                if (dinfo == null)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻信号检测出错.{deteResp.msg}");
+                                    LogHelper.Warning($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻未找到超短波信号ch1文件,跳过此组数据");
                                     continue;
                                 }
-                                LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻信号检测完成,共{deteResp.data.Count}个时隙");
-                                var smps = deteResp.data.Select(m => new SmpPosition(m.Start, m.Length)).ToList();//怎么补0?
-                                var cgDto = new CpuCgMultiDto()
-                                {
-                                    dtCenter = 260000,
-                                    dtRange = 50000,
-                                    file1 = cdbFile,
-                                    file2 = mainFile,
-                                    samplingRate = minfo.FsHz,
-                                    smpPositions = smps,
-                                    snrThreshold = 15,
-                                };
-                                var result1 = await HttpHelper.PostRequestAsync<List<CpuCgResDto>>(baseUrl + "DetectCg/CpuCgMultiCalc", cgDto, token: cts.Token);
-                                if (result1.code != 200)
+                                var taskSig = dto.Sigs.FirstOrDefault(p => p.FreqUp == dinfo.FreqHz);
+                                if (taskSig == null)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻主星超短CPU参估出错.{result1.msg}");
-                                    continue;
+                                    continue;//跳过不是任务处理的频点
                                 }
-                                LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻主星超短CPU参估完成.");
-                                cgDto = new CpuCgMultiDto()
-                                {
-                                    dtCenter = 260000,
-                                    dtRange = 50000,
-                                    file1 = cdbFile,
-                                    file2 = adjaFile,
-                                    samplingRate = minfo.FsHz,
-                                    smpPositions = smps,
-                                    snrThreshold = 15,
-                                };
-                                var result2 = await HttpHelper.PostRequestAsync<List<CpuCgResDto>>(baseUrl + "DetectCg/CpuCgMultiCalc", cgDto, token: cts.Token);
-                                if (result2.code != 200)
+                                //主星
+                                var minfo = finfos.FirstOrDefault(m => m.Ch == 2);
+                                if (minfo == null)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻邻星超短CPU参估出错.{result2.msg}");
+                                    LogHelper.Warning($"【任务{dto.ID}】信号[{taskSig.FreqUp / 1e6}],{capTime:yyyyMMddHHmmss}时刻未找到主星信号ch2文件,跳过此组数据");
                                     continue;
                                 }
-                                LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻邻星超短CPU参估完成");
-                                var data1 = result1.data;
-                                var data2 = result2.data;
-                                if (data1.Count != data2.Count || data1.Count != deteResp.data.Count)
+                                //邻1
+                                var ninfo = finfos.FirstOrDefault(m => m.Ch == 3);
+                                if (ninfo == null)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻参估结果个数和检测结果个数不匹配");
+                                    LogHelper.Info($"【任务{dto.ID}】信号[{taskSig.FreqUp / 1e6}],{capTime:yyyyMMddHHmmss}时刻未找到邻星信号ch3文件,跳过此组数据");
                                     continue;
                                 }
-                                for (int i = 0; i < data1.Count; i++)
+                                try
                                 {
-                                    try
-                                    {
-                                        if (cts.IsCancellationRequested) break;
-
-
+                                    var delay1 = taskSig.SigDelay.FirstOrDefault(p => p.SatInfoSatCode == minfo.SatId)?.Delay;
+                                    var delay2 = taskSig.SigDelay.FirstOrDefault(p => p.SatInfoSatCode == ninfo.SatId)?.Delay;
+                                    if (delay1 == null) delay1 = 0;
+                                    if (delay2 == null) delay2 = 0;
+                                    LogHelper.Info($"【任务{dto.ID}】信号[{taskSig.FreqUp / 1e6}],主星[{minfo.SatId}],转发时延{delay1}us");
+                                    LogHelper.Info($"【任务{dto.ID}】信号[{taskSig.FreqUp / 1e6}],邻星[{ninfo.SatId}],转发时延{delay2}us");
+                                    string mainFile = await HttpHelper.UploadFileAsync(minfo.FilePath, baseUrl + "File/UploadFileAsync", token: cts.Token);//主星文件
+                                    string adjaFile = await HttpHelper.UploadFileAsync(ninfo.FilePath, baseUrl + "File/UploadFileAsync", token: cts.Token);//邻星文件
+                                    string cdbFile = await HttpHelper.UploadFileAsync(dinfo.FilePath, baseUrl + "File/UploadFileAsync", token: cts.Token);//超短文件
 
-                                        X2D1NoXlNoParlPosDto x2D1 = new X2D1NoXlNoParlPosDto()
+                                    DetectDto detectDto = new DetectDto()
+                                    {
+                                        file1 = cdbFile,//11局使用上行泄露信号进行检测
+                                        dmcType = taskSig.SigType,//上行信号检测目前的算法只能使用基于能量的KY或IBS检测
+                                        fsHz = minfo.FsHz,
+                                    };
+                                    detectDto.dmcType = detectDto.dmcType & ~EnumSigCheckTypeDto.DAMA;//DAMA不支持上行信号检测,在这里移除掉
+                                    if (detectDto.dmcType == EnumSigCheckTypeDto.DAMA)
+                                    {
+                                        LogHelper.Warning($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},上行信号不支持DAMA检测");
+                                        continue;
+                                    }
+                                    var deteResp = await HttpHelper.PostRequestAsync<List<DetectResDto>>(baseUrl + "DetectCg/DetectCalc", detectDto, token: cts.Token);
+                                    if (deteResp.code != 200)
+                                    {
+                                        LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻信号检测出错.{deteResp.msg}");
+                                        continue;
+                                    }
+                                    LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻信号检测完成,共{deteResp.data.Count}个时隙");
+                                    var smps = deteResp.data.Select(m => new SmpPosition(m.Start, m.Length)).ToList();//怎么补0?
+                                    var cgDto = new CpuCgMultiDto()
+                                    {
+                                        dtCenter = 260000,
+                                        dtRange = 50000,
+                                        file1 = cdbFile,
+                                        file2 = mainFile,
+                                        samplingRate = minfo.FsHz,
+                                        smpPositions = smps,
+                                        snrThreshold = 15,
+                                    };
+                                    var result1 = await HttpHelper.PostRequestAsync<List<CpuCgResDto>>(baseUrl + "DetectCg/CpuCgMultiCalc", cgDto, token: cts.Token);
+                                    if (result1.code != 200)
+                                    {
+                                        LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻主星超短CPU参估出错.{result1.msg}");
+                                        continue;
+                                    }
+                                    LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻主星超短CPU参估完成.");
+                                    cgDto = new CpuCgMultiDto()
+                                    {
+                                        dtCenter = 260000,
+                                        dtRange = 50000,
+                                        file1 = cdbFile,
+                                        file2 = adjaFile,
+                                        samplingRate = minfo.FsHz,
+                                        smpPositions = smps,
+                                        snrThreshold = 15,
+                                    };
+                                    var result2 = await HttpHelper.PostRequestAsync<List<CpuCgResDto>>(baseUrl + "DetectCg/CpuCgMultiCalc", cgDto, token: cts.Token);
+                                    if (result2.code != 200)
+                                    {
+                                        LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻邻星超短CPU参估出错.{result2.msg}");
+                                        continue;
+                                    }
+                                    LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻邻星超短CPU参估完成");
+                                    var data1 = result1.data;
+                                    var data2 = result2.data;
+                                    if (data1.Count != data2.Count || data1.Count != deteResp.data.Count)
+                                    {
+                                        LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻参估结果个数和检测结果个数不匹配");
+                                        continue;
+                                    }
+                                    for (int i = 0; i < data1.Count; i++)
+                                    {
+                                        try
                                         {
-                                            TaskID = dto.ID,
-                                            SigTime = minfo.CapTime.AddSeconds(data1[i].Smpstart / minfo.FsHz),
-                                            MainCode = minfo.SatId,
-                                            AdjaCode = ninfo.SatId,
-                                            //卫星转发某些频点可能有时延,无参定位由于不能抵消需要减去这个时延
-                                            SxDto = data1[i].Dt * posDtoFactor - data2[i].Dt * posDtoFactor - delay1.Value + delay2.Value,
-                                            SxDfo = data1[i].Df,
-                                            SxSnr = data1[i].Snr,
-                                            XdDto = data1[i].Dt * posDtoFactor - delay1.Value,
-                                            XdDfo = data2[i].Df,
-                                            XdSnr = data2[i].Snr,
-                                            SatTxLon = dto.CapLon,
-                                            SatTxLat = dto.CapLat,
-                                            CdbTxLon = dto.CapLon,
-                                            CdbTxLat = dto.CapLat,
-                                            FreqDown = minfo.FreqHz,
-                                            FreqUp = dinfo.FreqHz,
-                                            CheckRes = new CheckResDto()
+                                            if (cts.IsCancellationRequested) break;
+                                            X2D1NoXlNoParlPosDto x2D1 = new X2D1NoXlNoParlPosDto()
                                             {
-                                                FileName = Path.GetFileName(dinfo.FilePath),
-                                                ModRate = deteResp.data[i].ModRate,
-                                                ModType = deteResp.data[i].ModType,
-                                                SmpCount = deteResp.data[i].Length,
-                                                SmpStart = deteResp.data[i].Start,
-                                                UserName = deteResp.data[i].UserName,
-                                                PosCheckType = deteResp.data[i].DmcType.GetEnumByDisplayName<EnumPosCheckTypeDto>(),
+                                                TaskID = dto.ID,
+                                                SigTime = minfo.CapTime.AddSeconds(data1[i].Smpstart / minfo.FsHz),
+                                                MainCode = minfo.SatId,
+                                                AdjaCode = ninfo.SatId,
+                                                XdDfo = data2[i].Df,
+                                                XdSnr = data2[i].Snr,
+                                                SatTxLon = dto.CapLon,
+                                                SatTxLat = dto.CapLat,
+                                                CdbTxLon = dto.CapLon,
+                                                CdbTxLat = dto.CapLat,
+                                                FreqDown = minfo.FreqHz,
+                                                FreqUp = dinfo.FreqHz,
+                                                CheckRes = new CheckResDto()
+                                                {
+                                                    FileName = Path.GetFileName(dinfo.FilePath),
+                                                    ModRate = deteResp.data[i].ModRate,
+                                                    ModType = deteResp.data[i].ModType,
+                                                    SmpCount = deteResp.data[i].Length,
+                                                    SmpStart = deteResp.data[i].Start,
+                                                    UserName = deteResp.data[i].UserName,
+                                                    PosCheckType = deteResp.data[i].DmcType.GetEnumByDisplayName<EnumPosCheckTypeDto>(),
+                                                }
+                                            };
+                                            if (data1[i].Snr > 0 && data2[i].Snr > 0)
+                                            {
+                                                //卫星转发某些频点可能有时延,无参定位由于不能抵消需要减去这个时延
+                                                x2D1.SxDto = data1[i].Dt * posDtoFactor - data2[i].Dt * posDtoFactor - delay1.Value + delay2.Value;
+                                                x2D1.SxDfo = data1[i].Df - data2[i].Df;
+                                                x2D1.SxSnr = Math.Min(data1[i].Snr, data2[i].Snr);
+                                                x2D1.XdDto = data1[i].Dt * posDtoFactor - delay1.Value;
+                                            }
+                                            var result = await HttpHelper.PostRequestAsync<PosResDto>(baseUrl + "Pos/PosX2D1NoXlNoParAsync", x2D1);
+                                            if (result.code != 200)
+                                            {
+                                                LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻时隙位置{data1[i].Smpstart}定位异常.{result.msg}");
                                             }
-                                        };
-                                        var result = await HttpHelper.PostRequestAsync<PosResDto>(baseUrl + "Pos/PosX2D1NoXlNoParAsync", x2D1);
-                                        if (result.code != 200)
+                                        }
+                                        catch (Exception ex)
                                         {
-                                            LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻时隙位置{data1[i].Smpstart}定位异常.{result.msg}");
+                                            LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻时隙位置{data1[i].Smpstart}定位异常", ex);
                                         }
                                     }
-                                    catch (Exception ex)
-                                    {
-                                        LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻时隙位置{data1[i].Smpstart}定位异常", ex);
-                                    }
+                                    LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻定位完成");
+
+                                }
+                                catch (Exception ex)
+                                {
+                                    LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻文件处理异常", ex);
+                                    continue;
                                 }
-                                LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻定位完成");
 
                             }
-                            catch (Exception ex)
-                            {
-                                LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻文件处理异常", ex);
-                                continue;
-                            }
+
 
                         }
                         ResetTime(formatFlag, ref preTime);
@@ -599,29 +582,6 @@ namespace X2D1NoRefTaskServer.Service
                 StopTask(dto.ID, EnumTaskStopType.Properly, "数据处理完成,任务结束");
             }, cts.Token);
         }
-        TimeSpan abs(TimeSpan t)
-        {
-            return (t.TotalSeconds >= 0) ? t : -t;
-        }
-        private bool IsFileInUse(string fileName)
-        {
-            bool inUse = true;
-            FileStream fs = null;
-            try
-            {
-                fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.None);
-                inUse = false;
-            }
-            catch
-            {
-            }
-            finally
-            {
-                if (fs != null)
-                    fs.Close();
-            }
-            return inUse;//true表示正在使用,false没有使用  
-        }
         private void ResetTime(int formatFlag, ref DateTime time)
         {
             if (formatFlag == 0)

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

@@ -69,6 +69,7 @@ namespace XdCxRhDW.Api
         /// <returns></returns>
         public static double[] X1D1_Pos(CgRes cgRes, StationRes sRes, CxRes cxRes, bool CalcConfidence = false)
         {
+            if (cgRes.DtoCdb.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] satStation = new double[3] { sRes.SatTxLon, sRes.SatTxLat, 0 };
             double[] cdbStation = new double[3] { sRes.CdbTxLon.Value, sRes.CdbTxLat.Value, 0 };
@@ -120,7 +121,10 @@ namespace XdCxRhDW.Api
         /// <returns></returns>
         public static double[] X2D1_Pos(CgRes cgRes, StationRes sRes, bool CalcConfidence = false)
         {
-
+            if (cgRes.Dto1.Value == 0 || cgRes.DtoCdb.Value == 0)
+            {
+                return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+            }
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] adjaSat = new double[3] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value };
             double[] satStation = new double[3] { sRes.SatTxLon, sRes.SatTxLat, 0 };
@@ -182,6 +186,10 @@ namespace XdCxRhDW.Api
         /// <returns></returns>
         public static double[] X2D1_PosNoRef(CgRes cgRes, StationRes sRes, bool CalcConfidence = false)
         {
+            if (cgRes.Dto1.Value == 0 || cgRes.DtoCdb.Value == 0)
+            {
+                return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+            }
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] adjaSat = new double[3] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value };
             double[] satStation = new double[3] { sRes.SatTxLon, sRes.SatTxLat, 0 };
@@ -308,6 +316,11 @@ namespace XdCxRhDW.Api
         /// <returns></returns>
         public static double[] X3_Pos(CgRes cgRes, StationRes sRes, bool CalcConfidence = false)
         {
+            if (cgRes.Dto1.Value == 0 || cgRes.Dto2.Value == 0)
+            {
+                return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+            }
+            if (cgRes.Dto1.Value == 0 || cgRes.Dto2.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] adjaSat1 = new double[3] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value };
             double[] adjaSat2 = new double[3] { cgRes.Adja2X.Value, cgRes.Adja2Y.Value, cgRes.Adja2Z.Value };
@@ -377,6 +390,10 @@ namespace XdCxRhDW.Api
         /// <returns></returns>
         public static double[] X3_PosNoRef(CgRes cgRes, StationRes sRes, bool CalcConfidence = false)
         {
+            if (cgRes.Dto1.Value == 0 || cgRes.Dto2.Value == 0)
+            {
+                return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+            }
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] adjaSat1 = new double[3] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value };
             double[] adjaSat2 = new double[3] { cgRes.Adja2X.Value, cgRes.Adja2Y.Value, cgRes.Adja2Z.Value };
@@ -440,6 +457,7 @@ namespace XdCxRhDW.Api
         /// <returns></returns>
         public static double[] X3_PosTwoDfo(CgRes cgRes, StationRes sRes, bool CalcConfidence = false)
         {
+            if (cgRes.Dfo1.Value == 0 || cgRes.Dfo2.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
             double[] mainSat = new double[6] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value, cgRes.MainVx.Value, cgRes.MainVy.Value, cgRes.MainVz.Value };
             double[] adjaSat1 = new double[6] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value, cgRes.Adja1Vx.Value, cgRes.Adja1Vy.Value, cgRes.Adja1Vz.Value };
             double[] adjaSat2 = new double[6] { cgRes.Adja2X.Value, cgRes.Adja2Y.Value, cgRes.Adja2Z.Value, cgRes.Adja2Vx.Value, cgRes.Adja2Vy.Value, cgRes.Adja2Vz.Value };
@@ -513,6 +531,7 @@ namespace XdCxRhDW.Api
         /// <returns></returns>
         public static double[] X2_PosDtoDfo(CgRes cgRes, StationRes sRes, bool CalcConfidence = false)
         {
+            if (cgRes.Dto1.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
             double[] mainSat = new double[6] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value, cgRes.MainVx.Value, cgRes.MainVy.Value, cgRes.MainVz.Value };
             double[] adjaSat = new double[6] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value, cgRes.Adja1Vx.Value, cgRes.Adja1Vy.Value, cgRes.Adja1Vz.Value };
             double[] satStation = new double[3] { sRes.SatTxLon, sRes.SatTxLat, 0 };

XdCxRhDW.App/Controllers/PosController.cs

@@ -85,10 +85,10 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo.Value, 4),
-                    SnrCdb = Math.Round(dto.XdSnr.Value, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     TaskID = runTask.ID,
@@ -202,10 +202,10 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo.Value, 4),
-                    SnrCdb = Math.Round(dto.XdSnr.Value, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     MainXlTime = ephMain.data.TleTime,
@@ -309,14 +309,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo.Value, 4),
-                    Snr1 = Math.Round(dto.SxSnr.Value, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo.Value, 4),
-                    SnrCdb = Math.Round(dto.XdSnr.Value, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
-                    YbAdja1Dto = Math.Round(dto.AdjaYbDto, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
+                    YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -452,14 +452,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo.Value, 4),
-                    Snr1 = Math.Round(dto.SxSnr.Value, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo.Value, 4),
-                    SnrCdb = Math.Round(dto.XdSnr.Value, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
-                    YbAdja1Dto = Math.Round(dto.AdjaYbDto, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
+                    YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     MainXlTime = ephMain.data.TleTime,
@@ -563,12 +563,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo.Value, 4),
-                    Snr1 = Math.Round(dto.SxSnr.Value, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo.Value, 4),
-                    SnrCdb = Math.Round(dto.XdSnr.Value, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -697,12 +697,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo.Value, 4),
-                    Snr1 = Math.Round(dto.SxSnr.Value, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo.Value, 4),
-                    SnrCdb = Math.Round(dto.XdSnr.Value, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -812,14 +812,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo.Value, 4),
-                    Snr1 = Math.Round(dto.SxSnr.Value, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo.Value, 4),
-                    SnrCdb = Math.Round(dto.XdSnr.Value, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
-                    YbAdja1Dto = Math.Round(dto.AdjaYbDto, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
+                    YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -954,14 +954,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo.Value, 4),
-                    Snr1 = Math.Round(dto.SxSnr.Value, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo.Value, 4),
-                    SnrCdb = Math.Round(dto.XdSnr.Value, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
-                    YbAdja1Dto = Math.Round(dto.AdjaYbDto, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
+                    YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -1072,15 +1072,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1.Value, 4),
-                    Snr1 = Math.Round(dto.Snr1.Value, 4),
-                    Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2.Value, 4),
-                    Snr2 = Math.Round(dto.Snr2.Value, 4),
-                    YbMainDto = Math.Round(dto.YbMainDto, 4),
-                    YbAdja1Dto = Math.Round(dto.YbAdja1Dto, 4),
-                    YbAdja2Dto = Math.Round(dto.YbAdja2Dto, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 = dto.Snr2,
+                    YbMainDto = dto.YbMainDto,
+                    YbAdja1Dto =    dto.YbAdja1Dto,
+                    YbAdja2Dto = dto.YbAdja2Dto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1231,15 +1231,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1.Value, 4),
-                    Snr1 = Math.Round(dto.Snr1.Value, 4),
-                    Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2.Value, 4),
-                    Snr2 = Math.Round(dto.Snr2.Value, 4),
-                    YbMainDto = Math.Round(dto.YbMainDto, 4),
-                    YbAdja1Dto = Math.Round(dto.YbAdja1Dto, 4),
-                    YbAdja2Dto = Math.Round(dto.YbAdja2Dto, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 = dto.Snr2,
+                    YbMainDto = dto.YbMainDto,
+                    YbAdja1Dto = dto.YbAdja1Dto,
+                    YbAdja2Dto = dto.YbAdja2Dto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1349,12 +1349,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1.Value, 4),
-                    Snr1 = Math.Round(dto.Snr1.Value, 4),
-                    Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2.Value, 4),
-                    Snr2 = Math.Round(dto.Snr2.Value, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 = dto.Snr2,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1502,12 +1502,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1.Value, 4),
-                    Snr1 = Math.Round(dto.Snr1.Value, 4),
-                    Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2.Value, 4),
-                    Snr2 = Math.Round(dto.Snr2.Value, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 = dto.Snr2,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1621,15 +1621,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1.Value, 4),
-                    Dfo1 = Math.Round(dto.Dfo1, 4),
-                    Snr1 = Math.Round(dto.Snr1.Value, 4),
-                    Dto2 = Math.Round(dto.Dto2.Value, 4),
-                    Dfo2 = Math.Round(dto.Dfo2, 4),
-                    Snr2 = Math.Round(dto.Snr2.Value, 4),
-                    YbMainDfo = Math.Round(dto.YbMainDfo, 4),
-                    YbAdja1Dfo = Math.Round(dto.YbAdja1Dfo, 4),
-                    YbAdja2Dfo = Math.Round(dto.YbAdja2Dfo, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 = dto.Snr2,
+                    YbMainDfo = dto.YbMainDfo,
+                    YbAdja1Dfo = dto.YbAdja1Dfo,
+                    YbAdja2Dfo = dto.YbAdja2Dfo,
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,
@@ -1782,15 +1782,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1.Value, 4),
-                    Dfo1 = Math.Round(dto.Dfo1, 4),
-                    Snr1 = Math.Round(dto.Snr1.Value, 4),
-                    Dto2 = Math.Round(dto.Dto2.Value, 4),
-                    Dfo2 = Math.Round(dto.Dfo2, 4),
-                    Snr2 = Math.Round(dto.Snr2.Value, 4),
-                    YbMainDfo = Math.Round(dto.YbMainDfo.Value, 4),
-                    YbAdja1Dfo = Math.Round(dto.YbAdja1Dfo.Value, 4),
-                    YbAdja2Dfo = Math.Round(dto.YbAdja2Dfo.Value, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 =dto.Snr2,
+                    YbMainDfo = dto.YbMainDfo,
+                    YbAdja1Dfo = dto.YbAdja1Dfo,
+                    YbAdja2Dfo = dto.YbAdja2Dfo,
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,
@@ -1906,13 +1906,13 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto, 4),
-                    Dfo1 = Math.Round(dto.Dfo, 4),
-                    Snr1 = Math.Round(dto.Snr.Value, 4),
-                    YbMainDto = Math.Round(dto.YbMainDto, 4),
-                    YbAdja1Dto = Math.Round(dto.YbAdjaDto, 4),
-                    YbMainDfo = Math.Round(dto.YbMainDfo, 4),
-                    YbAdja1Dfo = Math.Round(dto.YbAdjaDfo, 4),
+                    Dto1 = dto.Dto,
+                    Dfo1 = dto.Dfo,
+                    Snr1 = dto.Snr,
+                    YbMainDto = dto.YbMainDto,
+                    YbAdja1Dto = dto.YbAdjaDto,
+                    YbMainDfo = dto.YbMainDfo,
+                    YbAdja1Dfo = dto.YbAdjaDfo,
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,
@@ -2044,13 +2044,13 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto, 4),
-                    Dfo1 = Math.Round(dto.Dfo, 4),
-                    Snr1 = Math.Round(dto.Snr.Value, 4),
-                    YbMainDto = Math.Round(dto.YbMainDto, 4),
-                    YbAdja1Dto = Math.Round(dto.YbAdjaDto, 4),
-                    YbMainDfo = Math.Round(dto.YbMainDfo, 4),
-                    YbAdja1Dfo = Math.Round(dto.YbAdjaDfo, 4),
+                    Dto1 = dto.Dto,
+                    Dfo1 = dto.Dfo,
+                    Snr1 = dto.Snr,
+                    YbMainDto = dto.YbMainDto,
+                    YbAdja1Dto = dto.YbAdjaDto,
+                    YbMainDfo = dto.YbMainDfo,
+                    YbAdja1Dfo = dto.YbAdjaDfo,
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,

XdCxRhDW.App/EditForms/X1D1DTOParamEditor.cs

@@ -26,11 +26,11 @@ namespace XdCxRhDW.App.EditForms
         public X1D1DTOParamEditor(PosRes info, MapControl mapControl)
         {
             InitializeComponent();
+            this.info = info;
             itemSigTime.Text = $"{itemSigTime.Text}({SysConfig.Config.TimeZoneUTC})";
             sigTime.UseDefault();
             this.layoutControl1.UseDefault();
             this.Text = $"{info.PosResType.GetEnumDisplayName()}时差参数";
-            this.info = info;
             this.listSat = new List<SatInfo>();
             this.mapControl1 = mapControl;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
@@ -80,14 +80,14 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cx != null)
             {
-                this.txtcxFx.Text = $"{cx.Fx:f3}";
+                this.txtcxFx.Text = $"{cx.Fx:f4}";
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
-                this.txtcdbStation.Text = $"{station.CdbTxLon:f3},{station.CdbTxLat:f3}";
-                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
-                this.txtCxLocation.Text= $"{station.CxLon:f3},{station.CxLat:f3}";
+                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
+                this.txtcdbStation.Text = $"{station.CdbTxLon:f4},{station.CdbTxLat:f4}";
+                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
+                this.txtCxLocation.Text= $"{station.CxLon:f4},{station.CxLat:f4}";
             }
         }
 
@@ -221,12 +221,12 @@ namespace XdCxRhDW.App.EditForms
                 };
 
                 var res = PosApi.X1D1_Pos(cgRes, StationRes, cxRes);
-                this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f3},{res[1]:f3}] 镜像点:[{res[3]:f3},{res[4]:f3}]";
+                this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4} , {res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"手动{info.PosResType.GetEnumDisplayName()}定位失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"手动{info.PosResType.GetEnumDisplayName()}定位失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
     }

XdCxRhDW.App/EditForms/X1D1PosParamEditor.Designer.cs

@@ -29,21 +29,21 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.ucEphXYZMain = new XdCxRhDW.App.UserControl.UCEphXYZ();
             this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
@@ -62,7 +62,6 @@
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
@@ -71,8 +70,9 @@
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.itemSigTime = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.sigTime.Properties)).BeginInit();
@@ -89,7 +89,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
@@ -98,8 +97,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.itemSigTime)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -166,7 +166,7 @@
             this.txtDtoCdb.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtDtoCdb.Name = "txtDtoCdb";
             this.txtDtoCdb.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)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtDtoCdb.Properties.NullValuePrompt = "必需";
             this.txtDtoCdb.Size = new System.Drawing.Size(266, 20);
             this.txtDtoCdb.StyleController = this.layoutControl1;
@@ -178,7 +178,7 @@
             this.txtYbMain.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtYbMain.Name = "txtYbMain";
             this.txtYbMain.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtYbMain.Size = new System.Drawing.Size(268, 20);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
@@ -265,9 +265,7 @@
             this.txtcxFx.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtcxFx.Name = "txtcxFx";
             this.txtcxFx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "° ", -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.txtcxFx.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtcxFx.Properties.MaskSettings.Set("mask", "f3");
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "° ", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtcxFx.Properties.MaxLength = 20;
             this.txtcxFx.Size = new System.Drawing.Size(176, 20);
             this.txtcxFx.StyleController = this.layoutControl1;
@@ -359,23 +357,6 @@
             this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.btnOK;
-            this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(434, 186);
-            this.layoutControlItem17.MaxSize = new System.Drawing.Size(110, 33);
-            this.layoutControlItem17.MinSize = new System.Drawing.Size(110, 33);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(10, 2, 9, 2);
-            this.layoutControlItem17.Size = new System.Drawing.Size(110, 33);
-            this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem17.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
-            this.layoutControlItem17.Text = "layoutControlItem1";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem17.TextVisible = false;
-            // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txtYbMain;
@@ -481,9 +462,22 @@
             this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem3.TextVisible = false;
             // 
-            // dxErrorProvider
+            // layoutControlItem17
             // 
-            this.dxErrorProvider.ContainerControl = this;
+            this.layoutControlItem17.Control = this.btnOK;
+            this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
+            this.layoutControlItem17.Location = new System.Drawing.Point(434, 186);
+            this.layoutControlItem17.MaxSize = new System.Drawing.Size(110, 33);
+            this.layoutControlItem17.MinSize = new System.Drawing.Size(110, 33);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(10, 2, 9, 2);
+            this.layoutControlItem17.Size = new System.Drawing.Size(110, 33);
+            this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem17.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
+            this.layoutControlItem17.Text = "layoutControlItem1";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem17.TextVisible = false;
             // 
             // emptySpaceItem2
             // 
@@ -493,6 +487,10 @@
             this.emptySpaceItem2.Size = new System.Drawing.Size(334, 33);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
+            // dxErrorProvider
+            // 
+            this.dxErrorProvider.ContainerControl = this;
+            // 
             // X1D1PosParamEditor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -517,7 +515,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
@@ -526,8 +523,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.itemSigTime)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             this.ResumeLayout(false);
 
         }

XdCxRhDW.App/EditForms/X1D1PosParamEditor.cs

@@ -1,4 +1,5 @@
-using DevExpress.XtraMap;
+using DevExpress.XtraEditors.DXErrorProvider;
+using DevExpress.XtraMap;
 using DxHelper;
 using ExtensionsDev;
 using System;
@@ -25,10 +26,10 @@ namespace XdCxRhDW.App.EditForms
         public X1D1PosParamEditor(PosRes info, MapControl mapControl)
         {
             InitializeComponent();
+            this.info = info;
             itemSigTime.Text = $"{itemSigTime.Text}({SysConfig.Config.TimeZoneUTC})";
             this.layoutControl1.UseDefault();
             sigTime.UseDefault();
-            this.info = info;
             this.labelControl1.Text = $"";
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtcdbStation.EditValueChanged += TxtcdbStation_EditValueChanged;
@@ -59,7 +60,6 @@ namespace XdCxRhDW.App.EditForms
 
         private async void X1D1DTOParamEditor_Load(object sender, EventArgs e)
         {
-
             StationRes station = null;
             CxRes cx = null;
             using (RHDWPartContext db = RHDWPartContext.GetContext(info.SigTime))
@@ -77,14 +77,14 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cx != null)
             {
-                this.txtcxFx.Text = $"{cx.Fx:f3}";
+                this.txtcxFx.Text = $"{cx.Fx:f4}";
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
-                this.txtcdbStation.Text = $"{station.CdbTxLon:f3},{station.CdbTxLat:f3}";
-                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
-                this.txtCxLocation.Text = $"{station.CxLon:f3},{station.CxLat:f3}";
+                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
+                this.txtcdbStation.Text = $"{station.CdbTxLon:f4},{station.CdbTxLat:f4}";
+                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
+                this.txtCxLocation.Text = $"{station.CxLon:f4},{station.CxLat:f4}";
             }
         }
 
@@ -150,12 +150,12 @@ namespace XdCxRhDW.App.EditForms
                 };
 
                 var res = PosApi.X1D1_Pos(cgRes, StationRes, cxRes);
-                this.labelControl1.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f3},{res[1]:f3}] 镜像点:[{res[3]:f3},{res[4]:f3}]";
+                this.labelControl1.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"手动{info.PosResType.GetEnumDisplayName()}定位失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"手动{info.PosResType.GetEnumDisplayName()}定位失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
 

XdCxRhDW.App/EditForms/X2D1DTOParamEditor.cs

@@ -27,11 +27,11 @@ namespace XdCxRhDW.App.EditForms
         public X2D1DTOParamEditor(PosRes info, MapControl mapControl)
         {
             InitializeComponent();
+            this.info = info;
             itemSigTime.Text = $"{itemSigTime.Text}({SysConfig.Config.TimeZoneUTC})";
             this.layoutControl1.UseDefault();
             txtSigTime.UseDefault();
             this.Text = $"{info.PosResType.GetEnumDisplayName()}时差参数";
-            this.info = info;
             this.listSat = new List<SatInfo>();
             this.mapControl1 = mapControl;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
@@ -83,9 +83,9 @@ namespace XdCxRhDW.App.EditForms
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
-                this.txtcdbStation.Text = $"{station.CdbTxLon:f3},{station.CdbTxLat:f3}";
-                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
+                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
+                this.txtcdbStation.Text = $"{station.CdbTxLon:f4},{station.CdbTxLat:f4}";
+                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
             }
             if (info.PosResType == EnumPosResType.X2D1NoRef)
             {
@@ -305,7 +305,7 @@ namespace XdCxRhDW.App.EditForms
                         Adja1Z = dto.AdjaZ,
                     };
                     var res = PosApi.X2D1_PosNoRef(cgRes, StationRes);
-                    this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f3},{res[1]:f3}] 镜像点:[{res[3]:f3},{res[4]:f3}]";
+                    this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
                 }
                 else
                 {
@@ -355,13 +355,13 @@ namespace XdCxRhDW.App.EditForms
                         Adja1Z = dto.AdjaZ,
                     };
                     var res = PosApi.X2D1_Pos(cgRes, StationRes);
-                    this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f3},{res[1]:f3}] 镜像点:[{res[3]:f3},{res[4]:f3}]";
+                    this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
                 }
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"定位{info.PosResType.GetEnumDisplayName()}失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"定位{info.PosResType.GetEnumDisplayName()}失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
     }

XdCxRhDW.App/EditForms/X2D1PosParamEditor.Designer.cs

@@ -521,7 +521,7 @@
             this.Controls.Add(this.layoutControl1);
             this.Name = "X2D1PosParamEditor";
             this.Size = new System.Drawing.Size(642, 369);
-            this.Load += new System.EventHandler(this.X2D1DTOParamEditor_Load);
+            this.Load += new System.EventHandler(this.X2D1PosParamEditor_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txtSigTime.Properties.CalendarTimeProperties)).EndInit();

XdCxRhDW.App/EditForms/X2D1PosParamEditor.cs

@@ -23,11 +23,11 @@ namespace XdCxRhDW.App.EditForms
         public X2D1PosParamEditor(PosRes info)
         {
             InitializeComponent();
+            this.info = info;
             itemSigTime.Text = $"{itemSigTime.Text}({SysConfig.Config.TimeZoneUTC})";
             this.layoutControl1.UseDefault();
             txtSigTime.UseDefault();
             this.Text = $"{info.PosResType.GetEnumDisplayName()}手动定位";
-            this.info = info;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtcdbStation.EditValueChanged += TxtcdbStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
@@ -49,9 +49,8 @@ namespace XdCxRhDW.App.EditForms
             txtsatStation.CheckLonLat(dxErrorProvider, "接收站");
         }
 
-        private async void X2D1DTOParamEditor_Load(object sender, EventArgs e)
+        private async void X2D1PosParamEditor_Load(object sender, EventArgs e)
         {
-
             StationRes station = null;
             using (RHDWPartContext db = RHDWPartContext.GetContext(info.SigTime))
             {
@@ -73,9 +72,9 @@ namespace XdCxRhDW.App.EditForms
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
-                this.txtcdbStation.Text = $"{station.CdbTxLon:f3},{station.CdbTxLat:f3}";
-                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
+                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
+                this.txtcdbStation.Text = $"{station.CdbTxLon:f4},{station.CdbTxLat:f4}";
+                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
             }
             if (info.PosResType == EnumPosResType.X2D1NoRef)
             {
@@ -188,7 +187,7 @@ namespace XdCxRhDW.App.EditForms
                         Adja1Z = dto.AdjaZ,
                     };
                     var res = PosApi.X2D1_PosNoRef(cgRes, StationRes);
-                    this.lblRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f3},{res[1]:f3}] 镜像点:[{res[3]:f3},{res[4]:f3}]";
+                    this.lblRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
                     //var result = await HttpHelper.PostRequestAsync<PosResDto>(url, X2D1PosDto);
                     //if (result.code == 200)
                     //{
@@ -243,18 +242,13 @@ namespace XdCxRhDW.App.EditForms
                         Adja1Z = dto.AdjaZ,
                     };
                     var res = PosApi.X2D1_Pos(cgRes, StationRes);
-                    this.lblRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f3},{res[1]:f3}] 镜像点:[{res[3]:f3},{res[4]:f3}]";
-                    //var result = await HttpHelper.PostRequestAsync<PosResDto>(url, X2D1PosDto);
-                    //if (result.code == 200)
-                    //{
-                    //    lblRes.Text = $"定位结果{result.data.PosLon},{result.data.PosLat}";
-                    //}
+                    this.lblRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
                 }
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"定位{info.PosResType.GetEnumDisplayName()}失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"定位{info.PosResType.GetEnumDisplayName()}失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
 

XdCxRhDW.App/EditForms/X2DTOParamEditor.Designer.cs

@@ -165,7 +165,6 @@
             this.txtYbMain.Name = "txtYbMain";
             this.txtYbMain.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.txtYbMain.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtYbMain.Size = new System.Drawing.Size(199, 20);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;

XdCxRhDW.App/EditForms/X2DTOParamEditor.cs

@@ -32,11 +32,11 @@ namespace XdCxRhDW.App.EditForms
         public X2DTOParamEditor(PosRes info, MapControl mapControl)
         {
             InitializeComponent();
+            this.info = info;
             itemSigTime.Text = $"{itemSigTime.Text}({SysConfig.Config.TimeZoneUTC})";
             this.layoutControl1.UseDefault();
             sigTime.UseDefault();
             this.Text = $"{info.PosResType.GetEnumDisplayName()}时差参数";
-            this.info = info;
             this.listSat = new List<SatInfo>();
             this.mapControl1 = mapControl;
             //this.StartPosition = FormStartPosition.CenterParent;
@@ -79,8 +79,8 @@ namespace XdCxRhDW.App.EditForms
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
-                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
+                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
+                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
             }
         }
 

XdCxRhDW.App/EditForms/X2PosParamEditor.Designer.cs

@@ -235,9 +235,6 @@
             this.txtDtoSx.Name = "txtDtoSx";
             this.txtDtoSx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtoSx.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDtoSx.Properties.MaskSettings.Set("mask", "f4");
-            this.txtDtoSx.Properties.MaxLength = 10;
             this.txtDtoSx.Properties.NullValuePrompt = "必需";
             this.txtDtoSx.Size = new System.Drawing.Size(240, 20);
             this.txtDtoSx.StyleController = this.layoutControl1;
@@ -250,9 +247,6 @@
             this.txtYbMain.Name = "txtYbMain";
             this.txtYbMain.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYbMain.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtYbMain.Properties.MaskSettings.Set("mask", "f4");
-            this.txtYbMain.Properties.MaxLength = 10;
             this.txtYbMain.Size = new System.Drawing.Size(211, 20);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
@@ -264,9 +258,6 @@
             this.txtYbAdja.Name = "txtYbAdja";
             this.txtYbAdja.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYbAdja.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtYbAdja.Properties.MaskSettings.Set("mask", "f4");
-            this.txtYbAdja.Properties.MaxLength = 10;
             this.txtYbAdja.Size = new System.Drawing.Size(200, 20);
             this.txtYbAdja.StyleController = this.layoutControl1;
             this.txtYbAdja.TabIndex = 6;

XdCxRhDW.App/EditForms/X2PosParamEditor.cs

@@ -34,11 +34,11 @@ namespace XdCxRhDW.App.EditForms
         public X2PosParamEditor(PosRes info)
         {
             InitializeComponent();
+            this.info = info;
             itemSigTime.Text = $"{itemSigTime.Text}({SysConfig.Config.TimeZoneUTC})";
             this.layoutControl1.UseDefault();
             txtSigTime.UseDefault();
             this.Text = $"{info.PosResType.GetEnumDisplayName()}手动定位";
-            this.info = info;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
         }
@@ -87,8 +87,8 @@ namespace XdCxRhDW.App.EditForms
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
-                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
+                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
+                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
             }
         }
 
@@ -205,19 +205,13 @@ namespace XdCxRhDW.App.EditForms
                     Adja1Vz = dto.AdjaVz,
                 };
                 var res = PosApi.X2_PosDtoDfo(cgRes, StationRes);
-                this.lblRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f3},{res[1]:f3}] 镜像点:[{res[3]:f3},{res[4]:f3}]";
-                //string url = string.Format("http://{0}:{1}/Api/Pos/PosX2DtoDfoAsync", IpHelper.GetLocalIp(), settings.HttpPort);
-                //var result = await HttpHelper.PostRequestAsync<PosResDto>(url, X2DtoDfoPos);
-                //if (result.code == 200)
-                //{
-                //    lblRes.Text = $"定位结果{result.data.PosLon},{result.data.PosLat}";
-                //}
+                this.lblRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
             }
 
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"定位{info.PosResType.GetEnumDisplayName()}失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"定位{info.PosResType.GetEnumDisplayName()}失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
 

XdCxRhDW.App/EditForms/X3DTOParamEditor.cs

@@ -26,11 +26,11 @@ namespace XdCxRhDW.App.EditForms
         public X3DTOParamEditor(PosRes info, MapControl mapControl)
         {
             InitializeComponent();
+            this.info = info;
             itemSigTime.Text = $"{itemSigTime.Text}({SysConfig.Config.TimeZoneUTC})";
             this.layoutControl1.UseDefault();
             sigTime.UseDefault();
             this.Text = $"{info.PosResType.GetEnumDisplayName()}时差参数";
-            this.info = info;
             this.mapControl1 = mapControl;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
@@ -83,8 +83,8 @@ namespace XdCxRhDW.App.EditForms
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
-                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
+                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
+                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
             }
             if (info.PosResType == EnumPosResType.X3NoRef)
             {
@@ -274,13 +274,12 @@ namespace XdCxRhDW.App.EditForms
                     Adja2Z = Ns2Eph[2],
                 };
                 var res = info.PosResType == EnumPosResType.X3 ? PosApi.X3_Pos(cgRes, StationRes) : PosApi.X3_PosNoRef(cgRes, StationRes);
-
-                this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f3},{res[1]:f3}] 镜像点:[{res[3]:f3},{res[4]:f3}]";
+                this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"绘制{info.PosResType.GetEnumDisplayName()}时差线失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"绘制{info.PosResType.GetEnumDisplayName()}时差线失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
     }

XdCxRhDW.App/EditForms/X3DfoPosParamEditor.cs

@@ -28,10 +28,10 @@ namespace XdCxRhDW.App.EditForms
         public X3DfoPosParamEditor(PosRes info)
         {
             InitializeComponent();
+            this.info = info;
             itemSigTime.Text = $"{itemSigTime.Text}({SysConfig.Config.TimeZoneUTC})";
             this.layoutControl1.UseDefault();
             sigTime.UseDefault();
-            this.info = info;
             this.labelControl1.Text = $"";
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
@@ -80,8 +80,8 @@ namespace XdCxRhDW.App.EditForms
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
-                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
+                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
+                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
             }
             if (info.PosResType == EnumPosResType.X3NoRef)
             {
@@ -174,12 +174,12 @@ namespace XdCxRhDW.App.EditForms
                 };
                 var res = PosApi.X3_PosTwoDfo(cgRes, StationRes);
 
-                this.labelControl1.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f3},{res[1]:f3}] 镜像点:[{res[3]:f3},{res[4]:f3}]";
+                this.labelControl1.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"手动{info.PosResType.GetEnumDisplayName()}定位失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"手动{info.PosResType.GetEnumDisplayName()}定位失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
 

XdCxRhDW.App/EditForms/X3PosParamEditor.cs

@@ -24,10 +24,10 @@ namespace XdCxRhDW.App.EditForms
         public X3PosParamEditor(PosRes info, MapControl mapControl)
         {
             InitializeComponent();
+            this.info = info;
             itemSigTime.Text = $"{itemSigTime.Text}({SysConfig.Config.TimeZoneUTC})";
             this.layoutControl1.UseDefault();
             sigTime.UseDefault();
-            this.info = info;
             this.labelControl1.Text = $"";
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
@@ -75,8 +75,8 @@ namespace XdCxRhDW.App.EditForms
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
-                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
+                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
+                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
             }
             if (info.PosResType == EnumPosResType.X3NoRef)
             {
@@ -151,12 +151,12 @@ namespace XdCxRhDW.App.EditForms
                 };
                 var res = info.PosResType == EnumPosResType.X3 ? PosApi.X3_Pos(cgRes, StationRes) : PosApi.X3_PosNoRef(cgRes, StationRes);
 
-                this.labelControl1.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f3},{res[1]:f3}] 镜像点:[{res[3]:f3},{res[4]:f3}]";
+                this.labelControl1.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"绘制{info.PosResType.GetEnumDisplayName()}时差线失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"绘制{info.PosResType.GetEnumDisplayName()}时差线失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
 

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -132,6 +132,15 @@ public static class MapControlEx
         innerData.mapToolTip.ToolTipAnchor = DevExpress.Utils.ToolTipAnchor.Cursor;
         innerData.mapToolTip.ToolTipType = ToolTipType.SuperTip;
         ctrl.Tag = innerData;
+        MapOverlay overlay = new MapOverlay()
+        {
+            Alignment = ContentAlignment.BottomLeft,
+            JoiningOrientation = Orientation.Horizontal,
+            Margin = new Padding(5, 0, 0, 5),
+            Padding = new Padding(0),
+        };
+        //overlay.BackgroundStyle.Fill = Color.Transparent;
+        ctrl.Overlays.Add(overlay);
         ctrl.ToolTipController = innerData.mapToolTip;
         ctrl.ToolTipController.BeforeShow += (sender, e) =>
         {
@@ -248,6 +257,33 @@ public static class MapControlEx
                 ele.ToolTipPattern = sb.ToString();
             }
         };
+        ctrl.MouseMove += (sender, e) =>
+        {
+            overlay.Items.Clear();
+            var geo = (GeoPoint)ctrl.ScreenPointToCoordPoint(e.Location);
+            string ee = "E";
+            string nn = "N";
+            if (geo.Longitude < 0)
+            {
+                geo.Longitude *= -1;
+                ee = "W";
+            }
+            if (geo.Latitude < 0)
+            {
+                geo.Latitude *= -1;
+                nn = "S";
+            }
+            MapOverlayTextItem item = new MapOverlayTextItem()
+            {
+                Alignment = ContentAlignment.BottomLeft,
+                Text = $"{geo.Longitude:f1}°{ee}    {geo.Latitude:f1}°{nn}"
+                  
+
+            };
+            //item.TextStyle.TextColor = Color.FromArgb(128, 128, 128);
+            item.TextStyle.Font = new Font("微软雅黑", 11F);
+            overlay.Items.Add(item);
+        };
         ctrl.MouseDown += (sender, e) =>
         {
             if (e.Button == MouseButtons.Right)
@@ -319,15 +355,17 @@ public static class MapControlEx
         ((GeoMapCoordinateSystem)ctrl.CoordinateSystem).CircularScrollingMode = CircularScrollingMode.TilesAndVectorItems;
 
         //地图下方导航栏
-        ctrl.NavigationPanelOptions.Height = 35;
-        ctrl.NavigationPanelOptions.BackgroundStyle.Fill = Color.Transparent;
-        ctrl.NavigationPanelOptions.ShowScrollButtons = false;
-        ctrl.NavigationPanelOptions.ShowZoomTrackbar = false;
-        ctrl.NavigationPanelOptions.ShowCoordinates = true;
-        ctrl.NavigationPanelOptions.ShowKilometersScale = false;
-        ctrl.NavigationPanelOptions.ShowMilesScale = false;
-        ctrl.NavigationPanelOptions.CoordinatesStyle.Font = new Font("微软雅黑", 10F);
-        ctrl.NavigationPanelOptions.ScaleStyle.Font = new Font("微软雅黑", 10F);
+        ctrl.NavigationPanelOptions.Visible = false;
+        //ctrl.NavigationPanelOptions.Height = 35;
+        //ctrl.NavigationPanelOptions.BackgroundStyle.Fill = Color.Transparent;
+        //ctrl.NavigationPanelOptions.ShowScrollButtons = false;
+        //ctrl.NavigationPanelOptions.ShowZoomTrackbar = false;
+        //ctrl.NavigationPanelOptions.ShowCoordinates = true;
+        //ctrl.NavigationPanelOptions.ShowKilometersScale = false;
+        //ctrl.NavigationPanelOptions.ShowMilesScale = false;
+        //ctrl.NavigationPanelOptions.CoordinatesStyle.Font = new Font("微软雅黑", 12F);
+        //ctrl.NavigationPanelOptions.CoordinatesStyle.TextColor = Color.FromArgb(80, 80, 80);
+        //ctrl.NavigationPanelOptions.ScaleStyle.Font = new Font("微软雅黑", 10F);
 
         //地图绘制加载(标点、测距、框选等元素载体图层).用来绘制可擦除的元素
         var layerDraw = new VectorItemsLayer() { Name = "DrawLayer" };

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -79,13 +79,13 @@ namespace XdCxRhDW.App.UserControl
             gridView1.BestFitColumns();
             gridHomePosRes.UseDefault(new List<ModelPosRes>()).UseMultiSelect().UseRowNumber().UseNullValueText()
                 .AddRowMenu<ModelPosRes>("绘制时差线", SvgHelper.CreateDtoLine(), DrawDtoLine, item => item.PosResType != EnumPosResType.RH)
-                .AddRowMenuAsync<ModelPosRes>("绘制频差线", SvgHelper.CreateDfoLine(), DrawDfoLine, item => item.PosResType == EnumPosResType.X2Dfo || item.PosResType == EnumPosResType.X3TwoDfo)
+                .AddRowMenuAsync<ModelPosRes>("绘制频差线", SvgHelper.CreateDfoLine(), DrawDfoLine, item => item.PosResType != EnumPosResType.RH)
                 .AddRowMenuAsync<ModelPosRes>("绘制测向线", SvgHelper.CreateDfoLine(), DrawCxLine, item => item.PosResType == EnumPosResType.X1D1CX || item.PosResType == EnumPosResType.RH)
                 .AddRowMenu<ModelPosRes>("GDOP分析", SvgHelper.CreateGDOP(), DrawGdopLine, item => item.PosResType != EnumPosResType.RH)
                 .AddRowMenu<ModelPosRes>("查看参估", SvgHelper.CreateShowCafRes(), ShowCafRes)
                 .AddRowMenu<ModelPosRes>("查看测向", SvgHelper.CreateShowCxRes(), ShowCxRes)
-                .AddRowMenu<ModelPosRes>("查看检测", SvgHelper.CreateShowCheckRes(), ShowCheckRes, item => item.PosResType == EnumPosResType.X1D1CX || item.PosResType == EnumPosResType.RH)
-                .AddRowMenu<ModelPosRes>("手动定位", SvgHelper.CreatePosManual(), PosManual)
+                .AddRowMenu<ModelPosRes>("查看检测", SvgHelper.CreateShowCheckRes(), ShowCheckRes)
+                .AddRowMenu<ModelPosRes>("手动定位", SvgHelper.CreatePosManual(), PosManual, item => item.PosResType != EnumPosResType.RH)
                 .AddContentMenu<ModelPosRes>("重新定位", SvgHelper.CreateRepos(), Repos, true)
                 .UseDeleteAsync<ModelPosRes>(DelPos, "删除记录")
                 .SetDisplayText(nameof(ModelPosRes.FreqUpHz), val => (Convert.ToInt64(val) / 1e6).ToString("f3"))
@@ -404,7 +404,7 @@ namespace XdCxRhDW.App.UserControl
                         find.CapDir = editItem.CapDir;
                         find.TaskType = editItem.TaskType;
                         find.CapDirFormat = editItem.CapDirFormat;
-                        find.TaskType=editItem.TaskType;
+                        find.TaskType = editItem.TaskType;
                         if (find.PosType == EnumPosType.X1D1CX)
                         {
                             find.Adja1Sat = null;
@@ -1011,29 +1011,29 @@ namespace XdCxRhDW.App.UserControl
                     case EnumPosResType.X1D1CX:
                         X1D1GDOPParam x1D1GdopParam = new X1D1GDOPParam(item);
                         x1D1GdopParam.mapControl1 = mapControl1;
-                        DxHelper.PopupHelper.ShowPopup(x1D1GdopParam, layoutControl1, 500);
+                        DxHelper.PopupHelper.ShowPopup(x1D1GdopParam, layoutControl1, 600);
                         break;
                     case EnumPosResType.X2D1:
                     case EnumPosResType.X2D1NoRef:
                         X2D1GDOPParam x2D1GdopParam = new X2D1GDOPParam(item);
                         x2D1GdopParam.mapControl1 = mapControl1;
-                        DxHelper.PopupHelper.ShowPopup(x2D1GdopParam, layoutControl1, 500);
+                        DxHelper.PopupHelper.ShowPopup(x2D1GdopParam, layoutControl1, 600);
                         break;
                     case EnumPosResType.X3:
                     case EnumPosResType.X3NoRef:
                         X3GDOPParam x3GdopParam = new X3GDOPParam(item);
                         x3GdopParam.mapControl1 = mapControl1;
-                        DxHelper.PopupHelper.ShowPopup(x3GdopParam, layoutControl1, 500);
+                        DxHelper.PopupHelper.ShowPopup(x3GdopParam, layoutControl1, 600);
                         break;
                     case EnumPosResType.X3TwoDfo:
                         X3DFGDOPParam x3DFGdopParam = new X3DFGDOPParam(item);
                         x3DFGdopParam.mapControl1 = mapControl1;
-                        DxHelper.PopupHelper.ShowPopup(x3DFGdopParam, layoutControl1, 500);
+                        DxHelper.PopupHelper.ShowPopup(x3DFGdopParam, layoutControl1, 600);
                         break;
                     case EnumPosResType.X2Dfo:
                         X2DFGDOPParam x2DFGdopParam = new X2DFGDOPParam(item);
                         x2DFGdopParam.mapControl1 = mapControl1;
-                        DxHelper.PopupHelper.ShowPopup(x2DFGdopParam, layoutControl1, 500);
+                        DxHelper.PopupHelper.ShowPopup(x2DFGdopParam, layoutControl1, 600);
                         break;
                     default:
                         break;
@@ -1068,7 +1068,7 @@ namespace XdCxRhDW.App.UserControl
             {
                 case EnumPosResType.X1D1CX:
                     X1D1PosParamEditor frm = new X1D1PosParamEditor(item, mapControl1);
-                    DxHelper.PopupHelper.ShowPopup(frm, layoutControl1, 500);
+                    DxHelper.PopupHelper.ShowPopup(frm, layoutControl1, 600);
                     break;
                 case EnumPosResType.X2D1:
                 case EnumPosResType.X2D1NoRef:
@@ -1078,11 +1078,11 @@ namespace XdCxRhDW.App.UserControl
                 case EnumPosResType.X3:
                 case EnumPosResType.X3NoRef:
                     X3PosParamEditor X3frm = new X3PosParamEditor(item, mapControl1);
-                    DxHelper.PopupHelper.ShowPopup(X3frm, layoutControl1, 500);
+                    DxHelper.PopupHelper.ShowPopup(X3frm, layoutControl1, 600);
                     break;
                 case EnumPosResType.X3TwoDfo:
                     X3DfoPosParamEditor X3df0frm = new X3DfoPosParamEditor(item);
-                    DxHelper.PopupHelper.ShowPopup(X3df0frm, layoutControl1, 500);
+                    DxHelper.PopupHelper.ShowPopup(X3df0frm, layoutControl1, 600);
                     break;
                 case EnumPosResType.X2Dfo:
                     X2PosParamEditor X2PosParamEditor = new X2PosParamEditor(item);

XdCxRhDW.App/UserControl/X1D1GDOPParam.Designer.cs

@@ -211,9 +211,6 @@
             this.txtSatLocErr1.Properties.AutoHeight = false;
             this.txtSatLocErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtSatLocErr1.Size = new System.Drawing.Size(477, 22);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
@@ -241,10 +238,6 @@
             this.txtCxErr.Properties.AutoHeight = false;
             this.txtCxErr.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "° ", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtCxErr.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtCxErr.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtCxErr.Properties.MaskSettings.Set("mask", "f4");
-            this.txtCxErr.Properties.MaxLength = 10;
             this.txtCxErr.Size = new System.Drawing.Size(477, 22);
             this.txtCxErr.StyleController = this.layoutControl1;
             this.txtCxErr.TabIndex = 6;

XdCxRhDW.App/UserControl/X2D1GDOPParam.Designer.cs

@@ -188,9 +188,6 @@
             this.txtDtousErr1.Properties.AutoHeight = false;
             this.txtDtousErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDtousErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtDtousErr1.Size = new System.Drawing.Size(476, 22);
             this.txtDtousErr1.StyleController = this.layoutControl1;
             this.txtDtousErr1.TabIndex = 6;
@@ -207,9 +204,6 @@
             this.txtSatLocErr1.Properties.AutoHeight = false;
             this.txtSatLocErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtSatLocErr1.Size = new System.Drawing.Size(476, 22);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;

XdCxRhDW.App/UserControl/X2DFGDOPParam.Designer.cs

@@ -220,9 +220,6 @@
             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.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtSatLocErr1.Size = new System.Drawing.Size(254, 23);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
@@ -236,9 +233,6 @@
             this.txtDfoErr1.Name = "txtDfoErr1";
             this.txtDfoErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDfoErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtDfoErr1.Size = new System.Drawing.Size(237, 23);
             this.txtDfoErr1.StyleController = this.layoutControl1;
             this.txtDfoErr1.TabIndex = 13;
@@ -252,9 +246,6 @@
             this.txtEphVelErr1.Name = "txtEphVelErr1";
             this.txtEphVelErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtEphVelErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtEphVelErr1.Size = new System.Drawing.Size(237, 23);
             this.txtEphVelErr1.StyleController = this.layoutControl1;
             this.txtEphVelErr1.TabIndex = 14;
@@ -266,9 +257,6 @@
             this.txtFu1.Name = "txtFu1";
             this.txtFu1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtFu1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtFu1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtFu1.Properties.MaskSettings.Set("mask", "f");
             this.txtFu1.Size = new System.Drawing.Size(254, 23);
             this.txtFu1.StyleController = this.layoutControl1;
             this.txtFu1.TabIndex = 15;
@@ -280,9 +268,6 @@
             this.txtFu2.Name = "txtFu2";
             this.txtFu2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtFu2.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtFu2.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtFu2.Properties.MaskSettings.Set("mask", "f");
             this.txtFu2.Size = new System.Drawing.Size(237, 23);
             this.txtFu2.StyleController = this.layoutControl1;
             this.txtFu2.TabIndex = 16;
@@ -309,9 +294,6 @@
             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, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDtousErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtDtousErr1.Size = new System.Drawing.Size(254, 22);
             this.txtDtousErr1.StyleController = this.layoutControl1;
             this.txtDtousErr1.TabIndex = 6;

XdCxRhDW.App/UserControl/X3DFGDOPParam .Designer.cs

@@ -210,9 +210,6 @@
             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.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtSatLocErr1.Size = new System.Drawing.Size(259, 23);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
@@ -226,9 +223,6 @@
             this.txtDfoErr1.Name = "txtDfoErr1";
             this.txtDfoErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDfoErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtDfoErr1.Size = new System.Drawing.Size(242, 23);
             this.txtDfoErr1.StyleController = this.layoutControl1;
             this.txtDfoErr1.TabIndex = 13;
@@ -242,9 +236,6 @@
             this.txtEphVelErr1.Name = "txtEphVelErr1";
             this.txtEphVelErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtEphVelErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtEphVelErr1.Size = new System.Drawing.Size(242, 23);
             this.txtEphVelErr1.StyleController = this.layoutControl1;
             this.txtEphVelErr1.TabIndex = 14;
@@ -256,9 +247,6 @@
             this.txtFu1.Name = "txtFu1";
             this.txtFu1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtFu1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtFu1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtFu1.Properties.MaskSettings.Set("mask", "f");
             this.txtFu1.Size = new System.Drawing.Size(259, 23);
             this.txtFu1.StyleController = this.layoutControl1;
             this.txtFu1.TabIndex = 15;
@@ -270,9 +258,6 @@
             this.txtFu2.Name = "txtFu2";
             this.txtFu2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtFu2.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtFu2.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtFu2.Properties.MaskSettings.Set("mask", "f");
             this.txtFu2.Size = new System.Drawing.Size(242, 23);
             this.txtFu2.StyleController = this.layoutControl1;
             this.txtFu2.TabIndex = 16;

XdCxRhDW.App/UserControl/X3GDOPParam.Designer.cs

@@ -169,9 +169,6 @@
             this.txtDtousErr1.Properties.AutoHeight = false;
             this.txtDtousErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDtousErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtDtousErr1.Size = new System.Drawing.Size(450, 22);
             this.txtDtousErr1.StyleController = this.layoutControl1;
             this.txtDtousErr1.TabIndex = 6;
@@ -188,9 +185,6 @@
             this.txtSatLocErr1.Properties.AutoHeight = false;
             this.txtSatLocErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtSatLocErr1.Size = new System.Drawing.Size(450, 22);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;

XdCxRhDW.Sender/XdCxRhDW.Sender.csproj

@@ -91,7 +91,7 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

XdCxRhDw.Dto/PosDto/RHNoParPosDto.cs

@@ -130,7 +130,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 
 }

XdCxRhDw.Dto/PosDto/RHNoXlNoParPosDto.cs

@@ -105,7 +105,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 
 }

XdCxRhDw.Dto/PosDto/RHNoXlPosDto.cs

@@ -44,12 +44,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标双星频差(Hz)
         /// </summary>
-        public double? SxDfo { get; set; }
+        public double SxDfo { get; set; }
 
         /// <summary>
         /// 目标双星信噪比(dB)
         /// </summary>
-        public double? SxSnr { get; set; }
+        public double SxSnr { get; set; }
 
         /// <summary>
         /// 目标主星超短时差(us)
@@ -59,12 +59,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标星地频差(Hz)
         /// </summary>
-        public double? XdDfo { get; set; }
+        public double XdDfo { get; set; }
 
         /// <summary>
         /// 目标星地信噪比(dB)
         /// </summary>
-        public double? XdSnr { get; set; }
+        public double XdSnr { get; set; }
 
         /// <summary>
         /// 参考样本主时差(us)
@@ -155,6 +155,6 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 }

XdCxRhDw.Dto/PosDto/RHPosDto.cs

@@ -44,12 +44,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标双星频差(Hz)
         /// </summary>
-        public double? SxDfo { get; set; }
+        public double SxDfo { get; set; }
 
         /// <summary>
         /// 目标双星信噪比(dB)
         /// </summary>
-        public double? SxSnr { get; set; }
+        public double SxSnr { get; set; }
 
         /// <summary>
         /// 目标主星超短时差(us)
@@ -59,12 +59,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标星地频差(Hz)
         /// </summary>
-        public double? XdDfo { get; set; }
+        public double XdDfo { get; set; }
 
         /// <summary>
         /// 目标星地信噪比(dB)
         /// </summary>
-        public double? XdSnr { get; set; }
+        public double XdSnr { get; set; }
 
         /// <summary>
         /// 样本主星时差(us)
@@ -185,7 +185,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 
 }

XdCxRhDw.Dto/PosDto/X1D1NoParPosDto.cs

@@ -119,7 +119,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
 
     }
 

XdCxRhDw.Dto/PosDto/X1D1NoXlNoParPosDto.cs

@@ -103,6 +103,6 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 }

XdCxRhDw.Dto/PosDto/X1D1NoXlPosDto.cs

@@ -37,12 +37,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标星地频差(Hz)
         /// </summary>
-        public double? XdDfo { get; set; }
+        public double XdDfo { get; set; }
 
         /// <summary>
         /// 目标星地信噪比(dB)
         /// </summary>
-        public double? XdSnr { get; set; }
+        public double XdSnr { get; set; }
 
         /// <summary>
         /// 样本主星时差(us)
@@ -122,6 +122,6 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 }

XdCxRhDw.Dto/PosDto/X1D1PosDto.cs

@@ -36,12 +36,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标星地频差(Hz)
         /// </summary>
-        public double? XdDfo { get; set; }
+        public double XdDfo { get; set; }
 
         /// <summary>
         /// 目标星地信噪比(dB)
         /// </summary>
-        public double? XdSnr { get; set; }
+        public double XdSnr { get; set; }
 
         /// <summary>
         /// 样本主星时差(us)
@@ -136,7 +136,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 
 }

XdCxRhDw.Dto/PosDto/X2D1NoParPosDto.cs

@@ -44,12 +44,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标双星频差(Hz)
         /// </summary>
-        public double? SxDfo { get; set; }
+        public double SxDfo { get; set; }
 
         /// <summary>
         /// 目标双星信噪比(dB)
         /// </summary>
-        public double? SxSnr { get; set; }
+        public double SxSnr { get; set; }
 
         /// <summary>
         /// 目标主星超短时差(us)
@@ -59,12 +59,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标星地频差(Hz)
         /// </summary>
-        public double? XdDfo { get; set; }
+        public double XdDfo { get; set; }
 
         /// <summary>
         /// 目标星地信噪比(dB)
         /// </summary>
-        public double? XdSnr { get; set; }
+        public double XdSnr { get; set; }
 
         /// <summary>
         /// 目标上行频点Hz(可空)
@@ -176,7 +176,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 
 }

XdCxRhDw.Dto/PosDto/X2D1NoXlNoParlPosDto.cs

@@ -44,12 +44,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标双星频差(Hz)
         /// </summary>
-        public double? SxDfo { get; set; }
+        public double SxDfo { get; set; }
 
         /// <summary>
         /// 目标双星信噪比(dB)
         /// </summary>
-        public double? SxSnr { get; set; }
+        public double SxSnr { get; set; }
 
         /// <summary>
         /// 目标主星超短时差(us)
@@ -59,12 +59,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标星地频差(Hz)
         /// </summary>
-        public double? XdDfo { get; set; }
+        public double XdDfo { get; set; }
 
         /// <summary>
         /// 目标星地信噪比(dB)
         /// </summary>
-        public double? XdSnr { get; set; }
+        public double XdSnr { get; set; }
 
         /// <summary>
         /// 目标上行频点Hz(可空)
@@ -116,7 +116,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
 
     }
 

XdCxRhDw.Dto/PosDto/X2D1NoXlPosDto.cs

@@ -45,12 +45,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标双星频差(Hz)
         /// </summary>
-        public double? SxDfo { get; set; }
+        public double SxDfo { get; set; }
 
         /// <summary>
         /// 目标双星信噪比(dB)
         /// </summary>
-        public double? SxSnr { get; set; }
+        public double SxSnr { get; set; }
 
         /// <summary>
         /// 目标主星超短时差(us)
@@ -60,12 +60,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标星地频差(Hz)
         /// </summary>
-        public double? XdDfo { get; set; }
+        public double XdDfo { get; set; }
 
         /// <summary>
         /// 目标星地信噪比(dB)
         /// </summary>
-        public double? XdSnr { get; set; }
+        public double XdSnr { get; set; }
 
 
         /// <summary>
@@ -140,6 +140,6 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 }

XdCxRhDw.Dto/PosDto/X2D1PosDto.cs

@@ -44,12 +44,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标双星频差(Hz)
         /// </summary>
-        public double? SxDfo { get; set; }
+        public double SxDfo { get; set; }
 
         /// <summary>
         /// 目标双星信噪比(dB)
         /// </summary>
-        public double? SxSnr { get; set; }
+        public double SxSnr { get; set; }
 
         /// <summary>
         /// 目标主星超短时差(us)
@@ -59,12 +59,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 目标星地频差(Hz)
         /// </summary>
-        public double? XdDfo { get; set; }
+        public double XdDfo { get; set; }
 
         /// <summary>
         /// 目标星地信噪比(dB)
         /// </summary>
-        public double? XdSnr { get; set; }
+        public double XdSnr { get; set; }
 
         /// <summary>
         /// 样本主星时差(us)
@@ -198,7 +198,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 
 }

XdCxRhDw.Dto/PosDto/X2DtoDfoNoXlPosDto.cs

@@ -48,9 +48,9 @@ namespace XdCxRhDW.Dto
         public double Dfo { get; set; }
 
         /// <summary>
-        /// 主邻信噪比(dB)
+        /// 主邻星相关信噪比(dB)
         /// </summary>
-        public double? Snr { get; set; }
+        public double Snr { get; set; }
 
         /// <summary>
         /// 样本主星时差(us)
@@ -135,7 +135,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 
 }

XdCxRhDw.Dto/PosDto/X2DtoDfoPosDto.cs

@@ -48,9 +48,9 @@ namespace XdCxRhDW.Dto
         public double Dfo { get; set; }
 
         /// <summary>
-        /// 主邻1信噪比(dB)
+        /// 主邻星相关信噪比(dB)
         /// </summary>
-        public double? Snr { get; set; }
+        public double Snr { get; set; }
 
         /// <summary>
         /// 样本主星时差(us)
@@ -194,7 +194,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
 
     }
 

XdCxRhDw.Dto/PosDto/X3TwoDfoNoXlPosDto.cs

@@ -46,7 +46,7 @@ namespace XdCxRhDW.Dto
         /// 主邻1时差(us)
         /// </summary>
         [RangeDouble(-20000, 20000, IncludeMin = true)]
-        public double? Dto1 { get; set; }
+        public double Dto1 { get; set; }
 
         /// <summary>
         /// 主邻1频差(Hz)
@@ -56,13 +56,13 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻1信噪比(dB)
         /// </summary>
-        public double? Snr1 { get; set; }
+        public double Snr1 { get; set; }
 
         /// <summary>
         /// 主邻2时差(us)
         /// </summary>
         [RangeDouble(-20000, 20000, IncludeMin = true)]
-        public double? Dto2 { get; set; }
+        public double Dto2 { get; set; }
 
         /// <summary>
         /// 主邻2频差(Hz)
@@ -72,22 +72,22 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻2信噪比(dB)
         /// </summary>
-        public double? Snr2 { get; set; }
+        public double Snr2 { get; set; }
 
         /// <summary>
         /// 样本主星频差(Hz)
         /// </summary>
-        public double? YbMainDfo { get; set; }
+        public double YbMainDfo { get; set; }
 
         /// <summary>
         /// 样本邻星1频差(Hz)
         /// </summary>
-        public double? YbAdja1Dfo { get; set; }
+        public double YbAdja1Dfo { get; set; }
 
         /// <summary>
         /// 样本邻星1频差(Hz)
         /// </summary>
-        public double? YbAdja2Dfo { get; set; }
+        public double YbAdja2Dfo { get; set; }
 
         /// <summary>
         /// 目标上行频点(Hz)
@@ -151,7 +151,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
 
     }
 

XdCxRhDw.Dto/PosDto/X3TwoDfoPosDto.cs

@@ -45,7 +45,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>
-        public double? Dto1 { get; set; }
+        public double Dto1 { get; set; }
 
         /// <summary>
         /// 主邻1频差(Hz)
@@ -55,12 +55,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻1信噪比(dB)
         /// </summary>
-        public double? Snr1 { get; set; }
+        public double Snr1 { get; set; }
 
         /// <summary>
         /// 主邻2时差(us)
         /// </summary>
-        public double? Dto2 { get; set; }
+        public double Dto2 { get; set; }
 
         /// <summary>
         /// 主邻2频差(Hz)
@@ -70,7 +70,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻2信噪比(dB)
         /// </summary>
-        public double? Snr2 { get; set; }
+        public double Snr2 { get; set; }
 
         /// <summary>
         /// 样本主星频差(Hz)
@@ -239,7 +239,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoParPosDto.cs

@@ -50,12 +50,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻1频差(Hz)
         /// </summary>
-        public double? Dfo1 { get; set; }
+        public double Dfo1 { get; set; }
 
         /// <summary>
         /// 主邻1信噪比(dB)
         /// </summary>
-        public double? Snr1 { get; set; }
+        public double Snr1 { get; set; }
 
         /// <summary>
         /// 主邻2时差(us)
@@ -66,12 +66,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻2频差(Hz)
         /// </summary>
-        public double? Dfo2 { get; set; }
+        public double Dfo2 { get; set; }
 
         /// <summary>
         /// 主邻2信噪比(dB)
         /// </summary>
-        public double? Snr2 { get; set; }
+        public double Snr2 { get; set; }
 
         /// <summary>
         /// 目标上行频点Hz(可空)
@@ -201,7 +201,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlNoParPosDto.cs

@@ -50,12 +50,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻1频差(Hz)
         /// </summary>
-        public double? Dfo1 { get; set; }
+        public double Dfo1 { get; set; }
 
         /// <summary>
         /// 主邻1信噪比(dB)
         /// </summary>
-        public double? Snr1 { get; set; }
+        public double Snr1 { get; set; }
 
         /// <summary>
         /// 主邻2时差(us)
@@ -66,12 +66,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻2频差(Hz)
         /// </summary>
-        public double? Dfo2 { get; set; }
+        public double Dfo2 { get; set; }
 
         /// <summary>
         /// 主邻2信噪比(dB)
         /// </summary>
-        public double? Snr2 { get; set; }
+        public double Snr2 { get; set; }
 
         /// <summary>
         /// 目标上行频点Hz(可空)
@@ -111,7 +111,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlPosDto.cs

@@ -50,12 +50,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻1频差(Hz)
         /// </summary>
-        public double? Dfo1 { get; set; }
+        public double Dfo1 { get; set; }
 
         /// <summary>
         /// 主邻1信噪比(dB)
         /// </summary>
-        public double? Snr1 { get; set; }
+        public double Snr1 { get; set; }
 
         /// <summary>
         /// 主邻2时差(us)
@@ -66,12 +66,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻2频差(Hz)
         /// </summary>
-        public double? Dfo2 { get; set; }
+        public double Dfo2 { get; set; }
 
         /// <summary>
         /// 主邻2信噪比(dB)
         /// </summary>
-        public double? Snr2 { get; set; }
+        public double Snr2 { get; set; }
 
         /// <summary>
         /// 样本主星时差(us)
@@ -138,7 +138,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
 
     }
 

XdCxRhDw.Dto/PosDto/X3TwoDtoPosDto.cs

@@ -50,12 +50,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻1频差(Hz)
         /// </summary>
-        public double? Dfo1 { get; set; }
+        public double Dfo1 { get; set; }
 
         /// <summary>
         /// 主邻1信噪比(dB)
         /// </summary>
-        public double? Snr1 { get; set; }
+        public double Snr1 { get; set; }
 
         /// <summary>
         /// 主邻2时差(us)
@@ -66,12 +66,12 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 主邻2频差(Hz)
         /// </summary>
-        public double? Dfo2 { get; set; }
+        public double Dfo2 { get; set; }
 
         /// <summary>
         /// 主邻2信噪比(dB)
         /// </summary>
-        public double? Snr2 { get; set; }
+        public double Snr2 { get; set; }
 
         /// <summary>
         /// 样本主星时差(us)
@@ -228,7 +228,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 是否计算置信度
         /// </summary>
-        public bool CalcConfidence { get; set; } = true;
+        public bool CalcConfidence { get; set; } = false;
     }
 
 }