瀏覽代碼

修改时差线显示方式

wyq 1 年之前
父節點
當前提交
f07601c44b

+ 60 - 58
XdCxRhDW.App/EditForms/X1D1DTOParamEditor.Designer.cs

@@ -76,9 +76,9 @@
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
@@ -103,9 +103,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             this.SuspendLayout();
             // 
@@ -126,14 +126,14 @@
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(831, 101, 650, 400);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(642, 236);
+            this.layoutControl1.Size = new System.Drawing.Size(564, 247);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // sigTime
             // 
             this.sigTime.EditValue = null;
-            this.sigTime.Location = new System.Drawing.Point(428, 96);
+            this.sigTime.Location = new System.Drawing.Point(375, 95);
             this.sigTime.Name = "sigTime";
             this.sigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -145,13 +145,13 @@
             this.sigTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.sigTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
             this.sigTime.Properties.ReadOnly = true;
-            this.sigTime.Size = new System.Drawing.Size(192, 22);
+            this.sigTime.Size = new System.Drawing.Size(167, 20);
             this.sigTime.StyleController = this.layoutControl1;
             this.sigTime.TabIndex = 9;
             // 
             // txtDtoCdb
             // 
-            this.txtDtoCdb.Location = new System.Drawing.Point(22, 96);
+            this.txtDtoCdb.Location = new System.Drawing.Point(22, 95);
             this.txtDtoCdb.Name = "txtDtoCdb";
             this.txtDtoCdb.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)});
@@ -159,30 +159,31 @@
             this.txtDtoCdb.Properties.MaskSettings.Set("mask", "f3");
             this.txtDtoCdb.Properties.MaxLength = 10;
             this.txtDtoCdb.Properties.NullValuePrompt = "必需";
-            this.txtDtoCdb.Size = new System.Drawing.Size(180, 22);
+            this.txtDtoCdb.Size = new System.Drawing.Size(156, 23);
             this.txtDtoCdb.StyleController = this.layoutControl1;
             this.txtDtoCdb.TabIndex = 6;
             // 
             // txtYbMain
             // 
-            this.txtYbMain.Location = new System.Drawing.Point(206, 96);
+            this.txtYbMain.Location = new System.Drawing.Point(182, 95);
             this.txtYbMain.Name = "txtYbMain";
             this.txtYbMain.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -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.txtYbMain.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtYbMain.Properties.MaskSettings.Set("mask", "f3");
             this.txtYbMain.Properties.MaxLength = 10;
-            this.txtYbMain.Size = new System.Drawing.Size(218, 22);
+            this.txtYbMain.Size = new System.Drawing.Size(189, 23);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
             // 
             // txtsatStation
             // 
             this.txtsatStation.EditValue = "";
-            this.txtsatStation.Location = new System.Drawing.Point(22, 46);
+            this.txtsatStation.Location = new System.Drawing.Point(22, 45);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Size = new System.Drawing.Size(180, 19);
+            this.txtsatStation.Properties.MaxLength = 20;
+            this.txtsatStation.Size = new System.Drawing.Size(156, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
             this.txtsatStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -190,10 +191,11 @@
             // txtcdbStation
             // 
             this.txtcdbStation.EditValue = "";
-            this.txtcdbStation.Location = new System.Drawing.Point(206, 46);
+            this.txtcdbStation.Location = new System.Drawing.Point(182, 45);
             this.txtcdbStation.Name = "txtcdbStation";
             this.txtcdbStation.Properties.AutoHeight = false;
-            this.txtcdbStation.Size = new System.Drawing.Size(218, 19);
+            this.txtcdbStation.Properties.MaxLength = 20;
+            this.txtcdbStation.Size = new System.Drawing.Size(189, 20);
             this.txtcdbStation.StyleController = this.layoutControl1;
             this.txtcdbStation.TabIndex = 10;
             this.txtcdbStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -201,17 +203,18 @@
             // txtRefLocation
             // 
             this.txtRefLocation.EditValue = "";
-            this.txtRefLocation.Location = new System.Drawing.Point(428, 46);
+            this.txtRefLocation.Location = new System.Drawing.Point(375, 45);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Size = new System.Drawing.Size(192, 19);
+            this.txtRefLocation.Properties.MaxLength = 20;
+            this.txtRefLocation.Size = new System.Drawing.Size(167, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
             this.txtRefLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             // 
             // txtMainX
             // 
-            this.txtMainX.Location = new System.Drawing.Point(22, 147);
+            this.txtMainX.Location = new System.Drawing.Point(22, 146);
             this.txtMainX.Name = "txtMainX";
             this.txtMainX.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
@@ -219,13 +222,13 @@
             this.txtMainX.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainX.Properties.MaxLength = 10;
             this.txtMainX.Properties.NullValuePrompt = "必需";
-            this.txtMainX.Size = new System.Drawing.Size(180, 22);
+            this.txtMainX.Size = new System.Drawing.Size(156, 20);
             this.txtMainX.StyleController = this.layoutControl1;
             this.txtMainX.TabIndex = 6;
             // 
             // txtMainY
             // 
-            this.txtMainY.Location = new System.Drawing.Point(206, 147);
+            this.txtMainY.Location = new System.Drawing.Point(182, 146);
             this.txtMainY.Name = "txtMainY";
             this.txtMainY.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
@@ -233,13 +236,13 @@
             this.txtMainY.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainY.Properties.MaxLength = 10;
             this.txtMainY.Properties.NullValuePrompt = "必需";
-            this.txtMainY.Size = new System.Drawing.Size(218, 22);
+            this.txtMainY.Size = new System.Drawing.Size(189, 20);
             this.txtMainY.StyleController = this.layoutControl1;
             this.txtMainY.TabIndex = 6;
             // 
             // txtMainZ
             // 
-            this.txtMainZ.Location = new System.Drawing.Point(428, 147);
+            this.txtMainZ.Location = new System.Drawing.Point(375, 146);
             this.txtMainZ.Name = "txtMainZ";
             this.txtMainZ.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
@@ -247,16 +250,16 @@
             this.txtMainZ.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainZ.Properties.MaxLength = 10;
             this.txtMainZ.Properties.NullValuePrompt = "必需";
-            this.txtMainZ.Size = new System.Drawing.Size(192, 22);
+            this.txtMainZ.Size = new System.Drawing.Size(167, 20);
             this.txtMainZ.StyleController = this.layoutControl1;
             this.txtMainZ.TabIndex = 6;
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(428, 192);
+            this.btnOK.Location = new System.Drawing.Point(375, 177);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(192, 22);
+            this.btnOK.Size = new System.Drawing.Size(167, 22);
             this.btnOK.StyleController = this.layoutControl1;
             this.btnOK.TabIndex = 12;
             this.btnOK.Text = "确定";
@@ -277,20 +280,20 @@
             this.layoutControlItem12,
             this.layoutControlItem17,
             this.emptySpaceItem4,
-            this.emptySpaceItem2,
             this.layoutControlItem7,
-            this.layoutControlItem1});
+            this.layoutControlItem1,
+            this.emptySpaceItem2});
             this.Root.Name = "Root";
             this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 20, 20, 20);
-            this.Root.Size = new System.Drawing.Size(642, 236);
+            this.Root.Size = new System.Drawing.Size(564, 247);
             this.Root.TextVisible = false;
             // 
             // emptySpaceItem3
             // 
             this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 163);
+            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 148);
             this.emptySpaceItem3.Name = "emptySpaceItem3";
-            this.emptySpaceItem3.Size = new System.Drawing.Size(184, 33);
+            this.emptySpaceItem3.Size = new System.Drawing.Size(160, 33);
             this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem6
@@ -303,7 +306,7 @@
             this.layoutControlItem6.MinSize = new System.Drawing.Size(54, 51);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem6.Size = new System.Drawing.Size(184, 51);
+            this.layoutControlItem6.Size = new System.Drawing.Size(160, 51);
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.Text = "主星超短时差";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
@@ -319,7 +322,7 @@
             this.layoutControlItem14.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
-            this.layoutControlItem14.Size = new System.Drawing.Size(184, 46);
+            this.layoutControlItem14.Size = new System.Drawing.Size(160, 46);
             this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem14.Text = "接收站经纬度";
             this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
@@ -330,12 +333,12 @@
             this.layoutControlItem9.Control = this.txtcdbStation;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem9.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem9.Location = new System.Drawing.Point(184, 0);
+            this.layoutControlItem9.Location = new System.Drawing.Point(160, 0);
             this.layoutControlItem9.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem9.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
