diff --git a/全自动水压检测仪/Coeffiicientsetting.Designer.cs b/全自动水压检测仪/Coeffiicientsetting.Designer.cs
index ea8ca3c..0964252 100644
--- a/全自动水压检测仪/Coeffiicientsetting.Designer.cs
+++ b/全自动水压检测仪/Coeffiicientsetting.Designer.cs
@@ -57,6 +57,8 @@
this.uiGroupBox1 = new Sunny.UI.UIGroupBox();
this.uiTableLayoutPanel2 = new Sunny.UI.UITableLayoutPanel();
this.uiPanel3 = new Sunny.UI.UIPanel();
+ this.uiButton13 = new Sunny.UI.UIButton();
+ this.uiButton4 = new Sunny.UI.UIButton();
this.uiTextBox17 = new Sunny.UI.UITextBox();
this.uiLabel17 = new Sunny.UI.UILabel();
this.uiTextBox2 = new Sunny.UI.UITextBox();
@@ -72,9 +74,11 @@
this.uiTextBox5 = new Sunny.UI.UITextBox();
this.uiLabel5 = new Sunny.UI.UILabel();
this.uiPanel14 = new Sunny.UI.UIPanel();
+ this.uiButton9 = new Sunny.UI.UIButton();
this.uiTextBox11 = new Sunny.UI.UITextBox();
this.uiLabel11 = new Sunny.UI.UILabel();
this.uiPanel15 = new Sunny.UI.UIPanel();
+ this.uiButton8 = new Sunny.UI.UIButton();
this.uiTextBox12 = new Sunny.UI.UITextBox();
this.uiLabel12 = new Sunny.UI.UILabel();
this.uiTableLayoutPanel5 = new Sunny.UI.UITableLayoutPanel();
@@ -88,18 +92,18 @@
this.uiTextBox7 = new Sunny.UI.UITextBox();
this.uiLabel7 = new Sunny.UI.UILabel();
this.uiPanel19 = new Sunny.UI.UIPanel();
- this.uiButton3 = new Sunny.UI.UIButton();
- this.uiButton2 = new Sunny.UI.UIButton();
- this.uiButton1 = new Sunny.UI.UIButton();
- this.uiButton5 = new Sunny.UI.UIButton();
- this.uiButton7 = new Sunny.UI.UIButton();
this.uiButton10 = new Sunny.UI.UIButton();
this.uiButton11 = new Sunny.UI.UIButton();
this.uiButton12 = new Sunny.UI.UIButton();
- this.uiButton13 = new Sunny.UI.UIButton();
- this.uiButton4 = new Sunny.UI.UIButton();
- this.uiButton8 = new Sunny.UI.UIButton();
- this.uiButton9 = new Sunny.UI.UIButton();
+ this.uiButton7 = new Sunny.UI.UIButton();
+ this.uiButton5 = new Sunny.UI.UIButton();
+ this.uiButton3 = new Sunny.UI.UIButton();
+ this.uiButton2 = new Sunny.UI.UIButton();
+ this.uiButton1 = new Sunny.UI.UIButton();
+ this.uiTextBox4 = new Sunny.UI.UITextBox();
+ this.uiLabel4 = new Sunny.UI.UILabel();
+ this.uiTextBox18 = new Sunny.UI.UITextBox();
+ this.uiLabel18 = new Sunny.UI.UILabel();
this.uiTableLayoutPanel1.SuspendLayout();
this.uiGroupBox4.SuspendLayout();
this.uiTableLayoutPanel7.SuspendLayout();
@@ -604,6 +608,32 @@
this.uiPanel3.Text = null;
this.uiPanel3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
//
+ // uiButton13
+ //
+ this.uiButton13.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton13.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton13.Location = new System.Drawing.Point(775, 42);
+ this.uiButton13.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton13.Name = "uiButton13";
+ this.uiButton13.Size = new System.Drawing.Size(166, 35);
+ this.uiButton13.TabIndex = 10;
+ this.uiButton13.Text = "高温抽水";
+ this.uiButton13.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton13.Click += new System.EventHandler(this.uiButton13_Click);
+ //
+ // uiButton4
+ //
+ this.uiButton4.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton4.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton4.Location = new System.Drawing.Point(775, 3);
+ this.uiButton4.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton4.Name = "uiButton4";
+ this.uiButton4.Size = new System.Drawing.Size(166, 35);
+ this.uiButton4.TabIndex = 9;
+ this.uiButton4.Text = "常温抽水";
+ this.uiButton4.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton4.Click += new System.EventHandler(this.uiButton4_Click);
+ //
// uiTextBox17
//
this.uiTextBox17.Cursor = System.Windows.Forms.Cursors.IBeam;
@@ -831,6 +861,19 @@
this.uiPanel14.Text = null;
this.uiPanel14.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
//
+ // uiButton9
+ //
+ this.uiButton9.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton9.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton9.Location = new System.Drawing.Point(364, 3);
+ this.uiButton9.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton9.Name = "uiButton9";
+ this.uiButton9.Size = new System.Drawing.Size(107, 35);
+ this.uiButton9.TabIndex = 13;
+ this.uiButton9.Text = "高温回水";
+ this.uiButton9.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton9.Click += new System.EventHandler(this.uiButton9_Click);
+ //
// uiTextBox11
//
this.uiTextBox11.Cursor = System.Windows.Forms.Cursors.IBeam;
@@ -877,6 +920,19 @@
this.uiPanel15.Text = null;
this.uiPanel15.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
//
+ // uiButton8
+ //
+ this.uiButton8.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton8.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton8.Location = new System.Drawing.Point(364, 0);
+ this.uiButton8.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton8.Name = "uiButton8";
+ this.uiButton8.Size = new System.Drawing.Size(107, 35);
+ this.uiButton8.TabIndex = 8;
+ this.uiButton8.Text = "常温回水";
+ this.uiButton8.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton8.Click += new System.EventHandler(this.uiButton8_Click);
+ //
// uiTextBox12
//
this.uiTextBox12.Cursor = System.Windows.Forms.Cursors.IBeam;
@@ -971,6 +1027,8 @@
//
// uiPanel12
//
+ this.uiPanel12.Controls.Add(this.uiTextBox18);
+ this.uiPanel12.Controls.Add(this.uiLabel18);
this.uiPanel12.Controls.Add(this.uiTextBox9);
this.uiPanel12.Controls.Add(this.uiLabel9);
this.uiPanel12.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -991,7 +1049,7 @@
this.uiTextBox9.Cursor = System.Windows.Forms.Cursors.IBeam;
this.uiTextBox9.FillColor = System.Drawing.Color.Yellow;
this.uiTextBox9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiTextBox9.Location = new System.Drawing.Point(255, 0);
+ this.uiTextBox9.Location = new System.Drawing.Point(181, 0);
this.uiTextBox9.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiTextBox9.MinimumSize = new System.Drawing.Size(1, 16);
this.uiTextBox9.Name = "uiTextBox9";
@@ -1008,7 +1066,7 @@
//
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.Location = new System.Drawing.Point(16, 7);
this.uiLabel9.Name = "uiLabel9";
this.uiLabel9.Size = new System.Drawing.Size(179, 35);
this.uiLabel9.TabIndex = 0;
@@ -1016,6 +1074,8 @@
//
// uiPanel10
//
+ this.uiPanel10.Controls.Add(this.uiTextBox4);
+ this.uiPanel10.Controls.Add(this.uiLabel4);
this.uiPanel10.Controls.Add(this.uiTextBox7);
this.uiPanel10.Controls.Add(this.uiLabel7);
this.uiPanel10.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1036,7 +1096,7 @@
this.uiTextBox7.Cursor = System.Windows.Forms.Cursors.IBeam;
this.uiTextBox7.FillColor = System.Drawing.Color.Yellow;
this.uiTextBox7.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiTextBox7.Location = new System.Drawing.Point(255, 0);
+ this.uiTextBox7.Location = new System.Drawing.Point(180, 1);
this.uiTextBox7.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiTextBox7.MinimumSize = new System.Drawing.Size(1, 16);
this.uiTextBox7.Name = "uiTextBox7";
@@ -1053,7 +1113,7 @@
//
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.Location = new System.Drawing.Point(15, 8);
this.uiLabel7.Name = "uiLabel7";
this.uiLabel7.Size = new System.Drawing.Size(179, 35);
this.uiLabel7.TabIndex = 0;
@@ -1082,6 +1142,71 @@
this.uiPanel19.Text = null;
this.uiPanel19.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
//
+ // uiButton10
+ //
+ this.uiButton10.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton10.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton10.Location = new System.Drawing.Point(633, 0);
+ this.uiButton10.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton10.Name = "uiButton10";
+ this.uiButton10.Size = new System.Drawing.Size(129, 35);
+ this.uiButton10.TabIndex = 11;
+ this.uiButton10.Text = "空气抽气";
+ this.uiButton10.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton10.Click += new System.EventHandler(this.uiButton10_Click);
+ //
+ // uiButton11
+ //
+ this.uiButton11.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton11.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton11.Location = new System.Drawing.Point(334, -3);
+ this.uiButton11.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton11.Name = "uiButton11";
+ this.uiButton11.Size = new System.Drawing.Size(142, 35);
+ this.uiButton11.TabIndex = 10;
+ this.uiButton11.Text = "高温加水";
+ this.uiButton11.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton11.Click += new System.EventHandler(this.uiButton11_Click);
+ //
+ // uiButton12
+ //
+ this.uiButton12.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton12.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton12.Location = new System.Drawing.Point(494, -1);
+ this.uiButton12.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton12.Name = "uiButton12";
+ this.uiButton12.Size = new System.Drawing.Size(119, 35);
+ this.uiButton12.TabIndex = 9;
+ this.uiButton12.Text = "高压进阀";
+ this.uiButton12.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton12.Click += new System.EventHandler(this.uiButton12_Click);
+ //
+ // uiButton7
+ //
+ this.uiButton7.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton7.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton7.Location = new System.Drawing.Point(494, 40);
+ this.uiButton7.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton7.Name = "uiButton7";
+ this.uiButton7.Size = new System.Drawing.Size(119, 35);
+ this.uiButton7.TabIndex = 6;
+ this.uiButton7.Text = "高压出阀";
+ this.uiButton7.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton7.Click += new System.EventHandler(this.uiButton7_Click);
+ //
+ // uiButton5
+ //
+ this.uiButton5.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiButton5.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton5.Location = new System.Drawing.Point(333, 40);
+ this.uiButton5.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiButton5.Name = "uiButton5";
+ this.uiButton5.Size = new System.Drawing.Size(142, 35);
+ this.uiButton5.TabIndex = 4;
+ this.uiButton5.Text = "常温加水";
+ this.uiButton5.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiButton5.Click += new System.EventHandler(this.uiButton5_Click);
+ //
// uiButton3
//
this.uiButton3.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -1121,122 +1246,61 @@
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);
//
- // uiButton5
+ // uiTextBox4
//
- this.uiButton5.Cursor = System.Windows.Forms.Cursors.Hand;
- this.uiButton5.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton5.Location = new System.Drawing.Point(16, 40);
- this.uiButton5.MinimumSize = new System.Drawing.Size(1, 1);
- this.uiButton5.Name = "uiButton5";
- this.uiButton5.Size = new System.Drawing.Size(142, 35);
- this.uiButton5.TabIndex = 4;
- this.uiButton5.Text = "常温加水";
- this.uiButton5.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton5.Click += new System.EventHandler(this.uiButton5_Click);
+ 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(384, 1);
+ 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(86, 35);
+ this.uiTextBox4.TabIndex = 6;
+ this.uiTextBox4.Text = "0.00";
+ this.uiTextBox4.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+ this.uiTextBox4.Watermark = "";
+ this.uiTextBox4.Click += new System.EventHandler(this.uiTextBox4_Click);
//
- // uiButton7
+ // uiLabel4
//
- this.uiButton7.Cursor = System.Windows.Forms.Cursors.Hand;
- this.uiButton7.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton7.Location = new System.Drawing.Point(494, 40);
- this.uiButton7.MinimumSize = new System.Drawing.Size(1, 1);
- this.uiButton7.Name = "uiButton7";
- this.uiButton7.Size = new System.Drawing.Size(119, 35);
- this.uiButton7.TabIndex = 6;
- this.uiButton7.Text = "高压出阀";
- this.uiButton7.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton7.Click += new System.EventHandler(this.uiButton7_Click);
+ 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(304, 1);
+ this.uiLabel4.Name = "uiLabel4";
+ this.uiLabel4.Size = new System.Drawing.Size(74, 36);
+ this.uiLabel4.TabIndex = 5;
+ this.uiLabel4.Text = "温度保护:";
//
- // uiButton10
+ // uiTextBox18
//
- this.uiButton10.Cursor = System.Windows.Forms.Cursors.Hand;
- this.uiButton10.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton10.Location = new System.Drawing.Point(633, 0);
- this.uiButton10.MinimumSize = new System.Drawing.Size(1, 1);
- this.uiButton10.Name = "uiButton10";
- this.uiButton10.Size = new System.Drawing.Size(129, 35);
- this.uiButton10.TabIndex = 11;
- this.uiButton10.Text = "空气抽气";
- this.uiButton10.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton10.Click += new System.EventHandler(this.uiButton10_Click);
+ this.uiTextBox18.Cursor = System.Windows.Forms.Cursors.IBeam;
+ this.uiTextBox18.FillColor = System.Drawing.Color.Yellow;
+ this.uiTextBox18.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiTextBox18.Location = new System.Drawing.Point(382, 1);
+ this.uiTextBox18.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.uiTextBox18.MinimumSize = new System.Drawing.Size(1, 16);
+ this.uiTextBox18.Name = "uiTextBox18";
+ this.uiTextBox18.Padding = new System.Windows.Forms.Padding(5);
+ this.uiTextBox18.ShowText = false;
+ this.uiTextBox18.Size = new System.Drawing.Size(87, 35);
+ this.uiTextBox18.TabIndex = 8;
+ this.uiTextBox18.Text = "0.00";
+ this.uiTextBox18.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+ this.uiTextBox18.Watermark = "";
+ this.uiTextBox18.Click += new System.EventHandler(this.uiTextBox18_Click);
//
- // uiButton11
+ // uiLabel18
//
- this.uiButton11.Cursor = System.Windows.Forms.Cursors.Hand;
- this.uiButton11.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton11.Location = new System.Drawing.Point(168, 40);
- this.uiButton11.MinimumSize = new System.Drawing.Size(1, 1);
- this.uiButton11.Name = "uiButton11";
- this.uiButton11.Size = new System.Drawing.Size(142, 35);
- this.uiButton11.TabIndex = 10;
- this.uiButton11.Text = "高温加水";
- this.uiButton11.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton11.Click += new System.EventHandler(this.uiButton11_Click);
- //
- // uiButton12
- //
- this.uiButton12.Cursor = System.Windows.Forms.Cursors.Hand;
- this.uiButton12.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton12.Location = new System.Drawing.Point(494, -1);
- this.uiButton12.MinimumSize = new System.Drawing.Size(1, 1);
- this.uiButton12.Name = "uiButton12";
- this.uiButton12.Size = new System.Drawing.Size(119, 35);
- this.uiButton12.TabIndex = 9;
- this.uiButton12.Text = "高压进阀";
- this.uiButton12.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton12.Click += new System.EventHandler(this.uiButton12_Click);
- //
- // uiButton13
- //
- this.uiButton13.Cursor = System.Windows.Forms.Cursors.Hand;
- this.uiButton13.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton13.Location = new System.Drawing.Point(775, 42);
- this.uiButton13.MinimumSize = new System.Drawing.Size(1, 1);
- this.uiButton13.Name = "uiButton13";
- this.uiButton13.Size = new System.Drawing.Size(166, 35);
- this.uiButton13.TabIndex = 10;
- this.uiButton13.Text = "高温抽水";
- this.uiButton13.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton13.Click += new System.EventHandler(this.uiButton13_Click);
- //
- // uiButton4
- //
- this.uiButton4.Cursor = System.Windows.Forms.Cursors.Hand;
- this.uiButton4.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton4.Location = new System.Drawing.Point(775, 3);
- this.uiButton4.MinimumSize = new System.Drawing.Size(1, 1);
- this.uiButton4.Name = "uiButton4";
- this.uiButton4.Size = new System.Drawing.Size(166, 35);
- this.uiButton4.TabIndex = 9;
- this.uiButton4.Text = "常温抽水";
- this.uiButton4.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton4.Click += new System.EventHandler(this.uiButton4_Click);
- //
- // uiButton8
- //
- this.uiButton8.Cursor = System.Windows.Forms.Cursors.Hand;
- this.uiButton8.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton8.Location = new System.Drawing.Point(364, 0);
- this.uiButton8.MinimumSize = new System.Drawing.Size(1, 1);
- this.uiButton8.Name = "uiButton8";
- this.uiButton8.Size = new System.Drawing.Size(107, 35);
- this.uiButton8.TabIndex = 8;
- this.uiButton8.Text = "常温回水";
- this.uiButton8.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton8.Click += new System.EventHandler(this.uiButton8_Click);
- //
- // uiButton9
- //
- this.uiButton9.Cursor = System.Windows.Forms.Cursors.Hand;
- this.uiButton9.Font = new System.Drawing.Font("微软雅黑", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton9.Location = new System.Drawing.Point(364, 3);
- this.uiButton9.MinimumSize = new System.Drawing.Size(1, 1);
- this.uiButton9.Name = "uiButton9";
- this.uiButton9.Size = new System.Drawing.Size(107, 35);
- this.uiButton9.TabIndex = 13;
- this.uiButton9.Text = "高温回水";
- this.uiButton9.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.uiButton9.Click += new System.EventHandler(this.uiButton9_Click);
+ this.uiLabel18.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiLabel18.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+ this.uiLabel18.Location = new System.Drawing.Point(304, 1);
+ this.uiLabel18.Name = "uiLabel18";
+ this.uiLabel18.Size = new System.Drawing.Size(74, 36);
+ this.uiLabel18.TabIndex = 7;
+ this.uiLabel18.Text = "压力保护:";
//
// Coeffiicientsetting
//
@@ -1358,5 +1422,9 @@
private Sunny.UI.UIButton uiButton4;
private Sunny.UI.UIButton uiButton9;
private Sunny.UI.UIButton uiButton8;
+ private Sunny.UI.UITextBox uiTextBox18;
+ private Sunny.UI.UILabel uiLabel18;
+ private Sunny.UI.UITextBox uiTextBox4;
+ private Sunny.UI.UILabel uiLabel4;
}
}
\ No newline at end of file
diff --git a/全自动水压检测仪/Coeffiicientsetting.cs b/全自动水压检测仪/Coeffiicientsetting.cs
index 0db5b96..8cff014 100644
--- a/全自动水压检测仪/Coeffiicientsetting.cs
+++ b/全自动水压检测仪/Coeffiicientsetting.cs
@@ -107,6 +107,8 @@ namespace 全自动水压检测仪
CreateRegisterConfig(2300, uiTextBox17, "F2",false), // 转速
CreateRegisterConfig(2402, uiTextBox16, "F2",false), // 温度
+ CreateRegisterConfig(3484, uiTextBox4, "F2",false), // 温度保护
+ CreateRegisterConfig(3134, uiTextBox18, "F2",false), // 压力保护
CreateRegisterConfig(2408, uiTextBox14, "0",true), // 稳压时间
CreateRegisterConfig(2406, uiTextBox15, "0",true), // 通水时间
@@ -533,5 +535,16 @@ namespace 全自动水压检测仪
_readTimer.Start();
}
}
+
+ //温度保护
+ private void uiTextBox4_Click(object sender, EventArgs e)
+ {
+ ma?.WriteToPLCForNew(uiTextBox2.Text.Trim(), 3484, Function.DataType.浮点型);
+ }
+ //压力保护
+ private void uiTextBox18_Click(object sender, EventArgs e)
+ {
+ ma?.WriteToPLCForNew(uiTextBox2.Text.Trim(), 3134, Function.DataType.浮点型);
+ }
}
}
\ No newline at end of file
diff --git a/全自动水压检测仪/packages.config b/全自动水压检测仪/packages.config
index 26df6df..126e1c2 100644
--- a/全自动水压检测仪/packages.config
+++ b/全自动水压检测仪/packages.config
@@ -14,7 +14,6 @@
-