22

XdDw.App/Properties/licenses.licx

@@ -1,5 +0,0 @@
-DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

XdDw.App/XdDw.App.csproj

@@ -254,7 +254,6 @@
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="UserControl\CtrlCgRes.resx">
       <DependentUpon>CtrlCgRes.cs</DependentUpon>
     </EmbeddedResource>

XzDw.App/Properties/licenses.licx

@@ -1,3 +0,0 @@
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v23.1, Version=23.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

XzDw.App/UserControl/DXErrEllipseParam.Designer.cs

@@ -122,7 +122,7 @@
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(200, 466);
+            this.btnOK.Location = new System.Drawing.Point(200, 442);
             this.btnOK.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.btnOK.Name = "btnOK";
             this.btnOK.Size = new System.Drawing.Size(195, 27);
@@ -134,7 +134,7 @@
             // txtTleMain
             // 
             this.txtTleMain.EditValue = "";
-            this.txtTleMain.Location = new System.Drawing.Point(2, 26);
+            this.txtTleMain.Location = new System.Drawing.Point(2, 24);
             this.txtTleMain.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.txtTleMain.MaximumSize = new System.Drawing.Size(0, 28);
             this.txtTleMain.MinimumSize = new System.Drawing.Size(0, 28);
@@ -162,7 +162,7 @@
             // txtDfoErr1
             // 
             this.txtDfoErr1.EditValue = "";
-            this.txtDfoErr1.Location = new System.Drawing.Point(2, 254);
+            this.txtDfoErr1.Location = new System.Drawing.Point(2, 240);
             this.txtDfoErr1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.txtDfoErr1.MaximumSize = new System.Drawing.Size(0, 28);
             this.txtDfoErr1.MinimumSize = new System.Drawing.Size(0, 28);
@@ -181,7 +181,7 @@
             // txtSatLocErr1
             // 
             this.txtSatLocErr1.EditValue = "";
-            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 311);
+            this.txtSatLocErr1.Location = new System.Drawing.Point(2, 294);
             this.txtSatLocErr1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.txtSatLocErr1.MaximumSize = new System.Drawing.Size(0, 28);
             this.txtSatLocErr1.MinimumSize = new System.Drawing.Size(0, 28);
@@ -191,6 +191,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+            this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtSatLocErr1.Size = new System.Drawing.Size(393, 28);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
@@ -199,7 +200,7 @@
             // txtEphVelErr1
             // 
             this.txtEphVelErr1.EditValue = "";
-            this.txtEphVelErr1.Location = new System.Drawing.Point(2, 368);
+            this.txtEphVelErr1.Location = new System.Drawing.Point(2, 348);
             this.txtEphVelErr1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.txtEphVelErr1.MaximumSize = new System.Drawing.Size(0, 28);
             this.txtEphVelErr1.MinimumSize = new System.Drawing.Size(0, 28);
@@ -218,7 +219,7 @@
             // txtFu1
             // 
             this.txtFu1.EditValue = "";
-            this.txtFu1.Location = new System.Drawing.Point(2, 425);
+            this.txtFu1.Location = new System.Drawing.Point(2, 402);
             this.txtFu1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.txtFu1.MaximumSize = new System.Drawing.Size(0, 28);
             this.txtFu1.MinimumSize = new System.Drawing.Size(0, 28);
@@ -237,7 +238,7 @@
             // txtCapTime
             // 
             this.txtCapTime.EditValue = null;
-            this.txtCapTime.Location = new System.Drawing.Point(2, 83);
+            this.txtCapTime.Location = new System.Drawing.Point(2, 78);
             this.txtCapTime.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.txtCapTime.MaximumSize = new System.Drawing.Size(0, 28);
             this.txtCapTime.MinimumSize = new System.Drawing.Size(0, 28);
@@ -259,7 +260,7 @@
             // txtCapTime1
             // 
             this.txtCapTime1.EditValue = null;