-            this.layoutControlItem9.Size = new System.Drawing.Size(222, 46);
+            this.layoutControlItem9.Size = new System.Drawing.Size(193, 46);
             this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem9.Text = "超短波经纬度";
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
@@ -346,12 +349,12 @@
             this.layoutControlItem10.Control = this.txtRefLocation;
             this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem10.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem10.Location = new System.Drawing.Point(406, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(353, 0);
             this.layoutControlItem10.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem10.MinSize = new System.Drawing.Size(77, 46);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
-            this.layoutControlItem10.Size = new System.Drawing.Size(196, 46);
+            this.layoutControlItem10.Size = new System.Drawing.Size(171, 46);
             this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem10.Text = "参考站经纬度";
             this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
@@ -367,7 +370,7 @@
             this.layoutControlItem3.MinSize = new System.Drawing.Size(54, 51);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem3.Size = new System.Drawing.Size(184, 51);
+            this.layoutControlItem3.Size = new System.Drawing.Size(160, 51);
             this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem3.Text = "主星星历X";
             this.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
@@ -378,12 +381,12 @@
             this.layoutControlItem11.Control = this.txtMainY;
             this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem11.CustomizationFormText = "轨道经度";
-            this.layoutControlItem11.Location = new System.Drawing.Point(184, 97);
+            this.layoutControlItem11.Location = new System.Drawing.Point(160, 97);
             this.layoutControlItem11.MaxSize = new System.Drawing.Size(0, 51);
             this.layoutControlItem11.MinSize = new System.Drawing.Size(54, 51);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem11.Size = new System.Drawing.Size(222, 51);
+            this.layoutControlItem11.Size = new System.Drawing.Size(193, 51);
             this.layoutControlItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem11.Text = "主星星历Y";
             this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
@@ -394,12 +397,12 @@
             this.layoutControlItem12.Control = this.txtMainZ;
             this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem12.CustomizationFormText = "轨道经度";
-            this.layoutControlItem12.Location = new System.Drawing.Point(406, 97);
+            this.layoutControlItem12.Location = new System.Drawing.Point(353, 97);
             this.layoutControlItem12.MaxSize = new System.Drawing.Size(0, 51);
             this.layoutControlItem12.MinSize = new System.Drawing.Size(54, 51);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem12.Size = new System.Drawing.Size(196, 51);
+            this.layoutControlItem12.Size = new System.Drawing.Size(171, 51);
             this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem12.Text = "主星星历Z";
             this.layoutControlItem12.TextLocation = DevExpress.Utils.Locations.Top;
@@ -410,10 +413,10 @@
             this.layoutControlItem17.Control = this.btnOK;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(406, 163);
+            this.layoutControlItem17.Location = new System.Drawing.Point(353, 148);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem17.Size = new System.Drawing.Size(196, 33);
+            this.layoutControlItem17.Size = new System.Drawing.Size(171, 33);
             this.layoutControlItem17.Text = "layoutControlItem1";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem17.TextVisible = false;
@@ -421,30 +424,22 @@
             // emptySpaceItem4
             // 
             this.emptySpaceItem4.AllowHotTrack = false;
-            this.emptySpaceItem4.Location = new System.Drawing.Point(184, 163);
+            this.emptySpaceItem4.Location = new System.Drawing.Point(160, 148);
             this.emptySpaceItem4.Name = "emptySpaceItem4";
-            this.emptySpaceItem4.Size = new System.Drawing.Size(222, 33);
+            this.emptySpaceItem4.Size = new System.Drawing.Size(193, 33);
             this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
             // 
-            // emptySpaceItem2
-            // 
-            this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 148);
-            this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(602, 15);
-            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
-            // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txtYbMain;
             this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem7.CustomizationFormText = "轨道经度";
-            this.layoutControlItem7.Location = new System.Drawing.Point(184, 46);
+            this.layoutControlItem7.Location = new System.Drawing.Point(160, 46);
             this.layoutControlItem7.MaxSize = new System.Drawing.Size(0, 51);
             this.layoutControlItem7.MinSize = new System.Drawing.Size(54, 51);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem7.Size = new System.Drawing.Size(222, 51);
+            this.layoutControlItem7.Size = new System.Drawing.Size(193, 51);
             this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem7.Text = "样本主星时差";
             this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
@@ -453,17 +448,25 @@
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.sigTime;
-            this.layoutControlItem1.Location = new System.Drawing.Point(406, 46);
+            this.layoutControlItem1.Location = new System.Drawing.Point(353, 46);
             this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 54);
             this.layoutControlItem1.MinSize = new System.Drawing.Size(76, 51);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(196, 51);
+            this.layoutControlItem1.Size = new System.Drawing.Size(171, 51);
             this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem1.Text = "信号时间";
             this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
             // 
+            // emptySpaceItem2
+            // 
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 181);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(524, 26);
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+            // 
             // dxErrorProvider
             // 
             this.dxErrorProvider.ContainerControl = this;
@@ -472,10 +475,9 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(642, 236);
             this.Controls.Add(this.layoutControl1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             this.Name = "X1D1DTOParamEditor";
+            this.Size = new System.Drawing.Size(564, 247);
             this.Load += new System.EventHandler(this.X1D1DTOParamEditor_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
@@ -500,9 +502,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             this.ResumeLayout(false);
 

+ 10 - 10
XdCxRhDW.App/EditForms/X1D1DTOParamEditor.cs

@@ -25,7 +25,7 @@ using XdCxRhDW.Repostory.Model;
 
 namespace XdCxRhDW.App.EditForms
 {
-    public partial class X1D1DTOParamEditor : DevExpress.XtraEditors.XtraForm
+    public partial class X1D1DTOParamEditor : DevExpress.XtraEditors.XtraUserControl
     {
         private MapControl mapControl1;
         private PosRes info;
@@ -38,7 +38,7 @@ namespace XdCxRhDW.App.EditForms
             this.info = info;
             this.listSat = new List<SatInfo>();
             this.mapControl1 = mapControl;
-            this.StartPosition = FormStartPosition.CenterParent;
+            //this.StartPosition = FormStartPosition.CenterParent;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtcdbStation.EditValueChanged += TxtcdbStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
@@ -75,18 +75,18 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value}";
-                this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
+                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f3}";
+                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f3}";
                 this.sigTime.EditValue = info.SigTime;
-                this.txtMainX.Text = $"{cg.MainX.Value}";
-                this.txtMainY.Text = $"{cg.MainY.Value}";
-                this.txtMainZ.Text = $"{cg.MainZ.Value}";
+                this.txtMainX.Text = $"{cg.MainX.Value:f3}";
+                this.txtMainY.Text = $"{cg.MainY.Value:f3}";
+                this.txtMainZ.Text = $"{cg.MainZ.Value:f3}";
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
-                this.txtcdbStation.Text = $"{station.CdbTxLon},{station.CdbTxLat}";
-                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
+                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
+                this.txtcdbStation.Text = $"{station.CdbTxLon:f3},{station.CdbTxLat:f3}";
+                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
             }
         }
 

+ 69 - 67
XdCxRhDW.App/EditForms/X2D1DTOParamEditor.Designer.cs

@@ -29,6 +29,16 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -69,16 +79,6 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.sigTime = new DevExpress.XtraEditors.DateEdit();
             this.txtDtoSx = new DevExpress.XtraEditors.ButtonEdit();
@@ -113,8 +113,8 @@
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
@@ -151,8 +151,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             this.SuspendLayout();
             // 
@@ -185,7 +185,7 @@
             // sigTime
             // 
             this.sigTime.EditValue = null;
-            this.sigTime.Location = new System.Drawing.Point(428, 147);
+            this.sigTime.Location = new System.Drawing.Point(428, 146);
             this.sigTime.Name = "sigTime";
             this.sigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -197,71 +197,72 @@
             this.sigTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.sigTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
             this.sigTime.Properties.ReadOnly = true;
-            this.sigTime.Size = new System.Drawing.Size(192, 22);
+            this.sigTime.Size = new System.Drawing.Size(192, 20);
             this.sigTime.StyleController = this.layoutControl1;
             this.sigTime.TabIndex = 9;
             // 
             // txtDtoSx
             // 
-            this.txtDtoSx.Location = new System.Drawing.Point(22, 96);
+            this.txtDtoSx.Location = new System.Drawing.Point(22, 95);
             this.txtDtoSx.Name = "txtDtoSx";
             this.txtDtoSx.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)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtDtoSx.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtDtoSx.Properties.MaskSettings.Set("mask", "f3");
             this.txtDtoSx.Properties.MaxLength = 10;
             this.txtDtoSx.Properties.NullValuePrompt = "必需";
-            this.txtDtoSx.Size = new System.Drawing.Size(180, 22);
+            this.txtDtoSx.Size = new System.Drawing.Size(180, 23);
             this.txtDtoSx.StyleController = this.layoutControl1;
             this.txtDtoSx.TabIndex = 6;
             // 
             // txtDtoCdb
             // 
-            this.txtDtoCdb.Location = new System.Drawing.Point(206, 96);
+            this.txtDtoCdb.Location = new System.Drawing.Point(206, 95);
             this.txtDtoCdb.Name = "txtDtoCdb";
             this.txtDtoCdb.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtDtoCdb.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtDtoCdb.Properties.MaskSettings.Set("mask", "f3");
             this.txtDtoCdb.Properties.MaxLength = 10;
             this.txtDtoCdb.Properties.NullValuePrompt = "必需";
