fix：界面修改

DPTools/DevFrmMain.Designer.cs

@@ -753,7 +753,6 @@
             this.DWQKdelBtn = new DevExpress.XtraEditors.SimpleButton();
             this.DWQKimportfileBtn = new DevExpress.XtraEditors.SimpleButton();
             this.DWQKanalysisBtn = new DevExpress.XtraEditors.SimpleButton();
-            this.xtraTabPageDWZS = new DevExpress.XtraTab.XtraTabPage();
             this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog();
             ((System.ComponentModel.ISupportInitialize)(this.xrDesignRibbonController1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
@@ -1021,6 +1020,7 @@
             this.barButtonItem30,
             this.barButtonItem31});
             this.ribbon.Location = new System.Drawing.Point(0, 0);
+            this.ribbon.Margin = new System.Windows.Forms.Padding(4);
             this.ribbon.MaxItemId = 216;
             this.ribbon.MiniToolbars.Add(this.ribbonMiniToolbar1);
             this.ribbon.Name = "ribbon";
@@ -1037,7 +1037,7 @@
             this.repositoryItemCheckedComboBoxEdit1,
             this.repositoryItemCheckEdit1});
             this.ribbon.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2007;
-            this.ribbon.Size = new System.Drawing.Size(1331, 147);
+            this.ribbon.Size = new System.Drawing.Size(1664, 184);
             this.ribbon.StatusBar = this.ribbonStatusBar;
             this.ribbon.TransparentEditors = true;
             this.ribbon.Click += new System.EventHandler(this.ribbon_Click);
@@ -3598,6 +3598,7 @@
             this.DWSJBtn.Id = 209;
             this.DWSJBtn.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("DWSJBtn.LargeGlyph")));
             this.DWSJBtn.Name = "DWSJBtn";
+            this.DWSJBtn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             this.DWSJBtn.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.DWSJBtn_ItemClick);
             // 
             // barButtonItem29
@@ -3785,10 +3786,11 @@
             this.ribbonStatusBar.ItemLinks.Add(this.barButtonItem8);
             this.ribbonStatusBar.ItemLinks.Add(this.printPreviewStaticItem2);
             this.ribbonStatusBar.ItemLinks.Add(this.zoomTrackBarEditItem1);
-            this.ribbonStatusBar.Location = new System.Drawing.Point(0, 674);
+            this.ribbonStatusBar.Location = new System.Drawing.Point(0, 841);
+            this.ribbonStatusBar.Margin = new System.Windows.Forms.Padding(4);
             this.ribbonStatusBar.Name = "ribbonStatusBar";
             this.ribbonStatusBar.Ribbon = this.ribbon;
-            this.ribbonStatusBar.Size = new System.Drawing.Size(1331, 31);
+            this.ribbonStatusBar.Size = new System.Drawing.Size(1664, 40);
             this.ribbonStatusBar.Visible = false;
             // 
             // xrDesignDockManager1
@@ -4098,28 +4100,32 @@
             // 
             // xtraTabDataManager
             // 
+            this.xtraTabDataManager.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabDataManager.Name = "xtraTabDataManager";
-            this.xtraTabDataManager.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabDataManager.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabDataManager.Text = "工务数据展示";
             // 
             // xtraTabPageLGL
             // 
             this.xtraTabPageLGL.Controls.Add(this.gridControl3);
             this.xtraTabPageLGL.Controls.Add(this.panelControl4);
+            this.xtraTabPageLGL.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageLGL.Name = "xtraTabPageLGL";
             this.xtraTabPageLGL.PageVisible = false;
-            this.xtraTabPageLGL.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageLGL.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageLGL.Text = "轮轨力数据分析";
             // 
             // gridControl3
             // 
             this.gridControl3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl3.Location = new System.Drawing.Point(0, 48);
+            this.gridControl3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gridControl3.Location = new System.Drawing.Point(0, 60);
             this.gridControl3.MainView = this.gridView3;
+            this.gridControl3.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl3.Name = "gridControl3";
             this.gridControl3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit2});
-            this.gridControl3.Size = new System.Drawing.Size(1325, 450);
+            this.gridControl3.Size = new System.Drawing.Size(1657, 561);
             this.gridControl3.TabIndex = 15;
             this.gridControl3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView3});
@@ -4288,24 +4294,27 @@
             this.panelControl4.Controls.Add(this.LGLjiancecheBtn);
             this.panelControl4.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl4.Location = new System.Drawing.Point(0, 0);
+            this.panelControl4.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl4.Name = "panelControl4";
-            this.panelControl4.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl4.Size = new System.Drawing.Size(1657, 60);
             this.panelControl4.TabIndex = 11;
             // 
             // LGLTQBtn
             // 
-            this.LGLTQBtn.Location = new System.Drawing.Point(346, 15);
+            this.LGLTQBtn.Location = new System.Drawing.Point(432, 19);
+            this.LGLTQBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLTQBtn.Name = "LGLTQBtn";
-            this.LGLTQBtn.Size = new System.Drawing.Size(75, 23);
+            this.LGLTQBtn.Size = new System.Drawing.Size(94, 29);
             this.LGLTQBtn.TabIndex = 5;
             this.LGLTQBtn.Text = "轮轨力分析";
             this.LGLTQBtn.Click += new System.EventHandler(this.LGLTQBtn_Click);
             // 
             // LGLFXBtn
             // 
