Merge branch 'master' of http://139.155.15.221:3000/zoulei/XdCxRhDW

Service/CheckServer/CheckServer.csproj

@@ -166,7 +166,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

Service/GpuCgServer/GpuCgServer.csproj

@@ -161,7 +161,6 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <None Include="packages.config" />
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

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

@@ -30,12 +30,6 @@ namespace XdCxRhDW.Api
 
         public static EnumTargetState TheoryDfo(CgRes cRes, StationRes sRes, PosRes posRes, int YDPZThreshold)
         {
-            cRes.MainVx = 1;
-            cRes.MainVy = 2;
-            cRes.MainVz = 3;
-            cRes.Adja1Vx = 3;
-            cRes.Adja1Vy = 3;
-            cRes.Adja1Vz = 3;
             //张老板说理论频差如果和参估计算出来的频差差值比较大,就说明目标在运动(多路参估每一路都要比较,有一路判定运动则为运动)
             //?具体多少差异需要确定一下
             //主邻星本振不一样时该怎么计算
@@ -48,7 +42,7 @@ namespace XdCxRhDW.Api
 
             if (posRes.PosResType == EnumPosResType.X2D1 || posRes.PosResType == EnumPosResType.X2D1NoRef || posRes.PosResType == EnumPosResType.RH)
             {
-                if (cRes.Dfo1 == null) return EnumTargetState.Unknown;
+                if (cRes.Dfo1 == null || cRes.Adja1Vx == null || cRes.Adja1Vy == null || cRes.Adja1Vz == null) return EnumTargetState.Unknown;
                 var xlAdja1 = new double[6] { cRes.Adja1X.Value, cRes.Adja1Y.Value, cRes.Adja1Z.Value, cRes.Adja1Vx.Value, cRes.Adja1Vy.Value, cRes.Adja1Vz.Value };
                 double res = TheoryDfo(target, rec, rec, xlMain, xlAdja1, cRes.TarFreqUp.Value, cRes.TarFreqDown.Value);
                 var val = Math.Abs(res - cRes.Dfo1.Value);
@@ -77,6 +71,7 @@ namespace XdCxRhDW.Api
             else if (posRes.PosResType == EnumPosResType.X3 || posRes.PosResType == EnumPosResType.X3NoRef || posRes.PosResType == EnumPosResType.X3TwoDfo)
             {
                 if (cRes.Dfo1 == null && cRes.Dfo2 == null) return EnumTargetState.Unknown;
+                if (cRes.Adja1Vx == null || cRes.Adja1Vy == null || cRes.Adja1Vz == null) return EnumTargetState.Unknown;
                 if (cRes.Dfo1 != null)
                 {
                     var xlAdja1 = new double[6] { cRes.Adja1X.Value, cRes.Adja1Y.Value, cRes.Adja1Z.Value, cRes.Adja1Vx.Value, cRes.Adja1Vy.Value, cRes.Adja1Vz.Value };

XdCxRhDW.App/Controllers/PosController.cs

@@ -85,10 +85,10 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    DtoCdb = dto.XdDto,
-                    DfoCdb = dto.XdDfo,
-                    SnrCdb = dto.XdSnr,
-                    YbMainDto = dto.MainYbDto,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     TaskID = runTask.ID,
@@ -201,10 +201,10 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    DtoCdb = dto.XdDto,
-                    DfoCdb = dto.XdDfo,
-                    SnrCdb = dto.XdSnr,
-                    YbMainDto = dto.MainYbDto,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     MainXlTime = ephMain.data.TleTime,
@@ -307,14 +307,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = dto.SxDto,
-                    Dfo1 = dto.SxDfo,
-                    Snr1 = dto.SxSnr,
-                    DtoCdb = dto.XdDto,
-                    DfoCdb = dto.XdDfo,
-                    SnrCdb = dto.XdSnr,
-                    YbMainDto = dto.MainYbDto,
-                    YbAdja1Dto = dto.AdjaYbDto,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -445,14 +445,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = dto.SxDto,
-                    Dfo1 = dto.SxDfo,
-                    Snr1 = dto.SxSnr,
-                    DtoCdb = dto.XdDto,
-                    DfoCdb = dto.XdDfo,
-                    SnrCdb = dto.XdSnr,
-                    YbMainDto = dto.MainYbDto,
-                    YbAdja1Dto = dto.AdjaYbDto,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     MainXlTime = ephMain.data.TleTime,
@@ -555,12 +555,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = dto.SxDto,
-                    Dfo1 = dto.SxDfo,
-                    Snr1 = dto.SxSnr,
-                    DtoCdb = dto.XdDto,
-                    DfoCdb = dto.XdDfo,
-                    SnrCdb = dto.XdSnr,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -688,12 +688,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = dto.SxDto,
-                    Dfo1 = dto.SxDfo,
-                    Snr1 = dto.SxSnr,
-                    DtoCdb = dto.XdDto,
-                    DfoCdb = dto.XdDfo,
-                    SnrCdb = dto.XdSnr,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -802,14 +802,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = dto.SxDto,
-                    Dfo1 = dto.SxDfo,
-                    Snr1 = dto.SxSnr,
-                    DtoCdb = dto.XdDto,
-                    DfoCdb = dto.XdDfo,
-                    SnrCdb = dto.XdSnr,
-                    YbMainDto = dto.MainYbDto,
-                    YbAdja1Dto = dto.AdjaYbDto,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -943,14 +943,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = dto.SxDto,
-                    Dfo1 = dto.SxDfo,
-                    Snr1 = dto.SxSnr,
-                    DtoCdb = dto.XdDto,
-                    DfoCdb = dto.XdDfo,
-                    SnrCdb = dto.XdSnr,
-                    YbMainDto = dto.MainYbDto,
-                    YbAdja1Dto = dto.AdjaYbDto,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -1060,15 +1060,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    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,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1218,15 +1218,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    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,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1335,12 +1335,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = dto.Dto1,
-                    Dfo1 = dto.Dfo1,
-                    Snr1 = dto.Snr1,
-                    Dto2 = dto.Dto2,
-                    Dfo2 = dto.Dfo2,
-                    Snr2 = dto.Snr2,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1487,12 +1487,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = dto.Dto1,
-                    Dfo1 = dto.Dfo1,
-                    Snr1 = dto.Snr1,
-                    Dto2 = dto.Dto2,
-                    Dfo2 = dto.Dfo2,
-                    Snr2 = dto.Snr2,
+                    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),
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1605,15 +1605,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    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,
+                    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),
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,
@@ -1765,15 +1765,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    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,
+                    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),
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,
@@ -1888,13 +1888,13 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = dto.Dto,
-                    Dfo1 = dto.Dfo,
-                    Snr1 = dto.Snr,
-                    YbMainDto = dto.YbMainDto,
-                    YbAdja1Dto = dto.YbAdjaDto,
-                    YbMainDfo = dto.YbMainDfo,
-                    YbAdja1Dfo = dto.YbAdjaDfo,
+                    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),
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,
@@ -2025,13 +2025,13 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = dto.Dto,
-                    Dfo1 = dto.Dfo,
-                    Snr1 = dto.Snr,
-                    YbMainDto = dto.YbMainDto,
-                    YbAdja1Dto = dto.YbAdjaDto,
-                    YbMainDfo = dto.YbMainDfo,
-                    YbAdja1Dfo = dto.YbAdjaDfo,
+                    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),
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,