-            this.txtDtoCdb.Size = new System.Drawing.Size(218, 22);
+            this.txtDtoCdb.Size = new System.Drawing.Size(218, 23);
             this.txtDtoCdb.StyleController = this.layoutControl1;
             this.txtDtoCdb.TabIndex = 6;
             // 
             // txtYbMain
             // 
-            this.txtYbMain.Location = new System.Drawing.Point(22, 147);
+            this.txtYbMain.Location = new System.Drawing.Point(22, 146);
             this.txtYbMain.Name = "txtYbMain";
             this.txtYbMain.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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.txtYbMain.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtYbMain.Properties.MaskSettings.Set("mask", "f3");
             this.txtYbMain.Properties.MaxLength = 10;
-            this.txtYbMain.Size = new System.Drawing.Size(180, 22);
+            this.txtYbMain.Size = new System.Drawing.Size(180, 23);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
             // 
             // txtYbAdja
             // 
-            this.txtYbAdja.Location = new System.Drawing.Point(206, 147);
+            this.txtYbAdja.Location = new System.Drawing.Point(206, 146);
             this.txtYbAdja.Name = "txtYbAdja";
             this.txtYbAdja.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -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.txtYbAdja.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtYbAdja.Properties.MaskSettings.Set("mask", "f3");
             this.txtYbAdja.Properties.MaxLength = 10;
-            this.txtYbAdja.Size = new System.Drawing.Size(218, 22);
+            this.txtYbAdja.Size = new System.Drawing.Size(218, 23);
             this.txtYbAdja.StyleController = this.layoutControl1;
             this.txtYbAdja.TabIndex = 6;
             // 
             // txtsatStation
             // 
             this.txtsatStation.EditValue = "";
-            this.txtsatStation.Location = new System.Drawing.Point(22, 46);
+            this.txtsatStation.Location = new System.Drawing.Point(22, 45);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Size = new System.Drawing.Size(180, 19);
+            this.txtsatStation.Properties.MaxLength = 20;
+            this.txtsatStation.Size = new System.Drawing.Size(180, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
             this.txtsatStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -269,10 +270,11 @@
             // txtcdbStation
             // 
             this.txtcdbStation.EditValue = "";
-            this.txtcdbStation.Location = new System.Drawing.Point(206, 46);
+            this.txtcdbStation.Location = new System.Drawing.Point(206, 45);
             this.txtcdbStation.Name = "txtcdbStation";
             this.txtcdbStation.Properties.AutoHeight = false;
-            this.txtcdbStation.Size = new System.Drawing.Size(218, 19);
+            this.txtcdbStation.Properties.MaxLength = 20;
+            this.txtcdbStation.Size = new System.Drawing.Size(218, 20);
             this.txtcdbStation.StyleController = this.layoutControl1;
             this.txtcdbStation.TabIndex = 10;
             this.txtcdbStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -280,101 +282,102 @@
             // txtRefLocation
             // 
             this.txtRefLocation.EditValue = "";
-            this.txtRefLocation.Location = new System.Drawing.Point(428, 46);
+            this.txtRefLocation.Location = new System.Drawing.Point(428, 45);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Size = new System.Drawing.Size(192, 19);
+            this.txtRefLocation.Properties.MaxLength = 20;
+            this.txtRefLocation.Size = new System.Drawing.Size(192, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
             this.txtRefLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             // 
             // txtMainX
             // 
-            this.txtMainX.Location = new System.Drawing.Point(22, 198);
+            this.txtMainX.Location = new System.Drawing.Point(22, 197);
             this.txtMainX.Name = "txtMainX";
             this.txtMainX.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtMainX.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtMainX.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainX.Properties.MaxLength = 10;
             this.txtMainX.Properties.NullValuePrompt = "必需";
-            this.txtMainX.Size = new System.Drawing.Size(180, 22);
+            this.txtMainX.Size = new System.Drawing.Size(180, 20);
             this.txtMainX.StyleController = this.layoutControl1;
             this.txtMainX.TabIndex = 6;
             // 
             // txtMainY
             // 
-            this.txtMainY.Location = new System.Drawing.Point(206, 198);
+            this.txtMainY.Location = new System.Drawing.Point(206, 197);
             this.txtMainY.Name = "txtMainY";
             this.txtMainY.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtMainY.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtMainY.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainY.Properties.MaxLength = 10;
             this.txtMainY.Properties.NullValuePrompt = "必需";
-            this.txtMainY.Size = new System.Drawing.Size(218, 22);
+            this.txtMainY.Size = new System.Drawing.Size(218, 20);
             this.txtMainY.StyleController = this.layoutControl1;
             this.txtMainY.TabIndex = 6;
             // 
             // txtMainZ
             // 
-            this.txtMainZ.Location = new System.Drawing.Point(428, 198);
+            this.txtMainZ.Location = new System.Drawing.Point(428, 197);
             this.txtMainZ.Name = "txtMainZ";
             this.txtMainZ.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtMainZ.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtMainZ.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainZ.Properties.MaxLength = 10;
             this.txtMainZ.Properties.NullValuePrompt = "必需";
-            this.txtMainZ.Size = new System.Drawing.Size(192, 22);
+            this.txtMainZ.Size = new System.Drawing.Size(192, 20);
             this.txtMainZ.StyleController = this.layoutControl1;
             this.txtMainZ.TabIndex = 6;
             // 
             // txtAdjaX
             // 
-            this.txtAdjaX.Location = new System.Drawing.Point(22, 254);
+            this.txtAdjaX.Location = new System.Drawing.Point(22, 253);
             this.txtAdjaX.Name = "txtAdjaX";
             this.txtAdjaX.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtAdjaX.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtAdjaX.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaX.Properties.MaxLength = 10;
             this.txtAdjaX.Properties.NullValuePrompt = "必需";
-            this.txtAdjaX.Size = new System.Drawing.Size(180, 22);
+            this.txtAdjaX.Size = new System.Drawing.Size(180, 20);
             this.txtAdjaX.StyleController = this.layoutControl1;
             this.txtAdjaX.TabIndex = 6;
             // 
             // txtAdjaY
             // 
-            this.txtAdjaY.Location = new System.Drawing.Point(206, 254);
+            this.txtAdjaY.Location = new System.Drawing.Point(206, 253);
             this.txtAdjaY.Name = "txtAdjaY";
             this.txtAdjaY.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtAdjaY.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtAdjaY.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaY.Properties.MaxLength = 10;
             this.txtAdjaY.Properties.NullValuePrompt = "必需";
-            this.txtAdjaY.Size = new System.Drawing.Size(218, 22);
+            this.txtAdjaY.Size = new System.Drawing.Size(218, 20);
             this.txtAdjaY.StyleController = this.layoutControl1;
             this.txtAdjaY.TabIndex = 6;
             // 
             // txtAdjaZ
             // 
-            this.txtAdjaZ.Location = new System.Drawing.Point(428, 254);
+            this.txtAdjaZ.Location = new System.Drawing.Point(428, 253);
             this.txtAdjaZ.Name = "txtAdjaZ";
             this.txtAdjaZ.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtAdjaZ.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtAdjaZ.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaZ.Properties.MaxLength = 10;
             this.txtAdjaZ.Properties.NullValuePrompt = "必需";
-            this.txtAdjaZ.Size = new System.Drawing.Size(192, 22);
+            this.txtAdjaZ.Size = new System.Drawing.Size(192, 20);
             this.txtAdjaZ.StyleController = this.layoutControl1;
             this.txtAdjaZ.TabIndex = 6;
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(428, 313);
+            this.btnOK.Location = new System.Drawing.Point(428, 284);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
             this.btnOK.Size = new System.Drawing.Size(192, 22);
@@ -405,8 +408,8 @@
             this.layoutControlItem1,
             this.layoutControlItem17,
             this.emptySpaceItem4,
-            this.emptySpaceItem2,
-            this.layoutControlItem8});
+            this.layoutControlItem8,
+            this.emptySpaceItem2});
             this.Root.Name = "Root";
             this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 20, 20, 20);
             this.Root.Size = new System.Drawing.Size(642, 357);
@@ -415,7 +418,7 @@
             // emptySpaceItem3
             // 
             this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 284);
+            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 255);
             this.emptySpaceItem3.Name = "emptySpaceItem3";
             this.emptySpaceItem3.Size = new System.Drawing.Size(184, 33);
             this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
@@ -639,7 +642,7 @@
             this.layoutControlItem17.Control = this.btnOK;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(406, 284);
+            this.layoutControlItem17.Location = new System.Drawing.Point(406, 255);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
             this.layoutControlItem17.Size = new System.Drawing.Size(196, 33);
@@ -650,19 +653,11 @@
             // emptySpaceItem4
             // 
             this.emptySpaceItem4.AllowHotTrack = false;
