zoulei il y a 1 an
Parent
commit
153b8c1a30

+ 114 - 114
XdCxRhDW.App/Controllers/PosController.cs

@@ -85,10 +85,10 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo, 4),
-                    SnrCdb = Math.Round(dto.XdSnr, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     TaskID = runTask.ID,
@@ -202,10 +202,10 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo, 4),
-                    SnrCdb = Math.Round(dto.XdSnr, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     MainXlTime = ephMain.data.TleTime,
@@ -309,14 +309,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo, 4),
-                    Snr1 = Math.Round(dto.SxSnr, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo, 4),
-                    SnrCdb = Math.Round(dto.XdSnr, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
-                    YbAdja1Dto = Math.Round(dto.AdjaYbDto, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
+                    YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -452,14 +452,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo, 4),
-                    Snr1 = Math.Round(dto.SxSnr, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo, 4),
-                    SnrCdb = Math.Round(dto.XdSnr, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
-                    YbAdja1Dto = Math.Round(dto.AdjaYbDto, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
+                    YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     MainXlTime = ephMain.data.TleTime,
@@ -563,12 +563,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo, 4),
-                    Snr1 = Math.Round(dto.SxSnr, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo, 4),
-                    SnrCdb = Math.Round(dto.XdSnr, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -697,12 +697,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo, 4),
-                    Snr1 = Math.Round(dto.SxSnr, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo, 4),
-                    SnrCdb = Math.Round(dto.XdSnr, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -812,14 +812,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo, 4),
-                    Snr1 = Math.Round(dto.SxSnr, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo, 4),
-                    SnrCdb = Math.Round(dto.XdSnr, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
-                    YbAdja1Dto = Math.Round(dto.AdjaYbDto, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
+                    YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -954,14 +954,14 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto, 4),
-                    Dfo1 = Math.Round(dto.SxDfo, 4),
-                    Snr1 = Math.Round(dto.SxSnr, 4),
-                    DtoCdb = Math.Round(dto.XdDto, 4),
-                    DfoCdb = Math.Round(dto.XdDfo, 4),
-                    SnrCdb = Math.Round(dto.XdSnr, 4),
-                    YbMainDto = Math.Round(dto.MainYbDto, 4),
-                    YbAdja1Dto = Math.Round(dto.AdjaYbDto, 4),
+                    Dto1 = dto.SxDto,
+                    Dfo1 = dto.SxDfo,
+                    Snr1 = dto.SxSnr,
+                    DtoCdb = dto.XdDto,
+                    DfoCdb = dto.XdDfo,
+                    SnrCdb = dto.XdSnr,
+                    YbMainDto = dto.MainYbDto,
+                    YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.AdjaCode,
@@ -1072,15 +1072,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1, 4),
-                    Snr1 = Math.Round(dto.Snr1, 4),
-                    Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2, 4),
-                    Snr2 = Math.Round(dto.Snr2, 4),
-                    YbMainDto = Math.Round(dto.YbMainDto, 4),
-                    YbAdja1Dto = Math.Round(dto.YbAdja1Dto, 4),
-                    YbAdja2Dto = Math.Round(dto.YbAdja2Dto, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 = dto.Snr2,
+                    YbMainDto = dto.YbMainDto,
+                    YbAdja1Dto =    dto.YbAdja1Dto,
+                    YbAdja2Dto = dto.YbAdja2Dto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1231,15 +1231,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1, 4),
-                    Snr1 = Math.Round(dto.Snr1, 4),
-                    Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2, 4),
-                    Snr2 = Math.Round(dto.Snr2, 4),
-                    YbMainDto = Math.Round(dto.YbMainDto, 4),
-                    YbAdja1Dto = Math.Round(dto.YbAdja1Dto, 4),
-                    YbAdja2Dto = Math.Round(dto.YbAdja2Dto, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 = dto.Snr2,
+                    YbMainDto = dto.YbMainDto,
+                    YbAdja1Dto = dto.YbAdja1Dto,
+                    YbAdja2Dto = dto.YbAdja2Dto,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1349,12 +1349,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1, 4),
-                    Snr1 = Math.Round(dto.Snr1, 4),
-                    Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2, 4),
-                    Snr2 = Math.Round(dto.Snr2, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 = dto.Snr2,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1502,12 +1502,12 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1, 4),
-                    Snr1 = Math.Round(dto.Snr1, 4),
-                    Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2, 4),
-                    Snr2 = Math.Round(dto.Snr2, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 = dto.Snr2,
                     StationResID = StationRes.ID,
                     MainCode = dto.MainCode,
                     Adja1Code = dto.Adja1Code,
@@ -1621,15 +1621,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1, 4),
-                    Snr1 = Math.Round(dto.Snr1, 4),
-                    Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2, 4),
-                    Snr2 = Math.Round(dto.Snr2, 4),
-                    YbMainDfo = Math.Round(dto.YbMainDfo, 4),
-                    YbAdja1Dfo = Math.Round(dto.YbAdja1Dfo, 4),
-                    YbAdja2Dfo = Math.Round(dto.YbAdja2Dfo, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 = dto.Snr2,
+                    YbMainDfo = dto.YbMainDfo,
+                    YbAdja1Dfo = dto.YbAdja1Dfo,
+                    YbAdja2Dfo = dto.YbAdja2Dfo,
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,
@@ -1782,15 +1782,15 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1, 4),
-                    Dfo1 = Math.Round(dto.Dfo1, 4),
-                    Snr1 = Math.Round(dto.Snr1, 4),
-                    Dto2 = Math.Round(dto.Dto2, 4),
-                    Dfo2 = Math.Round(dto.Dfo2, 4),
-                    Snr2 = Math.Round(dto.Snr2, 4),
-                    YbMainDfo = Math.Round(dto.YbMainDfo, 4),
-                    YbAdja1Dfo = Math.Round(dto.YbAdja1Dfo, 4),
-                    YbAdja2Dfo = Math.Round(dto.YbAdja2Dfo, 4),
+                    Dto1 = dto.Dto1,
+                    Dfo1 = dto.Dfo1,
+                    Snr1 = dto.Snr1,
+                    Dto2 = dto.Dto2,
+                    Dfo2 = dto.Dfo2,
+                    Snr2 =dto.Snr2,
+                    YbMainDfo = dto.YbMainDfo,
+                    YbAdja1Dfo = dto.YbAdja1Dfo,
+                    YbAdja2Dfo = dto.YbAdja2Dfo,
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,
@@ -1906,13 +1906,13 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto, 4),
-                    Dfo1 = Math.Round(dto.Dfo, 4),
-                    Snr1 = Math.Round(dto.Snr, 4),
-                    YbMainDto = Math.Round(dto.YbMainDto, 4),
-                    YbAdja1Dto = Math.Round(dto.YbAdjaDto, 4),
-                    YbMainDfo = Math.Round(dto.YbMainDfo, 4),
-                    YbAdja1Dfo = Math.Round(dto.YbAdjaDfo, 4),
+                    Dto1 = dto.Dto,
+                    Dfo1 = dto.Dfo,
+                    Snr1 = dto.Snr,
+                    YbMainDto = dto.YbMainDto,
+                    YbAdja1Dto = dto.YbAdjaDto,
+                    YbMainDfo = dto.YbMainDfo,
+                    YbAdja1Dfo = dto.YbAdjaDfo,
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,
@@ -2044,13 +2044,13 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto, 4),
-                    Dfo1 = Math.Round(dto.Dfo, 4),
-                    Snr1 = Math.Round(dto.Snr, 4),
-                    YbMainDto = Math.Round(dto.YbMainDto, 4),
-                    YbAdja1Dto = Math.Round(dto.YbAdjaDto, 4),
-                    YbMainDfo = Math.Round(dto.YbMainDfo, 4),
-                    YbAdja1Dfo = Math.Round(dto.YbAdjaDfo, 4),
+                    Dto1 = dto.Dto,
+                    Dfo1 = dto.Dfo,
+                    Snr1 = dto.Snr,
+                    YbMainDto = dto.YbMainDto,
+                    YbAdja1Dto = dto.YbAdjaDto,
+                    YbMainDfo = dto.YbMainDfo,
+                    YbAdja1Dfo = dto.YbAdjaDfo,
                     TarFreqUp = dto.TarFreqUp,
                     TarFreqDown = dto.TarFreqDown,
                     RefFreqUp = dto.RefFreqUp,

