gongqiuhong hace 1 año
padre
commit
b2b0e7d8fc
Se han modificado 2 ficheros con 22 adiciones y 22 borrados
  1. 1 0
      XdCxRhDW.Sender/Form1.Designer.cs
  2. 21 22
      XdCxRhDW.Sender/Form1.cs

+ 1 - 0
XdCxRhDW.Sender/Form1.Designer.cs

@@ -93,6 +93,7 @@
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem("两星一地无参定位", "X2D1NoPar", -1),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem("融合定位", "RH", -1),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双时差定位", "X3TwoDto", -1),
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双时差无参定位", "X3TwoDtoNoPar", -1),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双频差定位", "X3TwoDfo", -1),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem("双星时频差定位", "X2Dfo", -1)});
             this.txtTskType.Size = new System.Drawing.Size(102, 22);

+ 21 - 22
XdCxRhDW.Sender/Form1.cs

@@ -49,7 +49,6 @@ namespace XdCxRhDW.Sender
                     {
                         try
                         {
-
                             string url = string.Format("http://{0}:{1}/Api/Pos/", ip, port);
                             if (tskType == "X1D1CX")//一星一地测向定位
                             {
@@ -215,15 +214,15 @@ namespace XdCxRhDW.Sender
                 cts1?.Cancel();
             }
         }
-            /// <summary>
-            /// 两星一地定位无参
-            /// </summary>
-            private X2D1PosDto X2D1NoPar()
+        /// <summary>
+        /// 两星一地定位无参
+        /// </summary>
+        private X2D1PosDto X2D1NoPar()
         {
             X2D1PosDto X2D1PosDto = new X2D1PosDto();
             X2D1PosDto.SigTime = DateTime.Now;
-            X2D1PosDto.SxDto = 2198.485309353;
-            X2D1PosDto.XdDto = 245961.726007262;
+            X2D1PosDto.SxDto = -0.002198485309353 * 1e6;
+            X2D1PosDto.XdDto = 0.245961726007262 * 1e6;
             X2D1PosDto.MainX = -38209016;
             X2D1PosDto.MainY = 17858458;
             X2D1PosDto.MainZ = 13250;
@@ -244,11 +243,11 @@ namespace XdCxRhDW.Sender
         {
             X3TwoDtoPosDto X3TwoDtoPosDto = new X3TwoDtoPosDto();
             X3TwoDtoPosDto.SigTime = DateTime.Now;
-            X3TwoDtoPosDto.Dto1 = -3768.3828;
-            X3TwoDtoPosDto.Dto2 = 4114.76;
-            X3TwoDtoPosDto.YbMainDto = 253339.246;
-            X3TwoDtoPosDto.YbAdja1Dto = 254082.015;
-            X3TwoDtoPosDto.YbAdja2Dto = 247747.625;
+            X3TwoDtoPosDto.Dto1 = -0.0037683828 * 1e6;
+            X3TwoDtoPosDto.Dto2 = 0.00411476 * 1e6;
+            X3TwoDtoPosDto.YbMainDto = 0.253339246 * 1e6;
+            X3TwoDtoPosDto.YbAdja1Dto = 0.254082015 * 1e6;
+            X3TwoDtoPosDto.YbAdja2Dto = 0.247747625 * 1e6;
             X3TwoDtoPosDto.MainX = -38209016;
             X3TwoDtoPosDto.MainY = 17858458;
             X3TwoDtoPosDto.MainZ = 13250;
@@ -272,8 +271,8 @@ namespace XdCxRhDW.Sender
         {
             X3TwoDtoNoParPosDto X3TwoDtoNoParPosDto = new X3TwoDtoNoParPosDto();
             X3TwoDtoNoParPosDto.SigTime = DateTime.Now;
-            X3TwoDtoNoParPosDto.Dto1 = -8361.002956792;
-            X3TwoDtoNoParPosDto.Dto2 = 4191.941221694;
+            X3TwoDtoNoParPosDto.Dto1 = -0.008361002956792 * 1e6;
+            X3TwoDtoNoParPosDto.Dto2 = 0.004191941221694 * 1e6;
             X3TwoDtoNoParPosDto.MainX = -38214804;
             X3TwoDtoNoParPosDto.MainY = 17780164;
             X3TwoDtoNoParPosDto.MainZ = -6857;
@@ -300,10 +299,10 @@ namespace XdCxRhDW.Sender
             X3TwoDfoPosDto.YbMainDfo = 0;
             X3TwoDfoPosDto.YbAdja1Dfo = 17.453698229247941;
             X3TwoDfoPosDto.YbAdja2Dfo = 37.022577554138941;
-            X3TwoDfoPosDto.TarFreqUp = 6033000000;
-            X3TwoDfoPosDto.TarFreqDown = 3808000000;
-            X3TwoDfoPosDto.RefFreqUp = 6021000000;
-            X3TwoDfoPosDto.RefFreqDown = 3796000000;
+            X3TwoDfoPosDto.TarFreqUp = 3808 * 1e6 + 2225 * 1e6;
+            X3TwoDfoPosDto.TarFreqDown = 3808 * 1e6;
+            X3TwoDfoPosDto.RefFreqUp = 3796 * 1e6 + 2225 * 1e6;
+            X3TwoDfoPosDto.RefFreqDown = 3796 * 1e6;
             X3TwoDfoPosDto.MainX = -18149981.873274;
             X3TwoDfoPosDto.MainY = 38039767.675679;
             X3TwoDfoPosDto.MainZ = -5662.335149;
@@ -342,10 +341,10 @@ namespace XdCxRhDW.Sender
             X2DtoDfoPosDto.YbAdjaDto = 6.352805492137770e-05 * 1e6;
             X2DtoDfoPosDto.YbMainDfo = 0;
             X2DtoDfoPosDto.YbAdjaDfo = 17.453698229247941;
-            X2DtoDfoPosDto.TarFreqUp = 6033000000;
-            X2DtoDfoPosDto.TarFreqDown = 3808000000;
-            X2DtoDfoPosDto.RefFreqUp = 6021000000;
-            X2DtoDfoPosDto.RefFreqDown = 3796000000;
+            X2DtoDfoPosDto.TarFreqUp = 3808 * 1e6 + 2225 * 1e6;
+            X2DtoDfoPosDto.TarFreqDown = 3808 * 1e6;
+            X2DtoDfoPosDto.RefFreqUp = 3796 * 1e6 + 2225 * 1e6;
+            X2DtoDfoPosDto.RefFreqDown = 3796 * 1e6;
             X2DtoDfoPosDto.MainX = -18149981.873274;
             X2DtoDfoPosDto.MainY = 38039767.675679;
             X2DtoDfoPosDto.MainZ = -5662.335149;