-            this.LGLFXBtn.Location = new System.Drawing.Point(457, 15);
+            this.LGLFXBtn.Location = new System.Drawing.Point(571, 19);
+            this.LGLFXBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLFXBtn.Name = "LGLFXBtn";
-            this.LGLFXBtn.Size = new System.Drawing.Size(75, 23);
+            this.LGLFXBtn.Size = new System.Drawing.Size(94, 29);
             this.LGLFXBtn.TabIndex = 5;
             this.LGLFXBtn.Text = "道岔分析";
             this.LGLFXBtn.Visible = false;
@@ -4314,49 +4323,54 @@
             // LGLdelBtn
             // 
             this.LGLdelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.LGLdelBtn.Location = new System.Drawing.Point(1217, 15);
+            this.LGLdelBtn.Location = new System.Drawing.Point(1522, 19);
+            this.LGLdelBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLdelBtn.Name = "LGLdelBtn";
-            this.LGLdelBtn.Size = new System.Drawing.Size(72, 23);
+            this.LGLdelBtn.Size = new System.Drawing.Size(90, 29);
             this.LGLdelBtn.TabIndex = 5;
             this.LGLdelBtn.Text = " 删除选中";
             this.LGLdelBtn.Click += new System.EventHandler(this.DelJHFXBtn_Click);
             // 
             // LGLJCCcomboBoxEdit
             // 
-            this.LGLJCCcomboBoxEdit.Location = new System.Drawing.Point(71, 16);
+            this.LGLJCCcomboBoxEdit.Location = new System.Drawing.Point(89, 20);
+            this.LGLJCCcomboBoxEdit.Margin = new System.Windows.Forms.Padding(4);
             this.LGLJCCcomboBoxEdit.MenuManager = this.xrDesignRibbonController1;
             this.LGLJCCcomboBoxEdit.Name = "LGLJCCcomboBoxEdit";
             this.LGLJCCcomboBoxEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.LGLJCCcomboBoxEdit.Size = new System.Drawing.Size(122, 20);
+            this.LGLJCCcomboBoxEdit.Size = new System.Drawing.Size(152, 24);
             this.LGLJCCcomboBoxEdit.TabIndex = 9;
             // 
             // LGLcheckEdit
             // 
             this.LGLcheckEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.LGLcheckEdit.Location = new System.Drawing.Point(1075, 16);
+            this.LGLcheckEdit.Location = new System.Drawing.Point(1345, 20);
+            this.LGLcheckEdit.Margin = new System.Windows.Forms.Padding(4);
             this.LGLcheckEdit.MenuManager = this.xrDesignRibbonController1;
             this.LGLcheckEdit.Name = "LGLcheckEdit";
             this.LGLcheckEdit.Properties.Caption = "浏览文件夹";
-            this.LGLcheckEdit.Size = new System.Drawing.Size(89, 19);
+            this.LGLcheckEdit.Size = new System.Drawing.Size(111, 22);
             this.LGLcheckEdit.TabIndex = 5;
             this.LGLcheckEdit.Visible = false;
             // 
             // LGLOpenfileBtn
             // 
             this.LGLOpenfileBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.LGLOpenfileBtn.Location = new System.Drawing.Point(993, 15);
+            this.LGLOpenfileBtn.Location = new System.Drawing.Point(1242, 19);
+            this.LGLOpenfileBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLOpenfileBtn.Name = "LGLOpenfileBtn";
-            this.LGLOpenfileBtn.Size = new System.Drawing.Size(75, 23);
+            this.LGLOpenfileBtn.Size = new System.Drawing.Size(94, 29);
             this.LGLOpenfileBtn.TabIndex = 0;
             this.LGLOpenfileBtn.Text = "浏览";
             this.LGLOpenfileBtn.Click += new System.EventHandler(this.LGLOpenfileBtn_Click);
             // 
             // LGLgengxinBtn
             // 
-            this.LGLgengxinBtn.Location = new System.Drawing.Point(21, 15);
+            this.LGLgengxinBtn.Location = new System.Drawing.Point(26, 19);
+            this.LGLgengxinBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLgengxinBtn.Name = "LGLgengxinBtn";
-            this.LGLgengxinBtn.Size = new System.Drawing.Size(44, 23);
+            this.LGLgengxinBtn.Size = new System.Drawing.Size(55, 29);
             this.LGLgengxinBtn.TabIndex = 5;
             this.LGLgengxinBtn.Text = "更新";
             this.LGLgengxinBtn.ToolTip = "更新检测车信息";
@@ -4364,9 +4378,10 @@
             // 
             // LGLjiancecheBtn
             // 
-            this.LGLjiancecheBtn.Location = new System.Drawing.Point(199, 15);
+            this.LGLjiancecheBtn.Location = new System.Drawing.Point(249, 19);
+            this.LGLjiancecheBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLjiancecheBtn.Name = "LGLjiancecheBtn";
-            this.LGLjiancecheBtn.Size = new System.Drawing.Size(100, 23);
+            this.LGLjiancecheBtn.Size = new System.Drawing.Size(125, 29);
             this.LGLjiancecheBtn.TabIndex = 5;
             this.LGLjiancecheBtn.Text = " 修正检测车信息";
             this.LGLjiancecheBtn.ToolTip = "修正选中文件的检测车信息";
@@ -4376,19 +4391,22 @@
             // 
             this.xtraTabPageJH.Controls.Add(this.gridControl2);
             this.xtraTabPageJH.Controls.Add(this.panelControl1);
+            this.xtraTabPageJH.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageJH.Name = "xtraTabPageJH";
-            this.xtraTabPageJH.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageJH.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageJH.Text = "轨道几何数据分析";
             // 
             // gridControl2
             // 
             this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl2.Location = new System.Drawing.Point(0, 48);
