wyq 1 anno fa
parent
commit
c097ec2d9a

+ 1 - 1
XdCxRhDW.App/EditForms/X2PosParamEditor.Designer.cs

@@ -376,7 +376,7 @@
             this.txtEphCalc.Size = new System.Drawing.Size(204, 22);
             this.txtEphCalc.StyleController = this.layoutControl1;
             this.txtEphCalc.TabIndex = 21;
-            this.txtEphCalc.Text = "推算星厉";
+            this.txtEphCalc.Text = "星历推算";
             this.txtEphCalc.Click += new System.EventHandler(this.txtEphCalc_Click);
             // 
             // Root

+ 0 - 3
XdCxRhDW.App/EditForms/X2PosParamEditor.cs

@@ -31,14 +31,12 @@ namespace XdCxRhDW.App.EditForms
     {
         private PosRes info;
         private CgRes cg;
-        private List<SatInfo> listSat;
         private SysSetings settings = new SysSetings();
         public X2PosParamEditor(PosRes info)
         {
             InitializeComponent();
             this.Text = $"{info.PosResType.GetEnumDisplayName()}手动定位";
             this.info = info;
-            this.listSat = new List<SatInfo>();
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
         }
@@ -60,7 +58,6 @@ namespace XdCxRhDW.App.EditForms
             StationRes station;
             using (RHDWContext db = new RHDWContext())
             {
-                listSat = await db.SatInfos.ToListAsync();
                 settings = await db.SysSetings.FirstOrDefaultAsync();
             }
             using (RHDWPartContext db = RHDWPartContext.GetContext(info.SigTime))

+ 8 - 8
XdCxRhDW.Sender/Form1.Designer.cs

@@ -96,14 +96,14 @@
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双时差无参定位", "X3TwoDtoNoPar", -1),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双频差定位", "X3TwoDfo", -1),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem("双星时频差定位", "X2Dfo", -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("一星一地测向定位无星", "X1D1CXNoXL", -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("两星一地定位无星", "X2D1NoXL", -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("两星一地无参定位无星", "X2D1NoParNoXL", -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("融合定位无星", "RHNoXL", -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双时差定位无星", "X3TwoDtoNoXL", -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双时差无参定位无星", "X3TwoDtoNoParNoXL", -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双频差定位无星", "X3TwoDfoNoXL", -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("双星时频差定位无星", "X2DfoNoXL", -1)});
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("一星一地测向定位无星", "X1D1CXNoXL", -1),
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("两星一地定位无星", "X2D1NoXL", -1),
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("两星一地无参定位无星", "X2D1NoParNoXL", -1),
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("融合定位无星", "RHNoXL", -1),
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双时差定位无星", "X3TwoDtoNoXL", -1),
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双时差无参定位无星", "X3TwoDtoNoParNoXL", -1),
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双频差定位无星", "X3TwoDfoNoXL", -1),
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("双星时频差定位无星", "X2DfoNoXL", -1)});
             this.txtTskType.Size = new System.Drawing.Size(197, 20);
             this.txtTskType.StyleController = this.layoutControl1;
             this.txtTskType.TabIndex = 6;

+ 13 - 13
XdCxRhDW.Sender/Form1.cs

@@ -276,7 +276,7 @@ namespace XdCxRhDW.Sender
                                         }
                                         Log($"已向[{txtAddr1.Text}]发送双星时频差定位仿真结果");
                                     }
-                                    if (tskType == "X1D1CXNoXL")//一星一地测向定位无星
+                                    if (tskType == "X1D1CXNoXL")//一星一地测向定位无星
                                     {
                                         var lines = File.ReadAllLines("Simulation_Data2023.dat");
                                         int idx = 1;
@@ -316,7 +316,7 @@ namespace XdCxRhDW.Sender
                                             Log($"已向[{txtAddr1.Text}]发送第{idx++}条仿真结果");
                                         }
                                     }
-                                    if (tskType == "X2D1NoXL")//两星一地定位无星
+                                    if (tskType == "X2D1NoXL")//两星一地定位无星
                                     {
                                         var lines = File.ReadAllLines("Simulation_Data2023.dat");
                                         int idx = 1;
@@ -359,7 +359,7 @@ namespace XdCxRhDW.Sender
                                             Log($"已向[{txtAddr1.Text}]发送第{idx++}条仿真结果");
                                         }
                                     }
