11

Service/CheckServer/App.config

@@ -11,7 +11,7 @@
 		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
 
 		<!--使用老板本检测=1,使用新版本检测=2,老板本无结果时使用新版本=3-->
-		<add key="DamaVersion" value="2"/>
+		<add key="DamaVersion" value="3"/>
 
 	</appSettings>
 	<startup>

Service/CheckServer/MainForm.cs

@@ -96,8 +96,7 @@ namespace CheckServer
                 url = posPlatformAddr + "api/SvrReport/Report";
             else
                 url = posPlatformAddr + "/api/SvrReport/Report";
-#warning 检测程序不知道为啥崩溃,先不清理数据,方便找到崩溃文件
-            //_ = ClearLocalFile();
+            _ = ClearLocalFile();
             bool preSucceed = false;
             while (!this.Disposing)
             {

XdCxRhDW.App/CorTools/DetectToolForm.designer.cs

@@ -83,6 +83,7 @@
             this.DemType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.modType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.modRate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.SigSnr = new DevExpress.XtraGrid.Columns.GridColumn();
             this.colFFC = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tePos = new DevExpress.XtraEditors.TextEdit();
             this.teCount = new DevExpress.XtraEditors.TextEdit();
@@ -118,7 +119,6 @@
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.itemBand = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.SigSnr = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtFileTime.Properties)).BeginInit();
@@ -319,7 +319,7 @@
             // 
             // snr
             // 
-            this.snr.Caption = "信噪比";
+            this.snr.Caption = "相关信噪比";
             this.snr.FieldName = "snr";
             this.snr.MinWidth = 22;
             this.snr.Name = "snr";
@@ -403,12 +403,20 @@
             // 
             // modRate
             // 
-            this.modRate.Caption = "调制速率bps";
+            this.modRate.Caption = "信号带宽";
             this.modRate.FieldName = "ModRate";
             this.modRate.Name = "modRate";
             this.modRate.Visible = true;
             this.modRate.VisibleIndex = 12;
             // 
+            // SigSnr
+            // 
+            this.SigSnr.Caption = "信号信噪比";
+            this.SigSnr.FieldName = "SigSnr";
+            this.SigSnr.Name = "SigSnr";
+            this.SigSnr.Visible = true;
+            this.SigSnr.VisibleIndex = 14;
+            // 
             // colFFC
             // 
             this.colFFC.Caption = "频偏Hz";
@@ -874,14 +882,6 @@
             this.layoutControlItem14.TextSize = new System.Drawing.Size(52, 14);
             this.layoutControlItem14.TextToControlDistance = 5;
             // 
-            // SigSnr
-            // 
-            this.SigSnr.Caption = "信号信噪比dB";
-            this.SigSnr.FieldName = "SigSnr";
-            this.SigSnr.Name = "SigSnr";
-            this.SigSnr.Visible = true;
-            this.SigSnr.VisibleIndex = 14;
-            // 
             // DetectToolForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);

XdCxRhDW.App/EditForms/X2D1DTOParamEditor.cs

@@ -100,55 +100,26 @@ namespace XdCxRhDW.App.EditForms
                 this.txtRefLocation.Text = $"{0},{0}";
             }
 
-            //txtsatStation.Text = "43.7,12.9";
-            //txtcdbStation.Text = "43.7,12.9";
-            //txtDtoSx.Text = "6348.6030";
-            //txtDtoCdb.Text = "246616.0330";
-            //ucEphXYZMain.SetXYZ("a", 1, (11265194.9906, 40486056.6399, -2055810.5412), Color.Red);
-            //ucEphXYZAdaj.SetXYZ("b", 1, (25525328.3455, 33539987.1755, -49504.0378), Color.Red);
-
-            //double tarLon = 43.065, tarLat = 11.519;
-            //double recLon = 45, recLat = 13;
+
+            //double tarLon = 122.88, tarLat = 31.29;
+            //double recLon = 118.5, recLat = 32.1;
+            //double refLon = 121, refLat = 30;
+            //double cdbLon = 122, cdbLat = 30;
+            //var refEcef = PhysicsHelper.GeoToEcef((refLon, refLat, 0));
             //var tarEcef = PhysicsHelper.GeoToEcef((tarLon, tarLat, 0));
             //var recEcef = PhysicsHelper.GeoToEcef((recLon, recLat, 0));
