wyq 1 年之前
父节点
当前提交
4a4fa83fc6
共有 27 个文件被更改,包括 154 次插入151 次删除
  1. 16 14
      XdCxRhDW.App/Controllers/PosController.cs
  2. 2 6
      XdCxRhDW.App/EditForms/X1D1DTOParamEditor.Designer.cs
  3. 7 7
      XdCxRhDW.App/EditForms/X1D1DTOParamEditor.cs
  4. 0 5
      XdCxRhDW.App/EditForms/X1D1PosParamEditor.Designer.cs
  5. 7 7
      XdCxRhDW.App/EditForms/X1D1PosParamEditor.cs
  6. 0 3
      XdCxRhDW.App/EditForms/X2D1DTOParamEditor.Designer.cs
  7. 18 18
      XdCxRhDW.App/EditForms/X2D1DTOParamEditor.cs
  8. 0 3
      XdCxRhDW.App/EditForms/X2D1PosParamEditor.Designer.cs
  9. 7 7
      XdCxRhDW.App/EditForms/X2D1PosParamEditor.cs
  10. 0 2
      XdCxRhDW.App/EditForms/X2DTOParamEditor.Designer.cs
  11. 5 5
      XdCxRhDW.App/EditForms/X2DTOParamEditor.cs
  12. 0 2
      XdCxRhDW.App/EditForms/X2PosParamEditor.Designer.cs
  13. 12 12
      XdCxRhDW.App/EditForms/X2PosParamEditor.cs
  14. 0 2
      XdCxRhDW.App/EditForms/X3DTOParamEditor.Designer.cs
  15. 7 7
      XdCxRhDW.App/EditForms/X3DTOParamEditor.cs
  16. 4 10
      XdCxRhDW.App/EditForms/X3DfoPosParamEditor.Designer.cs
  17. 11 11
      XdCxRhDW.App/EditForms/X3DfoPosParamEditor.cs
  18. 0 2
      XdCxRhDW.App/EditForms/X3PosParamEditor.Designer.cs
  19. 7 7
      XdCxRhDW.App/EditForms/X3PosParamEditor.cs
  20. 38 6
      XdCxRhDW.App/ExtensionsDev/MapControlEx.cs
  21. 二进制
      XdCxRhDW.App/Service/信号检测服务/AddIns/XdCxRhDw.Dto.pdb
  22. 3 3
      XdCxRhDW.App/UserControl/UCEphXYZ.cs
  23. 6 6
      XdCxRhDW.App/UserControl/UCEphXYZParam.cs
  24. 2 2
      XdCxRhDW.App/UserControl/X2DFGDOPParam.cs
  25. 2 2
      XdCxRhDW.App/UserControl/X3DFGDOPParam .cs
  26. 0 1
      XdCxRhDW.App/XdCxRhDW.App.csproj
  27. 0 1
      XdCxRhDW.Sender/XdCxRhDW.Sender.csproj

+ 16 - 14
XdCxRhDW.App/Controllers/PosController.cs

@@ -1906,13 +1906,15 @@ 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, 10),
+                    Dfo1 = Math.Round(dto.Dfo, 10),
+                    Snr1 = Math.Round(dto.Snr, 1),
+                    YbMainDto = Math.Round(dto.YbMainDto, 10),
+                    YbAdja1Dto = Math.Round(dto.YbAdjaDto, 10),
+                    YbMainDfo = Math.Round(dto.YbMainDfo, 10),
+                    YbAdja1Dfo = Math.Round(dto.YbAdjaDfo, 10),
+
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,
@@ -2044,13 +2046,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,10),
+                    Dfo1 = Math.Round(dto.Dfo, 10),
+                    Snr1 =  Math.Round(dto.Snr, 1),
+                    YbMainDto =  Math.Round(dto.YbMainDto, 10),
+                    YbAdja1Dto = Math.Round(dto.YbAdjaDto, 10),
+                    YbMainDfo  = Math.Round(dto.YbMainDfo, 10),
+                    YbAdja1Dfo  = Math.Round(dto.YbAdjaDfo, 10),
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,