XdCxRhDW.App/EditForms/SatEditor.Designer.cs

@@ -117,6 +117,10 @@
             this.txtSatLon.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
             this.txtSatLon.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.txtSatLon.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            this.txtSatLon.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+            this.txtSatLon.Properties.MaskSettings.Set("mask", "f3");
+            this.txtSatLon.Properties.MaxLength = 10;
             this.txtSatLon.Size = new System.Drawing.Size(251, 23);
             this.txtSatLon.StyleController = this.layoutControl1;
             this.txtSatLon.TabIndex = 6;
@@ -156,6 +160,10 @@
             this.txtSatTrans.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
             this.txtSatTrans.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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.txtSatTrans.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            this.txtSatTrans.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+            this.txtSatTrans.Properties.MaskSettings.Set("mask", "f3");
+            this.txtSatTrans.Properties.MaxLength = 15;
             this.txtSatTrans.Size = new System.Drawing.Size(251, 23);
             this.txtSatTrans.StyleController = this.layoutControl1;
             this.txtSatTrans.TabIndex = 6;

XdCxRhDW.App/EditForms/X1D1DTOParamEditor.cs

@@ -68,8 +68,8 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f3}";
-                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f3}";
+                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f4}";
+                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
                 this.sigTime.EditValue = info.SigTime;
 
                 ucEphXYZMain.SetXYZ("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ), Color.Black);

XdCxRhDW.App/EditForms/X1D1PosParamEditor.cs

@@ -69,8 +69,8 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f3}";
-                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f3}";
+                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f4}";
+                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
                 this.sigTime.EditValue = info.SigTime;
                 ucEphXYZMain.SetXYZ("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ), Color.Black);
             }

