diff --git a/FormAnalysis/FormFT.Designer.cs b/FormAnalysis/FormFT.Designer.cs index 2e30bd4..2f4dcea 100644 --- a/FormAnalysis/FormFT.Designer.cs +++ b/FormAnalysis/FormFT.Designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); @@ -37,25 +37,23 @@ this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.superTabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +61,7 @@ this.groupPanel1.Controls.Add(this.textBoxFTSD); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(1, -1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(685, 94); // @@ -86,7 +84,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +95,7 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "覆土审核"; + this.groupPanel1.Text = "覆土审查"; // // buttonX1 // @@ -150,7 +147,6 @@ this.buttonExpCAD.TabIndex = 5; this.buttonExpCAD.Text = "导出CAD"; this.buttonExpCAD.Visible = false; - //this.buttonExpCAD.Click += new System.EventHandler(this.buttonExpCAD_Click); // // buttonOK // @@ -196,44 +192,6 @@ this.superTabItem2}); this.superTabControl1.Text = "superTabControl1"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -248,14 +206,14 @@ // this.dataGridViewX1.AllowUserToAddRows = false; this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); @@ -272,6 +230,44 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // FormFT // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -283,15 +279,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormFT"; - this.Text = "覆土审核"; + this.Text = "覆土审查"; this.Load += new System.EventHandler(this.FormFT_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.superTabControlPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormFT.Designer.cs b/FormAnalysis/FormFT.Designer.cs index 2e30bd4..2f4dcea 100644 --- a/FormAnalysis/FormFT.Designer.cs +++ b/FormAnalysis/FormFT.Designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); @@ -37,25 +37,23 @@ this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.superTabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +61,7 @@ this.groupPanel1.Controls.Add(this.textBoxFTSD); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(1, -1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(685, 94); // @@ -86,7 +84,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +95,7 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "覆土审核"; + this.groupPanel1.Text = "覆土审查"; // // buttonX1 // @@ -150,7 +147,6 @@ this.buttonExpCAD.TabIndex = 5; this.buttonExpCAD.Text = "导出CAD"; this.buttonExpCAD.Visible = false; - //this.buttonExpCAD.Click += new System.EventHandler(this.buttonExpCAD_Click); // // buttonOK // @@ -196,44 +192,6 @@ this.superTabItem2}); this.superTabControl1.Text = "superTabControl1"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -248,14 +206,14 @@ // this.dataGridViewX1.AllowUserToAddRows = false; this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); @@ -272,6 +230,44 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // FormFT // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -283,15 +279,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormFT"; - this.Text = "覆土审核"; + this.Text = "覆土审查"; this.Load += new System.EventHandler(this.FormFT_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.superTabControlPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormFT.resx b/FormAnalysis/FormFT.resx index 1af7de1..94904f3 100644 --- a/FormAnalysis/FormFT.resx +++ b/FormAnalysis/FormFT.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 144, 17 + + + 251, 17 + + + 346, 17 + + + 472, 17 + + + 611, 17 + + + 721, 17 + + + 879, 17 + + + 1069, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormFT.Designer.cs b/FormAnalysis/FormFT.Designer.cs index 2e30bd4..2f4dcea 100644 --- a/FormAnalysis/FormFT.Designer.cs +++ b/FormAnalysis/FormFT.Designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); @@ -37,25 +37,23 @@ this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.superTabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +61,7 @@ this.groupPanel1.Controls.Add(this.textBoxFTSD); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(1, -1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(685, 94); // @@ -86,7 +84,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +95,7 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "覆土审核"; + this.groupPanel1.Text = "覆土审查"; // // buttonX1 // @@ -150,7 +147,6 @@ this.buttonExpCAD.TabIndex = 5; this.buttonExpCAD.Text = "导出CAD"; this.buttonExpCAD.Visible = false; - //this.buttonExpCAD.Click += new System.EventHandler(this.buttonExpCAD_Click); // // buttonOK // @@ -196,44 +192,6 @@ this.superTabItem2}); this.superTabControl1.Text = "superTabControl1"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -248,14 +206,14 @@ // this.dataGridViewX1.AllowUserToAddRows = false; this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); @@ -272,6 +230,44 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // FormFT // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -283,15 +279,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormFT"; - this.Text = "覆土审核"; + this.Text = "覆土审查"; this.Load += new System.EventHandler(this.FormFT_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.superTabControlPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormFT.resx b/FormAnalysis/FormFT.resx index 1af7de1..94904f3 100644 --- a/FormAnalysis/FormFT.resx +++ b/FormAnalysis/FormFT.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 144, 17 + + + 251, 17 + + + 346, 17 + + + 472, 17 + + + 611, 17 + + + 721, 17 + + + 879, 17 + + + 1069, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormHor.Designer.cs b/FormAnalysis/FormHor.Designer.cs index ce20f03..e21efd1 100644 --- a/FormAnalysis/FormHor.Designer.cs +++ b/FormAnalysis/FormHor.Designer.cs @@ -28,28 +28,28 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.textBoxJJBZ = new DevComponents.DotNetBar.Controls.TextBoxX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel1.SuspendLayout(); this.superTabControlPanel2.SuspendLayout(); - this.groupPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); + this.superTabControlPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.groupPanel1.SuspendLayout(); this.SuspendLayout(); // // superTabControl1 @@ -69,8 +69,8 @@ this.superTabControl1.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabControl1.ControlBox.MenuBox, this.superTabControl1.ControlBox.CloseBox}); - this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Controls.Add(this.superTabControlPanel1); + this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Location = new System.Drawing.Point(0, 103); this.superTabControl1.Name = "superTabControl1"; this.superTabControl1.ReorderTabsEnabled = true; @@ -84,6 +84,44 @@ this.superTabItem2}); this.superTabControl1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(686, 291); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(686, 291); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -94,6 +132,27 @@ this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.superTabItem1; // + // dataGridViewX1 + // + this.dataGridViewX1.AllowUserToAddRows = false; + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); + this.dataGridViewX1.TabIndex = 0; + this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); + // // superTabItem1 // this.superTabItem1.AttachedControl = this.superTabControlPanel1; @@ -101,27 +160,10 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(686, 263); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -152,7 +194,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -164,7 +205,19 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "水平净距"; + this.groupPanel1.Text = "水平净距审查"; + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(483, 21); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 26); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 8; + this.buttonX1.Text = "导出EXCEL"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); // // labelX1 // @@ -217,60 +270,6 @@ this.buttonOK.Text = "开始分析"; this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); // - // dataGridViewX1 - // - this.dataGridViewX1.AllowUserToAddRows = false; - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX1.TabIndex = 0; - this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // buttonX1 - // - this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonX1.Location = new System.Drawing.Point(483, 21); - this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(75, 26); - this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonX1.TabIndex = 8; - this.buttonX1.Text = "导出EXCEL"; - this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); - // // FormHor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -282,15 +281,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormHor"; - this.Text = "水平净距"; + this.Text = "水平净距审查"; this.Load += new System.EventHandler(this.FormHor_Load); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel1.ResumeLayout(false); this.superTabControlPanel2.ResumeLayout(false); - this.groupPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); + this.superTabControlPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.groupPanel1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormFT.Designer.cs b/FormAnalysis/FormFT.Designer.cs index 2e30bd4..2f4dcea 100644 --- a/FormAnalysis/FormFT.Designer.cs +++ b/FormAnalysis/FormFT.Designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); @@ -37,25 +37,23 @@ this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.superTabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +61,7 @@ this.groupPanel1.Controls.Add(this.textBoxFTSD); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(1, -1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(685, 94); // @@ -86,7 +84,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +95,7 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "覆土审核"; + this.groupPanel1.Text = "覆土审查"; // // buttonX1 // @@ -150,7 +147,6 @@ this.buttonExpCAD.TabIndex = 5; this.buttonExpCAD.Text = "导出CAD"; this.buttonExpCAD.Visible = false; - //this.buttonExpCAD.Click += new System.EventHandler(this.buttonExpCAD_Click); // // buttonOK // @@ -196,44 +192,6 @@ this.superTabItem2}); this.superTabControl1.Text = "superTabControl1"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -248,14 +206,14 @@ // this.dataGridViewX1.AllowUserToAddRows = false; this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); @@ -272,6 +230,44 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // FormFT // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -283,15 +279,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormFT"; - this.Text = "覆土审核"; + this.Text = "覆土审查"; this.Load += new System.EventHandler(this.FormFT_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.superTabControlPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormFT.resx b/FormAnalysis/FormFT.resx index 1af7de1..94904f3 100644 --- a/FormAnalysis/FormFT.resx +++ b/FormAnalysis/FormFT.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 144, 17 + + + 251, 17 + + + 346, 17 + + + 472, 17 + + + 611, 17 + + + 721, 17 + + + 879, 17 + + + 1069, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormHor.Designer.cs b/FormAnalysis/FormHor.Designer.cs index ce20f03..e21efd1 100644 --- a/FormAnalysis/FormHor.Designer.cs +++ b/FormAnalysis/FormHor.Designer.cs @@ -28,28 +28,28 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.textBoxJJBZ = new DevComponents.DotNetBar.Controls.TextBoxX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel1.SuspendLayout(); this.superTabControlPanel2.SuspendLayout(); - this.groupPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); + this.superTabControlPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.groupPanel1.SuspendLayout(); this.SuspendLayout(); // // superTabControl1 @@ -69,8 +69,8 @@ this.superTabControl1.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabControl1.ControlBox.MenuBox, this.superTabControl1.ControlBox.CloseBox}); - this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Controls.Add(this.superTabControlPanel1); + this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Location = new System.Drawing.Point(0, 103); this.superTabControl1.Name = "superTabControl1"; this.superTabControl1.ReorderTabsEnabled = true; @@ -84,6 +84,44 @@ this.superTabItem2}); this.superTabControl1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(686, 291); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(686, 291); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -94,6 +132,27 @@ this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.superTabItem1; // + // dataGridViewX1 + // + this.dataGridViewX1.AllowUserToAddRows = false; + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); + this.dataGridViewX1.TabIndex = 0; + this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); + // // superTabItem1 // this.superTabItem1.AttachedControl = this.superTabControlPanel1; @@ -101,27 +160,10 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(686, 263); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -152,7 +194,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -164,7 +205,19 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "水平净距"; + this.groupPanel1.Text = "水平净距审查"; + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(483, 21); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 26); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 8; + this.buttonX1.Text = "导出EXCEL"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); // // labelX1 // @@ -217,60 +270,6 @@ this.buttonOK.Text = "开始分析"; this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); // - // dataGridViewX1 - // - this.dataGridViewX1.AllowUserToAddRows = false; - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX1.TabIndex = 0; - this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // buttonX1 - // - this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonX1.Location = new System.Drawing.Point(483, 21); - this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(75, 26); - this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonX1.TabIndex = 8; - this.buttonX1.Text = "导出EXCEL"; - this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); - // // FormHor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -282,15 +281,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormHor"; - this.Text = "水平净距"; + this.Text = "水平净距审查"; this.Load += new System.EventHandler(this.FormHor_Load); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel1.ResumeLayout(false); this.superTabControlPanel2.ResumeLayout(false); - this.groupPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); + this.superTabControlPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.groupPanel1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormHor.resx b/FormAnalysis/FormHor.resx index 1af7de1..14d0c54 100644 --- a/FormAnalysis/FormHor.resx +++ b/FormAnalysis/FormHor.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 365, 17 + + + 175, 17 + + + 555, 17 + + + 682, 17 + + + 789, 17 + + + 884, 17 + + + 1005, 17 + + + 1144, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormFT.Designer.cs b/FormAnalysis/FormFT.Designer.cs index 2e30bd4..2f4dcea 100644 --- a/FormAnalysis/FormFT.Designer.cs +++ b/FormAnalysis/FormFT.Designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); @@ -37,25 +37,23 @@ this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.superTabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +61,7 @@ this.groupPanel1.Controls.Add(this.textBoxFTSD); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(1, -1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(685, 94); // @@ -86,7 +84,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +95,7 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "覆土审核"; + this.groupPanel1.Text = "覆土审查"; // // buttonX1 // @@ -150,7 +147,6 @@ this.buttonExpCAD.TabIndex = 5; this.buttonExpCAD.Text = "导出CAD"; this.buttonExpCAD.Visible = false; - //this.buttonExpCAD.Click += new System.EventHandler(this.buttonExpCAD_Click); // // buttonOK // @@ -196,44 +192,6 @@ this.superTabItem2}); this.superTabControl1.Text = "superTabControl1"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -248,14 +206,14 @@ // this.dataGridViewX1.AllowUserToAddRows = false; this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); @@ -272,6 +230,44 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // FormFT // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -283,15 +279,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormFT"; - this.Text = "覆土审核"; + this.Text = "覆土审查"; this.Load += new System.EventHandler(this.FormFT_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.superTabControlPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormFT.resx b/FormAnalysis/FormFT.resx index 1af7de1..94904f3 100644 --- a/FormAnalysis/FormFT.resx +++ b/FormAnalysis/FormFT.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 144, 17 + + + 251, 17 + + + 346, 17 + + + 472, 17 + + + 611, 17 + + + 721, 17 + + + 879, 17 + + + 1069, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormHor.Designer.cs b/FormAnalysis/FormHor.Designer.cs index ce20f03..e21efd1 100644 --- a/FormAnalysis/FormHor.Designer.cs +++ b/FormAnalysis/FormHor.Designer.cs @@ -28,28 +28,28 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.textBoxJJBZ = new DevComponents.DotNetBar.Controls.TextBoxX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel1.SuspendLayout(); this.superTabControlPanel2.SuspendLayout(); - this.groupPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); + this.superTabControlPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.groupPanel1.SuspendLayout(); this.SuspendLayout(); // // superTabControl1 @@ -69,8 +69,8 @@ this.superTabControl1.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabControl1.ControlBox.MenuBox, this.superTabControl1.ControlBox.CloseBox}); - this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Controls.Add(this.superTabControlPanel1); + this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Location = new System.Drawing.Point(0, 103); this.superTabControl1.Name = "superTabControl1"; this.superTabControl1.ReorderTabsEnabled = true; @@ -84,6 +84,44 @@ this.superTabItem2}); this.superTabControl1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(686, 291); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(686, 291); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -94,6 +132,27 @@ this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.superTabItem1; // + // dataGridViewX1 + // + this.dataGridViewX1.AllowUserToAddRows = false; + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); + this.dataGridViewX1.TabIndex = 0; + this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); + // // superTabItem1 // this.superTabItem1.AttachedControl = this.superTabControlPanel1; @@ -101,27 +160,10 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(686, 263); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -152,7 +194,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -164,7 +205,19 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "水平净距"; + this.groupPanel1.Text = "水平净距审查"; + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(483, 21); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 26); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 8; + this.buttonX1.Text = "导出EXCEL"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); // // labelX1 // @@ -217,60 +270,6 @@ this.buttonOK.Text = "开始分析"; this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); // - // dataGridViewX1 - // - this.dataGridViewX1.AllowUserToAddRows = false; - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX1.TabIndex = 0; - this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // buttonX1 - // - this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonX1.Location = new System.Drawing.Point(483, 21); - this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(75, 26); - this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonX1.TabIndex = 8; - this.buttonX1.Text = "导出EXCEL"; - this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); - // // FormHor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -282,15 +281,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormHor"; - this.Text = "水平净距"; + this.Text = "水平净距审查"; this.Load += new System.EventHandler(this.FormHor_Load); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel1.ResumeLayout(false); this.superTabControlPanel2.ResumeLayout(false); - this.groupPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); + this.superTabControlPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.groupPanel1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormHor.resx b/FormAnalysis/FormHor.resx index 1af7de1..14d0c54 100644 --- a/FormAnalysis/FormHor.resx +++ b/FormAnalysis/FormHor.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 365, 17 + + + 175, 17 + + + 555, 17 + + + 682, 17 + + + 789, 17 + + + 884, 17 + + + 1005, 17 + + + 1144, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormVer.Designer.cs b/FormAnalysis/FormVer.Designer.cs index 7b231e0..17872e8 100644 --- a/FormAnalysis/FormVer.Designer.cs +++ b/FormAnalysis/FormVer.Designer.cs @@ -28,34 +28,34 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.textBoxJJBZ = new DevComponents.DotNetBar.Controls.TextBoxX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); this.superTabControlPanel1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +63,7 @@ this.groupPanel1.Controls.Add(this.textBoxJJBZ); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(-1, 1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(691, 94); // @@ -86,7 +86,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +97,19 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "垂直净距审核"; + this.groupPanel1.Text = "垂直净距审查"; + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(482, 21); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 26); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 8; + this.buttonX1.Text = "导出EXCEL"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); // // labelX1 // @@ -193,6 +204,27 @@ this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.superTabItem1; // + // dataGridViewX1 + // + this.dataGridViewX1.AllowUserToAddRows = false; + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(693, 285); + this.dataGridViewX1.TabIndex = 0; + this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); + // // superTabItem1 // this.superTabItem1.AttachedControl = this.superTabControlPanel1; @@ -204,12 +236,33 @@ // this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(693, 285); + this.superTabControlPanel2.Size = new System.Drawing.Size(693, 313); this.superTabControlPanel2.TabIndex = 0; this.superTabControlPanel2.TabItem = this.superTabItem2; // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(693, 313); + this.dataGridViewX2.TabIndex = 0; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // // superTabItem2 // this.superTabItem2.AttachedControl = this.superTabControlPanel2; @@ -217,60 +270,6 @@ this.superTabItem2.Name = "superTabItem2"; this.superTabItem2.Text = "审查结果"; // - // dataGridViewX1 - // - this.dataGridViewX1.AllowUserToAddRows = false; - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; - this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(693, 285); - this.dataGridViewX1.TabIndex = 0; - this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(693, 285); - this.dataGridViewX2.TabIndex = 0; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // buttonX1 - // - this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonX1.Location = new System.Drawing.Point(482, 21); - this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(75, 26); - this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonX1.TabIndex = 8; - this.buttonX1.Text = "导出EXCEL"; - this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); - // // FormVer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -282,14 +281,14 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormVer"; - this.Text = "垂直净距分析"; + this.Text = "垂直净距审查"; this.Load += new System.EventHandler(this.FormVer_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); this.superTabControlPanel1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); diff --git a/FormAnalysis/FormFT.Designer.cs b/FormAnalysis/FormFT.Designer.cs index 2e30bd4..2f4dcea 100644 --- a/FormAnalysis/FormFT.Designer.cs +++ b/FormAnalysis/FormFT.Designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); @@ -37,25 +37,23 @@ this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.superTabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +61,7 @@ this.groupPanel1.Controls.Add(this.textBoxFTSD); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(1, -1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(685, 94); // @@ -86,7 +84,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +95,7 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "覆土审核"; + this.groupPanel1.Text = "覆土审查"; // // buttonX1 // @@ -150,7 +147,6 @@ this.buttonExpCAD.TabIndex = 5; this.buttonExpCAD.Text = "导出CAD"; this.buttonExpCAD.Visible = false; - //this.buttonExpCAD.Click += new System.EventHandler(this.buttonExpCAD_Click); // // buttonOK // @@ -196,44 +192,6 @@ this.superTabItem2}); this.superTabControl1.Text = "superTabControl1"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -248,14 +206,14 @@ // this.dataGridViewX1.AllowUserToAddRows = false; this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); @@ -272,6 +230,44 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // FormFT // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -283,15 +279,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormFT"; - this.Text = "覆土审核"; + this.Text = "覆土审查"; this.Load += new System.EventHandler(this.FormFT_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.superTabControlPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormFT.resx b/FormAnalysis/FormFT.resx index 1af7de1..94904f3 100644 --- a/FormAnalysis/FormFT.resx +++ b/FormAnalysis/FormFT.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 144, 17 + + + 251, 17 + + + 346, 17 + + + 472, 17 + + + 611, 17 + + + 721, 17 + + + 879, 17 + + + 1069, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormHor.Designer.cs b/FormAnalysis/FormHor.Designer.cs index ce20f03..e21efd1 100644 --- a/FormAnalysis/FormHor.Designer.cs +++ b/FormAnalysis/FormHor.Designer.cs @@ -28,28 +28,28 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.textBoxJJBZ = new DevComponents.DotNetBar.Controls.TextBoxX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel1.SuspendLayout(); this.superTabControlPanel2.SuspendLayout(); - this.groupPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); + this.superTabControlPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.groupPanel1.SuspendLayout(); this.SuspendLayout(); // // superTabControl1 @@ -69,8 +69,8 @@ this.superTabControl1.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabControl1.ControlBox.MenuBox, this.superTabControl1.ControlBox.CloseBox}); - this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Controls.Add(this.superTabControlPanel1); + this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Location = new System.Drawing.Point(0, 103); this.superTabControl1.Name = "superTabControl1"; this.superTabControl1.ReorderTabsEnabled = true; @@ -84,6 +84,44 @@ this.superTabItem2}); this.superTabControl1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(686, 291); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(686, 291); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -94,6 +132,27 @@ this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.superTabItem1; // + // dataGridViewX1 + // + this.dataGridViewX1.AllowUserToAddRows = false; + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); + this.dataGridViewX1.TabIndex = 0; + this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); + // // superTabItem1 // this.superTabItem1.AttachedControl = this.superTabControlPanel1; @@ -101,27 +160,10 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(686, 263); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -152,7 +194,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -164,7 +205,19 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "水平净距"; + this.groupPanel1.Text = "水平净距审查"; + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(483, 21); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 26); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 8; + this.buttonX1.Text = "导出EXCEL"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); // // labelX1 // @@ -217,60 +270,6 @@ this.buttonOK.Text = "开始分析"; this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); // - // dataGridViewX1 - // - this.dataGridViewX1.AllowUserToAddRows = false; - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX1.TabIndex = 0; - this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // buttonX1 - // - this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonX1.Location = new System.Drawing.Point(483, 21); - this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(75, 26); - this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonX1.TabIndex = 8; - this.buttonX1.Text = "导出EXCEL"; - this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); - // // FormHor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -282,15 +281,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormHor"; - this.Text = "水平净距"; + this.Text = "水平净距审查"; this.Load += new System.EventHandler(this.FormHor_Load); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel1.ResumeLayout(false); this.superTabControlPanel2.ResumeLayout(false); - this.groupPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); + this.superTabControlPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.groupPanel1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormHor.resx b/FormAnalysis/FormHor.resx index 1af7de1..14d0c54 100644 --- a/FormAnalysis/FormHor.resx +++ b/FormAnalysis/FormHor.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 365, 17 + + + 175, 17 + + + 555, 17 + + + 682, 17 + + + 789, 17 + + + 884, 17 + + + 1005, 17 + + + 1144, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormVer.Designer.cs b/FormAnalysis/FormVer.Designer.cs index 7b231e0..17872e8 100644 --- a/FormAnalysis/FormVer.Designer.cs +++ b/FormAnalysis/FormVer.Designer.cs @@ -28,34 +28,34 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.textBoxJJBZ = new DevComponents.DotNetBar.Controls.TextBoxX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); this.superTabControlPanel1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +63,7 @@ this.groupPanel1.Controls.Add(this.textBoxJJBZ); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(-1, 1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(691, 94); // @@ -86,7 +86,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +97,19 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "垂直净距审核"; + this.groupPanel1.Text = "垂直净距审查"; + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(482, 21); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 26); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 8; + this.buttonX1.Text = "导出EXCEL"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); // // labelX1 // @@ -193,6 +204,27 @@ this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.superTabItem1; // + // dataGridViewX1 + // + this.dataGridViewX1.AllowUserToAddRows = false; + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(693, 285); + this.dataGridViewX1.TabIndex = 0; + this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); + // // superTabItem1 // this.superTabItem1.AttachedControl = this.superTabControlPanel1; @@ -204,12 +236,33 @@ // this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(693, 285); + this.superTabControlPanel2.Size = new System.Drawing.Size(693, 313); this.superTabControlPanel2.TabIndex = 0; this.superTabControlPanel2.TabItem = this.superTabItem2; // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(693, 313); + this.dataGridViewX2.TabIndex = 0; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // // superTabItem2 // this.superTabItem2.AttachedControl = this.superTabControlPanel2; @@ -217,60 +270,6 @@ this.superTabItem2.Name = "superTabItem2"; this.superTabItem2.Text = "审查结果"; // - // dataGridViewX1 - // - this.dataGridViewX1.AllowUserToAddRows = false; - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; - this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(693, 285); - this.dataGridViewX1.TabIndex = 0; - this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(693, 285); - this.dataGridViewX2.TabIndex = 0; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // buttonX1 - // - this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonX1.Location = new System.Drawing.Point(482, 21); - this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(75, 26); - this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonX1.TabIndex = 8; - this.buttonX1.Text = "导出EXCEL"; - this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); - // // FormVer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -282,14 +281,14 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormVer"; - this.Text = "垂直净距分析"; + this.Text = "垂直净距审查"; this.Load += new System.EventHandler(this.FormVer_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); this.superTabControlPanel1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); diff --git a/FormAnalysis/FormVer.resx b/FormAnalysis/FormVer.resx index 1af7de1..c8c4905 100644 --- a/FormAnalysis/FormVer.resx +++ b/FormAnalysis/FormVer.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 144, 17 + + + 251, 17 + + + 346, 17 + + + 467, 17 + + + 606, 17 + + + 716, 17 + + + 874, 17 + + + 1064, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormFT.Designer.cs b/FormAnalysis/FormFT.Designer.cs index 2e30bd4..2f4dcea 100644 --- a/FormAnalysis/FormFT.Designer.cs +++ b/FormAnalysis/FormFT.Designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); @@ -37,25 +37,23 @@ this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.superTabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +61,7 @@ this.groupPanel1.Controls.Add(this.textBoxFTSD); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(1, -1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(685, 94); // @@ -86,7 +84,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +95,7 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "覆土审核"; + this.groupPanel1.Text = "覆土审查"; // // buttonX1 // @@ -150,7 +147,6 @@ this.buttonExpCAD.TabIndex = 5; this.buttonExpCAD.Text = "导出CAD"; this.buttonExpCAD.Visible = false; - //this.buttonExpCAD.Click += new System.EventHandler(this.buttonExpCAD_Click); // // buttonOK // @@ -196,44 +192,6 @@ this.superTabItem2}); this.superTabControl1.Text = "superTabControl1"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -248,14 +206,14 @@ // this.dataGridViewX1.AllowUserToAddRows = false; this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); @@ -272,6 +230,44 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // FormFT // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -283,15 +279,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormFT"; - this.Text = "覆土审核"; + this.Text = "覆土审查"; this.Load += new System.EventHandler(this.FormFT_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.superTabControlPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormFT.resx b/FormAnalysis/FormFT.resx index 1af7de1..94904f3 100644 --- a/FormAnalysis/FormFT.resx +++ b/FormAnalysis/FormFT.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 144, 17 + + + 251, 17 + + + 346, 17 + + + 472, 17 + + + 611, 17 + + + 721, 17 + + + 879, 17 + + + 1069, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormHor.Designer.cs b/FormAnalysis/FormHor.Designer.cs index ce20f03..e21efd1 100644 --- a/FormAnalysis/FormHor.Designer.cs +++ b/FormAnalysis/FormHor.Designer.cs @@ -28,28 +28,28 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.textBoxJJBZ = new DevComponents.DotNetBar.Controls.TextBoxX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel1.SuspendLayout(); this.superTabControlPanel2.SuspendLayout(); - this.groupPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); + this.superTabControlPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.groupPanel1.SuspendLayout(); this.SuspendLayout(); // // superTabControl1 @@ -69,8 +69,8 @@ this.superTabControl1.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabControl1.ControlBox.MenuBox, this.superTabControl1.ControlBox.CloseBox}); - this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Controls.Add(this.superTabControlPanel1); + this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Location = new System.Drawing.Point(0, 103); this.superTabControl1.Name = "superTabControl1"; this.superTabControl1.ReorderTabsEnabled = true; @@ -84,6 +84,44 @@ this.superTabItem2}); this.superTabControl1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(686, 291); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(686, 291); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -94,6 +132,27 @@ this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.superTabItem1; // + // dataGridViewX1 + // + this.dataGridViewX1.AllowUserToAddRows = false; + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); + this.dataGridViewX1.TabIndex = 0; + this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); + // // superTabItem1 // this.superTabItem1.AttachedControl = this.superTabControlPanel1; @@ -101,27 +160,10 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(686, 263); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -152,7 +194,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -164,7 +205,19 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "水平净距"; + this.groupPanel1.Text = "水平净距审查"; + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(483, 21); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 26); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 8; + this.buttonX1.Text = "导出EXCEL"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); // // labelX1 // @@ -217,60 +270,6 @@ this.buttonOK.Text = "开始分析"; this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); // - // dataGridViewX1 - // - this.dataGridViewX1.AllowUserToAddRows = false; - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX1.TabIndex = 0; - this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // buttonX1 - // - this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonX1.Location = new System.Drawing.Point(483, 21); - this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(75, 26); - this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonX1.TabIndex = 8; - this.buttonX1.Text = "导出EXCEL"; - this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); - // // FormHor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -282,15 +281,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormHor"; - this.Text = "水平净距"; + this.Text = "水平净距审查"; this.Load += new System.EventHandler(this.FormHor_Load); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel1.ResumeLayout(false); this.superTabControlPanel2.ResumeLayout(false); - this.groupPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); + this.superTabControlPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.groupPanel1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormHor.resx b/FormAnalysis/FormHor.resx index 1af7de1..14d0c54 100644 --- a/FormAnalysis/FormHor.resx +++ b/FormAnalysis/FormHor.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 365, 17 + + + 175, 17 + + + 555, 17 + + + 682, 17 + + + 789, 17 + + + 884, 17 + + + 1005, 17 + + + 1144, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormVer.Designer.cs b/FormAnalysis/FormVer.Designer.cs index 7b231e0..17872e8 100644 --- a/FormAnalysis/FormVer.Designer.cs +++ b/FormAnalysis/FormVer.Designer.cs @@ -28,34 +28,34 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.textBoxJJBZ = new DevComponents.DotNetBar.Controls.TextBoxX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); this.superTabControlPanel1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +63,7 @@ this.groupPanel1.Controls.Add(this.textBoxJJBZ); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(-1, 1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(691, 94); // @@ -86,7 +86,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +97,19 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "垂直净距审核"; + this.groupPanel1.Text = "垂直净距审查"; + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(482, 21); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 26); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 8; + this.buttonX1.Text = "导出EXCEL"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); // // labelX1 // @@ -193,6 +204,27 @@ this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.superTabItem1; // + // dataGridViewX1 + // + this.dataGridViewX1.AllowUserToAddRows = false; + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(693, 285); + this.dataGridViewX1.TabIndex = 0; + this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); + // // superTabItem1 // this.superTabItem1.AttachedControl = this.superTabControlPanel1; @@ -204,12 +236,33 @@ // this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(693, 285); + this.superTabControlPanel2.Size = new System.Drawing.Size(693, 313); this.superTabControlPanel2.TabIndex = 0; this.superTabControlPanel2.TabItem = this.superTabItem2; // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(693, 313); + this.dataGridViewX2.TabIndex = 0; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // // superTabItem2 // this.superTabItem2.AttachedControl = this.superTabControlPanel2; @@ -217,60 +270,6 @@ this.superTabItem2.Name = "superTabItem2"; this.superTabItem2.Text = "审查结果"; // - // dataGridViewX1 - // - this.dataGridViewX1.AllowUserToAddRows = false; - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; - this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(693, 285); - this.dataGridViewX1.TabIndex = 0; - this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(693, 285); - this.dataGridViewX2.TabIndex = 0; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // buttonX1 - // - this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonX1.Location = new System.Drawing.Point(482, 21); - this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(75, 26); - this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonX1.TabIndex = 8; - this.buttonX1.Text = "导出EXCEL"; - this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); - // // FormVer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -282,14 +281,14 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormVer"; - this.Text = "垂直净距分析"; + this.Text = "垂直净距审查"; this.Load += new System.EventHandler(this.FormVer_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); this.superTabControlPanel1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); diff --git a/FormAnalysis/FormVer.resx b/FormAnalysis/FormVer.resx index 1af7de1..c8c4905 100644 --- a/FormAnalysis/FormVer.resx +++ b/FormAnalysis/FormVer.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 144, 17 + + + 251, 17 + + + 346, 17 + + + 467, 17 + + + 606, 17 + + + 716, 17 + + + 874, 17 + + + 1064, 17 + \ No newline at end of file diff --git a/FormAnalysis/FrmAnalysis.Designer.cs b/FormAnalysis/FrmAnalysis.Designer.cs index 67d7721..ca85e01 100644 --- a/FormAnalysis/FrmAnalysis.Designer.cs +++ b/FormAnalysis/FrmAnalysis.Designer.cs @@ -28,38 +28,38 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.superTabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(2, -2); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(691, 94); // @@ -82,7 +82,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -94,7 +93,7 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 2; - this.groupPanel1.Text = "碰撞审核"; + this.groupPanel1.Text = "碰撞审查"; // // buttonX1 // @@ -149,8 +148,8 @@ this.superTabControl1.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabControl1.ControlBox.MenuBox, this.superTabControl1.ControlBox.CloseBox}); - this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Controls.Add(this.superTabControlPanel1); + this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Location = new System.Drawing.Point(2, 98); this.superTabControl1.Name = "superTabControl1"; this.superTabControl1.ReorderTabsEnabled = true; @@ -164,44 +163,6 @@ this.superTabItem2}); this.superTabControl1.Text = "superTabControl1"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(693, 285); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(693, 285); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审查结果"; - // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -216,14 +177,14 @@ // this.dataGridViewX1.AllowUserToAddRows = false; this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); @@ -240,6 +201,44 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "待审查管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(693, 313); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(693, 313); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审查结果"; + // // FrmAnalysis // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -253,15 +252,15 @@ this.MinimizeBox = false; this.Name = "FrmAnalysis"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "审核"; + this.Text = "碰撞审查"; this.Load += new System.EventHandler(this.FrmAnalysis_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.superTabControlPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormFT.Designer.cs b/FormAnalysis/FormFT.Designer.cs index 2e30bd4..2f4dcea 100644 --- a/FormAnalysis/FormFT.Designer.cs +++ b/FormAnalysis/FormFT.Designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); @@ -37,25 +37,23 @@ this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.superTabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +61,7 @@ this.groupPanel1.Controls.Add(this.textBoxFTSD); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(1, -1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(685, 94); // @@ -86,7 +84,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +95,7 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "覆土审核"; + this.groupPanel1.Text = "覆土审查"; // // buttonX1 // @@ -150,7 +147,6 @@ this.buttonExpCAD.TabIndex = 5; this.buttonExpCAD.Text = "导出CAD"; this.buttonExpCAD.Visible = false; - //this.buttonExpCAD.Click += new System.EventHandler(this.buttonExpCAD_Click); // // buttonOK // @@ -196,44 +192,6 @@ this.superTabItem2}); this.superTabControl1.Text = "superTabControl1"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -248,14 +206,14 @@ // this.dataGridViewX1.AllowUserToAddRows = false; this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); @@ -272,6 +230,44 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(691, 302); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(691, 302); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // FormFT // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -283,15 +279,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormFT"; - this.Text = "覆土审核"; + this.Text = "覆土审查"; this.Load += new System.EventHandler(this.FormFT_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.superTabControlPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormFT.resx b/FormAnalysis/FormFT.resx index 1af7de1..94904f3 100644 --- a/FormAnalysis/FormFT.resx +++ b/FormAnalysis/FormFT.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 144, 17 + + + 251, 17 + + + 346, 17 + + + 472, 17 + + + 611, 17 + + + 721, 17 + + + 879, 17 + + + 1069, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormHor.Designer.cs b/FormAnalysis/FormHor.Designer.cs index ce20f03..e21efd1 100644 --- a/FormAnalysis/FormHor.Designer.cs +++ b/FormAnalysis/FormHor.Designer.cs @@ -28,28 +28,28 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.textBoxJJBZ = new DevComponents.DotNetBar.Controls.TextBoxX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel1.SuspendLayout(); this.superTabControlPanel2.SuspendLayout(); - this.groupPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); + this.superTabControlPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.groupPanel1.SuspendLayout(); this.SuspendLayout(); // // superTabControl1 @@ -69,8 +69,8 @@ this.superTabControl1.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabControl1.ControlBox.MenuBox, this.superTabControl1.ControlBox.CloseBox}); - this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Controls.Add(this.superTabControlPanel1); + this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Location = new System.Drawing.Point(0, 103); this.superTabControl1.Name = "superTabControl1"; this.superTabControl1.ReorderTabsEnabled = true; @@ -84,6 +84,44 @@ this.superTabItem2}); this.superTabControl1.Text = "审核管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(686, 291); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(686, 291); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审核结果"; + // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -94,6 +132,27 @@ this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.superTabItem1; // + // dataGridViewX1 + // + this.dataGridViewX1.AllowUserToAddRows = false; + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); + this.dataGridViewX1.TabIndex = 0; + this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); + // // superTabItem1 // this.superTabItem1.AttachedControl = this.superTabControlPanel1; @@ -101,27 +160,10 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "审核管段"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(686, 263); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审核结果"; - // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -152,7 +194,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -164,7 +205,19 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "水平净距"; + this.groupPanel1.Text = "水平净距审查"; + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(483, 21); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 26); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 8; + this.buttonX1.Text = "导出EXCEL"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); // // labelX1 // @@ -217,60 +270,6 @@ this.buttonOK.Text = "开始分析"; this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); // - // dataGridViewX1 - // - this.dataGridViewX1.AllowUserToAddRows = false; - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX1.TabIndex = 0; - this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(686, 263); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // buttonX1 - // - this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonX1.Location = new System.Drawing.Point(483, 21); - this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(75, 26); - this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonX1.TabIndex = 8; - this.buttonX1.Text = "导出EXCEL"; - this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); - // // FormHor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -282,15 +281,15 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormHor"; - this.Text = "水平净距"; + this.Text = "水平净距审查"; this.Load += new System.EventHandler(this.FormHor_Load); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel1.ResumeLayout(false); this.superTabControlPanel2.ResumeLayout(false); - this.groupPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); + this.superTabControlPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.groupPanel1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/FormAnalysis/FormHor.resx b/FormAnalysis/FormHor.resx index 1af7de1..14d0c54 100644 --- a/FormAnalysis/FormHor.resx +++ b/FormAnalysis/FormHor.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 365, 17 + + + 175, 17 + + + 555, 17 + + + 682, 17 + + + 789, 17 + + + 884, 17 + + + 1005, 17 + + + 1144, 17 + \ No newline at end of file diff --git a/FormAnalysis/FormVer.Designer.cs b/FormAnalysis/FormVer.Designer.cs index 7b231e0..17872e8 100644 --- a/FormAnalysis/FormVer.Designer.cs +++ b/FormAnalysis/FormVer.Designer.cs @@ -28,34 +28,34 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.textBoxJJBZ = new DevComponents.DotNetBar.Controls.TextBoxX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); this.superTabControlPanel1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); @@ -63,7 +63,7 @@ this.groupPanel1.Controls.Add(this.textBoxJJBZ); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(-1, 1); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(691, 94); // @@ -86,7 +86,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -98,7 +97,19 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 3; - this.groupPanel1.Text = "垂直净距审核"; + this.groupPanel1.Text = "垂直净距审查"; + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(482, 21); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 26); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 8; + this.buttonX1.Text = "导出EXCEL"; + this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); // // labelX1 // @@ -193,6 +204,27 @@ this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.superTabItem1; // + // dataGridViewX1 + // + this.dataGridViewX1.AllowUserToAddRows = false; + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(693, 285); + this.dataGridViewX1.TabIndex = 0; + this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); + // // superTabItem1 // this.superTabItem1.AttachedControl = this.superTabControlPanel1; @@ -204,12 +236,33 @@ // this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(693, 285); + this.superTabControlPanel2.Size = new System.Drawing.Size(693, 313); this.superTabControlPanel2.TabIndex = 0; this.superTabControlPanel2.TabItem = this.superTabItem2; // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(693, 313); + this.dataGridViewX2.TabIndex = 0; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // // superTabItem2 // this.superTabItem2.AttachedControl = this.superTabControlPanel2; @@ -217,60 +270,6 @@ this.superTabItem2.Name = "superTabItem2"; this.superTabItem2.Text = "审查结果"; // - // dataGridViewX1 - // - this.dataGridViewX1.AllowUserToAddRows = false; - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle3; - this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(693, 285); - this.dataGridViewX1.TabIndex = 0; - this.dataGridViewX1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX1_MouseDoubleClick); - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle4; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(693, 285); - this.dataGridViewX2.TabIndex = 0; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // buttonX1 - // - this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonX1.Location = new System.Drawing.Point(482, 21); - this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(75, 26); - this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonX1.TabIndex = 8; - this.buttonX1.Text = "导出EXCEL"; - this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); - // // FormVer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -282,14 +281,14 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormVer"; - this.Text = "垂直净距分析"; + this.Text = "垂直净距审查"; this.Load += new System.EventHandler(this.FormVer_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); this.superTabControlPanel1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); diff --git a/FormAnalysis/FormVer.resx b/FormAnalysis/FormVer.resx index 1af7de1..c8c4905 100644 --- a/FormAnalysis/FormVer.resx +++ b/FormAnalysis/FormVer.resx @@ -117,4 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 144, 17 + + + 251, 17 + + + 346, 17 + + + 467, 17 + + + 606, 17 + + + 716, 17 + + + 874, 17 + + + 1064, 17 + \ No newline at end of file diff --git a/FormAnalysis/FrmAnalysis.Designer.cs b/FormAnalysis/FrmAnalysis.Designer.cs index 67d7721..ca85e01 100644 --- a/FormAnalysis/FrmAnalysis.Designer.cs +++ b/FormAnalysis/FrmAnalysis.Designer.cs @@ -28,38 +28,38 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.buttonExpCAD = new DevComponents.DotNetBar.ButtonX(); this.buttonOK = new DevComponents.DotNetBar.ButtonX(); this.superTabControl1 = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.superTabItem1 = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.groupPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).BeginInit(); this.superTabControl1.SuspendLayout(); - this.superTabControlPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.superTabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.superTabControlPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // groupPanel1 // - this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupPanel1.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.buttonX1); this.groupPanel1.Controls.Add(this.buttonExpCAD); this.groupPanel1.Controls.Add(this.buttonOK); - this.groupPanel1.Location = new System.Drawing.Point(2, -2); + this.groupPanel1.Location = new System.Drawing.Point(0, 3); this.groupPanel1.Name = "groupPanel1"; this.groupPanel1.Size = new System.Drawing.Size(691, 94); // @@ -82,7 +82,6 @@ this.groupPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.groupPanel1.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; this.groupPanel1.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel1.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; // // // @@ -94,7 +93,7 @@ this.groupPanel1.StyleMouseOver.Class = ""; this.groupPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanel1.TabIndex = 2; - this.groupPanel1.Text = "碰撞审核"; + this.groupPanel1.Text = "碰撞审查"; // // buttonX1 // @@ -149,8 +148,8 @@ this.superTabControl1.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabControl1.ControlBox.MenuBox, this.superTabControl1.ControlBox.CloseBox}); - this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Controls.Add(this.superTabControlPanel1); + this.superTabControl1.Controls.Add(this.superTabControlPanel2); this.superTabControl1.Location = new System.Drawing.Point(2, 98); this.superTabControl1.Name = "superTabControl1"; this.superTabControl1.ReorderTabsEnabled = true; @@ -164,44 +163,6 @@ this.superTabItem2}); this.superTabControl1.Text = "superTabControl1"; // - // superTabControlPanel2 - // - this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); - this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel2.Location = new System.Drawing.Point(0, 28); - this.superTabControlPanel2.Name = "superTabControlPanel2"; - this.superTabControlPanel2.Size = new System.Drawing.Size(693, 285); - this.superTabControlPanel2.TabIndex = 0; - this.superTabControlPanel2.TabItem = this.superTabItem2; - // - // dataGridViewX2 - // - this.dataGridViewX2.AllowUserToAddRows = false; - this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(693, 285); - this.dataGridViewX2.TabIndex = 1; - this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); - // - // superTabItem2 - // - this.superTabItem2.AttachedControl = this.superTabControlPanel2; - this.superTabItem2.GlobalItem = false; - this.superTabItem2.Name = "superTabItem2"; - this.superTabItem2.Text = "审查结果"; - // // superTabControlPanel1 // this.superTabControlPanel1.Controls.Add(this.dataGridViewX1); @@ -216,14 +177,14 @@ // this.dataGridViewX1.AllowUserToAddRows = false; this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; this.dataGridViewX1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); @@ -240,6 +201,44 @@ this.superTabItem1.Name = "superTabItem1"; this.superTabItem1.Text = "待审查管段"; // + // superTabControlPanel2 + // + this.superTabControlPanel2.Controls.Add(this.dataGridViewX2); + this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel2.Location = new System.Drawing.Point(0, 0); + this.superTabControlPanel2.Name = "superTabControlPanel2"; + this.superTabControlPanel2.Size = new System.Drawing.Size(693, 313); + this.superTabControlPanel2.TabIndex = 0; + this.superTabControlPanel2.TabItem = this.superTabItem2; + // + // dataGridViewX2 + // + this.dataGridViewX2.AllowUserToAddRows = false; + this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle6; + this.dataGridViewX2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX2.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX2.Name = "dataGridViewX2"; + this.dataGridViewX2.RowTemplate.Height = 23; + this.dataGridViewX2.Size = new System.Drawing.Size(693, 313); + this.dataGridViewX2.TabIndex = 1; + this.dataGridViewX2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX2_MouseDoubleClick); + // + // superTabItem2 + // + this.superTabItem2.AttachedControl = this.superTabControlPanel2; + this.superTabItem2.GlobalItem = false; + this.superTabItem2.Name = "superTabItem2"; + this.superTabItem2.Text = "审查结果"; + // // FrmAnalysis // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -253,15 +252,15 @@ this.MinimizeBox = false; this.Name = "FrmAnalysis"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "审核"; + this.Text = "碰撞审查"; this.Load += new System.EventHandler(this.FrmAnalysis_Load); this.groupPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabControl1)).EndInit(); this.superTabControl1.ResumeLayout(false); - this.superTabControlPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.superTabControlPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.superTabControlPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); } diff --git a/FormAnalysis/FrmAnalysis.resx b/FormAnalysis/FrmAnalysis.resx index 1af7de1..022182d 100644 --- a/FormAnalysis/FrmAnalysis.resx +++ b/FormAnalysis/FrmAnalysis.resx @@ -117,4 +117,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 144, 17 + + + 251, 17 + + + 390, 17 + + + 500, 17 + + + 848, 17 + + + 658, 17 + \ No newline at end of file