diff --git a/全自动水压检测仪/App.config b/全自动水压检测仪/App.config index dfd15c7..447d87a 100644 --- a/全自动水压检测仪/App.config +++ b/全自动水压检测仪/App.config @@ -16,8 +16,8 @@ - - + + diff --git a/全自动水压检测仪/Coeffiicientsetting.Designer.cs b/全自动水压检测仪/Coeffiicientsetting.Designer.cs index b114a8b..da489d5 100644 --- a/全自动水压检测仪/Coeffiicientsetting.Designer.cs +++ b/全自动水压检测仪/Coeffiicientsetting.Designer.cs @@ -71,31 +71,20 @@ this.uiTableLayoutPanel4 = new Sunny.UI.UITableLayoutPanel(); this.uiTableLayoutPanel6 = new Sunny.UI.UITableLayoutPanel(); this.uiPanel8 = new Sunny.UI.UIPanel(); - 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(); this.uiPanel13 = new Sunny.UI.UIPanel(); - this.uiTextBox10 = new Sunny.UI.UITextBox(); - this.uiLabel10 = new Sunny.UI.UILabel(); this.uiPanel12 = new Sunny.UI.UIPanel(); this.uiTextBox18 = new Sunny.UI.UITextBox(); this.uiLabel18 = new Sunny.UI.UILabel(); - this.uiTextBox9 = new Sunny.UI.UITextBox(); - this.uiLabel9 = new Sunny.UI.UILabel(); this.uiPanel10 = new Sunny.UI.UIPanel(); this.uiTextBox4 = new Sunny.UI.UITextBox(); this.uiLabel4 = new Sunny.UI.UILabel(); - this.uiTextBox7 = new Sunny.UI.UITextBox(); - this.uiLabel7 = new Sunny.UI.UILabel(); this.uiPanel19 = new Sunny.UI.UIPanel(); + this.uiCheckBox1 = new Sunny.UI.UICheckBox(); this.uiButton10 = new Sunny.UI.UIButton(); this.uiButton11 = new Sunny.UI.UIButton(); this.uiButton12 = new Sunny.UI.UIButton(); @@ -104,7 +93,6 @@ this.uiButton3 = new Sunny.UI.UIButton(); this.uiButton2 = new Sunny.UI.UIButton(); this.uiButton1 = new Sunny.UI.UIButton(); - this.uiCheckBox1 = new Sunny.UI.UICheckBox(); this.uiTableLayoutPanel1.SuspendLayout(); this.uiGroupBox4.SuspendLayout(); this.uiTableLayoutPanel7.SuspendLayout(); @@ -124,11 +112,9 @@ this.uiGroupBox3.SuspendLayout(); this.uiTableLayoutPanel4.SuspendLayout(); this.uiTableLayoutPanel6.SuspendLayout(); - this.uiPanel8.SuspendLayout(); this.uiPanel14.SuspendLayout(); this.uiPanel15.SuspendLayout(); this.uiTableLayoutPanel5.SuspendLayout(); - this.uiPanel13.SuspendLayout(); this.uiPanel12.SuspendLayout(); this.uiPanel10.SuspendLayout(); this.uiPanel19.SuspendLayout(); @@ -801,8 +787,6 @@ // // uiPanel8 // - this.uiPanel8.Controls.Add(this.uiTextBox5); - this.uiPanel8.Controls.Add(this.uiLabel5); this.uiPanel8.Dock = System.Windows.Forms.DockStyle.Fill; this.uiPanel8.FillColor = System.Drawing.Color.White; this.uiPanel8.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -816,39 +800,9 @@ this.uiPanel8.Text = null; this.uiPanel8.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // - // uiTextBox5 - // - this.uiTextBox5.Cursor = System.Windows.Forms.Cursors.IBeam; - this.uiTextBox5.FillColor = System.Drawing.Color.Yellow; - this.uiTextBox5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiTextBox5.Location = new System.Drawing.Point(237, 0); - this.uiTextBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.uiTextBox5.MinimumSize = new System.Drawing.Size(1, 16); - this.uiTextBox5.Name = "uiTextBox5"; - this.uiTextBox5.Padding = new System.Windows.Forms.Padding(5); - this.uiTextBox5.ShowText = false; - this.uiTextBox5.Size = new System.Drawing.Size(120, 35); - this.uiTextBox5.TabIndex = 1; - this.uiTextBox5.Text = "0.00"; - this.uiTextBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiTextBox5.Watermark = ""; - this.uiTextBox5.Click += new System.EventHandler(this.uiTextBox5_Click); - // - // uiLabel5 - // - 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(67, 7); - this.uiLabel5.Name = "uiLabel5"; - this.uiLabel5.Size = new System.Drawing.Size(188, 35); - this.uiLabel5.TabIndex = 0; - this.uiLabel5.Text = "设置高温液位下限:"; - // // uiPanel14 // this.uiPanel14.Controls.Add(this.uiButton9); - this.uiPanel14.Controls.Add(this.uiTextBox11); - this.uiPanel14.Controls.Add(this.uiLabel11); this.uiPanel14.Dock = System.Windows.Forms.DockStyle.Fill; this.uiPanel14.FillColor = System.Drawing.Color.White; this.uiPanel14.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -875,39 +829,9 @@ 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; - this.uiTextBox11.FillColor = System.Drawing.Color.Yellow; - this.uiTextBox11.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiTextBox11.Location = new System.Drawing.Point(237, 0); - this.uiTextBox11.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.uiTextBox11.MinimumSize = new System.Drawing.Size(1, 16); - this.uiTextBox11.Name = "uiTextBox11"; - this.uiTextBox11.Padding = new System.Windows.Forms.Padding(5); - this.uiTextBox11.ShowText = false; - this.uiTextBox11.Size = new System.Drawing.Size(120, 35); - this.uiTextBox11.TabIndex = 1; - this.uiTextBox11.Text = "0.00"; - this.uiTextBox11.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiTextBox11.Watermark = ""; - this.uiTextBox11.Click += new System.EventHandler(this.uiTextBox11_Click); - // - // uiLabel11 - // - 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(67, 7); - this.uiLabel11.Name = "uiLabel11"; - this.uiLabel11.Size = new System.Drawing.Size(188, 35); - this.uiLabel11.TabIndex = 0; - this.uiLabel11.Text = "设置高温液位上限:"; - // // uiPanel15 // this.uiPanel15.Controls.Add(this.uiButton8); - this.uiPanel15.Controls.Add(this.uiTextBox12); - this.uiPanel15.Controls.Add(this.uiLabel12); this.uiPanel15.Dock = System.Windows.Forms.DockStyle.Fill; this.uiPanel15.FillColor = System.Drawing.Color.White; this.uiPanel15.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -934,34 +858,6 @@ 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; - this.uiTextBox12.FillColor = System.Drawing.Color.Yellow; - this.uiTextBox12.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiTextBox12.Location = new System.Drawing.Point(237, 0); - this.uiTextBox12.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.uiTextBox12.MinimumSize = new System.Drawing.Size(1, 16); - this.uiTextBox12.Name = "uiTextBox12"; - this.uiTextBox12.Padding = new System.Windows.Forms.Padding(5); - this.uiTextBox12.ShowText = false; - this.uiTextBox12.Size = new System.Drawing.Size(120, 35); - this.uiTextBox12.TabIndex = 1; - this.uiTextBox12.Text = "0.00"; - this.uiTextBox12.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiTextBox12.Watermark = ""; - this.uiTextBox12.Click += new System.EventHandler(this.uiTextBox12_Click); - // - // uiLabel12 - // - 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(67, 8); - this.uiLabel12.Name = "uiLabel12"; - this.uiLabel12.Size = new System.Drawing.Size(188, 35); - this.uiLabel12.TabIndex = 0; - this.uiLabel12.Text = "设置高温液位系数:"; - // // uiTableLayoutPanel5 // this.uiTableLayoutPanel5.ColumnCount = 1; @@ -983,8 +879,6 @@ // // uiPanel13 // - this.uiPanel13.Controls.Add(this.uiTextBox10); - this.uiPanel13.Controls.Add(this.uiLabel10); this.uiPanel13.Dock = System.Windows.Forms.DockStyle.Fill; this.uiPanel13.FillColor = System.Drawing.Color.White; this.uiPanel13.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -998,40 +892,10 @@ this.uiPanel13.Text = null; this.uiPanel13.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // - // uiTextBox10 - // - this.uiTextBox10.Cursor = System.Windows.Forms.Cursors.IBeam; - this.uiTextBox10.FillColor = System.Drawing.Color.Yellow; - this.uiTextBox10.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiTextBox10.Location = new System.Drawing.Point(255, 0); - this.uiTextBox10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.uiTextBox10.MinimumSize = new System.Drawing.Size(1, 16); - this.uiTextBox10.Name = "uiTextBox10"; - this.uiTextBox10.Padding = new System.Windows.Forms.Padding(5); - this.uiTextBox10.ShowText = false; - this.uiTextBox10.Size = new System.Drawing.Size(120, 35); - this.uiTextBox10.TabIndex = 1; - this.uiTextBox10.Text = "0.00"; - this.uiTextBox10.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiTextBox10.Watermark = ""; - this.uiTextBox10.Click += new System.EventHandler(this.uiTextBox10_Click); - // - // uiLabel10 - // - 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"; - this.uiLabel10.Size = new System.Drawing.Size(179, 35); - this.uiLabel10.TabIndex = 0; - this.uiLabel10.Text = "设置常温液位下限:"; - // // 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; this.uiPanel12.FillColor = System.Drawing.Color.White; this.uiPanel12.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -1072,40 +936,10 @@ this.uiLabel18.TabIndex = 7; this.uiLabel18.Text = "压力保护:"; // - // uiTextBox9 - // - 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(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"; - this.uiTextBox9.Padding = new System.Windows.Forms.Padding(5); - this.uiTextBox9.ShowText = false; - this.uiTextBox9.Size = new System.Drawing.Size(120, 35); - this.uiTextBox9.TabIndex = 1; - this.uiTextBox9.Text = "0.00"; - this.uiTextBox9.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiTextBox9.Watermark = ""; - this.uiTextBox9.Click += new System.EventHandler(this.uiTextBox9_Click); - // - // uiLabel9 - // - 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(16, 7); - this.uiLabel9.Name = "uiLabel9"; - this.uiLabel9.Size = new System.Drawing.Size(179, 35); - this.uiLabel9.TabIndex = 0; - this.uiLabel9.Text = "设置常温液位上限:"; - // // 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; this.uiPanel10.FillColor = System.Drawing.Color.White; this.uiPanel10.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -1146,34 +980,6 @@ this.uiLabel4.TabIndex = 5; this.uiLabel4.Text = "温度保护:"; // - // uiTextBox7 - // - 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(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"; - this.uiTextBox7.Padding = new System.Windows.Forms.Padding(5); - this.uiTextBox7.ShowText = false; - this.uiTextBox7.Size = new System.Drawing.Size(120, 35); - this.uiTextBox7.TabIndex = 1; - this.uiTextBox7.Text = "0.00"; - this.uiTextBox7.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiTextBox7.Watermark = ""; - this.uiTextBox7.Click += new System.EventHandler(this.uiTextBox7_Click); - // - // uiLabel7 - // - 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(15, 8); - this.uiLabel7.Name = "uiLabel7"; - this.uiLabel7.Size = new System.Drawing.Size(179, 35); - this.uiLabel7.TabIndex = 0; - this.uiLabel7.Text = "设置常温液位系数:"; - // // uiPanel19 // this.uiPanel19.Controls.Add(this.uiCheckBox1); @@ -1198,6 +1004,19 @@ this.uiPanel19.Text = null; this.uiPanel19.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // + // uiCheckBox1 + // + this.uiCheckBox1.Cursor = System.Windows.Forms.Cursors.Hand; + this.uiCheckBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiCheckBox1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + this.uiCheckBox1.Location = new System.Drawing.Point(633, 40); + this.uiCheckBox1.MinimumSize = new System.Drawing.Size(1, 1); + this.uiCheckBox1.Name = "uiCheckBox1"; + this.uiCheckBox1.Size = new System.Drawing.Size(150, 29); + this.uiCheckBox1.TabIndex = 12; + this.uiCheckBox1.Text = "允许修改报表"; + this.uiCheckBox1.CheckedChanged += new System.EventHandler(this.uiCheckBox1_CheckedChanged); + // // uiButton10 // this.uiButton10.Cursor = System.Windows.Forms.Cursors.Hand; @@ -1302,19 +1121,6 @@ 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); // - // uiCheckBox1 - // - this.uiCheckBox1.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiCheckBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiCheckBox1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.uiCheckBox1.Location = new System.Drawing.Point(633, 40); - this.uiCheckBox1.MinimumSize = new System.Drawing.Size(1, 1); - this.uiCheckBox1.Name = "uiCheckBox1"; - this.uiCheckBox1.Size = new System.Drawing.Size(150, 29); - this.uiCheckBox1.TabIndex = 12; - this.uiCheckBox1.Text = "允许修改报表"; - this.uiCheckBox1.CheckedChanged += new System.EventHandler(this.uiCheckBox1_CheckedChanged); - // // Coeffiicientsetting // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1349,11 +1155,9 @@ this.uiGroupBox3.ResumeLayout(false); this.uiTableLayoutPanel4.ResumeLayout(false); this.uiTableLayoutPanel6.ResumeLayout(false); - this.uiPanel8.ResumeLayout(false); this.uiPanel14.ResumeLayout(false); this.uiPanel15.ResumeLayout(false); this.uiTableLayoutPanel5.ResumeLayout(false); - this.uiPanel13.ResumeLayout(false); this.uiPanel12.ResumeLayout(false); this.uiPanel10.ResumeLayout(false); this.uiPanel19.ResumeLayout(false); @@ -1386,24 +1190,12 @@ private Sunny.UI.UITableLayoutPanel uiTableLayoutPanel4; private Sunny.UI.UITableLayoutPanel uiTableLayoutPanel6; private Sunny.UI.UIPanel uiPanel8; - private Sunny.UI.UITextBox uiTextBox5; - private Sunny.UI.UILabel uiLabel5; private Sunny.UI.UIPanel uiPanel14; - private Sunny.UI.UITextBox uiTextBox11; - private Sunny.UI.UILabel uiLabel11; private Sunny.UI.UIPanel uiPanel15; - private Sunny.UI.UITextBox uiTextBox12; - private Sunny.UI.UILabel uiLabel12; private Sunny.UI.UITableLayoutPanel uiTableLayoutPanel5; private Sunny.UI.UIPanel uiPanel13; - private Sunny.UI.UITextBox uiTextBox10; - private Sunny.UI.UILabel uiLabel10; private Sunny.UI.UIPanel uiPanel12; - private Sunny.UI.UITextBox uiTextBox9; - private Sunny.UI.UILabel uiLabel9; private Sunny.UI.UIPanel uiPanel10; - private Sunny.UI.UITextBox uiTextBox7; - private Sunny.UI.UILabel uiLabel7; private Sunny.UI.UIGroupBox uiGroupBox4; private Sunny.UI.UITableLayoutPanel uiTableLayoutPanel7; private Sunny.UI.UIPanel uiPanel16; diff --git a/全自动水压检测仪/Coeffiicientsetting.cs b/全自动水压检测仪/Coeffiicientsetting.cs index 90983e0..ff86b68 100644 --- a/全自动水压检测仪/Coeffiicientsetting.cs +++ b/全自动水压检测仪/Coeffiicientsetting.cs @@ -99,12 +99,12 @@ namespace 全自动水压检测仪 //CreateRegisterConfig(2374, uiTextBox4, "F2",false), // 压力下限 CreateRegisterConfig(3482, uiTextBox8, "F2",false), // 温度系数 CreateRegisterConfig(3176, uiTextBox6, "F2",false), // 出口温度系数 - CreateRegisterConfig(3076, uiTextBox7, "F2",false), // 常温液位系数 - CreateRegisterConfig(3086, uiTextBox9, "F2",false), // 常温液位上限 - CreateRegisterConfig(3084, uiTextBox10, "F2",false), // 常温液位下限 - CreateRegisterConfig(3026, uiTextBox12, "F2",false), // 高温液位系数 - CreateRegisterConfig(3036, uiTextBox11, "F2",false), // 高温液位上限 - CreateRegisterConfig(3034, uiTextBox5, "F2",false), // 高温液位下限 + //CreateRegisterConfig(3076, uiTextBox7, "F2",false), // 常温液位系数 + //CreateRegisterConfig(3086, uiTextBox9, "F2",false), // 常温液位上限 + //CreateRegisterConfig(3084, uiTextBox10, "F2",false), // 常温液位下限 + //CreateRegisterConfig(3026, uiTextBox12, "F2",false), // 高温液位系数 + //CreateRegisterConfig(3036, uiTextBox11, "F2",false), // 高温液位上限 + //CreateRegisterConfig(3034, uiTextBox5, "F2",false), // 高温液位下限 CreateRegisterConfig(2300, uiTextBox17, "F2",false), // 转速 CreateRegisterConfig(2402, uiTextBox16, "F2",false), // 温度 @@ -396,36 +396,36 @@ namespace 全自动水压检测仪 { ma?.WriteToPLCForNew(uiTextBox6.Text.Trim(), 3176, Function.DataType.浮点型); } - //常温液位系数 - private void uiTextBox7_Click(object sender, EventArgs e) - { - ma?.WriteToPLCForNew(uiTextBox7.Text.Trim(), 3076, Function.DataType.浮点型); - } - //常温液位上限 - private void uiTextBox9_Click(object sender, EventArgs e) - { - ma?.WriteToPLCForNew(uiTextBox9.Text.Trim(), 3086, Function.DataType.浮点型); - } - //常温液位下限 - private void uiTextBox10_Click(object sender, EventArgs e) - { - ma?.WriteToPLCForNew(uiTextBox10.Text.Trim(), 3084, Function.DataType.浮点型); - } - //高温液位系数 - private void uiTextBox12_Click(object sender, EventArgs e) - { - ma?.WriteToPLCForNew(uiTextBox12.Text.Trim(), 3026, Function.DataType.浮点型); - } - //高温液位上限 - private void uiTextBox11_Click(object sender, EventArgs e) - { - ma?.WriteToPLCForNew(uiTextBox11.Text.Trim(), 3036, Function.DataType.浮点型); - } - //高温液位下限 - private void uiTextBox5_Click(object sender, EventArgs e) - { - ma?.WriteToPLCForNew(uiTextBox5.Text.Trim(), 3034, Function.DataType.浮点型); - } + ////常温液位系数 + //private void uiTextBox7_Click(object sender, EventArgs e) + //{ + // ma?.WriteToPLCForNew(uiTextBox7.Text.Trim(), 3076, Function.DataType.浮点型); + //} + ////常温液位上限 + //private void uiTextBox9_Click(object sender, EventArgs e) + //{ + // ma?.WriteToPLCForNew(uiTextBox9.Text.Trim(), 3086, Function.DataType.浮点型); + //} + ////常温液位下限 + //private void uiTextBox10_Click(object sender, EventArgs e) + //{ + // ma?.WriteToPLCForNew(uiTextBox10.Text.Trim(), 3084, Function.DataType.浮点型); + //} + ////高温液位系数 + //private void uiTextBox12_Click(object sender, EventArgs e) + //{ + // ma?.WriteToPLCForNew(uiTextBox12.Text.Trim(), 3026, Function.DataType.浮点型); + //} + ////高温液位上限 + //private void uiTextBox11_Click(object sender, EventArgs e) + //{ + // ma?.WriteToPLCForNew(uiTextBox11.Text.Trim(), 3036, Function.DataType.浮点型); + //} + ////高温液位下限 + //private void uiTextBox5_Click(object sender, EventArgs e) + //{ + // ma?.WriteToPLCForNew(uiTextBox5.Text.Trim(), 3034, Function.DataType.浮点型); + //} //返回 private void uiButton1_Click(object sender, EventArgs e) diff --git a/全自动水压检测仪/NormalTemperatureMode.Designer.cs b/全自动水压检测仪/NormalTemperatureMode.Designer.cs index 3a2b87c..1331bb9 100644 --- a/全自动水压检测仪/NormalTemperatureMode.Designer.cs +++ b/全自动水压检测仪/NormalTemperatureMode.Designer.cs @@ -80,12 +80,18 @@ namespace 全自动水压检测仪 this.uiLabel39 = new Sunny.UI.UILabel(); this.uiTableLayoutPanel13 = new Sunny.UI.UITableLayoutPanel(); this.uiPanel31 = new Sunny.UI.UIPanel(); - this.uiLabel7 = new Sunny.UI.UILabel(); - this.uiLabel8 = new Sunny.UI.UILabel(); + this.uiLabel16 = new Sunny.UI.UILabel(); + this.uiLabel27 = new Sunny.UI.UILabel(); + this.uiLabel31 = new Sunny.UI.UILabel(); + this.uiLight15 = new Sunny.UI.UILight(); + this.uiLight16 = new Sunny.UI.UILight(); this.uiLabel34 = new Sunny.UI.UILabel(); this.uiPanel23 = new Sunny.UI.UIPanel(); this.uiLabel12 = new Sunny.UI.UILabel(); - this.uiLabel16 = new Sunny.UI.UILabel(); + this.uiLabel8 = new Sunny.UI.UILabel(); + this.uiLabel7 = new Sunny.UI.UILabel(); + this.uiLight14 = new Sunny.UI.UILight(); + this.uiLight13 = new Sunny.UI.UILight(); this.uiLabel17 = new Sunny.UI.UILabel(); this.uiPanel27 = new Sunny.UI.UIPanel(); this.uiLabel28 = new Sunny.UI.UILabel(); @@ -110,6 +116,10 @@ namespace 全自动水压检测仪 this.uiPanel13 = new Sunny.UI.UIPanel(); this.uiTableLayoutPanel9 = new Sunny.UI.UITableLayoutPanel(); this.uiPanel14 = new Sunny.UI.UIPanel(); + this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.checkBox3 = new System.Windows.Forms.CheckBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); this.uiLabel26 = new Sunny.UI.UILabel(); this.uiTextBox14 = new Sunny.UI.UITextBox(); this.uiLabel25 = new Sunny.UI.UILabel(); @@ -171,10 +181,6 @@ namespace 全自动水压检测仪 this.uiPanel2 = new Sunny.UI.UIPanel(); this.uiLabel1 = new Sunny.UI.UILabel(); this.uiLight1 = new Sunny.UI.UILight(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); this.uiTableLayoutPanel1.SuspendLayout(); this.uiPanel1.SuspendLayout(); this.uiPanel4.SuspendLayout(); @@ -1018,8 +1024,11 @@ namespace 全自动水压检测仪 // // uiPanel31 // - this.uiPanel31.Controls.Add(this.uiLabel7); - this.uiPanel31.Controls.Add(this.uiLabel8); + this.uiPanel31.Controls.Add(this.uiLabel16); + this.uiPanel31.Controls.Add(this.uiLabel27); + this.uiPanel31.Controls.Add(this.uiLabel31); + this.uiPanel31.Controls.Add(this.uiLight15); + this.uiPanel31.Controls.Add(this.uiLight16); this.uiPanel31.Controls.Add(this.uiLabel34); this.uiPanel31.Dock = System.Windows.Forms.DockStyle.Fill; this.uiPanel31.FillColor = System.Drawing.Color.White; @@ -1034,28 +1043,60 @@ namespace 全自动水压检测仪 this.uiPanel31.Text = null; this.uiPanel31.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // - // uiLabel7 + // uiLabel16 // - this.uiLabel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(245))))); - this.uiLabel7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold); - this.uiLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.uiLabel7.Location = new System.Drawing.Point(148, 1); - this.uiLabel7.Name = "uiLabel7"; - this.uiLabel7.Size = new System.Drawing.Size(80, 30); - this.uiLabel7.TabIndex = 2; - this.uiLabel7.Text = "0.00"; - this.uiLabel7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.uiLabel16.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel16.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); + this.uiLabel16.Location = new System.Drawing.Point(216, 5); + this.uiLabel16.Name = "uiLabel16"; + this.uiLabel16.Size = new System.Drawing.Size(25, 30); + this.uiLabel16.TabIndex = 11; + this.uiLabel16.Text = "高"; + this.uiLabel16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // uiLabel8 + // uiLabel27 // - this.uiLabel8.Font = new System.Drawing.Font("微软雅黑", 10F, 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(-2, 1); - this.uiLabel8.Name = "uiLabel8"; - this.uiLabel8.Size = new System.Drawing.Size(158, 30); - this.uiLabel8.TabIndex = 0; - this.uiLabel8.Text = "高温实时液位(mm):"; - this.uiLabel8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiLabel27.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel27.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); + this.uiLabel27.Location = new System.Drawing.Point(139, 10); + this.uiLabel27.Name = "uiLabel27"; + this.uiLabel27.Size = new System.Drawing.Size(25, 30); + this.uiLabel27.TabIndex = 10; + this.uiLabel27.Text = "低:"; + this.uiLabel27.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // uiLabel31 + // + this.uiLabel31.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel31.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); + this.uiLabel31.Location = new System.Drawing.Point(3, 8); + this.uiLabel31.Name = "uiLabel31"; + this.uiLabel31.Size = new System.Drawing.Size(91, 30); + this.uiLabel31.TabIndex = 9; + this.uiLabel31.Text = "高温液位:"; + this.uiLabel31.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // uiLight15 + // + this.uiLight15.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLight15.Location = new System.Drawing.Point(175, 4); + this.uiLight15.MinimumSize = new System.Drawing.Size(1, 1); + this.uiLight15.Name = "uiLight15"; + this.uiLight15.Radius = 35; + this.uiLight15.Size = new System.Drawing.Size(35, 35); + this.uiLight15.TabIndex = 8; + this.uiLight15.Text = "uiLight15"; + // + // uiLight16 + // + this.uiLight16.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLight16.Location = new System.Drawing.Point(100, 5); + this.uiLight16.MinimumSize = new System.Drawing.Size(1, 1); + this.uiLight16.Name = "uiLight16"; + this.uiLight16.Radius = 35; + this.uiLight16.Size = new System.Drawing.Size(35, 35); + this.uiLight16.TabIndex = 7; + this.uiLight16.Text = "高温低液位"; // // uiLabel34 // @@ -1070,7 +1111,10 @@ namespace 全自动水压检测仪 // uiPanel23 // this.uiPanel23.Controls.Add(this.uiLabel12); - this.uiPanel23.Controls.Add(this.uiLabel16); + this.uiPanel23.Controls.Add(this.uiLabel8); + this.uiPanel23.Controls.Add(this.uiLabel7); + this.uiPanel23.Controls.Add(this.uiLight14); + this.uiPanel23.Controls.Add(this.uiLight13); this.uiPanel23.Controls.Add(this.uiLabel17); this.uiPanel23.Dock = System.Windows.Forms.DockStyle.Fill; this.uiPanel23.FillColor = System.Drawing.Color.White; @@ -1087,32 +1131,64 @@ namespace 全自动水压检测仪 // // uiLabel12 // - this.uiLabel12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(245))))); - this.uiLabel12.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold); - this.uiLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.uiLabel12.Location = new System.Drawing.Point(148, -1); + this.uiLabel12.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); + this.uiLabel12.Location = new System.Drawing.Point(217, 4); this.uiLabel12.Name = "uiLabel12"; - this.uiLabel12.Size = new System.Drawing.Size(80, 30); - this.uiLabel12.TabIndex = 2; - this.uiLabel12.Text = "0.00"; - this.uiLabel12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.uiLabel12.Size = new System.Drawing.Size(25, 30); + this.uiLabel12.TabIndex = 6; + this.uiLabel12.Text = "高"; + this.uiLabel12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // uiLabel16 + // uiLabel8 // - this.uiLabel16.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiLabel16.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); - this.uiLabel16.Location = new System.Drawing.Point(-2, 0); - this.uiLabel16.Name = "uiLabel16"; - this.uiLabel16.Size = new System.Drawing.Size(158, 30); - this.uiLabel16.TabIndex = 0; - this.uiLabel16.Text = "常温实时液位(mm):"; - this.uiLabel16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiLabel8.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); + this.uiLabel8.Location = new System.Drawing.Point(140, 9); + this.uiLabel8.Name = "uiLabel8"; + this.uiLabel8.Size = new System.Drawing.Size(25, 30); + this.uiLabel8.TabIndex = 5; + this.uiLabel8.Text = "低:"; + this.uiLabel8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // uiLabel7 + // + this.uiLabel7.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); + this.uiLabel7.Location = new System.Drawing.Point(3, 7); + this.uiLabel7.Name = "uiLabel7"; + this.uiLabel7.Size = new System.Drawing.Size(91, 30); + this.uiLabel7.TabIndex = 4; + this.uiLabel7.Text = "常温液位:"; + this.uiLabel7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // uiLight14 + // + this.uiLight14.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLight14.Location = new System.Drawing.Point(176, 3); + this.uiLight14.MinimumSize = new System.Drawing.Size(1, 1); + this.uiLight14.Name = "uiLight14"; + this.uiLight14.Radius = 35; + this.uiLight14.Size = new System.Drawing.Size(35, 35); + this.uiLight14.TabIndex = 3; + this.uiLight14.Text = "uiLight14"; + // + // uiLight13 + // + this.uiLight13.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLight13.Location = new System.Drawing.Point(100, 4); + this.uiLight13.MinimumSize = new System.Drawing.Size(1, 1); + this.uiLight13.Name = "uiLight13"; + this.uiLight13.Radius = 35; + this.uiLight13.Size = new System.Drawing.Size(35, 35); + this.uiLight13.TabIndex = 2; + this.uiLight13.Text = "高温低液位"; // // uiLabel17 // this.uiLabel17.Font = new System.Drawing.Font("微软雅黑", 9.5F); this.uiLabel17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); - this.uiLabel17.Location = new System.Drawing.Point(15, 7); + this.uiLabel17.Location = new System.Drawing.Point(33, 7); this.uiLabel17.Name = "uiLabel17"; this.uiLabel17.Size = new System.Drawing.Size(131, 35); this.uiLabel17.TabIndex = 1; @@ -1475,6 +1551,54 @@ namespace 全自动水压检测仪 this.uiPanel14.Text = null; this.uiPanel14.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // + // checkBox4 + // + this.checkBox4.AutoSize = true; + this.checkBox4.Enabled = false; + this.checkBox4.Location = new System.Drawing.Point(425, 175); + this.checkBox4.Name = "checkBox4"; + this.checkBox4.Size = new System.Drawing.Size(131, 24); + this.checkBox4.TabIndex = 30; + this.checkBox4.Text = "常温高液位"; + this.checkBox4.UseVisualStyleBackColor = true; + this.checkBox4.Visible = false; + // + // checkBox3 + // + this.checkBox3.AutoSize = true; + this.checkBox3.Enabled = false; + this.checkBox3.Location = new System.Drawing.Point(298, 175); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(131, 24); + this.checkBox3.TabIndex = 29; + this.checkBox3.Text = "常温低液位"; + this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox3.Visible = false; + // + // checkBox2 + // + this.checkBox2.AutoSize = true; + this.checkBox2.Enabled = false; + this.checkBox2.Location = new System.Drawing.Point(150, 175); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(131, 24); + this.checkBox2.TabIndex = 28; + this.checkBox2.Text = "高温高液位"; + this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox2.Visible = false; + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Enabled = false; + this.checkBox1.Location = new System.Drawing.Point(11, 175); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(131, 24); + this.checkBox1.TabIndex = 27; + this.checkBox1.Text = "高温低液位"; + this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox1.Visible = false; + // // uiLabel26 // this.uiLabel26.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -2393,50 +2517,6 @@ namespace 全自动水压检测仪 this.uiLight1.TabIndex = 1; this.uiLight1.Text = "uiLight1"; // - // checkBox1 - // - this.checkBox1.AutoSize = true; - this.checkBox1.Enabled = false; - this.checkBox1.Location = new System.Drawing.Point(11, 175); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(131, 24); - this.checkBox1.TabIndex = 27; - this.checkBox1.Text = "高温低液位"; - this.checkBox1.UseVisualStyleBackColor = true; - // - // checkBox2 - // - this.checkBox2.AutoSize = true; - this.checkBox2.Enabled = false; - this.checkBox2.Location = new System.Drawing.Point(150, 175); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(131, 24); - this.checkBox2.TabIndex = 28; - this.checkBox2.Text = "高温高液位"; - this.checkBox2.UseVisualStyleBackColor = true; - // - // checkBox3 - // - this.checkBox3.AutoSize = true; - this.checkBox3.Enabled = false; - this.checkBox3.Location = new System.Drawing.Point(298, 175); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(131, 24); - this.checkBox3.TabIndex = 29; - this.checkBox3.Text = "常温低液位"; - this.checkBox3.UseVisualStyleBackColor = true; - // - // checkBox4 - // - this.checkBox4.AutoSize = true; - this.checkBox4.Enabled = false; - this.checkBox4.Location = new System.Drawing.Point(425, 175); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(131, 24); - this.checkBox4.TabIndex = 30; - this.checkBox4.Text = "常温高液位"; - this.checkBox4.UseVisualStyleBackColor = true; - // // NormalTemperatureMode // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -2549,8 +2629,6 @@ namespace 全自动水压检测仪 private Sunny.UI.UILabel uiLabel18; private Sunny.UI.UITableLayoutPanel uiTableLayoutPanel13; private Sunny.UI.UIPanel uiPanel23; - private Sunny.UI.UILabel uiLabel12; - private Sunny.UI.UILabel uiLabel16; private Sunny.UI.UILabel uiLabel17; private Sunny.UI.UIPanel uiPanel27; private Sunny.UI.UILabel uiLabel28; @@ -2571,10 +2649,6 @@ namespace 全自动水压检测仪 private Sunny.UI.UIPanel uiPanel17; private Sunny.UI.UILabel uiLabel6; private Sunny.UI.UILight uiLight2; - private Sunny.UI.UIPanel uiPanel31; - private Sunny.UI.UILabel uiLabel7; - private Sunny.UI.UILabel uiLabel8; - private Sunny.UI.UILabel uiLabel34; private Sunny.UI.UITableLayoutPanel uiTableLayoutPanel16; private Sunny.UI.UIPanel uiPanel33; private Sunny.UI.UILabel uiLabel38; @@ -2656,6 +2730,18 @@ namespace 全自动水压检测仪 private CheckBox checkBox3; private CheckBox checkBox2; private CheckBox checkBox1; + private Sunny.UI.UILight uiLight13; + private Sunny.UI.UILabel uiLabel7; + private Sunny.UI.UIPanel uiPanel31; + private Sunny.UI.UILabel uiLabel34; + private Sunny.UI.UILabel uiLabel31; + private Sunny.UI.UILight uiLight16; + private Sunny.UI.UILabel uiLabel16; + private Sunny.UI.UILabel uiLabel27; + private Sunny.UI.UILight uiLight15; + private Sunny.UI.UILabel uiLabel12; + private Sunny.UI.UILabel uiLabel8; + private Sunny.UI.UILight uiLight14; } } diff --git a/全自动水压检测仪/NormalTemperatureMode.cs b/全自动水压检测仪/NormalTemperatureMode.cs index 6c6bb4a..25b2be8 100644 --- a/全自动水压检测仪/NormalTemperatureMode.cs +++ b/全自动水压检测仪/NormalTemperatureMode.cs @@ -489,39 +489,70 @@ namespace 全自动水压检测仪 uiLabel28.Text = value0.ToString("F2"); } - // 常温实时液位 - if (uiLabel12 != null && !uiLabel12.IsDisposed && - modbusData.Real2 != null && modbusData.Real2.Length >= 2) - { - var value1 = c.UshortToFloat(modbusData.Real2[1], modbusData.Real2[0]); - float percentage = (value1 / 150f) * 100f; + //// 常温实时液位 + //if (modbusData.Real2 != null && modbusData.Real2.Length >= 2) + //{ + // var value1 = c.UshortToFloat(modbusData.Real2[1], modbusData.Real2[0]); + // float percentage = (value1 / 150f) * 100f; - // 限制百分比在0-100之间 - if (percentage < 0) percentage = 0; - if (percentage > 100) percentage = 100; + // // 限制百分比在0-100之间 + // if (percentage < 0) percentage = 0; + // if (percentage > 100) percentage = 100; - bool[] a = _modbusMaster?.ReadCoils(1, 10040, 1); - bool[] b = _modbusMaster?.ReadCoils(1, 10041, 1); - bool[] cc = _modbusMaster?.ReadCoils(1, 10042, 1); - bool[] d = _modbusMaster?.ReadCoils(1, 10043, 1); + bool[] a = _modbusMaster?.ReadCoils(1, 10042, 1); + bool[] b = _modbusMaster?.ReadCoils(1, 10043, 1); + bool[] cc = _modbusMaster?.ReadCoils(1, 10040, 1); + bool[] d = _modbusMaster?.ReadCoils(1, 10041, 1); if (a != null && a.Length > 0) { - checkBox1.Checked = a[0] ? true : false; + if (a[0]) + { + uiLight13.OnColor = System.Drawing.Color.Green;//有水 + } + + else + { + uiLight13.OnColor = System.Drawing.Color.Red; + } } if (b != null && b.Length > 0) { - checkBox2.Checked = b[0] ? true : false; + if (!b[0]) + { + uiLight14.OnColor = System.Drawing.Color.Green;//有水 + } + + else + { + uiLight14.OnColor = System.Drawing.Color.Red; + } } if (cc != null && cc.Length > 0) { - checkBox3.Checked = cc[0] ? true : false; + if (cc[0]) + { + uiLight16.OnColor = System.Drawing.Color.Green;//有水 + } + + else + { + uiLight16.OnColor = System.Drawing.Color.Red; + } } if (d != null && d.Length > 0) { - checkBox4.Checked = d[0] ? true : false; + if (!d[0]) + { + uiLight15.OnColor = System.Drawing.Color.Green;//有水 + } + + else + { + uiLight15.OnColor = System.Drawing.Color.Red; + } } @@ -532,8 +563,8 @@ namespace 全自动水压检测仪 //if (uiProcessBar1 != null && !uiProcessBar1.IsDisposed) // uiProcessBar1.Value = (int)percentage; - uiLabel12.Text = value1.ToString("F2"); - } + //uiLabel12.Text = value1.ToString("F2"); + //} // 初始压力 if (uiLabel14 != null && !uiLabel14.IsDisposed && @@ -572,24 +603,24 @@ namespace 全自动水压检测仪 uiLabel9.Text = timeString; } - // 高温实时液位 - if (uiLabel7 != null && !uiLabel7.IsDisposed && - modbusData.Real9 != null && modbusData.Real9.Length >= 2) - { - var value8 = c.UshortToFloat(modbusData.Real9[1], modbusData.Real9[0]); - float percentage = (value8 / 150f) * 100f; + //// 高温实时液位 + //if (uiLabel7 != null && !uiLabel7.IsDisposed && + // modbusData.Real9 != null && modbusData.Real9.Length >= 2) + //{ + // var value8 = c.UshortToFloat(modbusData.Real9[1], modbusData.Real9[0]); + // float percentage = (value8 / 150f) * 100f; - // 限制百分比在0-100之间 - if (percentage < 0) percentage = 0; - if (percentage > 100) percentage = 100; + // // 限制百分比在0-100之间 + // if (percentage < 0) percentage = 0; + // if (percentage > 100) percentage = 100; - //// 更新进度条 - //if (uiProcessBar2 != null && !uiProcessBar2.IsDisposed) - // uiProcessBar2.Value = (int)percentage; + // //// 更新进度条 + // //if (uiProcessBar2 != null && !uiProcessBar2.IsDisposed) + // // uiProcessBar2.Value = (int)percentage; - uiLabel7.Text = value8.ToString("F2"); - } + // uiLabel7.Text = value8.ToString("F2"); + //} // 箱体温度 if (uiLabel42 != null && !uiLabel42.IsDisposed && diff --git a/全自动水压检测仪/Program.cs b/全自动水压检测仪/Program.cs index 1554102..ee4dea7 100644 --- a/全自动水压检测仪/Program.cs +++ b/全自动水压检测仪/Program.cs @@ -24,13 +24,13 @@ namespace 全自动水压检测仪 Application.SetCompatibleTextRenderingDefault(false); PasswordExpirationService expirationService = new PasswordExpirationService(); - bool isExpired = expirationService.IsPasswordExpired(DateTime.Parse("2026-2-6")); - bool isExpiringSoon = expirationService.IsPasswordExpiringSoon(DateTime.Parse("2026-2-6")); - if (isExpired) - { - MessageBox.Show("授权已过期，请联系经销商处理"); - Application.Run(new ChangPassword()); - } + bool isExpired = expirationService.IsPasswordExpired(DateTime.Parse("3000-2-6")); + bool isExpiringSoon = expirationService.IsPasswordExpiringSoon(DateTime.Parse("3000-2-6")); + //if (isExpired) + //{ + // MessageBox.Show("授权已过期，请联系经销商处理"); + // Application.Run(new ChangPassword()); + //} if (isExpiringSoon && !isExpired) { MessageBox.Show("授权即将过期，请联系经销商处理");