+ 2 - 6
XdCxRhDW.App/EditForms/X1D1DTOParamEditor.Designer.cs

@@ -171,7 +171,7 @@
             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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYbMain.Properties.MaxLength = 10;
+          
             this.txtYbMain.Size = new System.Drawing.Size(169, 20);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
@@ -183,7 +183,6 @@
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Properties.MaxLength = 20;
             this.txtsatStation.Size = new System.Drawing.Size(167, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
@@ -196,7 +195,6 @@
             this.txtcdbStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtcdbStation.Name = "txtcdbStation";
             this.txtcdbStation.Properties.AutoHeight = false;
-            this.txtcdbStation.Properties.MaxLength = 20;
             this.txtcdbStation.Size = new System.Drawing.Size(168, 20);
             this.txtcdbStation.StyleController = this.layoutControl1;
             this.txtcdbStation.TabIndex = 10;
@@ -209,7 +207,6 @@
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Properties.MaxLength = 20;
             this.txtRefLocation.Size = new System.Drawing.Size(167, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
@@ -256,7 +253,6 @@
             this.txtCxLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtCxLocation.Name = "txtCxLocation";
             this.txtCxLocation.Properties.AutoHeight = false;
-            this.txtCxLocation.Properties.MaxLength = 20;
             this.txtCxLocation.Size = new System.Drawing.Size(167, 20);
             this.txtCxLocation.StyleController = this.layoutControl1;
             this.txtCxLocation.TabIndex = 10;
@@ -269,7 +265,7 @@
             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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtcxFx.Properties.MaxLength = 10;
+           
             this.txtcxFx.Size = new System.Drawing.Size(168, 20);
             this.txtcxFx.StyleController = this.layoutControl1;
             this.txtcxFx.TabIndex = 6;

+ 7 - 7
XdCxRhDW.App/EditForms/X1D1DTOParamEditor.cs

@@ -71,8 +71,8 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f4}";
-                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
+                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value}";
+                this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
                 this.sigTime.EditValue = info.SigTime;
 
                 ucEphXYZMain.SetXYZ("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ), Color.Black);
@@ -80,14 +80,14 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cx != null)
             {
-                this.txtcxFx.Text = $"{cx.Fx:f4}";
+                this.txtcxFx.Text = $"{cx.Fx}";
             }
             if (station != null)
             {
-                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}";
+                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
+                this.txtcdbStation.Text = $"{station.CdbTxLon},{station.CdbTxLat}";
+                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
+                this.txtCxLocation.Text= $"{station.CxLon},{station.CxLat}";
             }
         }
 

+ 0 - 5
XdCxRhDW.App/EditForms/X1D1PosParamEditor.Designer.cs

@@ -190,7 +190,6 @@
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Properties.MaxLength = 20;
             this.txtsatStation.Size = new System.Drawing.Size(175, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
@@ -203,7 +202,6 @@
             this.txtcdbStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtcdbStation.Name = "txtcdbStation";
             this.txtcdbStation.Properties.AutoHeight = false;
-            this.txtcdbStation.Properties.MaxLength = 20;
             this.txtcdbStation.Size = new System.Drawing.Size(177, 20);
             this.txtcdbStation.StyleController = this.layoutControl1;
             this.txtcdbStation.TabIndex = 10;
@@ -216,7 +214,6 @@
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Properties.MaxLength = 20;
             this.txtRefLocation.Size = new System.Drawing.Size(176, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
@@ -252,7 +249,6 @@
             this.txtCxLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtCxLocation.Name = "txtCxLocation";
             this.txtCxLocation.Properties.AutoHeight = false;
-            this.txtCxLocation.Properties.MaxLength = 20;
             this.txtCxLocation.Size = new System.Drawing.Size(177, 20);
             this.txtCxLocation.StyleController = this.layoutControl1;
             this.txtCxLocation.TabIndex = 10;
@@ -266,7 +262,6 @@
             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, 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;
             this.txtcxFx.TabIndex = 10;

+ 7 - 7
XdCxRhDW.App/EditForms/X1D1PosParamEditor.cs

@@ -70,21 +70,21 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f4}";
-                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
+                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value}";
+                this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
                 this.sigTime.EditValue = info.SigTime;
                 ucEphXYZMain.SetXYZ("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ), Color.Black);
             }
             if (cx != null)
             {
-                this.txtcxFx.Text = $"{cx.Fx:f4}";
+                this.txtcxFx.Text = $"{cx.Fx}";
             }
             if (station != null)
             {
-                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}";
+                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
+                this.txtcdbStation.Text = $"{station.CdbTxLon},{station.CdbTxLat}";
+                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
+                this.txtCxLocation.Text = $"{station.CxLon},{station.CxLat}";
             }
         }
 