XdCxRhDW.App/EditForms/X2D1DTOParamEditor.cs

@@ -68,12 +68,12 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value:f3}";
-                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f3}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value:f4}";
+                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f4}";
                 if (info.PosResType == EnumPosResType.X2D1)
                 {
-                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f3}";
-                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f3}";
+                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
+                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f4}";
                 }
                 this.sigTime.EditValue = info.SigTime;
                 ucEphXYZMain.SetXYZ("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ), Color.Black);

XdCxRhDW.App/EditForms/X2D1PosParamEditor.cs

@@ -60,12 +60,12 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value:f3}";
-                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f3}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value:f4}";
+                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f4}";
                 if (info.PosResType == EnumPosResType.X2D1)
                 {
-                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f3}";
-                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f3}";
+                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
+                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f4}";
                 }
                 this.txtSigTime.EditValue = info.SigTime;
                 ucEphXYZMain.SetXYZ("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ), Color.Black);

XdCxRhDW.App/EditForms/X2DTOParamEditor.cs

@@ -69,9 +69,9 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value:f3}";
-                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f3}";
-                this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f3}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value:f4}";
+                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
+                this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f4}";
                 this.sigTime.EditValue = info.SigTime;
                 ucEphXYZMain.SetXYZ("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ), Color.Black);
                 ucEphXYZAdaj.SetXYZ("邻星", cg.Adja1Code, (cg.Adja1X, cg.Adja1Y, cg.Adja1Z), Color.Black);

XdCxRhDW.App/EditForms/X2PosParamEditor.Designer.cs

@@ -325,7 +325,7 @@
             this.txtTarFreqUp.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtTarFreqUp.Name = "txtTarFreqUp";
             this.txtTarFreqUp.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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.txtTarFreqUp.Size = new System.Drawing.Size(240, 20);
             this.txtTarFreqUp.StyleController = this.layoutControl1;
             this.txtTarFreqUp.TabIndex = 14;
@@ -336,7 +336,7 @@
             this.txtTarFreqDown.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtTarFreqDown.Name = "txtTarFreqDown";
             this.txtTarFreqDown.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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.txtTarFreqDown.Size = new System.Drawing.Size(415, 20);
             this.txtTarFreqDown.StyleController = this.layoutControl1;
             this.txtTarFreqDown.TabIndex = 15;
@@ -369,7 +369,7 @@
             this.txtRefFreqDown.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefFreqDown.Name = "txtRefFreqDown";
             this.txtRefFreqDown.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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.txtRefFreqDown.Size = new System.Drawing.Size(415, 20);
             this.txtRefFreqDown.StyleController = this.layoutControl1;
             this.txtRefFreqDown.TabIndex = 18;
@@ -380,7 +380,7 @@
             this.txtRefFreqUp.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefFreqUp.Name = "txtRefFreqUp";
             this.txtRefFreqUp.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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.txtRefFreqUp.Size = new System.Drawing.Size(240, 20);
             this.txtRefFreqUp.StyleController = this.layoutControl1;
             this.txtRefFreqUp.TabIndex = 19;

XdCxRhDW.App/EditForms/X2PosParamEditor.cs

@@ -78,10 +78,11 @@ namespace XdCxRhDW.App.EditForms
                 this.txtDfo.Text = $"{cg.Dfo1.Value:f4}";
                 this.txtYbMainDfo.Text = $"{cg.YbMainDfo.Value:f4}";
                 this.txtYbAdjaDfo.Text = $"{cg.YbAdja1Dfo.Value:f4}";
-                this.txtTarFreqUp.Text = $"{cg.TarFreqUp.Value:f3}";
-                this.txtTarFreqDown.Text = $"{cg.TarFreqDown.Value:f3}";
-                this.txtRefFreqUp.Text = $"{cg.RefFreqUp.Value:f3}";
-                this.txtRefFreqDown.Text = $"{cg.RefFreqDown.Value:f3}";
+
+                this.txtTarFreqUp.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 950;
+                this.txtTarFreqDown.EditValue = cg.TarFreqDown.HasValue ? cg.TarFreqDown.Value * 1e-6 : 950;
+                this.txtRefFreqUp.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value * 1e-6 : 950;
+                this.txtRefFreqDown.EditValue = cg.RefFreqDown.HasValue ? cg.RefFreqDown.Value * 1e-6 : 950;
             }
             if (station != null)
             {
@@ -122,10 +123,10 @@ namespace XdCxRhDW.App.EditForms
                 var Dfo = Convert.ToDouble(this.txtDfo.Text);
                 var YbMainDfo = Convert.ToDouble(this.txtYbMainDfo.Text);
                 var YbAdja1Dfo = Convert.ToDouble(this.txtYbAdjaDfo.Text);
-                var TarFreqUp = Convert.ToDouble(this.txtTarFreqUp.Text);
-                var TarFreqDown = Convert.ToDouble(this.txtTarFreqDown.Text);
-                var RefFreqUp = Convert.ToDouble(this.txtRefFreqUp.Text);
-                var RefFreqDown = Convert.ToDouble(this.txtRefFreqDown.Text);
+                var TarFreqUp = Convert.ToDouble(this.txtTarFreqUp.Text) * 1e6;
+                var TarFreqDown = Convert.ToDouble(this.txtTarFreqDown.Text) * 1e6;
+                var RefFreqUp = Convert.ToDouble(this.txtRefFreqUp.Text) * 1e6;
+                var RefFreqDown = Convert.ToDouble(this.txtRefFreqDown.Text) * 1e6;
 
                 var sigTime = txtSigTime.DateTime;
 

XdCxRhDW.App/EditForms/X3DTOParamEditor.cs

@@ -61,13 +61,13 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value:f3}";
-                this.txtDtoSx1.Text = $"{cg.Dto2.Value:f3}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value:f4}";
+                this.txtDtoSx1.Text = $"{cg.Dto2.Value:f4}";
                 if (info.PosResType == EnumPosResType.X3)
                 {
-                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f3}";
-                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f3}";
-                    this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value:f3}";
+                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
+                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f4}";
+                    this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value:f4}";
                 }
                 this.sigTime.EditValue = info.SigTime;
 

