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

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -1423,19 +1423,11 @@ public static class MapControlEx
     /// <param name="wcKm"></param>
     /// <param name="dots"></param>
     /// <param name="patterncount"></param>
-    public static void DrawGdopLineTwo(this MapControl ctrl, string wcKm, IEnumerable<(double lon, double lat)> dots, int patterncount, bool isClear = true)
+    public static void DrawGdopLineTwo(this MapControl ctrl, string wcKm, IEnumerable<(double lon, double lat)> dots, int patterncount)
     {
         if (dots == null || !dots.Any()) return;
         string identify = "DrawGdopLine_";
         var innerData = ctrl.Tag as InnerData;
-        if (isClear)
-        {
-            var mapItem = innerData.mMapStorage.Items.Find(m => m.Tag.ToString().StartsWith(identify));
-            if (mapItem != null)
-            {
-                innerData.mMapStorage.Items.Remove(mapItem);
-            }
-        }
         //多条线 两个点绘制一个线段 1和2一个线段 3和4一个线段
         List<MapPolyline> polylines = new List<MapPolyline>();
         int index = 0;

XdCxRhDW.App/Program.cs

@@ -21,6 +21,9 @@ namespace XdCxRhDW
         static Program()
         {
             AppDomain.CurrentDomain.SetData("PRIVATE_BINPATH", "AddIns;");
+            string paths = Environment.GetEnvironmentVariable("PATH");
+            string dllPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Api\GDOP误差椭圆\GDOP\");
+            Environment.SetEnvironmentVariable("PATH", $"{paths};{dllPath}");
             var m = typeof(AppDomainSetup).GetMethod("UpdateContextProperty", BindingFlags.NonPublic | BindingFlags.Static);
             var funsion = typeof(AppDomain).GetMethod("GetFusionContext", BindingFlags.NonPublic | BindingFlags.Instance);
             m.Invoke(null, new object[] { funsion.Invoke(AppDomain.CurrentDomain, null), "PRIVATE_BINPATH", "AddIns;" });

XdCxRhDW.App/UserControl/X1D1GDOPParam.cs

@@ -36,7 +36,7 @@ namespace XdCxRhDW.App.UserControl
             txtCXStation.UseDoubleClickToSelectAll();
             this.txtCapTime.DateTime = item.SigTime;
             this.txtDtousErr1.EditValue = 1;
-            this.txtSatLocErr1.EditValue = 1000;
+            this.txtSatLocErr1.EditValue = 10000;
             this.txtCxErr.EditValue = 0.001;
             List<string> xlall = new List<string>();
             string mainTle = string.Empty;

XdCxRhDW.App/UserControl/X2D1GDOPParam.cs

@@ -36,7 +36,7 @@ namespace XdCxRhDW.App.UserControl
             txtRefLocation1.UseDoubleClickToSelectAll();
             this.txtCapTime.DateTime = item.SigTime;
             this.txtDtousErr1.EditValue = 1;
-            this.txtSatLocErr1.EditValue = 1000;
+            this.txtSatLocErr1.EditValue = 10000;
             List<string> xlall = new List<string>();
             string mainTle = string.Empty;
             string adjaTle = string.Empty;

XdCxRhDW.App/UserControl/X2DFGDOPParam.cs

@@ -37,7 +37,7 @@ namespace XdCxRhDW.App.UserControl
             txtTleLeo2.UseDoubleClickToSelectAll();
             txtRefLocation1.UseDoubleClickToSelectAll();
             this.txtCapTime.DateTime = item.SigTime;
-            this.txtSatLocErr1.EditValue = 1000;
+            this.txtSatLocErr1.EditValue = 10000;
             this.txtEphVelErr1.EditValue = 0.1;
             this.txtDfoErr1.EditValue = 0.01;
             this.txtDtousErr1.EditValue = 1;
@@ -54,8 +54,8 @@ namespace XdCxRhDW.App.UserControl
                 {
                     this.txtRefLocation1.Text = $"{station.RefLon},{station.RefLat}";
                 }
-                this.txtFu1.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value : 950;
-                this.txtFu2.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value : 950;
+                this.txtFu1.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 950;
+                this.txtFu2.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value * 1e-6 : 950;
 
                 var xlList = db.XlInfos.OrderBy(p => p.SatName).OrderByDescending(p => p.TimeBJ).ToList();
                 xlall.AddRange(xlList.Select(m => m.TwoLine));

XdCxRhDW.App/UserControl/X3DFGDOPParam .cs

@@ -39,7 +39,7 @@ namespace XdCxRhDW.App.UserControl
             txtTleLeo3.UseDoubleClickToSelectAll();
             txtRefLocation1.UseDoubleClickToSelectAll();
             this.txtCapTime.DateTime = item.SigTime;
-            this.txtSatLocErr1.EditValue = 1000;
+            this.txtSatLocErr1.EditValue = 10000;
             this.txtEphVelErr1.EditValue = 0.1;
             this.txtDfoErr1.EditValue = 0.01;
 
@@ -56,8 +56,8 @@ namespace XdCxRhDW.App.UserControl
                 {
                     this.txtRefLocation1.Text = $"{station.RefLon},{station.RefLat}";
                 }
-                this.txtFu1.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value : 950;
-                this.txtFu2.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value : 950;
+                this.txtFu1.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 950;
+                this.txtFu2.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value * 1e-6 : 950;
 
                 var xlList = db.XlInfos.OrderBy(p => p.SatName).OrderByDescending(p => p.TimeBJ).ToList();
                 xlall.AddRange(xlList.Select(m => m.TwoLine));

XdCxRhDW.App/UserControl/X3GDOPParam.cs

@@ -34,7 +34,7 @@ namespace XdCxRhDW.App.UserControl
             txtRefLocation1.UseDoubleClickToSelectAll();
             this.txtCapTime.DateTime = item.SigTime;
             this.txtDtousErr1.EditValue = 1;
-            this.txtSatLocErr1.EditValue = 1000;
+            this.txtSatLocErr1.EditValue = 10000;
 
             PosResType = item.PosResType;
             if (PosResType == EnumPosResType.X3NoRef)

XdCxRhDW.Core/Api/GDOP误差椭圆/GdopHelper.cs

@@ -39,6 +39,7 @@ namespace XdCxRhDW.Core.Api
             }
             else
             {
+
                 GDOPApi.Gdop2Sat1DRef(mainLines, adajLines, timeSpan, cdbPos, refPos, dtousErr, ephLocErr, level, level.Length, resCount, out res, satllh);
 
             }