-            this.emptySpaceItem4.Location = new System.Drawing.Point(184, 284);
+            this.emptySpaceItem4.Location = new System.Drawing.Point(184, 255);
             this.emptySpaceItem4.Name = "emptySpaceItem4";
             this.emptySpaceItem4.Size = new System.Drawing.Size(222, 33);
             this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
             // 
-            // emptySpaceItem2
-            // 
-            this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 255);
-            this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(602, 29);
-            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
-            // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txtYbAdja;
@@ -679,6 +674,14 @@
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
             // 
+            // emptySpaceItem2
+            // 
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 288);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(602, 29);
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+            // 
             // dxErrorProvider
             // 
             this.dxErrorProvider.ContainerControl = this;
@@ -687,10 +690,9 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(642, 357);
             this.Controls.Add(this.layoutControl1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             this.Name = "X2D1DTOParamEditor";
+            this.Size = new System.Drawing.Size(642, 357);
             this.Load += new System.EventHandler(this.X2D1DTOParamEditor_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
@@ -727,8 +729,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             this.ResumeLayout(false);
 

+ 21 - 19
XdCxRhDW.App/EditForms/X2D1DTOParamEditor.cs

@@ -25,7 +25,7 @@ using XdCxRhDW.Repostory.Model;
 
 namespace XdCxRhDW.App.EditForms
 {
-    public partial class X2D1DTOParamEditor : DevExpress.XtraEditors.XtraForm
+    public partial class X2D1DTOParamEditor : DevExpress.XtraEditors.XtraUserControl
     {
         private MapControl mapControl1;
         private PosRes info;
@@ -38,7 +38,7 @@ namespace XdCxRhDW.App.EditForms
             this.info = info;
             this.listSat = new List<SatInfo>();
             this.mapControl1 = mapControl;
-            this.StartPosition = FormStartPosition.CenterParent;
+            //this.StartPosition = FormStartPosition.CenterParent;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtcdbStation.EditValueChanged += TxtcdbStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
@@ -75,33 +75,35 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value}";
-                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value:f3}";
+                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value:f3}";
                 if (info.PosResType == EnumPosResType.X2D1)
                 {
-                    this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
-                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value}";
+                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f3}";
+                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f3}";
                 }
                 this.sigTime.EditValue = info.SigTime;
-                this.txtMainX.Text = $"{cg.MainX.Value}";
-                this.txtMainY.Text = $"{cg.MainY.Value}";
-                this.txtMainZ.Text = $"{cg.MainZ.Value}";
-                this.txtAdjaX.Text = $"{cg.Adja1X.Value}";
-                this.txtAdjaY.Text = $"{cg.Adja1Y.Value}";
-                this.txtAdjaZ.Text = $"{cg.Adja1Z.Value}";
+                this.txtMainX.Text = $"{cg.MainX.Value:f3}";
+                this.txtMainY.Text = $"{cg.MainY.Value:f3}";
+                this.txtMainZ.Text = $"{cg.MainZ.Value:f3}";
+                this.txtAdjaX.Text = $"{cg.Adja1X.Value:f3}";
+                this.txtAdjaY.Text = $"{cg.Adja1Y.Value:f3}";
+                this.txtAdjaZ.Text = $"{cg.Adja1Z.Value:f3}";
+            }
+            if (station != null)
+            {
+                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
+                this.txtcdbStation.Text = $"{station.CdbTxLon:f3},{station.CdbTxLat:f3}";
+                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
             }
             if (info.PosResType == EnumPosResType.X2D1NoRef)
             {
                 txtYbMain.Properties.ReadOnly = true;
                 txtYbAdja.Properties.ReadOnly = true;
-                layoutControlItem10.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
-            }
-            if (station != null)
-            {
-                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
-                this.txtcdbStation.Text = $"{station.CdbTxLon},{station.CdbTxLat}";
-                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
+                txtRefLocation.Properties.ReadOnly = true;
+                this.txtRefLocation.Text = $"{0},{0}";
             }
+            
         }
 
         public bool CheckParam()

+ 79 - 78
XdCxRhDW.App/EditForms/X2DTOParamEditor.Designer.cs

@@ -90,7 +90,6 @@
             this.btnOK = new DevExpress.XtraEditors.SimpleButton();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -102,9 +101,10 @@
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
@@ -123,7 +123,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaZ.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
@@ -135,9 +134,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             this.SuspendLayout();
             // 
@@ -168,7 +168,7 @@
             // sigTime
             // 
             this.sigTime.EditValue = null;
-            this.sigTime.Location = new System.Drawing.Point(425, 50);
+            this.sigTime.Location = new System.Drawing.Point(425, 45);
             this.sigTime.Name = "sigTime";
             this.sigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -180,13 +180,13 @@
             this.sigTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.sigTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
             this.sigTime.Properties.ReadOnly = true;
-            this.sigTime.Size = new System.Drawing.Size(195, 22);
+            this.sigTime.Size = new System.Drawing.Size(195, 20);
             this.sigTime.StyleController = this.layoutControl1;
             this.sigTime.TabIndex = 9;
             // 
             // txtDtoSx
             // 
-            this.txtDtoSx.Location = new System.Drawing.Point(22, 101);
+            this.txtDtoSx.Location = new System.Drawing.Point(22, 100);
             this.txtDtoSx.Name = "txtDtoSx";
             this.txtDtoSx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
@@ -194,43 +194,44 @@
             this.txtDtoSx.Properties.MaskSettings.Set("mask", "f3");
             this.txtDtoSx.Properties.MaxLength = 10;
             this.txtDtoSx.Properties.NullValuePrompt = "必需";
-            this.txtDtoSx.Size = new System.Drawing.Size(222, 22);
+            this.txtDtoSx.Size = new System.Drawing.Size(222, 23);
             this.txtDtoSx.StyleController = this.layoutControl1;
             this.txtDtoSx.TabIndex = 6;
             // 
             // txtYbMain
             // 
-            this.txtYbMain.Location = new System.Drawing.Point(248, 101);
+            this.txtYbMain.Location = new System.Drawing.Point(248, 100);
             this.txtYbMain.Name = "txtYbMain";
             this.txtYbMain.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.txtYbMain.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtYbMain.Properties.MaskSettings.Set("mask", "f3");
             this.txtYbMain.Properties.MaxLength = 10;
-            this.txtYbMain.Size = new System.Drawing.Size(173, 22);
+            this.txtYbMain.Size = new System.Drawing.Size(173, 23);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
             // 
             // txtYbAdja
             // 
-            this.txtYbAdja.Location = new System.Drawing.Point(425, 101);
+            this.txtYbAdja.Location = new System.Drawing.Point(425, 100);
             this.txtYbAdja.Name = "txtYbAdja";
             this.txtYbAdja.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -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.txtYbAdja.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtYbAdja.Properties.MaskSettings.Set("mask", "f3");
             this.txtYbAdja.Properties.MaxLength = 10;
-            this.txtYbAdja.Size = new System.Drawing.Size(195, 22);
+            this.txtYbAdja.Size = new System.Drawing.Size(195, 23);
             this.txtYbAdja.StyleController = this.layoutControl1;
             this.txtYbAdja.TabIndex = 6;
             // 
             // txtsatStation
             // 
             this.txtsatStation.EditValue = "";