-                                    if (tskType == "X2D1NoParNoXL")//两星一地无参定位无星
+                                    if (tskType == "X2D1NoParNoXL")//两星一地无参定位无星
                                     {
                                         url += "PosX2D1NoXlNoParAsync";
                                         var res = X2D1NoParNoXL();
@@ -371,7 +371,7 @@ namespace XdCxRhDW.Sender
                                         }
                                         Log($"已向[{txtAddr1.Text}]发送两星一地无参定位仿真结果");
                                     }
-                                    if (tskType == "RHNoXL")//融合定位无星
+                                    if (tskType == "RHNoXL")//融合定位无星
                                     {
                                         var lines = File.ReadAllLines("Simulation_Data2023.dat");
                                         int idx = 1;
@@ -417,7 +417,7 @@ namespace XdCxRhDW.Sender
                                             Log($"已向[{txtAddr1.Text}]发送第{idx++}条仿真结果");
                                         }
                                     }
-                                    if (tskType == "X3TwoDtoNoXL")//三星双时差定位无星
+                                    if (tskType == "X3TwoDtoNoXL")//三星双时差定位无星
                                     {
                                         url += "PosX3TwoDtoNoXlAsync";
                                         var res = X3TwoDtoNoXL();
@@ -429,7 +429,7 @@ namespace XdCxRhDW.Sender
                                         }
                                         Log($"已向[{txtAddr1.Text}]发送三星双时差定位仿真结果");
                                     }
-                                    if (tskType == "X3TwoDtoNoParNoXL")//三星双时差无参定位无星
+                                    if (tskType == "X3TwoDtoNoParNoXL")//三星双时差无参定位无星
                                     {
                                         url += "PosX3TwoDtoNoXlNoParAsync";
                                         var res = X3TwoDtoNoParNoXL();
@@ -441,7 +441,7 @@ namespace XdCxRhDW.Sender
                                         }
                                         Log($"已向[{txtAddr1.Text}]发送三星双时差定位仿真结果");
                                     }
-                                    if (tskType == "X3TwoDfoNoXL")//三星双频差定位无星
+                                    if (tskType == "X3TwoDfoNoXL")//三星双频差定位无星
                                     {
                                         url += "PosX3TwoDfoNoXlAsync";
                                         var res = X3TwoDfoNoXL();
@@ -453,7 +453,7 @@ namespace XdCxRhDW.Sender
                                         }
                                         Log($"已向[{txtAddr1.Text}]发送三星双频差定位仿真结果");
                                     }
-                                    if (tskType == "X2DfoNoXL")//双星时频差定位无星
+                                    if (tskType == "X2DfoNoXL")//双星时频差定位无星
                                     {
                                         url += "PosX2DtoDfoNoXlAsync";
                                         var res = X2DfoNoXL();
@@ -742,7 +742,7 @@ namespace XdCxRhDW.Sender
 
 
         /// <summary>
-        /// 两星一地定位无参无星
+        /// 两星一地定位无参无星
         /// </summary>
         private X2D1NoXlNoParlPosDto X2D1NoParNoXL()
         {
@@ -760,7 +760,7 @@ namespace XdCxRhDW.Sender
         }
 
         /// <summary>
-        /// 三星双时差定位无星
+        /// 三星双时差定位无星
         /// </summary>
         private X3TwoDtoNoXlPosDto X3TwoDtoNoXL()
         {
@@ -782,7 +782,7 @@ namespace XdCxRhDW.Sender
         }
 
         /// <summary>
-        /// 三星双时差无参定位无星
+        /// 三星双时差无参定位无星
         /// </summary>
         private X3TwoDtoNoXlNoParPosDto X3TwoDtoNoParNoXL()
         {
@@ -801,7 +801,7 @@ namespace XdCxRhDW.Sender
         }
 
         /// <summary>
-        /// 三星双频差定位无星
+        /// 三星双频差定位无星
         /// </summary>
         private X3TwoDfoNoXlPosDto X3TwoDfoNoXL()
         {
@@ -829,7 +829,7 @@ namespace XdCxRhDW.Sender
         }
 
         /// <summary>
-        /// 双星时频差定位无星
+        /// 双星时频差定位无星
         /// </summary>
         private X2DtoDfoNoXlPosDto X2DfoNoXL()
         {