+ 0 - 1
XdCxRhDW.App/EditForms/X2DTOParamEditor.Designer.cs

@@ -165,7 +165,6 @@
             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)});
-            this.txtYbMain.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtYbMain.Size = new System.Drawing.Size(199, 20);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;

+ 0 - 9
XdCxRhDW.App/EditForms/X2PosParamEditor.Designer.cs

@@ -235,9 +235,6 @@
             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, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtoSx.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDtoSx.Properties.MaskSettings.Set("mask", "f4");
-            this.txtDtoSx.Properties.MaxLength = 10;
             this.txtDtoSx.Properties.NullValuePrompt = "必需";
             this.txtDtoSx.Size = new System.Drawing.Size(240, 20);
             this.txtDtoSx.StyleController = this.layoutControl1;
@@ -250,9 +247,6 @@
             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, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYbMain.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtYbMain.Properties.MaskSettings.Set("mask", "f4");
-            this.txtYbMain.Properties.MaxLength = 10;
             this.txtYbMain.Size = new System.Drawing.Size(211, 20);
             this.txtYbMain.StyleController = this.layoutControl1;
             this.txtYbMain.TabIndex = 6;
@@ -264,9 +258,6 @@
             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, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYbAdja.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtYbAdja.Properties.MaskSettings.Set("mask", "f4");