+            this.gridControl2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gridControl2.Location = new System.Drawing.Point(0, 60);
             this.gridControl2.MainView = this.gridView2;
+            this.gridControl2.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl2.Name = "gridControl2";
             this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit3});
-            this.gridControl2.Size = new System.Drawing.Size(1325, 450);
+            this.gridControl2.Size = new System.Drawing.Size(1657, 561);
             this.gridControl2.TabIndex = 14;
             this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView2});
@@ -4570,16 +4588,18 @@
             this.panelControl1.Controls.Add(this.JHFXJCCcomboBoxEdit);
             this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl1.Location = new System.Drawing.Point(0, 0);
+            this.panelControl1.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl1.Size = new System.Drawing.Size(1657, 60);
             this.panelControl1.TabIndex = 3;
             // 
             // JHdelBtn
             // 
             this.JHdelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.JHdelBtn.Location = new System.Drawing.Point(1217, 15);
+            this.JHdelBtn.Location = new System.Drawing.Point(1522, 19);
+            this.JHdelBtn.Margin = new System.Windows.Forms.Padding(4);
             this.JHdelBtn.Name = "JHdelBtn";
-            this.JHdelBtn.Size = new System.Drawing.Size(72, 23);
+            this.JHdelBtn.Size = new System.Drawing.Size(90, 29);
             this.JHdelBtn.TabIndex = 9;
             this.JHdelBtn.Text = " 删除选中";
             this.JHdelBtn.Click += new System.EventHandler(this.DelJHFXBtn_Click);
@@ -4587,37 +4607,41 @@
             // JHFXcheckEdit
             // 
             this.JHFXcheckEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.JHFXcheckEdit.Location = new System.Drawing.Point(1075, 16);
+            this.JHFXcheckEdit.Location = new System.Drawing.Point(1345, 20);
+            this.JHFXcheckEdit.Margin = new System.Windows.Forms.Padding(4);
             this.JHFXcheckEdit.MenuManager = this.xrDesignRibbonController1;
             this.JHFXcheckEdit.Name = "JHFXcheckEdit";
             this.JHFXcheckEdit.Properties.Caption = "浏览文件夹";
-            this.JHFXcheckEdit.Size = new System.Drawing.Size(89, 19);
+            this.JHFXcheckEdit.Size = new System.Drawing.Size(111, 22);
             this.JHFXcheckEdit.TabIndex = 4;
             this.JHFXcheckEdit.Visible = false;
             // 
             // WXSFBtn
             // 
-            this.WXSFBtn.Location = new System.Drawing.Point(459, 15);
+            this.WXSFBtn.Location = new System.Drawing.Point(574, 19);
+            this.WXSFBtn.Margin = new System.Windows.Forms.Padding(4);
             this.WXSFBtn.Name = "WXSFBtn";
-            this.WXSFBtn.Size = new System.Drawing.Size(75, 23);
+            this.WXSFBtn.Size = new System.Drawing.Size(94, 29);
             this.WXSFBtn.TabIndex = 5;
             this.WXSFBtn.Text = "微小算法";
             this.WXSFBtn.Click += new System.EventHandler(this.WXSFBtn_Click);
             // 
             // JHTQBtn
             // 
-            this.JHTQBtn.Location = new System.Drawing.Point(346, 15);
+            this.JHTQBtn.Location = new System.Drawing.Point(432, 19);
+            this.JHTQBtn.Margin = new System.Windows.Forms.Padding(4);
             this.JHTQBtn.Name = "JHTQBtn";
-            this.JHTQBtn.Size = new System.Drawing.Size(75, 23);
+            this.JHTQBtn.Size = new System.Drawing.Size(94, 29);
             this.JHTQBtn.TabIndex = 5;
             this.JHTQBtn.Text = "几何分析";
             this.JHTQBtn.Click += new System.EventHandler(this.JHTQBtn_Click);
             // 
             // JHgengxinBtn
             // 
-            this.JHgengxinBtn.Location = new System.Drawing.Point(23, 15);
+            this.JHgengxinBtn.Location = new System.Drawing.Point(29, 19);
+            this.JHgengxinBtn.Margin = new System.Windows.Forms.Padding(4);
             this.JHgengxinBtn.Name = "JHgengxinBtn";
-            this.JHgengxinBtn.Size = new System.Drawing.Size(44, 23);
+            this.JHgengxinBtn.Size = new System.Drawing.Size(55, 29);
             this.JHgengxinBtn.TabIndex = 10;
             this.JHgengxinBtn.Text = "更新";
             this.JHgengxinBtn.ToolTip = "更新检测车信息";
@@ -4625,9 +4649,10 @@
             // 
             // JHFXjiancecheBtn
             // 
-            this.JHFXjiancecheBtn.Location = new System.Drawing.Point(201, 15);
+            this.JHFXjiancecheBtn.Location = new System.Drawing.Point(251, 19);
+            this.JHFXjiancecheBtn.Margin = new System.Windows.Forms.Padding(4);
             this.JHFXjiancecheBtn.Name = "JHFXjiancecheBtn";
-            this.JHFXjiancecheBtn.Size = new System.Drawing.Size(100, 23);
+            this.JHFXjiancecheBtn.Size = new System.Drawing.Size(125, 29);
             this.JHFXjiancecheBtn.TabIndex = 8;
             this.JHFXjiancecheBtn.Text = " 修正检测车信息";
             this.JHFXjiancecheBtn.ToolTip = "修正选中文件的检测车信息";