+ 0 - 3
XdCxRhDW.App/EditForms/X2D1DTOParamEditor.Designer.cs

@@ -222,7 +222,6 @@
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Properties.MaxLength = 20;
             this.txtsatStation.Size = new System.Drawing.Size(201, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
@@ -235,7 +234,6 @@
             this.txtcdbStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtcdbStation.Name = "txtcdbStation";
             this.txtcdbStation.Properties.AutoHeight = false;
-            this.txtcdbStation.Properties.MaxLength = 20;
             this.txtcdbStation.Size = new System.Drawing.Size(203, 20);
             this.txtcdbStation.StyleController = this.layoutControl1;
             this.txtcdbStation.TabIndex = 10;
@@ -248,7 +246,6 @@
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Properties.MaxLength = 20;
             this.txtRefLocation.Size = new System.Drawing.Size(202, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;

+ 18 - 18
XdCxRhDW.App/EditForms/X2D1DTOParamEditor.cs

@@ -70,12 +70,12 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value:f4}";
-                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f4}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value}";
+                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value}";
                 if (info.PosResType == EnumPosResType.X2D1)
                 {
-                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
-                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f4}";
+                    this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
+                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value}";
                 }
                 this.txtSigTime.EditValue = info.SigTime;
                 ucEphXYZMain.SetXYZ("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ), Color.Black);
@@ -83,9 +83,9 @@ namespace XdCxRhDW.App.EditForms
             }
             if (station != null)
             {
-                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.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
+                this.txtcdbStation.Text = $"{station.CdbTxLon},{station.CdbTxLat}";
+                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
             }
             if (info.PosResType == EnumPosResType.X2D1NoRef)
             {
@@ -94,17 +94,17 @@ namespace XdCxRhDW.App.EditForms
                 txtRefLocation.Properties.ReadOnly = true;
                 this.txtRefLocation.Text = $"{0},{0}";
             }
-            double tarLon = 46, tarLat = 24;
-            double recLon = 45.9, recLat = 23.9;
-            var tarEcef = PhysicsHelper.GeoToEcef((tarLon, tarLat, 0));
-            var recEcef = PhysicsHelper.GeoToEcef((recLon, recLat, 0));
-            var xl1Ecef = (cg.MainX.Value, cg.MainY.Value, cg.MainZ.Value);
-            var xl2Ecef = (cg.Adja1X.Value, cg.Adja1Y.Value, cg.Adja1Z.Value);
-            var dt1 = PhysicsHelper.Dto(tarEcef, xl1Ecef, recEcef);
-            var dt2 = PhysicsHelper.Dto(tarEcef, xl2Ecef, recEcef);
-            var dto1 = (dt1 - dt2) * 1e6;
-            var dt3 = PhysicsHelper.Dto(tarEcef, recEcef);
-            var dto2 = (dt1 - dt3) * 1e6;
+            //double tarLon = 46, tarLat = 24;
+            //double recLon = 45.9, recLat = 23.9;
+            //var tarEcef = PhysicsHelper.GeoToEcef((tarLon, tarLat, 0));
+            //var recEcef = PhysicsHelper.GeoToEcef((recLon, recLat, 0));
+            //var xl1Ecef = (cg.MainX.Value, cg.MainY.Value, cg.MainZ.Value);
+            //var xl2Ecef = (cg.Adja1X.Value, cg.Adja1Y.Value, cg.Adja1Z.Value);
+            //var dt1 = PhysicsHelper.Dto(tarEcef, xl1Ecef, recEcef);
+            //var dt2 = PhysicsHelper.Dto(tarEcef, xl2Ecef, recEcef);
+            //var dto1 = (dt1 - dt2) * 1e6;
+            //var dt3 = PhysicsHelper.Dto(tarEcef, recEcef);
+            //var dto2 = (dt1 - dt3) * 1e6;
         }
 
         public bool CheckParam()