-            this.txtsatStation.Location = new System.Drawing.Point(22, 46);
+            this.txtsatStation.Location = new System.Drawing.Point(22, 45);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Size = new System.Drawing.Size(222, 19);
+            this.txtsatStation.Properties.MaxLength = 20;
+            this.txtsatStation.Size = new System.Drawing.Size(222, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
             this.txtsatStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -238,17 +239,18 @@
             // txtRefLocation
             // 
             this.txtRefLocation.EditValue = "";
-            this.txtRefLocation.Location = new System.Drawing.Point(248, 46);
+            this.txtRefLocation.Location = new System.Drawing.Point(248, 45);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Size = new System.Drawing.Size(173, 19);
+            this.txtRefLocation.Properties.MaxLength = 20;
+            this.txtRefLocation.Size = new System.Drawing.Size(173, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
             this.txtRefLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             // 
             // txtMainX
             // 
-            this.txtMainX.Location = new System.Drawing.Point(22, 152);
+            this.txtMainX.Location = new System.Drawing.Point(22, 151);
             this.txtMainX.Name = "txtMainX";
             this.txtMainX.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
@@ -256,13 +258,13 @@
             this.txtMainX.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainX.Properties.MaxLength = 10;
             this.txtMainX.Properties.NullValuePrompt = "必需";
-            this.txtMainX.Size = new System.Drawing.Size(222, 22);
+            this.txtMainX.Size = new System.Drawing.Size(222, 20);
             this.txtMainX.StyleController = this.layoutControl1;
             this.txtMainX.TabIndex = 6;
             // 
             // txtMainY
             // 
-            this.txtMainY.Location = new System.Drawing.Point(248, 152);
+            this.txtMainY.Location = new System.Drawing.Point(248, 151);
             this.txtMainY.Name = "txtMainY";
             this.txtMainY.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
@@ -270,13 +272,13 @@
             this.txtMainY.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainY.Properties.MaxLength = 10;
             this.txtMainY.Properties.NullValuePrompt = "必需";
-            this.txtMainY.Size = new System.Drawing.Size(173, 22);
+            this.txtMainY.Size = new System.Drawing.Size(173, 20);
             this.txtMainY.StyleController = this.layoutControl1;
             this.txtMainY.TabIndex = 6;
             // 
             // txtMainZ
             // 
-            this.txtMainZ.Location = new System.Drawing.Point(425, 152);
+            this.txtMainZ.Location = new System.Drawing.Point(425, 151);
             this.txtMainZ.Name = "txtMainZ";
             this.txtMainZ.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
@@ -284,13 +286,13 @@
             this.txtMainZ.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainZ.Properties.MaxLength = 10;
             this.txtMainZ.Properties.NullValuePrompt = "必需";
-            this.txtMainZ.Size = new System.Drawing.Size(195, 22);
+            this.txtMainZ.Size = new System.Drawing.Size(195, 20);
             this.txtMainZ.StyleController = this.layoutControl1;
             this.txtMainZ.TabIndex = 6;
             // 
             // txtAdjaX
             // 
-            this.txtAdjaX.Location = new System.Drawing.Point(22, 203);
+            this.txtAdjaX.Location = new System.Drawing.Point(22, 202);
             this.txtAdjaX.Name = "txtAdjaX";
             this.txtAdjaX.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
@@ -298,13 +300,13 @@
             this.txtAdjaX.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaX.Properties.MaxLength = 10;
             this.txtAdjaX.Properties.NullValuePrompt = "必需";
-            this.txtAdjaX.Size = new System.Drawing.Size(222, 22);
+            this.txtAdjaX.Size = new System.Drawing.Size(222, 20);
             this.txtAdjaX.StyleController = this.layoutControl1;
             this.txtAdjaX.TabIndex = 6;
             // 
             // txtAdjaY
             // 
-            this.txtAdjaY.Location = new System.Drawing.Point(248, 203);
+            this.txtAdjaY.Location = new System.Drawing.Point(248, 202);
             this.txtAdjaY.Name = "txtAdjaY";
             this.txtAdjaY.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
@@ -312,13 +314,13 @@
             this.txtAdjaY.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaY.Properties.MaxLength = 10;
             this.txtAdjaY.Properties.NullValuePrompt = "必需";
-            this.txtAdjaY.Size = new System.Drawing.Size(173, 22);
+            this.txtAdjaY.Size = new System.Drawing.Size(173, 20);
             this.txtAdjaY.StyleController = this.layoutControl1;
             this.txtAdjaY.TabIndex = 6;
             // 
             // txtAdjaZ
             // 
-            this.txtAdjaZ.Location = new System.Drawing.Point(425, 203);
+            this.txtAdjaZ.Location = new System.Drawing.Point(425, 202);
             this.txtAdjaZ.Name = "txtAdjaZ";
             this.txtAdjaZ.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
@@ -326,13 +328,13 @@
             this.txtAdjaZ.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaZ.Properties.MaxLength = 10;
             this.txtAdjaZ.Properties.NullValuePrompt = "必需";
-            this.txtAdjaZ.Size = new System.Drawing.Size(195, 22);
+            this.txtAdjaZ.Size = new System.Drawing.Size(195, 20);
             this.txtAdjaZ.StyleController = this.layoutControl1;
             this.txtAdjaZ.TabIndex = 6;
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(432, 264);
+            this.btnOK.Location = new System.Drawing.Point(432, 233);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
             this.btnOK.Size = new System.Drawing.Size(188, 22);
@@ -358,10 +360,10 @@
             this.layoutControlItem17,
             this.emptySpaceItem4,
             this.layoutControlItem8,
-            this.emptySpaceItem2,
             this.layoutControlItem12,
             this.layoutControlItem1,
-            this.layoutControlItem2});
+            this.layoutControlItem2,
+            this.emptySpaceItem2});
             this.Root.Name = "Root";
             this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 20, 20, 20);
             this.Root.Size = new System.Drawing.Size(642, 308);
@@ -370,27 +372,11 @@
             // emptySpaceItem3
             // 
             this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 235);
+            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 204);
             this.emptySpaceItem3.Name = "emptySpaceItem3";
             this.emptySpaceItem3.Size = new System.Drawing.Size(226, 33);
             this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
             // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txtDtoSx;
-            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem2.CustomizationFormText = "轨道经度";
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 51);
-            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem2.Size = new System.Drawing.Size(226, 51);
-            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem2.Text = "双星时差";
-            this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(79, 14);
-            // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txtsatStation;
@@ -524,7 +510,7 @@
             this.layoutControlItem17.Control = this.btnOK;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(410, 235);
+            this.layoutControlItem17.Location = new System.Drawing.Point(410, 204);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
             this.layoutControlItem17.Size = new System.Drawing.Size(192, 33);
@@ -535,7 +521,7 @@
             // emptySpaceItem4
             // 
             this.emptySpaceItem4.AllowHotTrack = false;
-            this.emptySpaceItem4.Location = new System.Drawing.Point(226, 235);
+            this.emptySpaceItem4.Location = new System.Drawing.Point(226, 204);
             this.emptySpaceItem4.Name = "emptySpaceItem4";
             this.emptySpaceItem4.Size = new System.Drawing.Size(184, 33);
             this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
@@ -556,13 +542,21 @@
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem8.TextSize = new System.Drawing.Size(79, 14);
             // 
-            // emptySpaceItem2
+            // layoutControlItem12
             // 
-            this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 204);
-            this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(602, 31);
-            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem12.Control = this.txtMainZ;
+            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem12.CustomizationFormText = "轨道经度";
+            this.layoutControlItem12.Location = new System.Drawing.Point(403, 102);
+            this.layoutControlItem12.MaxSize = new System.Drawing.Size(0, 51);
+            this.layoutControlItem12.MinSize = new System.Drawing.Size(54, 51);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.layoutControlItem12.Size = new System.Drawing.Size(199, 51);
+            this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem12.Text = "主星星历Z";
+            this.layoutControlItem12.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(79, 14);
             // 
             // layoutControlItem1
             // 
@@ -571,28 +565,36 @@
             this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 54);
             this.layoutControlItem1.MinSize = new System.Drawing.Size(83, 51);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 8, 1);
             this.layoutControlItem1.Size = new System.Drawing.Size(199, 51);
             this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem1.Text = "信号时间";
             this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem1.TextSize = new System.Drawing.Size(79, 14);
             // 
-            // layoutControlItem12
+            // layoutControlItem2
             // 
-            this.layoutControlItem12.Control = this.txtMainZ;
-            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem12.CustomizationFormText = "轨道经度";
-            this.layoutControlItem12.Location = new System.Drawing.Point(403, 102);
-            this.layoutControlItem12.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem12.MinSize = new System.Drawing.Size(54, 51);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem12.Size = new System.Drawing.Size(199, 51);
-            this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem12.Text = "主星星历Z";
-            this.layoutControlItem12.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(79, 14);
+            this.layoutControlItem2.Control = this.txtDtoSx;
+            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem2.CustomizationFormText = "轨道经度";
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 51);
+            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 51);
+            this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 51);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.layoutControlItem2.Size = new System.Drawing.Size(226, 51);
+            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem2.Text = "双星时差";
+            this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(79, 14);
+            // 
+            // emptySpaceItem2
+            // 
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 237);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(602, 31);
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // dxErrorProvider
             // 
@@ -602,10 +604,9 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(642, 308);
             this.Controls.Add(this.layoutControl1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             this.Name = "X2DTOParamEditor";
+            this.Size = new System.Drawing.Size(642, 308);
             this.Load += new System.EventHandler(this.X2DTOParamEditor_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
@@ -624,7 +625,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaZ.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
@@ -636,9 +636,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             this.ResumeLayout(false);
 

+ 13 - 13
XdCxRhDW.App/EditForms/X2DTOParamEditor.cs

@@ -25,7 +25,7 @@ using XdCxRhDW.Repostory.Model;
 
 namespace XdCxRhDW.App.EditForms
 {
-    public partial class X2DTOParamEditor : DevExpress.XtraEditors.XtraForm
+    public partial class X2DTOParamEditor : DevExpress.XtraEditors.XtraUserControl
     {
         private MapControl mapControl1;
         private PosRes info;
@@ -38,7 +38,7 @@ namespace XdCxRhDW.App.EditForms
             this.info = info;
             this.listSat = new List<SatInfo>();
             this.mapControl1 = mapControl;
-            this.StartPosition = FormStartPosition.CenterParent;
+            //this.StartPosition = FormStartPosition.CenterParent;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
         }
@@ -69,21 +69,21 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value}";
-                this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
-                this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value:f3}";
+                this.txtYbMain.Text = $"{cg.YbMainDto.Value:f3}";
+                this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f3}";
                 this.sigTime.EditValue = info.SigTime;