-            this.txtYbAdja.Properties.MaxLength = 10;
             this.txtYbAdja.Size = new System.Drawing.Size(200, 20);
             this.txtYbAdja.StyleController = this.layoutControl1;
             this.txtYbAdja.TabIndex = 6;

+ 12 - 12
XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -79,13 +79,13 @@ namespace XdCxRhDW.App.UserControl
             gridView1.BestFitColumns();
             gridHomePosRes.UseDefault(new List<ModelPosRes>()).UseMultiSelect().UseRowNumber().UseNullValueText()
                 .AddRowMenu<ModelPosRes>("绘制时差线", SvgHelper.CreateDtoLine(), DrawDtoLine, item => item.PosResType != EnumPosResType.RH)
-                .AddRowMenuAsync<ModelPosRes>("绘制频差线", SvgHelper.CreateDfoLine(), DrawDfoLine, item => item.PosResType == EnumPosResType.X2Dfo || item.PosResType == EnumPosResType.X3TwoDfo)
+                .AddRowMenuAsync<ModelPosRes>("绘制频差线", SvgHelper.CreateDfoLine(), DrawDfoLine, item => item.PosResType != EnumPosResType.RH)
                 .AddRowMenuAsync<ModelPosRes>("绘制测向线", SvgHelper.CreateDfoLine(), DrawCxLine, item => item.PosResType == EnumPosResType.X1D1CX || item.PosResType == EnumPosResType.RH)
                 .AddRowMenu<ModelPosRes>("GDOP分析", SvgHelper.CreateGDOP(), DrawGdopLine, item => item.PosResType != EnumPosResType.RH)
                 .AddRowMenu<ModelPosRes>("查看参估", SvgHelper.CreateShowCafRes(), ShowCafRes)
                 .AddRowMenu<ModelPosRes>("查看测向", SvgHelper.CreateShowCxRes(), ShowCxRes)