+ 0 - 3
XdCxRhDW.App/EditForms/X2D1PosParamEditor.Designer.cs

@@ -228,7 +228,6 @@
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Properties.MaxLength = 20;
             this.txtsatStation.Size = new System.Drawing.Size(201, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
@@ -241,7 +240,6 @@
             this.txtcdbStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtcdbStation.Name = "txtcdbStation";
             this.txtcdbStation.Properties.AutoHeight = false;
-            this.txtcdbStation.Properties.MaxLength = 20;
             this.txtcdbStation.Size = new System.Drawing.Size(203, 20);
             this.txtcdbStation.StyleController = this.layoutControl1;
             this.txtcdbStation.TabIndex = 10;
@@ -254,7 +252,6 @@
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Properties.MaxLength = 20;
             this.txtRefLocation.Size = new System.Drawing.Size(202, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;

+ 7 - 7
XdCxRhDW.App/EditForms/X2D1PosParamEditor.cs

@@ -59,12 +59,12 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value:f4}";
-                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f4}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value}";
+                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value}";
                 if (info.PosResType == EnumPosResType.X2D1)
                 {
-                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
-                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f4}";
+                    this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
+                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value}";
                 }
                 this.txtSigTime.EditValue = info.SigTime;
                 ucEphXYZMain.SetXYZ("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ), Color.Black);
@@ -72,9 +72,9 @@ namespace XdCxRhDW.App.EditForms
             }
             if (station != null)
             {
-                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.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
+                this.txtcdbStation.Text = $"{station.CdbTxLon},{station.CdbTxLat}";
+                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
             }
             if (info.PosResType == EnumPosResType.X2D1NoRef)
             {

+ 0 - 2
XdCxRhDW.App/EditForms/X2DTOParamEditor.Designer.cs

@@ -187,7 +187,6 @@
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Properties.MaxLength = 20;
             this.txtsatStation.Size = new System.Drawing.Size(222, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
@@ -200,7 +199,6 @@
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Properties.MaxLength = 20;
             this.txtRefLocation.Size = new System.Drawing.Size(199, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;

+ 5 - 5
XdCxRhDW.App/EditForms/X2DTOParamEditor.cs

@@ -70,17 +70,17 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value:f4}";
-                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
-                this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f4}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value}";
+                this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
+                this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value}";
                 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);
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
-                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
+                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
+                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
             }
         }
 

+ 0 - 2
XdCxRhDW.App/EditForms/X2PosParamEditor.Designer.cs

@@ -269,7 +269,6 @@
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Properties.MaxLength = 20;
             this.txtsatStation.Size = new System.Drawing.Size(240, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
@@ -282,7 +281,6 @@
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Properties.MaxLength = 20;
             this.txtRefLocation.Size = new System.Drawing.Size(211, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;

+ 12 - 12
XdCxRhDW.App/EditForms/X2PosParamEditor.cs

@@ -65,9 +65,9 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value:f4}";
-                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
-                this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f4}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value}";
+                this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
+                this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value}";
                 this.txtSigTime.EditValue = info.SigTime;
 
                 var mainEph = (cg.MainX, cg.MainY, cg.MainZ, cg.MainVx, cg.MainVy, cg.MainVz);