@@ -4636,38 +4661,41 @@
             // JHFXopenfileBtn
             // 
             this.JHFXopenfileBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.JHFXopenfileBtn.Location = new System.Drawing.Point(993, 15);
+            this.JHFXopenfileBtn.Location = new System.Drawing.Point(1242, 19);
+            this.JHFXopenfileBtn.Margin = new System.Windows.Forms.Padding(4);
             this.JHFXopenfileBtn.Name = "JHFXopenfileBtn";
-            this.JHFXopenfileBtn.Size = new System.Drawing.Size(75, 23);
+            this.JHFXopenfileBtn.Size = new System.Drawing.Size(94, 29);
             this.JHFXopenfileBtn.TabIndex = 0;
             this.JHFXopenfileBtn.Text = "浏览";
             this.JHFXopenfileBtn.Click += new System.EventHandler(this.JHFXopenfileBtn_Click);
             // 
             // JHFXJCCcomboBoxEdit
             // 
-            this.JHFXJCCcomboBoxEdit.Location = new System.Drawing.Point(73, 16);
+            this.JHFXJCCcomboBoxEdit.Location = new System.Drawing.Point(91, 20);
+            this.JHFXJCCcomboBoxEdit.Margin = new System.Windows.Forms.Padding(4);
             this.JHFXJCCcomboBoxEdit.MenuManager = this.xrDesignRibbonController1;
             this.JHFXJCCcomboBoxEdit.Name = "JHFXJCCcomboBoxEdit";
             this.JHFXJCCcomboBoxEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.JHFXJCCcomboBoxEdit.Size = new System.Drawing.Size(122, 20);
+            this.JHFXJCCcomboBoxEdit.Size = new System.Drawing.Size(152, 24);
             this.JHFXJCCcomboBoxEdit.TabIndex = 7;
             this.JHFXJCCcomboBoxEdit.SelectedIndexChanged += new System.EventHandler(this.JHFXJCCcomboBoxEdit_SelectedIndexChanged);
             // 
             // xtraTabPageGJ
             // 
             this.xtraTabPageGJ.Controls.Add(this.gjInform9);
+            this.xtraTabPageGJ.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageGJ.Name = "xtraTabPageGJ";
-            this.xtraTabPageGJ.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageGJ.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageGJ.Text = "管界信息管理";
             // 
             // gjInform9
             // 
             this.gjInform9.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gjInform9.Location = new System.Drawing.Point(0, 0);
-            this.gjInform9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.gjInform9.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.gjInform9.Name = "gjInform9";
-            this.gjInform9.Size = new System.Drawing.Size(1325, 498);
+            this.gjInform9.Size = new System.Drawing.Size(1657, 621);
             this.gjInform9.TabIndex = 0;
             this.gjInform9.Load += new System.EventHandler(this.gjInform9_Load);
             // 
@@ -4676,19 +4704,22 @@
             this.xtraTabPageQX.Controls.Add(this.gridControl1);
             this.xtraTabPageQX.Controls.Add(this.panelControl3);
             this.xtraTabPageQX.Controls.Add(this.panelControl2);
+            this.xtraTabPageQX.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageQX.Name = "xtraTabPageQX";
             this.xtraTabPageQX.ShowCloseButton = DevExpress.Utils.DefaultBoolean.False;
-            this.xtraTabPageQX.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageQX.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageQX.Text = "曲线信息管理";
             // 
             // gridControl1
             // 
             this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl1.Location = new System.Drawing.Point(0, 37);
+            this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gridControl1.Location = new System.Drawing.Point(0, 46);
             this.gridControl1.MainView = this.railwaybureau;
+            this.gridControl1.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl1.MenuManager = this.xrDesignRibbonController1;
             this.gridControl1.Name = "gridControl1";
-            this.gridControl1.Size = new System.Drawing.Size(1325, 461);
+            this.gridControl1.Size = new System.Drawing.Size(1657, 575);
             this.gridControl1.TabIndex = 0;
             this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.railwaybureau,
@@ -4930,9 +4961,10 @@
             // panelControl3
             // 
             this.panelControl3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelControl3.Location = new System.Drawing.Point(0, 37);
+            this.panelControl3.Location = new System.Drawing.Point(0, 46);
+            this.panelControl3.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl3.Name = "panelControl3";
-            this.panelControl3.Size = new System.Drawing.Size(1325, 461);
+            this.panelControl3.Size = new System.Drawing.Size(1657, 575);
             this.panelControl3.TabIndex = 2;
             // 
             // panelControl2
@@ -4940,15 +4972,17 @@
             this.panelControl2.Controls.Add(this.deleteroebtnqx);
             this.panelControl2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl2.Location = new System.Drawing.Point(0, 0);
+            this.panelControl2.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl2.Name = "panelControl2";
-            this.panelControl2.Size = new System.Drawing.Size(1325, 37);
+            this.panelControl2.Size = new System.Drawing.Size(1657, 46);
             this.panelControl2.TabIndex = 1;
             // 
             // deleteroebtnqx
             // 
-            this.deleteroebtnqx.Location = new System.Drawing.Point(21, 8);
+            this.deleteroebtnqx.Location = new System.Drawing.Point(26, 10);
+            this.deleteroebtnqx.Margin = new System.Windows.Forms.Padding(4);
             this.deleteroebtnqx.Name = "deleteroebtnqx";
-            this.deleteroebtnqx.Size = new System.Drawing.Size(75, 23);
+            this.deleteroebtnqx.Size = new System.Drawing.Size(94, 29);
             this.deleteroebtnqx.TabIndex = 0;
             this.deleteroebtnqx.Text = "删除选中行";
             this.deleteroebtnqx.Click += new System.EventHandler(this.deleteroebtnqx_Click);