-                .AddRowMenu<ModelPosRes>("查看检测", SvgHelper.CreateShowCheckRes(), ShowCheckRes, item => item.PosResType == EnumPosResType.X1D1CX || item.PosResType == EnumPosResType.RH)
-                .AddRowMenu<ModelPosRes>("手动定位", SvgHelper.CreatePosManual(), PosManual)
+                .AddRowMenu<ModelPosRes>("查看检测", SvgHelper.CreateShowCheckRes(), ShowCheckRes)
+                .AddRowMenu<ModelPosRes>("手动定位", SvgHelper.CreatePosManual(), PosManual, item => item.PosResType != EnumPosResType.RH)
                 .AddContentMenu<ModelPosRes>("重新定位", SvgHelper.CreateRepos(), Repos, true)
                 .UseDeleteAsync<ModelPosRes>(DelPos, "删除记录")
                 .SetDisplayText(nameof(ModelPosRes.FreqUpHz), val => (Convert.ToInt64(val) / 1e6).ToString("f3"))
@@ -404,7 +404,7 @@ namespace XdCxRhDW.App.UserControl
                         find.CapDir = editItem.CapDir;
                         find.TaskType = editItem.TaskType;
                         find.CapDirFormat = editItem.CapDirFormat;
-                        find.TaskType=editItem.TaskType;
+                        find.TaskType = editItem.TaskType;
                         if (find.PosType == EnumPosType.X1D1CX)
                         {
                             find.Adja1Sat = null;
@@ -1011,29 +1011,29 @@ namespace XdCxRhDW.App.UserControl
                     case EnumPosResType.X1D1CX:
                         X1D1GDOPParam x1D1GdopParam = new X1D1GDOPParam(item);
                         x1D1GdopParam.mapControl1 = mapControl1;
-                        DxHelper.PopupHelper.ShowPopup(x1D1GdopParam, layoutControl1, 500);
+                        DxHelper.PopupHelper.ShowPopup(x1D1GdopParam, layoutControl1, 600);
                         break;
                     case EnumPosResType.X2D1:
                     case EnumPosResType.X2D1NoRef:
                         X2D1GDOPParam x2D1GdopParam = new X2D1GDOPParam(item);
                         x2D1GdopParam.mapControl1 = mapControl1;
-                        DxHelper.PopupHelper.ShowPopup(x2D1GdopParam, layoutControl1, 500);
+                        DxHelper.PopupHelper.ShowPopup(x2D1GdopParam, layoutControl1, 600);
                         break;
                     case EnumPosResType.X3:
                     case EnumPosResType.X3NoRef:
                         X3GDOPParam x3GdopParam = new X3GDOPParam(item);
                         x3GdopParam.mapControl1 = mapControl1;
-                        DxHelper.PopupHelper.ShowPopup(x3GdopParam, layoutControl1, 500);
+                        DxHelper.PopupHelper.ShowPopup(x3GdopParam, layoutControl1, 600);
                         break;
                     case EnumPosResType.X3TwoDfo:
                         X3DFGDOPParam x3DFGdopParam = new X3DFGDOPParam(item);
                         x3DFGdopParam.mapControl1 = mapControl1;
-                        DxHelper.PopupHelper.ShowPopup(x3DFGdopParam, layoutControl1, 500);
+                        DxHelper.PopupHelper.ShowPopup(x3DFGdopParam, layoutControl1, 600);
                         break;
                     case EnumPosResType.X2Dfo:
                         X2DFGDOPParam x2DFGdopParam = new X2DFGDOPParam(item);
                         x2DFGdopParam.mapControl1 = mapControl1;
-                        DxHelper.PopupHelper.ShowPopup(x2DFGdopParam, layoutControl1, 500);
+                        DxHelper.PopupHelper.ShowPopup(x2DFGdopParam, layoutControl1, 600);
                         break;
                     default:
                         break;
@@ -1068,7 +1068,7 @@ namespace XdCxRhDW.App.UserControl
             {
                 case EnumPosResType.X1D1CX:
                     X1D1PosParamEditor frm = new X1D1PosParamEditor(item, mapControl1);
-                    DxHelper.PopupHelper.ShowPopup(frm, layoutControl1, 500);
+                    DxHelper.PopupHelper.ShowPopup(frm, layoutControl1, 600);
                     break;
                 case EnumPosResType.X2D1:
                 case EnumPosResType.X2D1NoRef:
@@ -1078,11 +1078,11 @@ namespace XdCxRhDW.App.UserControl
                 case EnumPosResType.X3:
                 case EnumPosResType.X3NoRef:
                     X3PosParamEditor X3frm = new X3PosParamEditor(item, mapControl1);
-                    DxHelper.PopupHelper.ShowPopup(X3frm, layoutControl1, 500);
+                    DxHelper.PopupHelper.ShowPopup(X3frm, layoutControl1, 600);
                     break;
                 case EnumPosResType.X3TwoDfo:
                     X3DfoPosParamEditor X3df0frm = new X3DfoPosParamEditor(item);
-                    DxHelper.PopupHelper.ShowPopup(X3df0frm, layoutControl1, 500);
+                    DxHelper.PopupHelper.ShowPopup(X3df0frm, layoutControl1, 600);
                     break;
                 case EnumPosResType.X2Dfo:
                     X2PosParamEditor X2PosParamEditor = new X2PosParamEditor(item);

+ 0 - 7
XdCxRhDW.App/UserControl/X1D1GDOPParam.Designer.cs

@@ -211,9 +211,6 @@
             this.txtSatLocErr1.Properties.AutoHeight = false;
             this.txtSatLocErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtSatLocErr1.Size = new System.Drawing.Size(477, 22);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
@@ -241,10 +238,6 @@
             this.txtCxErr.Properties.AutoHeight = false;
             this.txtCxErr.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)});
