11

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

@@ -320,7 +320,7 @@ namespace XdCxRhDW.Api
             {
                 return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
             }
-            if (cgRes.Snr1.Value == 0 || cgRes.Snr2.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 };

XdCxRhDW.App/Controllers/PosController.cs

@@ -813,8 +813,8 @@ namespace XdCxRhDW.App.Controllers
                 {
                     SigTime = dto.SigTime,
                     Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo.Value, 4),
-                    Snr1 = Math.Round(dto.SxSnr.Value, 4),
+                    Dfo1 = Math.Round(dto.SxDfo, 4),
+                    Snr1 = Math.Round(dto.SxSnr, 4),
                     DtoCdb = Math.Round(dto.XdDto, 4),
                     DfoCdb = Math.Round(dto.XdDfo, 4),
                     SnrCdb = Math.Round(dto.XdSnr, 4),
@@ -1232,11 +1232,11 @@ namespace XdCxRhDW.App.Controllers
                 {
                     SigTime = dto.SigTime,
                     Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1.Value, 4),
-                    Snr1 = Math.Round(dto.Snr1.Value, 4),
+                    Dfo1 = Math.Round(dto.Dfo1, 4),
+                    Snr1 = Math.Round(dto.Snr1, 4),
                     Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2.Value, 4),
-                    Snr2 = Math.Round(dto.Snr2.Value, 4),
+                    Dfo2 = Math.Round(dto.Dfo2, 4),
+                    Snr2 = Math.Round(dto.Snr2, 4),
                     YbMainDto = Math.Round(dto.YbMainDto, 4),
                     YbAdja1Dto = Math.Round(dto.YbAdja1Dto, 4),
                     YbAdja2Dto = Math.Round(dto.YbAdja2Dto, 4),
@@ -1350,11 +1350,11 @@ namespace XdCxRhDW.App.Controllers
                 {
                     SigTime = dto.SigTime,
                     Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1.Value, 4),
-                    Snr1 = Math.Round(dto.Snr1.Value, 4),
+                    Dfo1 = Math.Round(dto.Dfo1, 4),
+                    Snr1 = Math.Round(dto.Snr1, 4),
                     Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2.Value, 4),
-                    Snr2 = Math.Round(dto.Snr2.Value, 4),
+                    Dfo2 = Math.Round(dto.Dfo2, 4),
+                    Snr2 = Math.Round(dto.Snr2, 4),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1503,11 +1503,11 @@ namespace XdCxRhDW.App.Controllers
                 {
                     SigTime = dto.SigTime,
                     Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1.Value, 4),
-                    Snr1 = Math.Round(dto.Snr1.Value, 4),
+                    Dfo1 = Math.Round(dto.Dfo1, 4),
+                    Snr1 = Math.Round(dto.Snr1, 4),
                     Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2.Value, 4),
-                    Snr2 = Math.Round(dto.Snr2.Value, 4),
+                    Dfo2 = Math.Round(dto.Dfo2, 4),
+                    Snr2 = Math.Round(dto.Snr2, 4),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1621,12 +1621,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1.Value, 4),
+                    Dto1 = Math.Round(dto.Dto1, 4),
                     Dfo1 = Math.Round(dto.Dfo1, 4),
-                    Snr1 = Math.Round(dto.Snr1.Value, 4),
-                    Dto2 = Math.Round(dto.Dto2.Value, 4),
+                    Snr1 = Math.Round(dto.Snr1, 4),
+                    Dto2 = Math.Round(dto.Dto2, 4),
                     Dfo2 = Math.Round(dto.Dfo2, 4),
-                    Snr2 = Math.Round(dto.Snr2.Value, 4),
+                    Snr2 = Math.Round(dto.Snr2, 4),
                     YbMainDfo = Math.Round(dto.YbMainDfo, 4),
                     YbAdja1Dfo = Math.Round(dto.YbAdja1Dfo, 4),
                     YbAdja2Dfo = Math.Round(dto.YbAdja2Dfo, 4),
@@ -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),
+                    Dto1 = Math.Round(dto.Dto1, 4),
                     Dfo1 = Math.Round(dto.Dfo1, 4),