@@ -4957,10 +4991,11 @@
             // 
             this.xtraTabControl1.ClosePageButtonShowMode = DevExpress.XtraTab.ClosePageButtonShowMode.InAllTabPageHeaders;
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 147);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 184);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPageQX;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1331, 527);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1664, 657);
             this.xtraTabControl1.TabIndex = 2;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPageQX,
@@ -4975,15 +5010,15 @@
             this.xtraTabPageXXXW,
             this.xtraTabDataManager,
             this.xtraTabPageGL,
-            this.xtraTabPageQK,
-            this.xtraTabPageDWZS});
+            this.xtraTabPageQK});
             this.xtraTabControl1.CloseButtonClick += new System.EventHandler(this.xtraTabControl1_CloseButtonClick);
             // 
             // xtraTabPageDC
             // 
             this.xtraTabPageDC.Controls.Add(this.dcInform8);
+            this.xtraTabPageDC.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageDC.Name = "xtraTabPageDC";
-            this.xtraTabPageDC.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageDC.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageDC.Text = "道岔信息管理";
             this.xtraTabPageDC.Paint += new System.Windows.Forms.PaintEventHandler(this.xtraTabPage2_Paint);
             // 
@@ -4991,9 +5026,9 @@
             // 
             this.dcInform8.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dcInform8.Location = new System.Drawing.Point(0, 0);
-            this.dcInform8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.dcInform8.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.dcInform8.Name = "dcInform8";
-            this.dcInform8.Size = new System.Drawing.Size(1325, 498);
+            this.dcInform8.Size = new System.Drawing.Size(1657, 621);
             this.dcInform8.TabIndex = 0;
             this.dcInform8.Load += new System.EventHandler(this.dcInform8_Load);
             // 
@@ -5003,18 +5038,20 @@
             this.xtraTabPageGLData.Controls.Add(this.panelControl7);
             this.xtraTabPageGLData.Margin = new System.Windows.Forms.Padding(2);
             this.xtraTabPageGLData.Name = "xtraTabPageGLData";
-            this.xtraTabPageGLData.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageGLData.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageGLData.Text = "功率数据管理";
             // 
             // gridControl6
             // 
             this.gridControl6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl6.Location = new System.Drawing.Point(0, 48);
+            this.gridControl6.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gridControl6.Location = new System.Drawing.Point(0, 60);
             this.gridControl6.MainView = this.gridView6;
+            this.gridControl6.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl6.Name = "gridControl6";
             this.gridControl6.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit6});
-            this.gridControl6.Size = new System.Drawing.Size(1325, 450);
+            this.gridControl6.Size = new System.Drawing.Size(1657, 561);
             this.gridControl6.TabIndex = 20;
             this.gridControl6.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView6});
@@ -5094,16 +5131,18 @@
             this.panelControl7.Controls.Add(this.deleteGLdata);
             this.panelControl7.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl7.Location = new System.Drawing.Point(0, 0);
+            this.panelControl7.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl7.Name = "panelControl7";
-            this.panelControl7.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl7.Size = new System.Drawing.Size(1657, 60);
             this.panelControl7.TabIndex = 19;
             // 
             // importGLData
             // 
             this.importGLData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.importGLData.Location = new System.Drawing.Point(1131, 15);
+            this.importGLData.Location = new System.Drawing.Point(1415, 19);
+            this.importGLData.Margin = new System.Windows.Forms.Padding(4);
             this.importGLData.Name = "importGLData";
-            this.importGLData.Size = new System.Drawing.Size(72, 23);
+            this.importGLData.Size = new System.Drawing.Size(90, 29);
             this.importGLData.TabIndex = 6;
             this.importGLData.Text = "导入";
             this.importGLData.Click += new System.EventHandler(this.importGLData_Click);
@@ -5111,9 +5150,10 @@
             // deleteGLdata
             // 
             this.deleteGLdata.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.deleteGLdata.Location = new System.Drawing.Point(1217, 15);
+            this.deleteGLdata.Location = new System.Drawing.Point(1522, 19);
+            this.deleteGLdata.Margin = new System.Windows.Forms.Padding(4);
             this.deleteGLdata.Name = "deleteGLdata";
-            this.deleteGLdata.Size = new System.Drawing.Size(72, 23);
+            this.deleteGLdata.Size = new System.Drawing.Size(90, 29);
             this.deleteGLdata.TabIndex = 5;
             this.deleteGLdata.Text = " 删除选中";
             this.deleteGLdata.Click += new System.EventHandler(this.deleteGLdata_Click);
@@ -5124,18 +5164,20 @@
             this.xtraTabPageQKData.Controls.Add(this.panelControl8);
             this.xtraTabPageQKData.Margin = new System.Windows.Forms.Padding(2);
             this.xtraTabPageQKData.Name = "xtraTabPageQKData";
-            this.xtraTabPageQKData.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageQKData.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageQKData.Text = "缺口数据管理";
             // 
             // gridControl7
             // 
             this.gridControl7.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl7.Location = new System.Drawing.Point(0, 48);
+            this.gridControl7.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gridControl7.Location = new System.Drawing.Point(0, 60);
             this.gridControl7.MainView = this.gridView7;
+            this.gridControl7.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl7.Name = "gridControl7";
             this.gridControl7.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit7});
-            this.gridControl7.Size = new System.Drawing.Size(1325, 450);
+            this.gridControl7.Size = new System.Drawing.Size(1657, 561);
             this.gridControl7.TabIndex = 22;
             this.gridControl7.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView7});