-            this.txtCxErr.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtCxErr.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtCxErr.Properties.MaskSettings.Set("mask", "f4");
-            this.txtCxErr.Properties.MaxLength = 10;
             this.txtCxErr.Size = new System.Drawing.Size(477, 22);
             this.txtCxErr.StyleController = this.layoutControl1;
             this.txtCxErr.TabIndex = 6;

+ 0 - 6
XdCxRhDW.App/UserControl/X2D1GDOPParam.Designer.cs

@@ -188,9 +188,6 @@
             this.txtDtousErr1.Properties.AutoHeight = false;
             this.txtDtousErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDtousErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtDtousErr1.Size = new System.Drawing.Size(476, 22);
             this.txtDtousErr1.StyleController = this.layoutControl1;
             this.txtDtousErr1.TabIndex = 6;
@@ -207,9 +204,6 @@
             this.txtSatLocErr1.Properties.AutoHeight = false;
             this.txtSatLocErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtSatLocErr1.Size = new System.Drawing.Size(476, 22);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;

+ 0 - 18
XdCxRhDW.App/UserControl/X2DFGDOPParam.Designer.cs

@@ -220,9 +220,6 @@
             this.txtSatLocErr1.Properties.AutoHeight = false;
             this.txtSatLocErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -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.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtSatLocErr1.Size = new System.Drawing.Size(254, 23);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
@@ -236,9 +233,6 @@
             this.txtDfoErr1.Name = "txtDfoErr1";
             this.txtDfoErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -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.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDfoErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtDfoErr1.Size = new System.Drawing.Size(237, 23);
             this.txtDfoErr1.StyleController = this.layoutControl1;
             this.txtDfoErr1.TabIndex = 13;
@@ -252,9 +246,6 @@
             this.txtEphVelErr1.Name = "txtEphVelErr1";
             this.txtEphVelErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -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.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtEphVelErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtEphVelErr1.Size = new System.Drawing.Size(237, 23);
             this.txtEphVelErr1.StyleController = this.layoutControl1;
             this.txtEphVelErr1.TabIndex = 14;