-            this.txtCapTime1.Location = new System.Drawing.Point(2, 140);
+            this.txtCapTime1.Location = new System.Drawing.Point(2, 132);
             this.txtCapTime1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.txtCapTime1.MaximumSize = new System.Drawing.Size(0, 28);
             this.txtCapTime1.MinimumSize = new System.Drawing.Size(0, 28);
@@ -281,7 +282,7 @@
             // txtCapTime2
             // 
             this.txtCapTime2.EditValue = null;
-            this.txtCapTime2.Location = new System.Drawing.Point(2, 197);
+            this.txtCapTime2.Location = new System.Drawing.Point(2, 186);
             this.txtCapTime2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.txtCapTime2.MaximumSize = new System.Drawing.Size(0, 28);
             this.txtCapTime2.MinimumSize = new System.Drawing.Size(0, 28);
@@ -325,7 +326,7 @@
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(397, 57);
+            this.layoutControlItem8.Size = new System.Drawing.Size(397, 54);
             this.layoutControlItem8.Text = "主星星历";
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
@@ -335,9 +336,9 @@
             this.layoutControlItem4.Control = this.txtDfoErr1;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 228);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 216);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(397, 57);
+            this.layoutControlItem4.Size = new System.Drawing.Size(397, 54);
             this.layoutControlItem4.Text = "频差误差";
             this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
@@ -347,9 +348,9 @@
             this.layoutControlItem5.Control = this.txtSatLocErr1;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 285);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 270);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(397, 57);
+            this.layoutControlItem5.Size = new System.Drawing.Size(397, 54);
             this.layoutControlItem5.Text = "星历位置误差";
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
@@ -357,7 +358,7 @@
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.btnOK;
-            this.layoutControlItem1.Location = new System.Drawing.Point(198, 456);
+            this.layoutControlItem1.Location = new System.Drawing.Point(198, 432);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 10, 3);
             this.layoutControlItem1.Size = new System.Drawing.Size(199, 40);
@@ -367,15 +368,15 @@
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 496);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 472);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(397, 18);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(397, 42);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // emptySpaceItem2
             // 
             this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 456);
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 432);
             this.emptySpaceItem2.Name = "emptySpaceItem2";
             this.emptySpaceItem2.Size = new System.Drawing.Size(198, 40);
             this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
@@ -385,9 +386,9 @@
             this.layoutControlItem3.Control = this.txtEphVelErr1;
             this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem3.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 342);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 324);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(397, 57);
+            this.layoutControlItem3.Size = new System.Drawing.Size(397, 54);
             this.layoutControlItem3.Text = "星历速度误差";
             this.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
@@ -397,9 +398,9 @@
             this.layoutControlItem6.Control = this.txtFu1;
             this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem6.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 399);
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 378);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(397, 57);
+            this.layoutControlItem6.Size = new System.Drawing.Size(397, 54);
             this.layoutControlItem6.Text = "上行频点";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
@@ -409,9 +410,9 @@
             this.layoutControlItem11.Control = this.txtCapTime;
             this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem11.CustomizationFormText = "采集时刻";
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 57);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 54);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(397, 57);
+            this.layoutControlItem11.Size = new System.Drawing.Size(397, 54);
             this.layoutControlItem11.Text = "采集时刻1";
             this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
@@ -421,9 +422,9 @@
             this.layoutControlItem2.Control = this.txtCapTime1;
             this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem2.CustomizationFormText = "采集时刻";
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 114);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 108);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(397, 57);
+            this.layoutControlItem2.Size = new System.Drawing.Size(397, 54);
             this.layoutControlItem2.Text = "采集时刻2";
             this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
@@ -433,9 +434,9 @@
             this.layoutControlItem7.Control = this.txtCapTime2;
             this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem7.CustomizationFormText = "采集时刻";
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 171);
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 162);
             this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(397, 57);
+            this.layoutControlItem7.Size = new System.Drawing.Size(397, 54);
             this.layoutControlItem7.Text = "采集时刻3";
             this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);

XzDw.App/XzDw.App.csproj

@@ -281,7 +281,6 @@
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="UserControl\CtrlPosSingle.resx">
       <DependentUpon>CtrlPosSingle.cs</DependentUpon>
     </EmbeddedResource>