@@ -76,19 +76,19 @@ namespace XdCxRhDW.App.EditForms
                 var adjaEph = (cg.Adja1X, cg.Adja1Y, cg.Adja1Z, cg.Adja1Vx, cg.Adja1Vy, cg.Adja1Vz);
                 ucEphXYZAdja.SetParam($"邻星", cg.Adja1Code, adjaEph, Color.Black);
 
-                this.txtDfo.Text = $"{cg.Dfo1.Value:f4}";
-                this.txtYbMainDfo.Text = $"{cg.YbMainDfo.Value:f4}";
-                this.txtYbAdjaDfo.Text = $"{cg.YbAdja1Dfo.Value:f4}";
+                this.txtDfo.EditValue = $"{cg.Dfo1.Value}";
+                this.txtYbMainDfo.Text = $"{cg.YbMainDfo.Value}";
+                this.txtYbAdjaDfo.Text = $"{cg.YbAdja1Dfo.Value}";
 
-                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;
+                this.txtTarFreqUp.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 0;
+                this.txtTarFreqDown.EditValue = cg.TarFreqDown.HasValue ? cg.TarFreqDown.Value * 1e-6 : 0;
+                this.txtRefFreqUp.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value * 1e-6 : 0;
+                this.txtRefFreqDown.EditValue = cg.RefFreqDown.HasValue ? cg.RefFreqDown.Value * 1e-6 : 0;
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
-                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
+                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
+                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
             }
         }
 

+ 0 - 2
XdCxRhDW.App/EditForms/X3DTOParamEditor.Designer.cs

@@ -237,7 +237,6 @@
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Properties.MaxLength = 20;
             this.txtsatStation.Size = new System.Drawing.Size(305, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
@@ -250,7 +249,6 @@
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Properties.MaxLength = 20;
             this.txtRefLocation.Size = new System.Drawing.Size(307, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;

+ 7 - 7
XdCxRhDW.App/EditForms/X3DTOParamEditor.cs

@@ -62,13 +62,13 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value:f4}";
-                this.txtDtoSx1.Text = $"{cg.Dto2.Value:f4}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value}";
+                this.txtDtoSx1.Text = $"{cg.Dto2.Value}";
                 if (info.PosResType == EnumPosResType.X3)
                 {
-                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
-                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f4}";
-                    this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value:f4}";
+                    this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
+                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value}";
+                    this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value}";
                 }
                 this.sigTime.EditValue = info.SigTime;
 