-                this.txtMainX.Text = $"{cg.MainX.Value}";
-                this.txtMainY.Text = $"{cg.MainY.Value}";
-                this.txtMainZ.Text = $"{cg.MainZ.Value}";
-                this.txtAdjaX.Text = $"{cg.Adja1X.Value}";
-                this.txtAdjaY.Text = $"{cg.Adja1Y.Value}";
-                this.txtAdjaZ.Text = $"{cg.Adja1Z.Value}";
+                this.txtMainX.Text = $"{cg.MainX.Value:f3}";
+                this.txtMainY.Text = $"{cg.MainY.Value:f3}";
+                this.txtMainZ.Text = $"{cg.MainZ.Value:f3}";
+                this.txtAdjaX.Text = $"{cg.Adja1X.Value:f3}";
+                this.txtAdjaY.Text = $"{cg.Adja1Y.Value:f3}";
+                this.txtAdjaZ.Text = $"{cg.Adja1Z.Value:f3}";
             }
             if (station != null)
             {
-                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
-                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
+                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
+                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
             }
         }
 

+ 96 - 95
XdCxRhDW.App/EditForms/X3DTOParamEditor.Designer.cs

@@ -29,6 +29,11 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions15 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject57 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject58 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject59 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject60 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -94,11 +99,6 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject50 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject51 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject52 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions14 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject53 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject54 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject55 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject56 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.sigTime = new DevExpress.XtraEditors.DateEdit();
             this.txtDtoSx = new DevExpress.XtraEditors.ButtonEdit();
@@ -117,6 +117,7 @@
             this.txtAdjaY1 = new DevExpress.XtraEditors.ButtonEdit();
             this.txtAdjaX1 = new DevExpress.XtraEditors.ButtonEdit();
             this.txtAdjaZ1 = new DevExpress.XtraEditors.ButtonEdit();
+            this.txtYbAdja1 = new DevExpress.XtraEditors.ButtonEdit();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -135,13 +136,12 @@
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
-            this.txtYbAdja1 = new DevExpress.XtraEditors.ButtonEdit();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.sigTime.Properties)).BeginInit();
@@ -161,6 +161,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaY1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaX1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaZ1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYbAdja1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -179,13 +180,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYbAdja1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -220,7 +220,7 @@
             // sigTime
             // 
             this.sigTime.EditValue = null;
-            this.sigTime.Location = new System.Drawing.Point(425, 96);
+            this.sigTime.Location = new System.Drawing.Point(425, 95);
             this.sigTime.Name = "sigTime";
             this.sigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -232,71 +232,72 @@
             this.sigTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.sigTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
             this.sigTime.Properties.ReadOnly = true;
-            this.sigTime.Size = new System.Drawing.Size(195, 22);
+            this.sigTime.Size = new System.Drawing.Size(195, 20);
             this.sigTime.StyleController = this.layoutControl1;
             this.sigTime.TabIndex = 9;
             // 
             // txtDtoSx
             // 
-            this.txtDtoSx.Location = new System.Drawing.Point(22, 96);
+            this.txtDtoSx.Location = new System.Drawing.Point(22, 95);
             this.txtDtoSx.Name = "txtDtoSx";
             this.txtDtoSx.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)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions15, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject57, serializableAppearanceObject58, serializableAppearanceObject59, serializableAppearanceObject60, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtDtoSx.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtDtoSx.Properties.MaskSettings.Set("mask", "f3");
             this.txtDtoSx.Properties.MaxLength = 10;
             this.txtDtoSx.Properties.NullValuePrompt = "必需";
-            this.txtDtoSx.Size = new System.Drawing.Size(222, 22);
+            this.txtDtoSx.Size = new System.Drawing.Size(222, 23);
             this.txtDtoSx.StyleController = this.layoutControl1;
             this.txtDtoSx.TabIndex = 6;
             // 
             // txtDtoSx1
             // 
-            this.txtDtoSx1.Location = new System.Drawing.Point(248, 96);
+            this.txtDtoSx1.Location = new System.Drawing.Point(248, 95);
             this.txtDtoSx1.Name = "txtDtoSx1";
             this.txtDtoSx1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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.txtDtoSx1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtDtoSx1.Properties.MaskSettings.Set("mask", "f3");
             this.txtDtoSx1.Properties.MaxLength = 10;
             this.txtDtoSx1.Properties.NullValuePrompt = "必需";
-            this.txtDtoSx1.Size = new System.Drawing.Size(173, 22);
+            this.txtDtoSx1.Size = new System.Drawing.Size(173, 23);
             this.txtDtoSx1.StyleController = this.layoutControl1;
             this.txtDtoSx1.TabIndex = 6;
             // 
             // txtYbMain
             // 
-            this.txtYbMain.Location = new System.Drawing.Point(22, 147);
+            this.txtYbMain.Location = new System.Drawing.Point(22, 146);
             this.txtYbMain.Name = "txtYbMain";
             this.txtYbMain.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -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.txtYbMain.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtYbMain.Properties.MaskSettings.Set("mask", "f3");
             this.txtYbMain.Properties.MaxLength = 10;
-            this.txtYbMain.Size = new System.Drawing.Size(222, 22);
+            this.txtYbMain.Size = new System.Drawing.Size(222, 23);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
             // 
             // txtYbAdja
             // 
-            this.txtYbAdja.Location = new System.Drawing.Point(248, 147);
+            this.txtYbAdja.Location = new System.Drawing.Point(248, 146);
             this.txtYbAdja.Name = "txtYbAdja";
             this.txtYbAdja.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtYbAdja.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtYbAdja.Properties.MaskSettings.Set("mask", "f3");
             this.txtYbAdja.Properties.MaxLength = 10;
-            this.txtYbAdja.Size = new System.Drawing.Size(173, 22);
+            this.txtYbAdja.Size = new System.Drawing.Size(173, 23);
             this.txtYbAdja.StyleController = this.layoutControl1;
             this.txtYbAdja.TabIndex = 6;
             // 
             // txtsatStation
             // 
             this.txtsatStation.EditValue = "";
-            this.txtsatStation.Location = new System.Drawing.Point(22, 46);
+            this.txtsatStation.Location = new System.Drawing.Point(22, 45);
             this.txtsatStation.Name = "txtsatStation";
             this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Size = new System.Drawing.Size(222, 19);
+            this.txtsatStation.Properties.MaxLength = 20;
+            this.txtsatStation.Size = new System.Drawing.Size(222, 20);
             this.txtsatStation.StyleController = this.layoutControl1;
             this.txtsatStation.TabIndex = 10;
             this.txtsatStation.ToolTip = "经度纬度之间用英文逗号隔开";
@@ -304,104 +305,105 @@
             // txtRefLocation
             // 
             this.txtRefLocation.EditValue = "";
-            this.txtRefLocation.Location = new System.Drawing.Point(248, 46);
+            this.txtRefLocation.Location = new System.Drawing.Point(248, 45);
             this.txtRefLocation.Name = "txtRefLocation";
             this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Size = new System.Drawing.Size(173, 19);
+            this.txtRefLocation.Properties.MaxLength = 20;
+            this.txtRefLocation.Size = new System.Drawing.Size(173, 20);
             this.txtRefLocation.StyleController = this.layoutControl1;
             this.txtRefLocation.TabIndex = 10;
             this.txtRefLocation.ToolTip = "经度纬度之间用英文逗号隔开";
             // 
             // txtMainX
             // 
-            this.txtMainX.Location = new System.Drawing.Point(22, 198);
+            this.txtMainX.Location = new System.Drawing.Point(22, 197);
             this.txtMainX.Name = "txtMainX";
             this.txtMainX.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtMainX.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtMainX.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainX.Properties.MaxLength = 10;
             this.txtMainX.Properties.NullValuePrompt = "必需";
-            this.txtMainX.Size = new System.Drawing.Size(222, 22);
+            this.txtMainX.Size = new System.Drawing.Size(222, 20);
             this.txtMainX.StyleController = this.layoutControl1;
             this.txtMainX.TabIndex = 6;
             // 
             // txtMainY
             // 
-            this.txtMainY.Location = new System.Drawing.Point(248, 198);
+            this.txtMainY.Location = new System.Drawing.Point(248, 197);
             this.txtMainY.Name = "txtMainY";
             this.txtMainY.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtMainY.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtMainY.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainY.Properties.MaxLength = 10;
             this.txtMainY.Properties.NullValuePrompt = "必需";
-            this.txtMainY.Size = new System.Drawing.Size(173, 22);
+            this.txtMainY.Size = new System.Drawing.Size(173, 20);
             this.txtMainY.StyleController = this.layoutControl1;
             this.txtMainY.TabIndex = 6;
             // 
             // txtMainZ
             // 