-            //var xl1 = (14074005d, 39760440d, -15578d);
-            //var xl2 = (17150792d, 38524581d, -27470d);
-            //var xl3 = (25371296d, 33674065d, -21642);
-
-            ////var xl1Ecef = (cg.MainX.Value, cg.MainY.Value, cg.MainZ.Value);
-            ////var xl2Ecef = (cg.Adja1X.Value, cg.Adja1Y.Value, cg.Adja1Z.Value);
+            //var cdbEcef = PhysicsHelper.GeoToEcef((cdbLon, cdbLat, 0));
+            //var xl1 = (-41338971.25, 6141819.55, 5504123.22);
             //var dt1 = PhysicsHelper.Dto(tarEcef, xl1, recEcef);
-            //var dt2 = PhysicsHelper.Dto(tarEcef, xl2, recEcef);
-            //var dt3 = PhysicsHelper.Dto(tarEcef, xl3, recEcef);
-
-            //var dto1 = (dt1 - dt2) * 1e6;
-            //var dto2 = (dt1 - dt3) * 1e6;
-            //var res=PosApi.X3_PosNoRef(new CgRes()
-            //{
-            //    Dto1 = dto1,
-            //    Dto2 = dto2,
-            //    Snr1 = 16,
-            //    Snr2 = 19,
-            //    MainCode = 1,
-            //    Adja1Code = 2,
-            //    Adja2Code = 3,
-            //    MainX = xl1.Item1,
-            //    MainY = xl1.Item2,
-            //    MainZ = xl1.Item3,
-            //    Adja1X = xl2.Item1,
-            //    Adja1Y = xl2.Item2,
-            //    Adja1Z = xl2.Item3,
-            //    Adja2X = xl3.Item1,
-            //    Adja2Y = xl3.Item2,
-            //    Adja2Z = xl3.Item3,
-            //}, new StationRes()
-            //{
-            //    SatTxLon = recLon,
-            //    SatTxLat = recLat,
-            //});
+            //var dt2 = PhysicsHelper.Dto(tarEcef, cdbEcef);
+            //var dto1 = dt1 - dt2;
+            //var dt3 = PhysicsHelper.Dto(refEcef, xl1, recEcef);
+            //var dto2 = dt3 - 0;
+
         }
 
 
+
         public bool CheckParam()
         {
             dxErrorProvider.ClearErrors();

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -123,29 +123,6 @@ namespace XdCxRhDW.App.UserControl
                 return;
             }
 
-#warning 项目测试专用
-            //mapControl1.AddMapMenu("导入航迹", SvgHelper.CreateImport(), (double lon, double lat) =>
-            //{
-            //    Random r = new Random();
-            //    List<PosData> list = new List<PosData>();
-            //    DateTime dt = new DateTime(2024, 03, 18, 13, 42, 53, 125);
-            //    for (int i = 0; i < 185; i++)
-            //    {
-            //        list.Add(new PosData()
-            //        {
-            //            ColorKey = "航机目标",
-            //            //TODO 这里需要拿到一星一地定位结果导出,然后模拟一些满足定位经度的真实点位，暂时使用随机数
-            //            PosLon = r.Next(100, 130) + Math.Round(r.NextDouble(), 4),
-            //            PosLat = r.Next(11, 20) + Math.Round(r.NextDouble(), 4),
-            //            Confidence = 100,
-            //            SigTime = dt,
-            //        });
-            //        dt = dt.AddSeconds(1000).AddSeconds(i).AddMilliseconds(267);
-            //    }
-            //    mapControl1.AddPosItems(list);
-
-            //});
-
             OnSysSetingsChanged(SysConfig.Config);
 
             try
@@ -849,13 +826,8 @@ namespace XdCxRhDW.App.UserControl
             var cts = new CancellationTokenSource();
             listCts.Add(cts);
             var listPos = await searchPos(cts.Token);
-#warning 验收专用代码,统计地图加载耗时
-            Stopwatch sw = new Stopwatch();
-            sw.Start();
             this.gridHomePosRes.DataSource = listPos;
             this.mapControl1.SetPosDataSource(listPos);
-            sw.Stop();
-            Serilog.Log.Information($"地图加载{listPos.Count}个点耗时{sw.ElapsedMilliseconds}ms");
         }
         private async Task<List<ModelPosRes>> searchPos(CancellationToken ct = default)
         {

XdCxRhDW.App/UserControl/X1D1GDOPParam.Designer.cs

@@ -195,9 +195,6 @@
             this.txtDtousErr1.Properties.AutoHeight = false;
             this.txtDtousErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -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.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDtousErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtDtousErr1.Size = new System.Drawing.Size(477, 22);
             this.txtDtousErr1.StyleController = this.layoutControl1;
             this.txtDtousErr1.TabIndex = 6;