GDOP修改定位类型

XdCxRhDW.App/Properties/licenses.licx

@@ -1,4 +1,8 @@
 DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

XdCxRhDW.App/UserControl/X2D1GDOPParam.cs

@@ -24,6 +24,8 @@ namespace XdCxRhDW.App.UserControl
             DtousErr = Convert.ToDouble(txtDtousErr1.Text),
             SatLocErr = Convert.ToDouble(txtSatLocErr1.Text),
         };
+
+        private EnumPosResType PosResType;
         public X2D1GDOPParam(PosRes item)
         {
             InitializeComponent();
@@ -38,6 +40,12 @@ namespace XdCxRhDW.App.UserControl
             List<string> xlall = new List<string>();
             string mainTle = string.Empty;
             string adjaTle = string.Empty;
+
+            PosResType = item.PosResType;
+            if (PosResType == EnumPosResType.X2D1NoRef)
+            {
+                layoutControlItem14.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            }
             using (RHDWContext db = new RHDWContext())
             {
                 var sats = db.SatInfos.ToList();
@@ -75,6 +83,8 @@ namespace XdCxRhDW.App.UserControl
 
             txtTleMain.UseDefault().SetStringData(xlall).Text = mainTle;
             txtTleAdja.UseDefault().SetStringData(xlall).Text = adjaTle;
+
+
         }
 
 
@@ -85,12 +95,9 @@ namespace XdCxRhDW.App.UserControl
 
             var cdb = new double[] { Model.StationLon, Model.StationLat, 0 };
             var refstation = new double[] { Model.RefLon, Model.RefLat, 0 };
+
             var (listSat, data) = GdopHelper.Gdop2Sat1D(Model.TleMain, Model.TleAdja, Model.CapTime, cdb
-                             , Model.DtousErr, Model.SatLocErr, refstation);
-            if (data == null)
-            {
-                return;
-            }
+                     , Model.DtousErr, Model.SatLocErr, PosResType == EnumPosResType.X2D1NoRef ? null : refstation);
             foreach (var errLins in data)//画GDOP
             {
                 var mapDots = errLins.MapDots.Select(p => p).Select(p => (p.Lon, p.Lat));
@@ -150,5 +157,10 @@ namespace XdCxRhDW.App.UserControl
         /// </summary>
         public double SatLocErr { get; set; } = 10000;
 
+        /// <summary>
+        /// 定位类型
+        /// </summary>
+        public EnumPosResType PosResType { get; set; }
+
     }
 }

XdCxRhDW.App/UserControl/X3GDOPParam.cs

@@ -23,6 +23,7 @@ namespace XdCxRhDW.App.UserControl
             DtousErr = Convert.ToDouble(txtDtousErr1.Text),
             SatLocErr = Convert.ToDouble(txtSatLocErr1.Text),
         };
+        private EnumPosResType PosResType;
         public X3GDOPParam(PosRes item)
         {
             InitializeComponent();
@@ -34,6 +35,12 @@ namespace XdCxRhDW.App.UserControl
             this.txtCapTime.DateTime = item.SigTime;
             this.txtDtousErr1.EditValue = 1;
             this.txtSatLocErr1.EditValue = 1000;
+
+            PosResType =  item.PosResType;
+            if (PosResType == EnumPosResType.X3NoRef)
+            {
+                layoutControlItem14.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            }
             List<string> xlall = new List<string>();
             string mainTle = string.Empty;
             string adjaTle1 = string.Empty;
@@ -50,7 +57,7 @@ namespace XdCxRhDW.App.UserControl
                 var xlList = db.XlInfos.OrderBy(p => p.SatName).OrderByDescending(p => p.TimeBJ).ToList();
                 xlall.AddRange(xlList.Select(m => m.TwoLine));
                 if (xlall.Count() == 0) return;
-                if (cg.MainCode.HasValue&&xlList.Any(m => m.SatCode == cg.MainCode.Value))
+                if (cg.MainCode.HasValue && xlList.Any(m => m.SatCode == cg.MainCode.Value))
                 {
                     mainTle = xlList.First(m => m.SatCode == cg.MainCode.Value).TwoLine;
                 }
@@ -90,7 +97,7 @@ namespace XdCxRhDW.App.UserControl
             mapControl1.ClearMap();
             var refs = new double[] { Model.RefLon, Model.RefLat, 0 };
             var (listSat, data) = GdopHelper.Gdop3Sat(Model.TleMain, Model.TleAdja1, Model.TleAdja2, Model.CapTime
-                              , Model.DtousErr, Model.SatLocErr, refs);
+                              , Model.DtousErr, Model.SatLocErr, PosResType == EnumPosResType.X3NoRef ? null : refs);
             if (data == null)
             {
                 return;

XdCxRhDW.WebApi/Controllers/DetectCgController.cs

@@ -172,26 +172,26 @@ namespace XdCxRhDW.WebApi.Controllers
       /// </summary>
       /// <param name="token"></param>
       /// <returns></returns>
-        [HttpPost]
-        public async Task<AjaxResult<bool>> StopEstimationCalc(string token)
-        {
-            return await Task.Run(() =>
-            {
-                lock (thisLock)
-                {
-                    if (keyValues.ContainsKey(token))
-                    {
-                        keyValues[token].StopCalc();
-                        return Success(true);
-                    }
-                    else
-                    {
-                        return Success(false);
-                    }
-                }
-            });
+        //[HttpPost]
+        //public async Task<AjaxResult<bool>> StopEstimationCalc(string token)
+        //{
+        //    return await Task.Run(() =>
+        //    {
+        //        lock (thisLock)
+        //        {
+        //            if (keyValues.ContainsKey(token))
+        //            {
+        //                keyValues[token].StopCalc();
+        //                return Success(true);
+        //            }
+        //            else
+        //            {
+        //                return Success(false);
+        //            }
+        //        }
+        //    });
 
-        }
+        //}
 
 
 
@@ -282,26 +282,26 @@ namespace XdCxRhDW.WebApi.Controllers
         /// </summary>
         /// <param name="token"></param>
         /// <returns></returns>
-        [HttpPost]
-        public async Task<AjaxResult<bool>> StopDetectCalc(string token)
-        {
-            return await Task.Run(() =>
-            {
-                lock (thisLock)
-                {
-                    if (keyValues.ContainsKey(token))
-                    {
-                        keyValues[token].StopDm();
-                        return Success(true);
-                    }
-                    else
-                    {
-                        return Success(false);
-                    }
-                }
-            });
+        //[HttpPost]
+        //public async Task<AjaxResult<bool>> StopDetectCalc(string token)
+        //{
+        //    return await Task.Run(() =>
+        //    {
+        //        lock (thisLock)
+        //        {
+        //            if (keyValues.ContainsKey(token))
+        //            {
+        //                keyValues[token].StopDm();
+        //                return Success(true);
+        //            }
+        //            else
+        //            {
+        //                return Success(false);
+        //            }
+        //        }
+        //    });
 
-        }
+        //}
 
         /// <summary>
         /// 上传文件