diff --git a/全自动水压检测仪/Coeffiicientsetting.Designer.cs b/全自动水压检测仪/Coeffiicientsetting.Designer.cs index bdb99af..cc3de50 100644 --- a/全自动水压检测仪/Coeffiicientsetting.Designer.cs +++ b/全自动水压检测仪/Coeffiicientsetting.Designer.cs @@ -58,14 +58,9 @@ this.uiTextBox17 = new Sunny.UI.UITextBox(); this.uiLabel17 = new Sunny.UI.UILabel(); this.uiTableLayoutPanel2 = new Sunny.UI.UITableLayoutPanel(); - this.uiPanel5 = new Sunny.UI.UIPanel(); - this.uiTextBox4 = new Sunny.UI.UITextBox(); - this.uiLabel4 = new Sunny.UI.UILabel(); + this.uiPanel3 = new Sunny.UI.UIPanel(); this.uiTextBox3 = new Sunny.UI.UITextBox(); this.uiLabel3 = new Sunny.UI.UILabel(); - this.uiPanel3 = new Sunny.UI.UIPanel(); - this.uiTextBox2 = new Sunny.UI.UITextBox(); - this.uiLabel2 = new Sunny.UI.UILabel(); this.uiTextBox1 = new Sunny.UI.UITextBox(); this.uiLabel1 = new Sunny.UI.UILabel(); this.uiGroupBox3 = new Sunny.UI.UIGroupBox(); @@ -94,6 +89,8 @@ this.uiButton3 = new Sunny.UI.UIButton(); this.uiButton2 = new Sunny.UI.UIButton(); this.uiButton1 = new Sunny.UI.UIButton(); + this.uiTextBox2 = new Sunny.UI.UITextBox(); + this.uiLabel2 = new Sunny.UI.UILabel(); this.uiTableLayoutPanel1.SuspendLayout(); this.uiGroupBox4.SuspendLayout(); this.uiTableLayoutPanel7.SuspendLayout(); @@ -109,7 +106,6 @@ this.uiPanel2.SuspendLayout(); this.uiGroupBox1.SuspendLayout(); this.uiTableLayoutPanel2.SuspendLayout(); - this.uiPanel5.SuspendLayout(); this.uiPanel3.SuspendLayout(); this.uiGroupBox3.SuspendLayout(); this.uiTableLayoutPanel4.SuspendLayout(); @@ -155,7 +151,7 @@ // this.uiGroupBox4.Controls.Add(this.uiTableLayoutPanel7); this.uiGroupBox4.FillColor = System.Drawing.Color.White; - this.uiGroupBox4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiGroupBox4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiGroupBox4.Location = new System.Drawing.Point(5, 291); this.uiGroupBox4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiGroupBox4.MinimumSize = new System.Drawing.Size(1, 1); @@ -223,13 +219,13 @@ // // uiLabel13 // - this.uiLabel13.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel13.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel13.Location = new System.Drawing.Point(10, 4); this.uiLabel13.Name = "uiLabel13"; this.uiLabel13.Size = new System.Drawing.Size(150, 35); this.uiLabel13.TabIndex = 0; - this.uiLabel13.Text = "设置排空时间:"; + this.uiLabel13.Text = "设置排空时间(s):"; this.uiLabel13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // uiPanel17 @@ -269,13 +265,13 @@ // // uiLabel14 // - this.uiLabel14.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel14.Location = new System.Drawing.Point(35, 4); this.uiLabel14.Name = "uiLabel14"; this.uiLabel14.Size = new System.Drawing.Size(146, 35); this.uiLabel14.TabIndex = 0; - this.uiLabel14.Text = "设置稳压时间:"; + this.uiLabel14.Text = "设置稳压时间(s):"; this.uiLabel14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // uiPanel18 @@ -315,13 +311,13 @@ // // uiLabel15 // - this.uiLabel15.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel15.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.uiLabel15.Location = new System.Drawing.Point(28, 4); + this.uiLabel15.Location = new System.Drawing.Point(18, 5); this.uiLabel15.Name = "uiLabel15"; this.uiLabel15.Size = new System.Drawing.Size(146, 35); this.uiLabel15.TabIndex = 0; - this.uiLabel15.Text = "设置通水时间:"; + this.uiLabel15.Text = "设置通水时间(s):"; this.uiLabel15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // uiPanel7 @@ -345,7 +341,7 @@ this.uiGroupBox2.Controls.Add(this.uiTableLayoutPanel3); this.uiGroupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.uiGroupBox2.FillColor = System.Drawing.Color.White; - this.uiGroupBox2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiGroupBox2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiGroupBox2.Location = new System.Drawing.Point(3, 3); this.uiGroupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiGroupBox2.MinimumSize = new System.Drawing.Size(1, 1); @@ -412,13 +408,13 @@ // // uiLabel16 // - this.uiLabel16.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel16.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel16.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.uiLabel16.Location = new System.Drawing.Point(64, 0); + this.uiLabel16.Location = new System.Drawing.Point(46, 0); this.uiLabel16.Name = "uiLabel16"; - this.uiLabel16.Size = new System.Drawing.Size(150, 35); + this.uiLabel16.Size = new System.Drawing.Size(138, 35); this.uiLabel16.TabIndex = 0; - this.uiLabel16.Text = "设置温度:"; + this.uiLabel16.Text = "设置温度(°C):"; this.uiLabel16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // uiPanel9 @@ -458,7 +454,7 @@ // // uiLabel6 // - this.uiLabel6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel6.Location = new System.Drawing.Point(10, 0); this.uiLabel6.Name = "uiLabel6"; @@ -503,7 +499,7 @@ // // uiLabel8 // - this.uiLabel8.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel8.Location = new System.Drawing.Point(28, 0); this.uiLabel8.Name = "uiLabel8"; @@ -515,7 +511,7 @@ // uiPanel1 // this.uiPanel1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.uiPanel1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiPanel1.ForeColor = System.Drawing.Color.White; this.uiPanel1.Location = new System.Drawing.Point(5, 6); this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -544,12 +540,10 @@ // // uiGroupBox1 // - this.uiGroupBox1.Controls.Add(this.uiTextBox17); - this.uiGroupBox1.Controls.Add(this.uiLabel17); this.uiGroupBox1.Controls.Add(this.uiTableLayoutPanel2); this.uiGroupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.uiGroupBox1.FillColor = System.Drawing.Color.White; - this.uiGroupBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiGroupBox1.Location = new System.Drawing.Point(3, 3); this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1); @@ -566,7 +560,7 @@ this.uiTextBox17.Cursor = System.Windows.Forms.Cursors.IBeam; this.uiTextBox17.FillColor = System.Drawing.Color.Yellow; this.uiTextBox17.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiTextBox17.Location = new System.Drawing.Point(802, 36); + this.uiTextBox17.Location = new System.Drawing.Point(516, 0); this.uiTextBox17.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiTextBox17.MinimumSize = new System.Drawing.Size(1, 16); this.uiTextBox17.Name = "uiTextBox17"; @@ -581,9 +575,9 @@ // // uiLabel17 // - this.uiLabel17.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel17.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.uiLabel17.Location = new System.Drawing.Point(685, 42); + this.uiLabel17.Location = new System.Drawing.Point(419, 7); this.uiLabel17.Name = "uiLabel17"; this.uiLabel17.Size = new System.Drawing.Size(124, 36); this.uiLabel17.TabIndex = 3; @@ -593,72 +587,46 @@ // this.uiTableLayoutPanel2.ColumnCount = 1; this.uiTableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.uiTableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.uiTableLayoutPanel2.Controls.Add(this.uiPanel5, 0, 1); this.uiTableLayoutPanel2.Controls.Add(this.uiPanel3, 0, 0); this.uiTableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; this.uiTableLayoutPanel2.Location = new System.Drawing.Point(2, 32); this.uiTableLayoutPanel2.Name = "uiTableLayoutPanel2"; - this.uiTableLayoutPanel2.RowCount = 2; - this.uiTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.uiTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.uiTableLayoutPanel2.RowCount = 1; + this.uiTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.uiTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.uiTableLayoutPanel2.Size = new System.Drawing.Size(976, 93); this.uiTableLayoutPanel2.TabIndex = 0; this.uiTableLayoutPanel2.TagString = null; // - // uiPanel5 + // uiPanel3 // - this.uiPanel5.Controls.Add(this.uiTextBox4); - this.uiPanel5.Controls.Add(this.uiLabel4); - this.uiPanel5.Controls.Add(this.uiTextBox3); - this.uiPanel5.Controls.Add(this.uiLabel3); - this.uiPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.uiPanel5.FillColor = System.Drawing.Color.White; - this.uiPanel5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiPanel5.Location = new System.Drawing.Point(4, 51); - this.uiPanel5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.uiPanel5.MinimumSize = new System.Drawing.Size(1, 1); - this.uiPanel5.Name = "uiPanel5"; - this.uiPanel5.RectColor = System.Drawing.Color.White; - this.uiPanel5.Size = new System.Drawing.Size(968, 37); - this.uiPanel5.TabIndex = 2; - this.uiPanel5.Text = null; - this.uiPanel5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - // - // uiTextBox4 - // - this.uiTextBox4.Cursor = System.Windows.Forms.Cursors.IBeam; - this.uiTextBox4.FillColor = System.Drawing.Color.Yellow; - this.uiTextBox4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiTextBox4.Location = new System.Drawing.Point(509, 0); - this.uiTextBox4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.uiTextBox4.MinimumSize = new System.Drawing.Size(1, 16); - this.uiTextBox4.Name = "uiTextBox4"; - this.uiTextBox4.Padding = new System.Windows.Forms.Padding(5); - this.uiTextBox4.ShowText = false; - this.uiTextBox4.Size = new System.Drawing.Size(120, 35); - this.uiTextBox4.TabIndex = 1; - this.uiTextBox4.Text = "0.00"; - this.uiTextBox4.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiTextBox4.Watermark = ""; - this.uiTextBox4.Click += new System.EventHandler(this.uiTextBox4_Click); - // - // uiLabel4 - // - this.uiLabel4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiLabel4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.uiLabel4.Location = new System.Drawing.Point(343, 8); - this.uiLabel4.Name = "uiLabel4"; - this.uiLabel4.Size = new System.Drawing.Size(171, 35); - this.uiLabel4.TabIndex = 0; - this.uiLabel4.Text = "设置压力下限:"; + this.uiPanel3.Controls.Add(this.uiTextBox17); + this.uiPanel3.Controls.Add(this.uiLabel17); + this.uiPanel3.Controls.Add(this.uiTextBox2); + this.uiPanel3.Controls.Add(this.uiLabel2); + this.uiPanel3.Controls.Add(this.uiTextBox3); + this.uiPanel3.Controls.Add(this.uiLabel3); + this.uiPanel3.Controls.Add(this.uiTextBox1); + this.uiPanel3.Controls.Add(this.uiLabel1); + this.uiPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.uiPanel3.FillColor = System.Drawing.Color.White; + this.uiPanel3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiPanel3.Location = new System.Drawing.Point(4, 5); + this.uiPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.uiPanel3.MinimumSize = new System.Drawing.Size(1, 1); + this.uiPanel3.Name = "uiPanel3"; + this.uiPanel3.RectColor = System.Drawing.Color.White; + this.uiPanel3.Size = new System.Drawing.Size(968, 83); + this.uiPanel3.TabIndex = 0; + this.uiPanel3.Text = null; + this.uiPanel3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // uiTextBox3 // this.uiTextBox3.Cursor = System.Windows.Forms.Cursors.IBeam; this.uiTextBox3.FillColor = System.Drawing.Color.Yellow; this.uiTextBox3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiTextBox3.Location = new System.Drawing.Point(180, 0); + this.uiTextBox3.Location = new System.Drawing.Point(180, 43); this.uiTextBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiTextBox3.MinimumSize = new System.Drawing.Size(1, 16); this.uiTextBox3.Name = "uiTextBox3"; @@ -673,61 +641,14 @@ // // uiLabel3 // - this.uiLabel3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.uiLabel3.Location = new System.Drawing.Point(15, 8); + this.uiLabel3.Location = new System.Drawing.Point(15, 48); this.uiLabel3.Name = "uiLabel3"; this.uiLabel3.Size = new System.Drawing.Size(150, 35); this.uiLabel3.TabIndex = 0; this.uiLabel3.Text = "设置压力保护输入:"; // - // uiPanel3 - // - this.uiPanel3.Controls.Add(this.uiTextBox2); - this.uiPanel3.Controls.Add(this.uiLabel2); - this.uiPanel3.Controls.Add(this.uiTextBox1); - this.uiPanel3.Controls.Add(this.uiLabel1); - this.uiPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.uiPanel3.FillColor = System.Drawing.Color.White; - this.uiPanel3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiPanel3.Location = new System.Drawing.Point(4, 5); - this.uiPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.uiPanel3.MinimumSize = new System.Drawing.Size(1, 1); - this.uiPanel3.Name = "uiPanel3"; - this.uiPanel3.RectColor = System.Drawing.Color.White; - this.uiPanel3.Size = new System.Drawing.Size(968, 36); - this.uiPanel3.TabIndex = 0; - this.uiPanel3.Text = null; - this.uiPanel3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - // - // uiTextBox2 - // - this.uiTextBox2.Cursor = System.Windows.Forms.Cursors.IBeam; - this.uiTextBox2.FillColor = System.Drawing.Color.Yellow; - this.uiTextBox2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiTextBox2.Location = new System.Drawing.Point(509, 0); - this.uiTextBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.uiTextBox2.MinimumSize = new System.Drawing.Size(1, 16); - this.uiTextBox2.Name = "uiTextBox2"; - this.uiTextBox2.Padding = new System.Windows.Forms.Padding(5); - this.uiTextBox2.ShowText = false; - this.uiTextBox2.Size = new System.Drawing.Size(120, 35); - this.uiTextBox2.TabIndex = 1; - this.uiTextBox2.Text = "0.00"; - this.uiTextBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiTextBox2.Watermark = ""; - this.uiTextBox2.Click += new System.EventHandler(this.uiTextBox2_Click); - // - // uiLabel2 - // - this.uiLabel2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.uiLabel2.Location = new System.Drawing.Point(343, 7); - this.uiLabel2.Name = "uiLabel2"; - this.uiLabel2.Size = new System.Drawing.Size(163, 36); - this.uiLabel2.TabIndex = 0; - this.uiLabel2.Text = "设置压力上限:"; - // // uiTextBox1 // this.uiTextBox1.Cursor = System.Windows.Forms.Cursors.IBeam; @@ -748,7 +669,7 @@ // // uiLabel1 // - this.uiLabel1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel1.Location = new System.Drawing.Point(15, 8); this.uiLabel1.Name = "uiLabel1"; @@ -760,7 +681,7 @@ // this.uiGroupBox3.Controls.Add(this.uiTableLayoutPanel4); this.uiGroupBox3.FillColor = System.Drawing.Color.White; - this.uiGroupBox3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiGroupBox3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiGroupBox3.Location = new System.Drawing.Point(5, 393); this.uiGroupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiGroupBox3.MinimumSize = new System.Drawing.Size(1, 1); @@ -845,7 +766,7 @@ // // uiLabel5 // - this.uiLabel5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel5.Location = new System.Drawing.Point(77, 7); this.uiLabel5.Name = "uiLabel5"; @@ -890,7 +811,7 @@ // // uiLabel11 // - this.uiLabel11.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel11.Location = new System.Drawing.Point(77, 7); this.uiLabel11.Name = "uiLabel11"; @@ -935,7 +856,7 @@ // // uiLabel12 // - this.uiLabel12.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel12.Location = new System.Drawing.Point(77, 8); this.uiLabel12.Name = "uiLabel12"; @@ -999,7 +920,7 @@ // // uiLabel10 // - this.uiLabel10.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel10.Location = new System.Drawing.Point(90, 7); this.uiLabel10.Name = "uiLabel10"; @@ -1044,7 +965,7 @@ // // uiLabel9 // - this.uiLabel9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel9.Location = new System.Drawing.Point(90, 7); this.uiLabel9.Name = "uiLabel9"; @@ -1089,7 +1010,7 @@ // // uiLabel7 // - this.uiLabel7.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel7.Location = new System.Drawing.Point(90, 8); this.uiLabel7.Name = "uiLabel7"; @@ -1119,7 +1040,7 @@ // this.uiButton3.Cursor = System.Windows.Forms.Cursors.Hand; this.uiButton3.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiButton3.Location = new System.Drawing.Point(322, 4); + this.uiButton3.Location = new System.Drawing.Point(108, 4); this.uiButton3.MinimumSize = new System.Drawing.Size(1, 1); this.uiButton3.Name = "uiButton3"; this.uiButton3.Size = new System.Drawing.Size(125, 68); @@ -1132,7 +1053,7 @@ // this.uiButton2.Cursor = System.Windows.Forms.Cursors.Hand; this.uiButton2.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiButton2.Location = new System.Drawing.Point(172, 4); + this.uiButton2.Location = new System.Drawing.Point(248, 4); this.uiButton2.MinimumSize = new System.Drawing.Size(1, 1); this.uiButton2.Name = "uiButton2"; this.uiButton2.Size = new System.Drawing.Size(125, 68); @@ -1154,6 +1075,34 @@ this.uiButton1.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiButton1.Click += new System.EventHandler(this.uiButton1_Click); // + // uiTextBox2 + // + this.uiTextBox2.Cursor = System.Windows.Forms.Cursors.IBeam; + this.uiTextBox2.FillColor = System.Drawing.Color.Yellow; + this.uiTextBox2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiTextBox2.Location = new System.Drawing.Point(598, 40); + this.uiTextBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.uiTextBox2.MinimumSize = new System.Drawing.Size(1, 16); + this.uiTextBox2.Name = "uiTextBox2"; + this.uiTextBox2.Padding = new System.Windows.Forms.Padding(5); + this.uiTextBox2.ShowText = false; + this.uiTextBox2.Size = new System.Drawing.Size(120, 35); + this.uiTextBox2.TabIndex = 6; + this.uiTextBox2.Text = "0.00"; + this.uiTextBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + this.uiTextBox2.Watermark = ""; + this.uiTextBox2.Click += new System.EventHandler(this.uiTextBox2_Click); + // + // uiLabel2 + // + this.uiLabel2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + this.uiLabel2.Location = new System.Drawing.Point(404, 47); + this.uiLabel2.Name = "uiLabel2"; + this.uiLabel2.Size = new System.Drawing.Size(302, 36); + this.uiLabel2.TabIndex = 5; + this.uiLabel2.Text = "延迟记录初始值时间(ms):"; + // // Coeffiicientsetting // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1183,7 +1132,6 @@ this.uiPanel2.ResumeLayout(false); this.uiGroupBox1.ResumeLayout(false); this.uiTableLayoutPanel2.ResumeLayout(false); - this.uiPanel5.ResumeLayout(false); this.uiPanel3.ResumeLayout(false); this.uiGroupBox3.ResumeLayout(false); this.uiTableLayoutPanel4.ResumeLayout(false); @@ -1207,16 +1155,11 @@ private Sunny.UI.UIPanel uiPanel2; private Sunny.UI.UIGroupBox uiGroupBox1; private Sunny.UI.UITableLayoutPanel uiTableLayoutPanel2; - private Sunny.UI.UIPanel uiPanel5; private Sunny.UI.UITextBox uiTextBox3; private Sunny.UI.UILabel uiLabel3; private Sunny.UI.UIPanel uiPanel3; private Sunny.UI.UITextBox uiTextBox1; private Sunny.UI.UILabel uiLabel1; - private Sunny.UI.UITextBox uiTextBox4; - private Sunny.UI.UILabel uiLabel4; - private Sunny.UI.UITextBox uiTextBox2; - private Sunny.UI.UILabel uiLabel2; private Sunny.UI.UIPanel uiPanel7; private Sunny.UI.UIGroupBox uiGroupBox2; private Sunny.UI.UITableLayoutPanel uiTableLayoutPanel3; @@ -1268,5 +1211,7 @@ private Sunny.UI.UILabel uiLabel17; private Sunny.UI.UIButton uiButton3; private Sunny.UI.UIButton uiButton2; + private Sunny.UI.UITextBox uiTextBox2; + private Sunny.UI.UILabel uiLabel2; } } \ No newline at end of file diff --git a/全自动水压检测仪/Coeffiicientsetting.cs b/全自动水压检测仪/Coeffiicientsetting.cs index 1084fff..8e4f1b4 100644 --- a/全自动水压检测仪/Coeffiicientsetting.cs +++ b/全自动水压检测仪/Coeffiicientsetting.cs @@ -85,8 +85,8 @@ namespace 全自动水压检测仪 { CreateRegisterConfig(2394, uiTextBox1, "F2",false), // 控制压力系数 CreateRegisterConfig(3134, uiTextBox3, "F2",false), // 压力保护输入 - CreateRegisterConfig(2376, uiTextBox2, "F2",false), // 压力上限 - CreateRegisterConfig(2374, uiTextBox4, "F2",false), // 压力下限 + //CreateRegisterConfig(2376, uiTextBox2, "F2",false), // 压力上限 + //CreateRegisterConfig(2374, uiTextBox4, "F2",false), // 压力下限 CreateRegisterConfig(3482, uiTextBox8, "F2",false), // 温度系数 CreateRegisterConfig(3176, uiTextBox6, "F2",false), // 出口温度系数 CreateRegisterConfig(3076, uiTextBox7, "F2",false), // 常温液位系数 @@ -101,6 +101,7 @@ namespace 全自动水压检测仪 CreateRegisterConfig(2408, uiTextBox14, "0",true), // 稳压时间 CreateRegisterConfig(2406, uiTextBox15, "0",true), // 通水时间 CreateRegisterConfig(2410, uiTextBox13, "0",true), // 排空时间 + CreateRegisterConfig(2414, uiTextBox2, "0",true), // 延迟记录初始值时间 CreateRegisterConfig(2402, uiTextBox16, "0",true) // 温度 @@ -199,8 +200,8 @@ namespace 全自动水压检测仪 private void Coeffiicientsetting_Load(object sender, EventArgs e) { - string plcIp = "192.168.1.10"; - //string plcIp = "127.0.0.1"; + //string plcIp = "192.168.1.10"; + string plcIp = "127.0.0.1"; bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502); if (!initSuccess) { @@ -322,21 +323,26 @@ namespace 全自动水压检测仪 { ma?.WriteToPLCForNew(uiTextBox3.Text.Trim(), 3134, Function.DataType.浮点型); } + + //压力上限 - private void uiTextBox2_Click(object sender, EventArgs e) - { - ma?.WriteToPLCForNew(uiTextBox2.Text.Trim(), 2376, Function.DataType.浮点型); - } + //private void uiTextBox2_Click(object sender, EventArgs e) + //{ + // ma?.WriteToPLCForNew(uiTextBox2.Text.Trim(), 2376, Function.DataType.浮点型); + //} + //压力下限 - private void uiTextBox4_Click(object sender, EventArgs e) - { - ma?.WriteToPLCForNew(uiTextBox4.Text.Trim(), 2374, Function.DataType.浮点型); - } + //private void uiTextBox4_Click(object sender, EventArgs e) + //{ + // ma?.WriteToPLCForNew(uiTextBox4.Text.Trim(), 2374, Function.DataType.浮点型); + //} + //温度系数 private void uiTextBox8_Click(object sender, EventArgs e) { ma?.WriteToPLCForNew(uiTextBox8.Text.Trim(), 3482, Function.DataType.浮点型); } + //出口温度系数 private void uiTextBox6_Click(object sender, EventArgs e) { @@ -418,5 +424,11 @@ namespace 全自动水压检测仪 ma?.BtnClickFunctionForNew(Function.ButtonType.切换型, 10110); } + + //延迟记录初始值时间 + private void uiTextBox2_Click(object sender, EventArgs e) + { + ma?.WriteToPLCForNew(uiTextBox2.Text.Trim(), 2414, Function.DataType.整形); + } } } \ No newline at end of file diff --git a/全自动水压检测仪/NormalTemperatureMode.cs b/全自动水压检测仪/NormalTemperatureMode.cs index 042089d..741f30b 100644 --- a/全自动水压检测仪/NormalTemperatureMode.cs +++ b/全自动水压检测仪/NormalTemperatureMode.cs @@ -583,8 +583,8 @@ namespace 全自动水压检测仪 private void NormalTemperatureMode_Load(object sender, EventArgs e) { - string plcIp = "192.168.1.10"; - //string plcIp = "127.0.0.1"; + //string plcIp = "192.168.1.10"; + string plcIp = "127.0.0.1"; bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502); if (!initSuccess) {