XdCxRhDW.App/EditForms/X3PosParamEditor.cs

@@ -54,13 +54,13 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value:f3}";
-                this.txtDtoSx1.Text = $"{cg.Dto2.Value:f3}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value:f4}";
+                this.txtDtoSx1.Text = $"{cg.Dto2.Value:f4}";
                 if (info.PosResType == EnumPosResType.X3)
                 {
-                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f3}";
-                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f3}";
-                    this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value:f3}";
+                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
+                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f4}";
+                    this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value:f4}";
                 }
                 this.sigTime.EditValue = info.SigTime;
                 var mainEph = (cg.MainX, cg.MainY, cg.MainZ);

XdCxRhDW.App/ExtensionsDev/DateEditExtension.cs

@@ -14,7 +14,7 @@ namespace ExtensionsDev
     {
         public static DateEdit UseDefault(this DateEdit ctrl, string nullPrompt = "", string format = "yyyy-MM-dd HH:mm:ss")
         {
-            if (string.IsNullOrWhiteSpace(nullPrompt))
+            if (string.IsNullOrWhiteSpace(nullPrompt)&& SysConfig.Config!=null)
             {
                 if (SysConfig.Config==null) return ctrl;
                 ctrl.Properties.NullValuePrompt = SysConfig.Config.TimeZoneUTC;

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -1308,12 +1308,9 @@ namespace XdCxRhDW.App.UserControl
 
             var dto = new PosRequestByTimeRangeDto()
             {
-                TarFrequpHz = (long?)txtFrequpMHz.EditValue,
                 BeginTime = frm.start,
                 EndTime = frm.end,
-                TaskInfoID = tsk.ID,
-                IncludeInvalidate = btnIncludeInvalidate.Checked
-
+                TaskInfoID = tsk.ID
             };
             string baseUrl = null;
             if (SysConfig.Config != null)

XdCxRhDW.App/UserControl/CtrlTx.cs

@@ -94,9 +94,9 @@ namespace XdCxRhDW.App.UserControl
                 txRec.Name = txtMainTxName.Text;
                 txRec.TxType = EnumTxType.Rec;
                 if (!double.TryParse(txtMainTxLon.Text.Trim(), out double lon))
-                    throw new Exception("主星天线经度格式错误!");
+                    throw new Exception("接收站天线经度格式错误!");
                 if (!double.TryParse(txtMainTxLat.Text.Trim(), out double lat))
-                    throw new Exception("主星天线纬度格式错误!");
+                    throw new Exception("接收站天线纬度格式错误!");
                 txRec.Lon = lon;
                 txRec.Lat = lat;
                 tmp.Add(txRec);

XdCxRhDW.App/UserControl/UCEphXYZ.Designer.cs

@@ -71,7 +71,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephX.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephX.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephX.Properties.MaskSettings.Set("mask", "f3");
+            this.ephX.Properties.MaskSettings.Set("mask", "f4");
             this.ephX.Properties.MaxLength = 10;
             this.ephX.Properties.UseMaskAsDisplayFormat = true;
             this.ephX.Size = new System.Drawing.Size(169, 20);
@@ -86,7 +86,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephY.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephY.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephY.Properties.MaskSettings.Set("mask", "f3");
+            this.ephY.Properties.MaskSettings.Set("mask", "f4");
             this.ephY.Properties.MaxLength = 10;
             this.ephY.Properties.UseMaskAsDisplayFormat = true;
             this.ephY.Size = new System.Drawing.Size(146, 20);
@@ -101,7 +101,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephZ.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephZ.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephZ.Properties.MaskSettings.Set("mask", "f3");
+            this.ephZ.Properties.MaskSettings.Set("mask", "f4");
             this.ephZ.Properties.MaxLength = 10;
             this.ephZ.Properties.UseMaskAsDisplayFormat = true;
             this.ephZ.Size = new System.Drawing.Size(143, 20);

XdCxRhDW.App/UserControl/UCEphXYZ.cs

@@ -27,11 +27,11 @@ namespace XdCxRhDW.App.UserControl
             SatCode = satCode;
 
             layoutControlItemx.AllowHtmlStringInCaption = true;
-            ephX.EditValue = eph.x.HasValue ? Math.Round(eph.x.Value, 3) : 0;
+            ephX.EditValue = eph.x.HasValue ? Math.Round(eph.x.Value, 4) : 0;
             layoutControlItemx.Text = $"{title}<size=12><color=0,103,192> [{satCode}]</color></size>星历X";
-            ephY.EditValue = eph.y.HasValue ? Math.Round(eph.y.Value, 3) : 0;
+            ephY.EditValue = eph.y.HasValue ? Math.Round(eph.y.Value, 4) : 0;
             layoutControlItemy.Text = $"{title}星历Y";
-            ephZ.EditValue = eph.z.HasValue ? Math.Round(eph.z.Value, 3) : 0;
+            ephZ.EditValue = eph.z.HasValue ? Math.Round(eph.z.Value, 4) : 0;
             layoutControlItemz.Text = $"{title}星历Z";
             ephX.ForeColor = ephY.ForeColor = ephZ.ForeColor = color;
         }

XdCxRhDW.App/UserControl/UCEphXYZParam.Designer.cs

@@ -101,7 +101,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephX.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephX.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephX.Properties.MaskSettings.Set("mask", "f3");
+            this.ephX.Properties.MaskSettings.Set("mask", "f4");
             this.ephX.Properties.MaxLength = 10;
             this.ephX.Properties.UseMaskAsDisplayFormat = true;
             this.ephX.Size = new System.Drawing.Size(169, 20);
@@ -116,7 +116,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephY.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephY.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephY.Properties.MaskSettings.Set("mask", "f3");
+            this.ephY.Properties.MaskSettings.Set("mask", "f4");
             this.ephY.Properties.MaxLength = 10;
             this.ephY.Properties.UseMaskAsDisplayFormat = true;
             this.ephY.Size = new System.Drawing.Size(146, 20);
@@ -131,7 +131,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph)});
             this.ephZ.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephZ.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephZ.Properties.MaskSettings.Set("mask", "f3");