@@ -5225,16 +5267,18 @@
             this.panelControl8.Controls.Add(this.deleteQKdata);
             this.panelControl8.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl8.Location = new System.Drawing.Point(0, 0);
+            this.panelControl8.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl8.Name = "panelControl8";
-            this.panelControl8.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl8.Size = new System.Drawing.Size(1657, 60);
             this.panelControl8.TabIndex = 21;
             // 
             // simpleButton1
             // 
             this.simpleButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.simpleButton1.Location = new System.Drawing.Point(1131, 15);
+            this.simpleButton1.Location = new System.Drawing.Point(1415, 19);
+            this.simpleButton1.Margin = new System.Windows.Forms.Padding(4);
             this.simpleButton1.Name = "simpleButton1";
-            this.simpleButton1.Size = new System.Drawing.Size(72, 23);
+            this.simpleButton1.Size = new System.Drawing.Size(90, 29);
             this.simpleButton1.TabIndex = 6;
             this.simpleButton1.Text = "导入";
             this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
@@ -5242,32 +5286,36 @@
             // deleteQKdata
             // 
             this.deleteQKdata.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.deleteQKdata.Location = new System.Drawing.Point(1217, 15);
+            this.deleteQKdata.Location = new System.Drawing.Point(1522, 19);
+            this.deleteQKdata.Margin = new System.Windows.Forms.Padding(4);
             this.deleteQKdata.Name = "deleteQKdata";
-            this.deleteQKdata.Size = new System.Drawing.Size(72, 23);
+            this.deleteQKdata.Size = new System.Drawing.Size(90, 29);
             this.deleteQKdata.TabIndex = 5;
             this.deleteQKdata.Text = " 删除选中";
             this.deleteQKdata.Click += new System.EventHandler(this.deleteQKdata_Click);
             // 
             // xtraTabPageMTLF
             // 
+            this.xtraTabPageMTLF.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageMTLF.Name = "xtraTabPageMTLF";
             this.xtraTabPageMTLF.PageVisible = false;
-            this.xtraTabPageMTLF.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageMTLF.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageMTLF.Text = "密贴离缝";
             // 
             // xtraTabPageZZJH
             // 
+            this.xtraTabPageZZJH.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageZZJH.Name = "xtraTabPageZZJH";
             this.xtraTabPageZZJH.PageVisible = false;
-            this.xtraTabPageZZJH.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageZZJH.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageZZJH.Text = "逐枕几何";
             // 
             // xtraTabPageXXXW
             // 
+            this.xtraTabPageXXXW.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageXXXW.Name = "xtraTabPageXXXW";
             this.xtraTabPageXXXW.PageVisible = false;
-            this.xtraTabPageXXXW.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageXXXW.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageXXXW.Text = "线形线位";
             // 
             // xtraTabPageGL
@@ -5276,18 +5324,20 @@
             this.xtraTabPageGL.Controls.Add(this.panelControl5);
             this.xtraTabPageGL.Margin = new System.Windows.Forms.Padding(2);
             this.xtraTabPageGL.Name = "xtraTabPageGL";
-            this.xtraTabPageGL.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageGL.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageGL.Text = "功率分析";
             // 
             // gridControl4
             // 
             this.gridControl4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl4.Location = new System.Drawing.Point(0, 48);
+            this.gridControl4.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gridControl4.Location = new System.Drawing.Point(0, 60);
             this.gridControl4.MainView = this.gridView4;
+            this.gridControl4.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl4.Name = "gridControl4";
             this.gridControl4.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit4});
-            this.gridControl4.Size = new System.Drawing.Size(1325, 450);
+            this.gridControl4.Size = new System.Drawing.Size(1657, 561);
             this.gridControl4.TabIndex = 17;
             this.gridControl4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView4});
@@ -5438,28 +5488,30 @@
             this.panelControl5.Controls.Add(this.DWGLanalysisBtn);
             this.panelControl5.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl5.Location = new System.Drawing.Point(0, 0);
+            this.panelControl5.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl5.Name = "panelControl5";
-            this.panelControl5.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl5.Size = new System.Drawing.Size(1657, 60);
             this.panelControl5.TabIndex = 12;
             // 
             // DWGLcheckEdit
             // 
             this.DWGLcheckEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.DWGLcheckEdit.Location = new System.Drawing.Point(1084, 16);
+            this.DWGLcheckEdit.Location = new System.Drawing.Point(1356, 20);
             this.DWGLcheckEdit.Margin = new System.Windows.Forms.Padding(2);
             this.DWGLcheckEdit.MenuManager = this.xrDesignRibbonController1;
             this.DWGLcheckEdit.Name = "DWGLcheckEdit";
             this.DWGLcheckEdit.Properties.Caption = "浏览文件夹";
-            this.DWGLcheckEdit.Size = new System.Drawing.Size(97, 19);
+            this.DWGLcheckEdit.Size = new System.Drawing.Size(121, 22);
             this.DWGLcheckEdit.TabIndex = 17;
             this.DWGLcheckEdit.Visible = false;
             // 
             // DWGLdelBtn
             // 
             this.DWGLdelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.DWGLdelBtn.Location = new System.Drawing.Point(1217, 15);
+            this.DWGLdelBtn.Location = new System.Drawing.Point(1522, 19);
+            this.DWGLdelBtn.Margin = new System.Windows.Forms.Padding(4);
             this.DWGLdelBtn.Name = "DWGLdelBtn";