@@ -83,8 +83,8 @@ namespace XdCxRhDW.App.EditForms
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
-                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
+                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
+                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
             }
             if (info.PosResType == EnumPosResType.X3NoRef)
             {

+ 4 - 10
XdCxRhDW.App/EditForms/X3DfoPosParamEditor.Designer.cs

@@ -286,7 +286,6 @@
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Properties.MaxLength = 20;
             this.txtsatStation.Size = new System.Drawing.Size(201, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
@@ -299,7 +298,6 @@
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Properties.MaxLength = 20;
             this.txtRefLocation.Size = new System.Drawing.Size(203, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
@@ -347,8 +345,7 @@
             this.txtTargetDFreq.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.txtTargetDFreq.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtTargetDFreq.Properties.MaskSettings.Set("mask", "f3");
-            this.txtTargetDFreq.Properties.MaxLength = 10;
+          
             this.txtTargetDFreq.Size = new System.Drawing.Size(203, 20);
             this.txtTargetDFreq.StyleController = this.layoutControl1;
             this.txtTargetDFreq.TabIndex = 6;
@@ -361,8 +358,7 @@
             this.txtRefDFreq.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             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.txtRefDFreq.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtRefDFreq.Properties.MaskSettings.Set("mask", "f3");
-            this.txtRefDFreq.Properties.MaxLength = 10;
+         
             this.txtRefDFreq.Size = new System.Drawing.Size(202, 20);
             this.txtRefDFreq.StyleController = this.layoutControl1;
             this.txtRefDFreq.TabIndex = 6;
@@ -375,8 +371,7 @@
             this.txtTargetFreq.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtTargetFreq.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtTargetFreq.Properties.MaskSettings.Set("mask", "f3");
-            this.txtTargetFreq.Properties.MaxLength = 10;
+           
             this.txtTargetFreq.Size = new System.Drawing.Size(201, 20);
             this.txtTargetFreq.StyleController = this.layoutControl1;
             this.txtTargetFreq.TabIndex = 6;
@@ -389,8 +384,7 @@
             this.txtRefFreq.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtRefFreq.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtRefFreq.Properties.MaskSettings.Set("mask", "f3");
-            this.txtRefFreq.Properties.MaxLength = 10;
+           
             this.txtRefFreq.Size = new System.Drawing.Size(202, 20);
             this.txtRefFreq.StyleController = this.layoutControl1;
             this.txtRefFreq.TabIndex = 6;

+ 11 - 11
XdCxRhDW.App/EditForms/X3DfoPosParamEditor.cs

@@ -58,11 +58,11 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDfoSx.Text = $"{cg.Dfo1.Value:f4}";
-                this.txtDfoSx1.Text = $"{cg.Dfo2.Value:f4}";
-                this.txtYbMain.Text = $"{cg.YbMainDfo.Value:f4}";
-                this.txtYbAdja.Text = $"{cg.YbAdja1Dfo.Value:f4}";
-                this.txtYbAdja1.Text = $"{cg.YbAdja2Dfo.Value:f4}";
+                this.txtDfoSx.Text = $"{cg.Dfo1.Value}";
+                this.txtDfoSx1.Text = $"{cg.Dfo2.Value}";
+                this.txtYbMain.Text = $"{cg.YbMainDfo.Value}";
+                this.txtYbAdja.Text = $"{cg.YbAdja1Dfo.Value}";
+                this.txtYbAdja1.Text = $"{cg.YbAdja2Dfo.Value}";
                 this.sigTime.EditValue = info.SigTime;
                 var mainEph = (cg.MainX, cg.MainY, cg.MainZ, cg.MainVx, cg.MainVy, cg.MainVz);
                 ucEphXYZMain.SetParam($"主星", cg.MainCode, mainEph, Color.Black);
@@ -73,15 +73,15 @@ namespace XdCxRhDW.App.EditForms
                 var adja2Eph = (cg.Adja2X, cg.Adja2Y, cg.Adja2Z, cg.Adja2Vx, cg.Adja2Vy, cg.Adja2Vz);
                 ucEphXYZAdja2.SetParam($"邻星2", cg.Adja2Code, adja2Eph, Color.Black);
 
-                this.txtTargetFreq.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 950;
-                this.txtTargetDFreq.EditValue = cg.TarFreqDown.HasValue ? cg.TarFreqDown.Value * 1e-6 : 950;
-                this.txtRefFreq.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value * 1e-6 : 950;
-                this.txtRefDFreq.EditValue = cg.RefFreqDown.HasValue ? cg.RefFreqDown.Value * 1e-6 : 950;
+                this.txtTargetFreq.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 0;
+                this.txtTargetDFreq.EditValue = cg.TarFreqDown.HasValue ? cg.TarFreqDown.Value * 1e-6 : 0;
+                this.txtRefFreq.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value * 1e-6 : 0;
+                this.txtRefDFreq.EditValue = cg.RefFreqDown.HasValue ? cg.RefFreqDown.Value * 1e-6 : 0;
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
-                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
+                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
+                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
             }
             if (info.PosResType == EnumPosResType.X3NoRef)
             {

+ 0 - 2
XdCxRhDW.App/EditForms/X3PosParamEditor.Designer.cs

@@ -246,7 +246,6 @@
             this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Properties.MaxLength = 20;
             this.txtsatStation.Size = new System.Drawing.Size(224, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
@@ -259,7 +258,6 @@
             this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Properties.MaxLength = 20;
             this.txtRefLocation.Size = new System.Drawing.Size(196, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;

+ 7 - 7
XdCxRhDW.App/EditForms/X3PosParamEditor.cs

@@ -55,13 +55,13 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value:f4}";
-                this.txtDtoSx1.Text = $"{cg.Dto2.Value:f4}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value}";
+                this.txtDtoSx1.Text = $"{cg.Dto2.Value}";
                 if (info.PosResType == EnumPosResType.X3)
                 {
-                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f4}";
-                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f4}";
-                    this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value:f4}";
+                    this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
+                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value}";
+                    this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value}";
                 }
                 this.sigTime.EditValue = info.SigTime;
                 var mainEph = (cg.MainX, cg.MainY, cg.MainZ);