+            this.ephZ.Properties.MaskSettings.Set("mask", "f4");
             this.ephZ.Properties.MaxLength = 10;
             this.ephZ.Properties.UseMaskAsDisplayFormat = true;
             this.ephZ.Size = new System.Drawing.Size(143, 20);
@@ -147,7 +147,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -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.ephVX.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephVX.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephVX.Properties.MaskSettings.Set("mask", "f3");
+            this.ephVX.Properties.MaskSettings.Set("mask", "f4");
             this.ephVX.Properties.MaxLength = 10;
             this.ephVX.Properties.UseMaskAsDisplayFormat = true;
             this.ephVX.Size = new System.Drawing.Size(169, 20);
@@ -163,7 +163,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -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.ephVY.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephVY.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephVY.Properties.MaskSettings.Set("mask", "f3");
+            this.ephVY.Properties.MaskSettings.Set("mask", "f4");
             this.ephVY.Properties.MaxLength = 10;
             this.ephVY.Properties.UseMaskAsDisplayFormat = true;
             this.ephVY.Size = new System.Drawing.Size(146, 20);
@@ -179,7 +179,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.ephVZ.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.ephVZ.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.ephVZ.Properties.MaskSettings.Set("mask", "f3");
+            this.ephVZ.Properties.MaskSettings.Set("mask", "f4");
             this.ephVZ.Properties.MaxLength = 10;
             this.ephVZ.Properties.UseMaskAsDisplayFormat = true;
             this.ephVZ.Size = new System.Drawing.Size(143, 20);