@@ -266,9 +257,6 @@
             this.txtFu1.Name = "txtFu1";
             this.txtFu1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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.txtFu1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtFu1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtFu1.Properties.MaskSettings.Set("mask", "f");
             this.txtFu1.Size = new System.Drawing.Size(254, 23);
             this.txtFu1.StyleController = this.layoutControl1;
             this.txtFu1.TabIndex = 15;
@@ -280,9 +268,6 @@
             this.txtFu2.Name = "txtFu2";
             this.txtFu2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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.txtFu2.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtFu2.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtFu2.Properties.MaskSettings.Set("mask", "f");
             this.txtFu2.Size = new System.Drawing.Size(237, 23);
             this.txtFu2.StyleController = this.layoutControl1;
             this.txtFu2.TabIndex = 16;
@@ -309,9 +294,6 @@
             this.txtDtousErr1.Properties.AutoHeight = false;
             this.txtDtousErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDtousErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtDtousErr1.Size = new System.Drawing.Size(254, 22);
             this.txtDtousErr1.StyleController = this.layoutControl1;
             this.txtDtousErr1.TabIndex = 6;

+ 0 - 15
XdCxRhDW.App/UserControl/X3DFGDOPParam .Designer.cs

@@ -210,9 +210,6 @@
             this.txtSatLocErr1.Properties.AutoHeight = false;
             this.txtSatLocErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -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.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtSatLocErr1.Size = new System.Drawing.Size(259, 23);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;
@@ -226,9 +223,6 @@
             this.txtDfoErr1.Name = "txtDfoErr1";
             this.txtDfoErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -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.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDfoErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDfoErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtDfoErr1.Size = new System.Drawing.Size(242, 23);
             this.txtDfoErr1.StyleController = this.layoutControl1;
             this.txtDfoErr1.TabIndex = 13;
@@ -242,9 +236,6 @@
             this.txtEphVelErr1.Name = "txtEphVelErr1";
             this.txtEphVelErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -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.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtEphVelErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtEphVelErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtEphVelErr1.Size = new System.Drawing.Size(242, 23);
             this.txtEphVelErr1.StyleController = this.layoutControl1;
             this.txtEphVelErr1.TabIndex = 14;
@@ -256,9 +247,6 @@
             this.txtFu1.Name = "txtFu1";
             this.txtFu1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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.txtFu1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtFu1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtFu1.Properties.MaskSettings.Set("mask", "f");
             this.txtFu1.Size = new System.Drawing.Size(259, 23);
             this.txtFu1.StyleController = this.layoutControl1;
             this.txtFu1.TabIndex = 15;
@@ -270,9 +258,6 @@
             this.txtFu2.Name = "txtFu2";
             this.txtFu2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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.txtFu2.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtFu2.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtFu2.Properties.MaskSettings.Set("mask", "f");
             this.txtFu2.Size = new System.Drawing.Size(242, 23);
             this.txtFu2.StyleController = this.layoutControl1;
             this.txtFu2.TabIndex = 16;

+ 0 - 6
XdCxRhDW.App/UserControl/X3GDOPParam.Designer.cs

@@ -169,9 +169,6 @@
             this.txtDtousErr1.Properties.AutoHeight = false;
             this.txtDtousErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtDtousErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtDtousErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtDtousErr1.Size = new System.Drawing.Size(450, 22);
             this.txtDtousErr1.StyleController = this.layoutControl1;
             this.txtDtousErr1.TabIndex = 6;
@@ -188,9 +185,6 @@
             this.txtSatLocErr1.Properties.AutoHeight = false;
             this.txtSatLocErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtSatLocErr1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtSatLocErr1.Properties.MaskSettings.Set("mask", "f");
             this.txtSatLocErr1.Size = new System.Drawing.Size(450, 22);
             this.txtSatLocErr1.StyleController = this.layoutControl1;
             this.txtSatLocErr1.TabIndex = 6;