-            this.DWGLdelBtn.Size = new System.Drawing.Size(72, 23);
+            this.DWGLdelBtn.Size = new System.Drawing.Size(90, 29);
             this.DWGLdelBtn.TabIndex = 5;
             this.DWGLdelBtn.Text = " 删除选中";
             this.DWGLdelBtn.Click += new System.EventHandler(this.DWGLdelBtn_Click);
@@ -5467,18 +5519,20 @@
             // DWGLimportfileBtn
             // 
             this.DWGLimportfileBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.DWGLimportfileBtn.Location = new System.Drawing.Point(993, 15);
+            this.DWGLimportfileBtn.Location = new System.Drawing.Point(1242, 19);
+            this.DWGLimportfileBtn.Margin = new System.Windows.Forms.Padding(4);
             this.DWGLimportfileBtn.Name = "DWGLimportfileBtn";
-            this.DWGLimportfileBtn.Size = new System.Drawing.Size(75, 23);
+            this.DWGLimportfileBtn.Size = new System.Drawing.Size(94, 29);
             this.DWGLimportfileBtn.TabIndex = 0;
             this.DWGLimportfileBtn.Text = "导入";
             this.DWGLimportfileBtn.Click += new System.EventHandler(this.DWGLopenfileBtn_Click);
             // 
             // DWGLanalysisBtn
             // 
-            this.DWGLanalysisBtn.Location = new System.Drawing.Point(15, 15);
+            this.DWGLanalysisBtn.Location = new System.Drawing.Point(19, 19);
+            this.DWGLanalysisBtn.Margin = new System.Windows.Forms.Padding(4);
             this.DWGLanalysisBtn.Name = "DWGLanalysisBtn";
-            this.DWGLanalysisBtn.Size = new System.Drawing.Size(100, 23);
+            this.DWGLanalysisBtn.Size = new System.Drawing.Size(125, 29);
             this.DWGLanalysisBtn.TabIndex = 5;
             this.DWGLanalysisBtn.Text = "分析算法";
             this.DWGLanalysisBtn.ToolTip = "未定义";
@@ -5490,19 +5544,21 @@
             this.xtraTabPageQK.Controls.Add(this.panelControl6);
             this.xtraTabPageQK.Margin = new System.Windows.Forms.Padding(2);
             this.xtraTabPageQK.Name = "xtraTabPageQK";
-            this.xtraTabPageQK.Size = new System.Drawing.Size(1325, 498);
+            this.xtraTabPageQK.Size = new System.Drawing.Size(1657, 621);
             this.xtraTabPageQK.Text = "缺口分析";
             this.xtraTabPageQK.Paint += new System.Windows.Forms.PaintEventHandler(this.xtraTabPage2_Paint_1);
             // 
             // gridControl5
             // 
             this.gridControl5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl5.Location = new System.Drawing.Point(0, 48);
+            this.gridControl5.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gridControl5.Location = new System.Drawing.Point(0, 60);
             this.gridControl5.MainView = this.gridView5;
+            this.gridControl5.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl5.Name = "gridControl5";
             this.gridControl5.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit5});
-            this.gridControl5.Size = new System.Drawing.Size(1325, 450);
+            this.gridControl5.Size = new System.Drawing.Size(1657, 561);
             this.gridControl5.TabIndex = 18;
             this.gridControl5.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView5});
@@ -5653,28 +5709,30 @@
             this.panelControl6.Controls.Add(this.DWQKanalysisBtn);
             this.panelControl6.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl6.Location = new System.Drawing.Point(0, 0);
+            this.panelControl6.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl6.Name = "panelControl6";
-            this.panelControl6.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl6.Size = new System.Drawing.Size(1657, 60);
             this.panelControl6.TabIndex = 17;
             // 
             // DWQKcheckEdit
             // 
             this.DWQKcheckEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.DWQKcheckEdit.Location = new System.Drawing.Point(1084, 16);
+            this.DWQKcheckEdit.Location = new System.Drawing.Point(1356, 20);
             this.DWQKcheckEdit.Margin = new System.Windows.Forms.Padding(2);
             this.DWQKcheckEdit.MenuManager = this.xrDesignRibbonController1;
             this.DWQKcheckEdit.Name = "DWQKcheckEdit";
             this.DWQKcheckEdit.Properties.Caption = "浏览文件夹";
-            this.DWQKcheckEdit.Size = new System.Drawing.Size(99, 19);
+            this.DWQKcheckEdit.Size = new System.Drawing.Size(124, 22);
             this.DWQKcheckEdit.TabIndex = 18;
             this.DWQKcheckEdit.Visible = false;
             // 
             // DWQKdelBtn
             // 
             this.DWQKdelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.DWQKdelBtn.Location = new System.Drawing.Point(1217, 15);
+            this.DWQKdelBtn.Location = new System.Drawing.Point(1522, 19);
+            this.DWQKdelBtn.Margin = new System.Windows.Forms.Padding(4);
             this.DWQKdelBtn.Name = "DWQKdelBtn";
-            this.DWQKdelBtn.Size = new System.Drawing.Size(72, 23);
+            this.DWQKdelBtn.Size = new System.Drawing.Size(90, 29);
             this.DWQKdelBtn.TabIndex = 5;
             this.DWQKdelBtn.Text = " 删除选中";
             this.DWQKdelBtn.Click += new System.EventHandler(this.DWQKdelBtn_Click);
@@ -5682,39 +5740,35 @@
             // DWQKimportfileBtn
             // 
             this.DWQKimportfileBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.DWQKimportfileBtn.Location = new System.Drawing.Point(993, 15);