XdCxRhDW.App/UserControl/UCEphXYZParam.cs

@@ -27,18 +27,18 @@ namespace XdCxRhDW.App.UserControl
             SatCode = satCode;
 
             layoutControlItemx.AllowHtmlStringInCaption = true;
-            ephX.EditValue = eph.x.HasValue ? Math.Round(eph.x.Value, 3) : 0;
+            ephX.EditValue = eph.x.HasValue ? Math.Round(eph.x.Value, 4) : 0;
             layoutControlItemx.Text = $"{title}<size=12><color=0,103,192> [{satCode}]</color></size>星历X";
-            ephY.EditValue = eph.y.HasValue ? Math.Round(eph.y.Value, 3) : 0;
+            ephY.EditValue = eph.y.HasValue ? Math.Round(eph.y.Value, 4) : 0;
             layoutControlItemy.Text = $"{title}星历Y";
-            ephZ.EditValue = eph.z.HasValue ? Math.Round(eph.z.Value, 3) : 0;
+            ephZ.EditValue = eph.z.HasValue ? Math.Round(eph.z.Value, 4) : 0;
             layoutControlItemz.Text = $"{title}星历Z";
 
-            ephVX.EditValue = eph.vx.HasValue ? Math.Round(eph.vx.Value, 3) : 0;
+            ephVX.EditValue = eph.vx.HasValue ? Math.Round(eph.vx.Value, 4) : 0;
             layoutControlItemvx.Text = $"{title}星历VX";
-            ephVY.EditValue = eph.vy.HasValue ? Math.Round(eph.vy.Value, 3) : 0;
+            ephVY.EditValue = eph.vy.HasValue ? Math.Round(eph.vy.Value, 4) : 0;
             layoutControlItemvy.Text = $"{title}星历VY";
-            ephVZ.EditValue = eph.vz.HasValue ? Math.Round(eph.vz.Value, 3) : 0;
+            ephVZ.EditValue = eph.vz.HasValue ? Math.Round(eph.vz.Value, 4) : 0;
             layoutControlItemvz.Text = $"{title}星历VZ";
 
             ephX.ForeColor = ephY.ForeColor = ephZ.ForeColor = ephVX.ForeColor = ephVY.ForeColor = ephVZ.ForeColor = color;

XdCxRhDW.Repostory/XlRepository.cs

@@ -37,22 +37,22 @@ namespace XdCxRhDW.Repostory
         /// 获取某个星某个时刻最近的双行根(可能返回null)
         /// </summary>
         /// <param name="satCode">卫星编号</param>
-        /// <param name="timeBj">时刻</param>
+        /// <param name="sigTime">时刻</param>
         /// <returns></returns>
-        public static async Task<XlInfo> GetLatestAsync(int satCode, DateTime timeBj)
+        public static async Task<XlInfo> GetLatestAsync(int satCode, DateTime sigTime)
         {
             try
             {
                 using (RHDWContext db = new RHDWContext())
                 {
-                  var res= await db.XlInfos.SqlQuery($"SELECT min(abs(JULIANDAY(timebj)-JULIANDAY('{timeBj:yyyy-MM-dd HH:mm:ss}')))" +
+                  var res= await db.XlInfos.SqlQuery($"SELECT min(abs(JULIANDAY(TimeUTC)-JULIANDAY('{sigTime:yyyy-MM-dd HH:mm:ss}')))" +
                         $" as NearDaySpan,* FROM XlInfo where satcode={satCode}").FirstOrDefaultAsync();
                     return res;
                 }
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, $"获取卫星[{satCode}]--{timeBj:yyyyMMddHHmmss}时刻附近的双行根数出错!");
+                Serilog.Log.Error(ex, $"获取卫星[{satCode}]--{sigTime:yyyyMMddHHmmss}时刻附近的双行根数出错!");
                 return null;
             }
         }