@@ -75,8 +75,8 @@ namespace XdCxRhDW.App.EditForms
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon:f4},{station.SatTxLat:f4}";
-                this.txtRefLocation.Text = $"{station.RefLon:f4},{station.RefLat:f4}";
+                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
+                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
             }
             if (info.PosResType == EnumPosResType.X3NoRef)
             {

+ 38 - 6
XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -277,7 +277,7 @@ public static class MapControlEx
             {
                 Alignment = ContentAlignment.BottomLeft,
                 Text = $"{geo.Longitude:f1}°{ee}    {geo.Latitude:f1}°{nn}"
-                  
+
 
             };
             //item.TextStyle.TextColor = Color.FromArgb(128, 128, 128);
@@ -1910,15 +1910,17 @@ public static class MapControlEx
     /// <returns></returns>
     public static (double, double) CalcSituation(double lon, double lat, double deg, double dis)
     {
-        double arc = 6371.393 * 1000;       //地球平均半径
         double rad = deg * (Math.PI / 180); //角度转弧度
-        double c_lng = lon + dis * Math.Sin(rad) / (arc * Math.Cos(lat) * 2 * Math.PI / 360);
-
-        double c_lat = lat + dis * Math.Cos(rad) / (arc * 2 * Math.PI / 360);
+        double dx = dis * Math.Sin(rad);
+        double dy = dis * Math.Cos(rad);
 
-        return (c_lng, c_lat);  //方向上的另一点坐标
+        MyLatLng A = new MyLatLng(lon, lat);
+        double bjd = (dx / A.Ed + A.m_RadLo) * 180/ Math.PI;
+        double bwd = (dy / A.Ec + A.m_RadLa) * 180/ Math.PI;
+        return (bjd, bwd);
     }
 
+
     /**
     * 求B点经纬度
     * @param A 已知点的经纬度,
@@ -2966,4 +2968,34 @@ public static class MapControlEx
         }
 
     }
+}
+
+
+class MyLatLng
+{
+    static double Rc = 6378137;
+    static double Rj = 6356725;
+    double m_LoDeg, m_LoMin, m_LoSec;
+    double m_LaDeg, m_LaMin, m_LaSec;
+    double m_Longitude, m_Latitude;
+    double m_RadLo, m_RadLa;
+    double Ec;
+    double Ed;
+    public MyLatLng(double longitude, double latitude)
+    {
+        m_LoDeg = (int)longitude;
+        m_LoMin = (int)((longitude - m_LoDeg) * 60);
+        m_LoSec = (longitude - m_LoDeg - m_LoMin / 60) * 3600;
+
+        m_LaDeg = (int)latitude;
+        m_LaMin = (int)((latitude - m_LaDeg) * 60);
+        m_LaSec = (latitude - m_LaDeg - m_LaMin / 60) * 3600;
+
+        m_Longitude = longitude;
+        m_Latitude = latitude;
+        m_RadLo = longitude * Math.PI / 180;
+        m_RadLa = latitude * Math.PI / 180;
+        Ec = Rj + (Rc - Rj) * (90 - m_Latitude) / 90;
+        Ed = Ec * Math.Cos(m_RadLa);
+    }
 }

二进制
XdCxRhDW.App/Service/信号检测服务/AddIns/XdCxRhDw.Dto.pdb


+ 3 - 3
XdCxRhDW.App/UserControl/UCEphXYZ.cs

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

+ 6 - 6
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, 4) : 0;
+            ephX.EditValue = eph.x.HasValue ? eph.x.Value : 0;
             layoutControlItemx.Text = $"{title}<size=12><color=0,103,192> [{satCode}]</color></size>星历X";
-            ephY.EditValue = eph.y.HasValue ? Math.Round(eph.y.Value, 4) : 0;
+            ephY.EditValue = eph.y.HasValue ? eph.y.Value: 0;
             layoutControlItemy.Text = $"{title}星历Y";
-            ephZ.EditValue = eph.z.HasValue ? Math.Round(eph.z.Value, 4) : 0;
+            ephZ.EditValue = eph.z.HasValue ? eph.z.Value : 0;
             layoutControlItemz.Text = $"{title}星历Z";
 
-            ephVX.EditValue = eph.vx.HasValue ? Math.Round(eph.vx.Value, 4) : 0;
+            ephVX.EditValue = eph.vx.HasValue ? eph.vx.Value : 0;
             layoutControlItemvx.Text = $"{title}星历VX";
-            ephVY.EditValue = eph.vy.HasValue ? Math.Round(eph.vy.Value, 4) : 0;
+            ephVY.EditValue = eph.vy.HasValue ? eph.vy.Value : 0;
             layoutControlItemvy.Text = $"{title}星历VY";
-            ephVZ.EditValue = eph.vz.HasValue ? Math.Round(eph.vz.Value, 4) : 0;
+            ephVZ.EditValue = eph.vz.HasValue ? eph.vz.Value : 0;
             layoutControlItemvz.Text = $"{title}星历VZ";
 
             ephX.ForeColor = ephY.ForeColor = ephZ.ForeColor = ephVX.ForeColor = ephVY.ForeColor = ephVZ.ForeColor = color;

+ 2 - 2
XdCxRhDW.App/UserControl/X2DFGDOPParam.cs

@@ -52,8 +52,8 @@ namespace XdCxRhDW.App.UserControl
                 }
                 if (cg != null)
                 {
-                    this.txtFu1.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 950;
-                    this.txtFu2.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value * 1e-6 : 950;
+                    this.txtFu1.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 0;
+                    this.txtFu2.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value * 1e-6 : 0;
 
                     var mainEph = (cg.MainX, cg.MainY, cg.MainZ, cg.MainVx, cg.MainVy, cg.MainVz);
                     ucEphXYZMain.SetParam($"主星", cg.MainCode, mainEph, Color.Black);

+ 2 - 2
XdCxRhDW.App/UserControl/X3DFGDOPParam .cs

@@ -51,8 +51,8 @@ namespace XdCxRhDW.App.UserControl
                 }
                 if (cg != null)
                 {
-                    this.txtFu1.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 950;
-                    this.txtFu2.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value * 1e-6 : 950;
+                    this.txtFu1.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 0;
+                    this.txtFu2.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value * 1e-6 : 0;
 
                     var mainEph = (cg.MainX, cg.MainY, cg.MainZ, cg.MainVx, cg.MainVy, cg.MainVz);
                     ucEphXYZMain.SetParam($"主星", cg.MainCode, mainEph, Color.Black);

+ 0 - 1
XdCxRhDW.App/XdCxRhDW.App.csproj

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

+ 0 - 1
XdCxRhDW.Sender/XdCxRhDW.Sender.csproj

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