-                    Snr1 = Math.Round(dto.Snr1.Value, 4),
-                    Dto2 = Math.Round(dto.Dto2.Value, 4),
+                    Snr1 = Math.Round(dto.Snr1, 4),
+                    Dto2 = Math.Round(dto.Dto2, 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),
+                    Snr2 = Math.Round(dto.Snr2, 4),
+                    YbMainDfo = Math.Round(dto.YbMainDfo, 4),
+                    YbAdja1Dfo = Math.Round(dto.YbAdja1Dfo, 4),
+                    YbAdja2Dfo = Math.Round(dto.YbAdja2Dfo, 4),
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,
@@ -1908,7 +1908,7 @@ namespace XdCxRhDW.App.Controllers
                     SigTime = dto.SigTime,
                     Dto1 = Math.Round(dto.Dto, 4),
                     Dfo1 = Math.Round(dto.Dfo, 4),
-                    Snr1 = Math.Round(dto.Snr.Value, 4),
+                    Snr1 = Math.Round(dto.Snr, 4),
                     YbMainDto = Math.Round(dto.YbMainDto, 4),
                     YbAdja1Dto = Math.Round(dto.YbAdjaDto, 4),
                     YbMainDfo = Math.Round(dto.YbMainDfo, 4),
@@ -2046,7 +2046,7 @@ namespace XdCxRhDW.App.Controllers
                     SigTime = dto.SigTime,
                     Dto1 = Math.Round(dto.Dto, 4),
                     Dfo1 = Math.Round(dto.Dfo, 4),
-                    Snr1 = Math.Round(dto.Snr.Value, 4),
+                    Snr1 = Math.Round(dto.Snr, 4),
                     YbMainDto = Math.Round(dto.YbMainDto, 4),
                     YbAdja1Dto = Math.Round(dto.YbAdjaDto, 4),
                     YbMainDfo = Math.Round(dto.YbMainDfo, 4),

XdCxRhDW.App/EditForms/X1D1DTOParamEditor.cs

@@ -225,8 +225,8 @@ namespace XdCxRhDW.App.EditForms
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"手动{info.PosResType.GetEnumDisplayName()}定位失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"手动{info.PosResType.GetEnumDisplayName()}定位失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
     }

XdCxRhDW.App/EditForms/X1D1PosParamEditor.cs

@@ -154,8 +154,8 @@ namespace XdCxRhDW.App.EditForms
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"手动{info.PosResType.GetEnumDisplayName()}定位失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"手动{info.PosResType.GetEnumDisplayName()}定位失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
 

XdCxRhDW.App/EditForms/X2D1DTOParamEditor.cs

@@ -360,8 +360,8 @@ namespace XdCxRhDW.App.EditForms
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"定位{info.PosResType.GetEnumDisplayName()}失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"定位{info.PosResType.GetEnumDisplayName()}失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
     }

XdCxRhDW.App/EditForms/X2D1PosParamEditor.cs

@@ -243,17 +243,12 @@ namespace XdCxRhDW.App.EditForms
                     };
                     var res = PosApi.X2D1_Pos(cgRes, StationRes);
                     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)
-                    //{
-                    //    lblRes.Text = $"定位结果{result.data.PosLon},{result.data.PosLat}";
-                    //}
                 }
             }
             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/X2PosParamEditor.cs

@@ -206,18 +206,12 @@ namespace XdCxRhDW.App.EditForms
                 };
                 var res = PosApi.X2_PosDtoDfo(cgRes, StationRes);
                 this.lblRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
-                //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}";
-                //}
             }
 
             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

@@ -278,8 +278,8 @@ namespace XdCxRhDW.App.EditForms
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"绘制{info.PosResType.GetEnumDisplayName()}时差线失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"绘制{info.PosResType.GetEnumDisplayName()}时差线失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
     }

XdCxRhDW.App/EditForms/X3DfoPosParamEditor.cs

@@ -178,8 +178,8 @@ namespace XdCxRhDW.App.EditForms
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"手动{info.PosResType.GetEnumDisplayName()}定位失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"手动{info.PosResType.GetEnumDisplayName()}定位失败");
+                Serilog.Log.Error(ex, $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.ID},SigTime={info.SigTime}");
+                DxHelper.MsgBoxHelper.ShowWarning($"{info.PosResType.GetEnumDisplayName()}手动定位失败");
             }
         }
 

XdCxRhDW.App/EditForms/X3PosParamEditor.cs

@@ -155,8 +155,8 @@ namespace XdCxRhDW.App.EditForms
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"绘制{info.PosResType.GetEnumDisplayName()}时差线失败.PosID={info.ID},SigTime={info.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"绘制{info.PosResType.GetEnumDisplayName()}时差线失败");
+                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,16 +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("微软雅黑", 12F);
-        ctrl.NavigationPanelOptions.CoordinatesStyle.TextColor = Color.FromArgb(80, 80, 80);
-        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.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

@@ -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)
@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

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