+            this.DWQKimportfileBtn.Location = new System.Drawing.Point(1242, 19);
+            this.DWQKimportfileBtn.Margin = new System.Windows.Forms.Padding(4);
             this.DWQKimportfileBtn.Name = "DWQKimportfileBtn";
-            this.DWQKimportfileBtn.Size = new System.Drawing.Size(75, 23);
+            this.DWQKimportfileBtn.Size = new System.Drawing.Size(94, 29);
             this.DWQKimportfileBtn.TabIndex = 0;
             this.DWQKimportfileBtn.Text = "导入";
             this.DWQKimportfileBtn.Click += new System.EventHandler(this.DWQKopenfileBtn_Click);
             // 
             // DWQKanalysisBtn
             // 
-            this.DWQKanalysisBtn.Location = new System.Drawing.Point(15, 15);
+            this.DWQKanalysisBtn.Location = new System.Drawing.Point(19, 19);
+            this.DWQKanalysisBtn.Margin = new System.Windows.Forms.Padding(4);
             this.DWQKanalysisBtn.Name = "DWQKanalysisBtn";
-            this.DWQKanalysisBtn.Size = new System.Drawing.Size(100, 23);
+            this.DWQKanalysisBtn.Size = new System.Drawing.Size(125, 29);
             this.DWQKanalysisBtn.TabIndex = 5;
             this.DWQKanalysisBtn.Text = "分析算法";
             this.DWQKanalysisBtn.ToolTip = "未定义";
             // 
-            // xtraTabPageDWZS
-            // 
-            this.xtraTabPageDWZS.Margin = new System.Windows.Forms.Padding(2);
-            this.xtraTabPageDWZS.Name = "xtraTabPageDWZS";
-            this.xtraTabPageDWZS.Size = new System.Drawing.Size(1325, 498);
-            this.xtraTabPageDWZS.Text = "电务数据展示";
-            // 
             // DevFrmMain
             // 
             this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(1331, 705);
+            this.ClientSize = new System.Drawing.Size(1664, 881);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.ribbonStatusBar);
             this.Controls.Add(this.ribbon);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "DevFrmMain";
             this.Ribbon = this.ribbon;
             this.StatusBar = this.ribbonStatusBar;
@@ -6135,7 +6189,6 @@
         private DevExpress.XtraTab.XtraTabPage xtraTabPageGL;
         private DevExpress.XtraTab.XtraTabPage xtraTabPageQK;
         private System.Windows.Forms.PageSetupDialog pageSetupDialog1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPageDWZS;
         private DevExpress.XtraEditors.PanelControl panelControl5;
         private DevExpress.XtraEditors.SimpleButton DWGLdelBtn;
         private DevExpress.XtraEditors.SimpleButton DWGLimportfileBtn;

DPTools/DevFrmMain.resx

@@ -118,10 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="xrDesignRibbonController1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>516, 17</value>
+    <value>618, 17</value>
   </metadata>
   <metadata name="applicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>729, 17</value>
+    <value>876, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="barButtonImageTile.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1766,10 +1766,10 @@
 </value>
   </data>
   <metadata name="ribbonMiniToolbar1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>149, 55</value>
+    <value>527, 59</value>
   </metadata>
   <metadata name="xrDesignDockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>888, 17</value>
+    <value>1066, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>113</value>
@@ -1937,7 +1937,7 @@
 </value>
   </data>
   <metadata name="galleryDropDown1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>353, 17</value>
+    <value>422, 17</value>
   </metadata>
   <data name="barButtonItem2.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -2102,19 +2102,19 @@
 </value>
   </data>
   <metadata name="reportDesigner1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>205, 17</value>
+    <value>245, 17</value>
   </metadata>
   <metadata name="popupMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1082, 17</value>
+    <value>1300, 17</value>
   </metadata>
   <metadata name="galleryDropDown2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1214, 17</value>
+    <value>17, 59</value>
   </metadata>
   <metadata name="popupMenu2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1377, 17</value>
+    <value>213, 59</value>
   </metadata>
   <metadata name="popupMenu3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 55</value>
+    <value>370, 59</value>
   </metadata>
   <data name="barButtonItem15.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -2158,6 +2158,6 @@
 </value>
   </data>
   <metadata name="pageSetupDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>319, 55</value>
+    <value>727, 59</value>
   </metadata>
 </root>

DPTools/Uninpho.Railway.Tools.csproj

@@ -221,9 +221,6 @@
     <Reference Include="Package_turnout_analysis">
       <HintPath>libs\matlabSuanFa\Package_turnout_analysis.dll</HintPath>
     </Reference>
-    <Reference Include="Package_turnout_analysis_geo">
-      <HintPath>libs\matlabSuanFa\Package_turnout_analysis_geo.dll</HintPath>
-    </Reference>
     <Reference Include="Package_turnout_analysis_wrf, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>libs\matlabSuanFa\Package_turnout_analysis_wrf.dll</HintPath>
@@ -234,6 +231,9 @@
     <Reference Include="Package_turnout_identify_wrf">
       <HintPath>libs\matlabSuanFa\Package_turnout_identify_wrf.dll</HintPath>
     </Reference>
+    <Reference Include="sub_main_turnout_analysis_geo">
+      <HintPath>libs\matlabSuanFa\sub_main_turnout_analysis_geo.dll</HintPath>
+    </Reference>
     <Reference Include="System">
       <Private>True</Private>
     </Reference>
@@ -663,7 +663,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>PrintRibbonControllerResources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
+    <None Include="Properties\licenses.licx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>