-            this.txtMainZ.Location = new System.Drawing.Point(425, 198);
+            this.txtMainZ.Location = new System.Drawing.Point(425, 197);
             this.txtMainZ.Name = "txtMainZ";
             this.txtMainZ.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtMainZ.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtMainZ.Properties.MaskSettings.Set("mask", "f3");
             this.txtMainZ.Properties.MaxLength = 10;
             this.txtMainZ.Properties.NullValuePrompt = "必需";
-            this.txtMainZ.Size = new System.Drawing.Size(195, 22);
+            this.txtMainZ.Size = new System.Drawing.Size(195, 20);
             this.txtMainZ.StyleController = this.layoutControl1;
             this.txtMainZ.TabIndex = 6;
             // 
             // txtAdjaX
             // 
-            this.txtAdjaX.Location = new System.Drawing.Point(22, 249);
+            this.txtAdjaX.Location = new System.Drawing.Point(22, 248);
             this.txtAdjaX.Name = "txtAdjaX";
             this.txtAdjaX.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtAdjaX.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtAdjaX.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaX.Properties.MaxLength = 10;
             this.txtAdjaX.Properties.NullValuePrompt = "必需";
-            this.txtAdjaX.Size = new System.Drawing.Size(222, 22);
+            this.txtAdjaX.Size = new System.Drawing.Size(222, 20);
             this.txtAdjaX.StyleController = this.layoutControl1;
             this.txtAdjaX.TabIndex = 6;
             // 
             // txtAdjaY
             // 
-            this.txtAdjaY.Location = new System.Drawing.Point(248, 249);
+            this.txtAdjaY.Location = new System.Drawing.Point(248, 248);
             this.txtAdjaY.Name = "txtAdjaY";
             this.txtAdjaY.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtAdjaY.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtAdjaY.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaY.Properties.MaxLength = 10;
             this.txtAdjaY.Properties.NullValuePrompt = "必需";
-            this.txtAdjaY.Size = new System.Drawing.Size(173, 22);
+            this.txtAdjaY.Size = new System.Drawing.Size(173, 20);
             this.txtAdjaY.StyleController = this.layoutControl1;
             this.txtAdjaY.TabIndex = 6;
             // 
             // txtAdjaZ
             // 
-            this.txtAdjaZ.Location = new System.Drawing.Point(425, 249);
+            this.txtAdjaZ.Location = new System.Drawing.Point(425, 248);
             this.txtAdjaZ.Name = "txtAdjaZ";
             this.txtAdjaZ.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtAdjaZ.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtAdjaZ.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaZ.Properties.MaxLength = 10;
             this.txtAdjaZ.Properties.NullValuePrompt = "必需";
-            this.txtAdjaZ.Size = new System.Drawing.Size(195, 22);
+            this.txtAdjaZ.Size = new System.Drawing.Size(195, 20);
             this.txtAdjaZ.StyleController = this.layoutControl1;
             this.txtAdjaZ.TabIndex = 6;
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(432, 361);
+            this.btnOK.Location = new System.Drawing.Point(425, 330);
             this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(188, 22);
+            this.btnOK.Size = new System.Drawing.Size(195, 22);
             this.btnOK.StyleController = this.layoutControl1;
             this.btnOK.TabIndex = 12;
             this.btnOK.Text = "确定";
@@ -409,46 +411,59 @@
             // 
             // txtAdjaY1
             // 
-            this.txtAdjaY1.Location = new System.Drawing.Point(248, 300);
+            this.txtAdjaY1.Location = new System.Drawing.Point(248, 299);
             this.txtAdjaY1.Name = "txtAdjaY1";
             this.txtAdjaY1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtAdjaY1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtAdjaY1.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaY1.Properties.MaxLength = 10;
             this.txtAdjaY1.Properties.NullValuePrompt = "必需";
-            this.txtAdjaY1.Size = new System.Drawing.Size(173, 22);
+            this.txtAdjaY1.Size = new System.Drawing.Size(173, 20);
             this.txtAdjaY1.StyleController = this.layoutControl1;
             this.txtAdjaY1.TabIndex = 6;
             // 
             // txtAdjaX1
             // 
-            this.txtAdjaX1.Location = new System.Drawing.Point(22, 300);
+            this.txtAdjaX1.Location = new System.Drawing.Point(22, 299);
             this.txtAdjaX1.Name = "txtAdjaX1";
             this.txtAdjaX1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtAdjaX1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtAdjaX1.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaX1.Properties.MaxLength = 10;
             this.txtAdjaX1.Properties.NullValuePrompt = "必需";
-            this.txtAdjaX1.Size = new System.Drawing.Size(222, 22);
+            this.txtAdjaX1.Size = new System.Drawing.Size(222, 20);
             this.txtAdjaX1.StyleController = this.layoutControl1;
             this.txtAdjaX1.TabIndex = 6;
             // 
             // txtAdjaZ1
             // 
-            this.txtAdjaZ1.Location = new System.Drawing.Point(425, 300);
+            this.txtAdjaZ1.Location = new System.Drawing.Point(425, 299);
             this.txtAdjaZ1.Name = "txtAdjaZ1";
             this.txtAdjaZ1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions13, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject49, serializableAppearanceObject50, serializableAppearanceObject51, serializableAppearanceObject52, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtAdjaZ1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtAdjaZ1.Properties.MaskSettings.Set("mask", "f3");
             this.txtAdjaZ1.Properties.MaxLength = 10;
             this.txtAdjaZ1.Properties.NullValuePrompt = "必需";
-            this.txtAdjaZ1.Size = new System.Drawing.Size(195, 22);
+            this.txtAdjaZ1.Size = new System.Drawing.Size(195, 20);
             this.txtAdjaZ1.StyleController = this.layoutControl1;
             this.txtAdjaZ1.TabIndex = 6;
             // 
+            // txtYbAdja1
+            // 
+            this.txtYbAdja1.Location = new System.Drawing.Point(425, 146);
+            this.txtYbAdja1.Name = "txtYbAdja1";
+            this.txtYbAdja1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions13, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject49, serializableAppearanceObject50, serializableAppearanceObject51, serializableAppearanceObject52, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtYbAdja1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            this.txtYbAdja1.Properties.MaskSettings.Set("mask", "f3");
+            this.txtYbAdja1.Properties.MaxLength = 10;
+            this.txtYbAdja1.Size = new System.Drawing.Size(195, 23);
+            this.txtYbAdja1.StyleController = this.layoutControl1;
+            this.txtYbAdja1.TabIndex = 6;
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -471,11 +486,11 @@
             this.layoutControlItem4,
             this.layoutControlItem5,
             this.layoutControlItem9,
-            this.emptySpaceItem2,
             this.emptySpaceItem5,
             this.layoutControlItem1,
             this.layoutControlItem12,
-            this.layoutControlItem18});
+            this.layoutControlItem18,
+            this.emptySpaceItem2});
             this.Root.Name = "Root";
             this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 20, 20, 20);
             this.Root.Size = new System.Drawing.Size(642, 405);
@@ -484,7 +499,7 @@
             // emptySpaceItem3
             // 
             this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 332);
+            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 301);
             this.emptySpaceItem3.Name = "emptySpaceItem3";
             this.emptySpaceItem3.Size = new System.Drawing.Size(226, 33);
             this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
@@ -654,10 +669,10 @@
             this.layoutControlItem17.Control = this.btnOK;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(410, 332);
+            this.layoutControlItem17.Location = new System.Drawing.Point(403, 301);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem17.Size = new System.Drawing.Size(192, 33);
+            this.layoutControlItem17.Size = new System.Drawing.Size(199, 33);
             this.layoutControlItem17.Text = "layoutControlItem1";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem17.TextVisible = false;
@@ -665,9 +680,9 @@
             // emptySpaceItem4
             // 
             this.emptySpaceItem4.AllowHotTrack = false;
-            this.emptySpaceItem4.Location = new System.Drawing.Point(226, 332);
+            this.emptySpaceItem4.Location = new System.Drawing.Point(226, 301);
             this.emptySpaceItem4.Name = "emptySpaceItem4";
-            this.emptySpaceItem4.Size = new System.Drawing.Size(184, 33);
+            this.emptySpaceItem4.Size = new System.Drawing.Size(177, 33);
             this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem8
@@ -734,14 +749,6 @@
             this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem9.TextSize = new System.Drawing.Size(79, 14);
             // 
-            // emptySpaceItem2
-            // 
-            this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 301);
-            this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(602, 31);
-            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
-            // 
             // emptySpaceItem5
             // 
             this.emptySpaceItem5.AllowHotTrack = false;
@@ -780,23 +787,6 @@
             this.layoutControlItem12.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem12.TextSize = new System.Drawing.Size(79, 14);
             // 
-            // dxErrorProvider
-            // 
-            this.dxErrorProvider.ContainerControl = this;
-            // 
-            // txtYbAdja1
-            // 
-            this.txtYbAdja1.Location = new System.Drawing.Point(425, 147);
-            this.txtYbAdja1.Name = "txtYbAdja1";
-            this.txtYbAdja1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions14, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject53, serializableAppearanceObject54, serializableAppearanceObject55, serializableAppearanceObject56, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYbAdja1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtYbAdja1.Properties.MaskSettings.Set("mask", "f3");
-            this.txtYbAdja1.Properties.MaxLength = 10;
-            this.txtYbAdja1.Size = new System.Drawing.Size(195, 22);
-            this.txtYbAdja1.StyleController = this.layoutControl1;
-            this.txtYbAdja1.TabIndex = 6;
-            // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txtYbAdja1;
@@ -813,14 +803,25 @@
             this.layoutControlItem18.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem18.TextSize = new System.Drawing.Size(79, 14);
             // 
+            // emptySpaceItem2
+            // 
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 334);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(602, 31);
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // dxErrorProvider
+            // 
+            this.dxErrorProvider.ContainerControl = this;
+            // 
             // X3DTOParamEditor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(642, 405);
             this.Controls.Add(this.layoutControl1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             this.Name = "X3DTOParamEditor";
+            this.Size = new System.Drawing.Size(642, 405);
             this.Load += new System.EventHandler(this.X3DTOParamEditor_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
@@ -841,6 +842,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaY1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaX1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtAdjaZ1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYbAdja1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -859,13 +861,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYbAdja1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             this.ResumeLayout(false);
 
         }

+ 24 - 22
XdCxRhDW.App/EditForms/X3DTOParamEditor.cs

@@ -25,7 +25,7 @@ using XdCxRhDW.Repostory.Model;
 
 namespace XdCxRhDW.App.EditForms
 {
-    public partial class X3DTOParamEditor : DevExpress.XtraEditors.XtraForm
+    public partial class X3DTOParamEditor : DevExpress.XtraEditors.XtraUserControl
     {
         private MapControl mapControl1;
         private PosRes info;
@@ -37,7 +37,7 @@ namespace XdCxRhDW.App.EditForms
             this.Text = $"{info.PosResType.GetEnumDisplayName()}时差参数";
             this.info = info;
             this.mapControl1 = mapControl;
-            this.StartPosition = FormStartPosition.CenterParent;
+            //this.StartPosition = FormStartPosition.CenterParent;
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
         }
@@ -68,37 +68,39 @@ namespace XdCxRhDW.App.EditForms
             }
             if (cg != null)
             {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value}";
-                this.txtDtoSx1.Text = $"{cg.Dto2.Value}";
+                this.txtDtoSx.Text = $"{cg.Dto1.Value:f3}";
+                this.txtDtoSx1.Text = $"{cg.Dto2.Value:f3}";
                 if (info.PosResType == EnumPosResType.X3)
                 {
-                    this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
-                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value}";
-                    this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value}";
+                    this.txtYbMain.Text = $"{cg.YbMainDto.Value:f3}";
+                    this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value:f3}";
+                    this.txtYbAdja1.Text = $"{cg.YbAdja2Dto.Value:f3}";
                 }
                 this.sigTime.EditValue = info.SigTime;
-                this.txtMainX.Text = $"{cg.MainX.Value}";
-                this.txtMainY.Text = $"{cg.MainY.Value}";
-                this.txtMainZ.Text = $"{cg.MainZ.Value}";
-                this.txtAdjaX.Text = $"{cg.Adja1X.Value}";
-                this.txtAdjaY.Text = $"{cg.Adja1Y.Value}";
-                this.txtAdjaZ.Text = $"{cg.Adja1Z.Value}";
-                this.txtAdjaX1.Text = $"{cg.Adja2X.Value}";
-                this.txtAdjaY1.Text = $"{cg.Adja2Y.Value}";
-                this.txtAdjaZ1.Text = $"{cg.Adja2Z.Value}";
+                this.txtMainX.Text = $"{cg.MainX.Value:f3}";
+                this.txtMainY.Text = $"{cg.MainY.Value:f3}";
+                this.txtMainZ.Text = $"{cg.MainZ.Value:f3}";
+                this.txtAdjaX.Text = $"{cg.Adja1X.Value:f3}";
+                this.txtAdjaY.Text = $"{cg.Adja1Y.Value:f3}";
+                this.txtAdjaZ.Text = $"{cg.Adja1Z.Value:f3}";
+                this.txtAdjaX1.Text = $"{cg.Adja2X.Value:f3}";
+                this.txtAdjaY1.Text = $"{cg.Adja2Y.Value:f3}";
+                this.txtAdjaZ1.Text = $"{cg.Adja2Z.Value:f3}";
+            }
+            if (station != null)
+            {
+                this.txtsatStation.Text = $"{station.SatTxLon:f3},{station.SatTxLat:f3}";
+                this.txtRefLocation.Text = $"{station.RefLon:f3},{station.RefLat:f3}";
             }
             if (info.PosResType == EnumPosResType.X3NoRef)
             {
                 txtYbMain.Properties.ReadOnly = true;
                 txtYbAdja.Properties.ReadOnly = true;
                 txtYbAdja1.Properties.ReadOnly = true;
-                layoutControlItem10.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
-            }
-            if (station != null)
-            {
-                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
-                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
+                txtRefLocation.Properties.ReadOnly = true;
+                this.txtRefLocation.Text = $"{0},{0}";
             }
+           
         }
 
         public bool CheckParam()

+ 7 - 34
XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -932,54 +932,27 @@ namespace XdCxRhDW.App.UserControl
             {
                 case EnumPosResType.X1D1CX:
                     X1D1DTOParamEditor frm = new X1D1DTOParamEditor(item, mapControl1);
-                    frm.ShowDialog();
+                    DxHelper.PopupHelper.ShowPopup(frm, layoutControl1, 500);
                     break;
                 case EnumPosResType.X2D1:
                 case EnumPosResType.X2D1NoRef:
-                    DrawXDtoLine(item);
+                    X2D1DTOParamEditor X2D1frm = new X2D1DTOParamEditor(item, mapControl1);
+                    DxHelper.PopupHelper.ShowPopup(X2D1frm, layoutControl1, 500); 
                     break;
                 case EnumPosResType.X3:
                 case EnumPosResType.X3NoRef:
-                    DrawX3toLine(item);
+                    X3DTOParamEditor X3frm = new X3DTOParamEditor(item, mapControl1);
+                    DxHelper.PopupHelper.ShowPopup(X3frm, layoutControl1, 500);
                     break;
                 case EnumPosResType.X2Dfo:
-                    X2DTOParamEditor frm2 = new X2DTOParamEditor(item, mapControl1);
-                    frm2.ShowDialog();
+                    X2DTOParamEditor X2Dfofrm = new X2DTOParamEditor(item, mapControl1);
+                    DxHelper.PopupHelper.ShowPopup(X2Dfofrm, layoutControl1, 500);
                     break;
                 default:
                     break;
             }
 
         }
-        private void DrawXDtoLine(PosRes item)
-        {
-            try
-            {
-                X2D1DTOParamEditor frm = new X2D1DTOParamEditor(item, mapControl1);
-                frm.ShowDialog();
-
-            }
-            catch (Exception ex)
-            {
-                Serilog.Log.Error(ex, $"绘制{item.PosResType.GetEnumDisplayName()}时差线失败.PosID={item.ID},SigTime={item.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"绘制{item.PosResType.GetEnumDisplayName()}时差线失败");
-            }
-        }
-
-        private void DrawX3toLine(PosRes item)
-        {
-            try
-            {
-                X3DTOParamEditor frm = new X3DTOParamEditor(item, mapControl1);
-                frm.ShowDialog();
-
-            }
-            catch (Exception ex)
-            {
-                Serilog.Log.Error(ex, $"绘制{item.PosResType.GetEnumDisplayName()}时差线失败.PosID={item.ID},SigTime={item.SigTime}");
-                DxHelper.MsgBoxHelper.ShowWarning($"绘制{item.PosResType.GetEnumDisplayName()}时差线失败");
-            }
-        }
 
         private void DrawDfoLine(PosRes item)
         {

+ 4 - 4
XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -312,25 +312,25 @@
       <DependentUpon>TaskEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="EditForms\X1D1DTOParamEditor.cs">
-      <SubType>Form</SubType>
+      <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="EditForms\X1D1DTOParamEditor.Designer.cs">
       <DependentUpon>X1D1DTOParamEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="EditForms\X2DTOParamEditor.cs">
-      <SubType>Form</SubType>
+      <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="EditForms\X2DTOParamEditor.Designer.cs">
       <DependentUpon>X2DTOParamEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="EditForms\X3DTOParamEditor.cs">
-      <SubType>Form</SubType>
+      <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="EditForms\X3DTOParamEditor.Designer.cs">
       <DependentUpon>X3DTOParamEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="EditForms\X2D1DTOParamEditor.cs">
-      <SubType>Form</SubType>
+      <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="EditForms\X2D1DTOParamEditor.Designer.cs">
       <DependentUpon>X2D1DTOParamEditor.cs</DependentUpon>