From 192cd18087329ce36dd345ad3f5791414b576079 Mon Sep 17 00:00:00 2001 From: wxt Date: Tue, 6 Jan 2026 20:44:21 +0800 Subject: [PATCH] --- .../Model/PrimaryIgnitionModel.cs | 11 + .../PenetrationForm.Designer.cs | 111 ++++ .../外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs | 125 +++- .../外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs | 2 +- .../SecondaryIgnitionForm.Designer.cs | 577 +++++++++-------- .../SecondaryIgnitionForm.cs | 582 +++++++++++++++++- .../bin/Debug/net8.0-windows7.0/BasicDemo_CS.exe | Bin 129536 -> 129536 bytes .../bin/Debug/net8.0-windows7.0/BasicDemo_CS.pdb | Bin 151040 -> 151040 bytes .../bin/Debug/net8.0-windows7.0/en-US/BasicDemo_CS.resources.dll | Bin 9728 -> 9728 bytes .../bin/Debug/net8.0-windows7.0/zh-CHS/BasicDemo_CS.resources.dll | Bin 25600 -> 25600 bytes 10 files changed, 1134 insertions(+), 274 deletions(-) diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs index e891819..95388a8 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs @@ -30,4 +30,15 @@ namespace 外科辅料和患者防护罩激光抗性测试仪.Model public double? costTime2 { get; set; } public float? penetime2 { get; set; } } + public class SecondaryIgnitionModel + { + public int sampleType3 { get; set; } + public string result3 { get; set; } + public string O23 { get; set; } + public float? yuhui3 { get; set; } + public float? yuyan3 { get; set; } + public bool Iszixi3 { get; set; } + public bool Isdianhuo3 { get; set; } + + } } diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs index ff87022..29bc5b6 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs @@ -32,6 +32,7 @@ uiTableLayoutPanel2 = new Sunny.UI.UITableLayoutPanel(); uiPanel3 = new Sunny.UI.UIPanel(); uiGroupBox2 = new Sunny.UI.UIGroupBox(); + uiButton8 = new Sunny.UI.UIButton(); uiLabel29 = new Sunny.UI.UILabel(); uiLabel30 = new Sunny.UI.UILabel(); uiLabel31 = new Sunny.UI.UILabel(); @@ -84,6 +85,9 @@ uiTableLayoutPanel4 = new Sunny.UI.UITableLayoutPanel(); uiTableLayoutPanel5 = new Sunny.UI.UITableLayoutPanel(); uiGroupBox4 = new Sunny.UI.UIGroupBox(); + uiButton13 = new Sunny.UI.UIButton(); + uiButton10 = new Sunny.UI.UIButton(); + uiButton9 = new Sunny.UI.UIButton(); uiLabel46 = new Sunny.UI.UILabel(); uiLabel47 = new Sunny.UI.UILabel(); uiLabel44 = new Sunny.UI.UILabel(); @@ -180,6 +184,7 @@ // uiGroupBox2 // uiGroupBox2.BackColor = Color.White; + uiGroupBox2.Controls.Add(uiButton8); uiGroupBox2.Controls.Add(uiLabel29); uiGroupBox2.Controls.Add(uiLabel30); uiGroupBox2.Controls.Add(uiLabel31); @@ -205,6 +210,31 @@ uiGroupBox2.Text = "测试控制"; uiGroupBox2.TextAlignment = ContentAlignment.MiddleLeft; // + // uiButton8 + // + uiButton8.Cursor = Cursors.Hand; + uiButton8.FillColor = Color.FromArgb(230, 162, 60); + uiButton8.FillColor2 = Color.FromArgb(230, 162, 60); + uiButton8.FillHoverColor = Color.FromArgb(235, 181, 99); + uiButton8.FillPressColor = Color.FromArgb(212, 145, 47); + uiButton8.FillSelectedColor = Color.FromArgb(212, 145, 47); + uiButton8.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton8.Location = new Point(743, 64); + uiButton8.MinimumSize = new Size(1, 1); + uiButton8.Name = "uiButton8"; + uiButton8.Radius = 8; + uiButton8.RectColor = Color.FromArgb(230, 162, 60); + uiButton8.RectHoverColor = Color.FromArgb(235, 181, 99); + uiButton8.RectPressColor = Color.FromArgb(212, 145, 47); + uiButton8.RectSelectedColor = Color.FromArgb(212, 145, 47); + uiButton8.Size = new Size(111, 85); + uiButton8.Style = Sunny.UI.UIStyle.Custom; + uiButton8.StyleCustomMode = true; + uiButton8.TabIndex = 9; + uiButton8.Text = "查看相机"; + uiButton8.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton8.Click += uiButton8_Click; + // // uiLabel29 // uiLabel29.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); @@ -1068,6 +1098,9 @@ // uiGroupBox4 // uiGroupBox4.BackColor = Color.White; + uiGroupBox4.Controls.Add(uiButton13); + uiGroupBox4.Controls.Add(uiButton10); + uiGroupBox4.Controls.Add(uiButton9); uiGroupBox4.Controls.Add(uiLabel46); uiGroupBox4.Controls.Add(uiLabel47); uiGroupBox4.Controls.Add(uiLabel44); @@ -1104,6 +1137,80 @@ uiGroupBox4.Text = "测试结果"; uiGroupBox4.TextAlignment = ContentAlignment.MiddleLeft; // + // uiButton13 + // + uiButton13.Cursor = Cursors.Hand; + uiButton13.FillColor = Color.FromArgb(64, 158, 255); + uiButton13.FillColor2 = Color.FromArgb(64, 158, 255); + uiButton13.FillHoverColor = Color.FromArgb(102, 177, 255); + uiButton13.FillPressColor = Color.FromArgb(47, 144, 255); + uiButton13.FillSelectedColor = Color.FromArgb(47, 144, 255); + uiButton13.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton13.Location = new Point(162, 779); + uiButton13.MinimumSize = new Size(1, 1); + uiButton13.Name = "uiButton13"; + uiButton13.Radius = 6; + uiButton13.RectColor = Color.FromArgb(64, 158, 255); + uiButton13.RectHoverColor = Color.FromArgb(102, 177, 255); + uiButton13.RectPressColor = Color.FromArgb(47, 144, 255); + uiButton13.RectSelectedColor = Color.FromArgb(47, 144, 255); + uiButton13.Size = new Size(208, 56); + uiButton13.Style = Sunny.UI.UIStyle.Custom; + uiButton13.StyleCustomMode = true; + uiButton13.TabIndex = 26; + uiButton13.Text = "返回主页面"; + uiButton13.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton13.Click += uiButton13_Click; + // + // uiButton10 + // + uiButton10.Cursor = Cursors.Hand; + uiButton10.FillColor = Color.FromArgb(230, 162, 60); + uiButton10.FillColor2 = Color.FromArgb(230, 162, 60); + uiButton10.FillHoverColor = Color.FromArgb(235, 181, 99); + uiButton10.FillPressColor = Color.FromArgb(212, 145, 47); + uiButton10.FillSelectedColor = Color.FromArgb(212, 145, 47); + uiButton10.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton10.Location = new Point(162, 684); + uiButton10.MinimumSize = new Size(1, 1); + uiButton10.Name = "uiButton10"; + uiButton10.Radius = 6; + uiButton10.RectColor = Color.FromArgb(230, 162, 60); + uiButton10.RectHoverColor = Color.FromArgb(235, 181, 99); + uiButton10.RectPressColor = Color.FromArgb(212, 145, 47); + uiButton10.RectSelectedColor = Color.FromArgb(212, 145, 47); + uiButton10.Size = new Size(208, 56); + uiButton10.Style = Sunny.UI.UIStyle.Custom; + uiButton10.StyleCustomMode = true; + uiButton10.TabIndex = 24; + uiButton10.Text = "清除"; + uiButton10.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton10.Click += uiButton10_Click; + // + // uiButton9 + // + uiButton9.Cursor = Cursors.Hand; + uiButton9.FillColor = Color.FromArgb(103, 194, 58); + uiButton9.FillColor2 = Color.FromArgb(103, 194, 58); + uiButton9.FillHoverColor = Color.FromArgb(133, 206, 97); + uiButton9.FillPressColor = Color.FromArgb(84, 178, 38); + uiButton9.FillSelectedColor = Color.FromArgb(84, 178, 38); + uiButton9.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton9.Location = new Point(162, 589); + uiButton9.MinimumSize = new Size(1, 1); + uiButton9.Name = "uiButton9"; + uiButton9.Radius = 6; + uiButton9.RectColor = Color.FromArgb(103, 194, 58); + uiButton9.RectHoverColor = Color.FromArgb(133, 206, 97); + uiButton9.RectPressColor = Color.FromArgb(84, 178, 38); + uiButton9.RectSelectedColor = Color.FromArgb(84, 178, 38); + uiButton9.Size = new Size(208, 56); + uiButton9.Style = Sunny.UI.UIStyle.Custom; + uiButton9.StyleCustomMode = true; + uiButton9.TabIndex = 25; + uiButton9.Text = "保存结果"; + uiButton9.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + // // uiLabel46 // uiLabel46.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); @@ -1481,5 +1588,9 @@ private Sunny.UI.UILabel uiLabel43; private Sunny.UI.UILabel uiLabel46; private Sunny.UI.UILabel uiLabel47; + private Sunny.UI.UIButton uiButton8; + private Sunny.UI.UIButton uiButton13; + private Sunny.UI.UIButton uiButton10; + private Sunny.UI.UIButton uiButton9; } } \ No newline at end of file diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs index a3522b9..9e6bf57 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs @@ -1,4 +1,5 @@ -using Modbus.Device; +using BasicDemo; +using Modbus.Device; using Sunny.UI; using System; using System.Collections.Generic; @@ -37,6 +38,8 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 private System.Windows.Forms.Timer _readtimer; private readonly object _serialLock = new object(); private System.Windows.Forms.Timer _powerMeterTimer; + + public bool RunStatus = false; public PenetrationForm() { InitializeComponent(); @@ -45,6 +48,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 InitComboBox2Pattern(); InitTimer(); + InitTimer2(); } private System.Windows.Forms.Timer InitTimer() @@ -68,6 +72,61 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 } + private System.Windows.Forms.Timer InitTimer2() + { + var timer = new System.Windows.Forms.Timer() + { + Interval = 1000, + }; + timer.Tick += async (s, e) => + { + if (_modbusMaster != null) + { + try + { + await WriteDataAsync(); + } + catch { } + } + }; + timer.Start(); + return timer; + + } + + private async System.Threading.Tasks.Task WriteDataAsync() + { + try + { + if (_modbusMaster == null || _tcpClient == null || !_tcpClient.Connected) + { + return; + } + string labelText = await Task.Factory.StartNew(() => + { + + if (this.InvokeRequired) + { + return (string)this.Invoke(new Func(() => uiLabel23.Text)); + } + else + { + return uiLabel23.Text; + } + }); + await Task.Run(() => + { + ma?.WriteToPLCForNew(labelText, 74, Function.DataType.浮点型, 3); + }); + + } + catch (Exception ex) + { + //ShowError($"读取数据失败：{ex.Message}"); + } + } + + private async System.Threading.Tasks.Task ReadDataAsync() { try @@ -901,8 +960,8 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 #region 串口功率计 - private string _serialBuffer = ""; - private bool _waitingResponse = false; + private string _serialBuffer = ""; + private bool _waitingResponse = false; //private void uiButton11_Click(object sender, EventArgs e) //{ // if (this.connect.Text == "🔗 连接功率计") @@ -961,14 +1020,14 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 { _serialBuffer = ""; _waitingResponse = false; - + serialPort = new SerialPort(); serialPort.PortName = this.comkou.Text; - serialPort.BaudRate = 38400; + serialPort.BaudRate = 38400; serialPort.DataBits = 8; serialPort.Parity = Parity.None; serialPort.StopBits = StopBits.One; - serialPort.NewLine = "\r\n"; + serialPort.NewLine = "\r\n"; serialPort.DataReceived += SerialPort_DataReceived; @@ -980,13 +1039,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 toolStripStatusLabel1.BackColor = Color.Lime; WriteToLog("功率计串口连接成功"); - + _powerMeterTimer = new System.Windows.Forms.Timer(); _powerMeterTimer.Interval = 300; // 100ms读取一次 _powerMeterTimer.Tick += PowerMeterTimer_Tick; _powerMeterTimer.Start(); - + //SendCommand("S01"); } catch (Exception ex) @@ -1017,7 +1076,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 if (serialPort == null || !serialPort.IsOpen) return; string data = serialPort.ReadExisting(); - _serialBuffer += data; + _serialBuffer += data; int newLineIndex; @@ -1026,7 +1085,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 string line = _serialBuffer.Substring(0, newLineIndex); - + _serialBuffer = _serialBuffer.Substring(newLineIndex + 2); if (!string.IsNullOrEmpty(line)) @@ -1053,10 +1112,10 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 string trimmedLine = data.Trim(); WriteToLog($"处理数据行: '{trimmedLine}'"); - + if (double.TryParse(trimmedLine, NumberStyles.Float, CultureInfo.InvariantCulture, out double powerValue)) { - + uiLabel23.Text = $"{powerValue:F3} W"; _waitingResponse = false; } @@ -1068,7 +1127,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 if (double.TryParse(part, NumberStyles.Float, CultureInfo.InvariantCulture, out double power)) { uiLabel23.Text = $"{power:F3} W"; - _waitingResponse = false; + _waitingResponse = false; break; } } @@ -1091,7 +1150,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 if (_isSerialPortAvailable && serialPort != null && serialPort.IsOpen && !_waitingResponse) { SendCommand("GD"); - _waitingResponse = true; + _waitingResponse = true; } } @@ -1108,7 +1167,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 serialPort.Write(fullCommand); WriteToLog($"发送命令: {command}"); - + Task.Delay(2000).ContinueWith(t => { if (_waitingResponse) @@ -1131,7 +1190,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 private void Disconnect() { _isSerialPortAvailable = false; - _waitingResponse = false; + _waitingResponse = false; _serialBuffer = ""; @@ -1147,7 +1206,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 { if (serialPort != null && serialPort.IsOpen) { - SendCommand("S00"); + SendCommand("S00"); } } catch { } @@ -1210,13 +1269,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 case "样品1": { var data = reportList?.FirstOrDefault(x => x.sampleType2 == 1); - uiLabel21.Text = data?.O22.ToString()?? string.Empty; - uiLabel44.Text = data?.result2.ToString()?? string.Empty; + uiLabel21.Text = data?.O22.ToString() ?? string.Empty; + uiLabel44.Text = data?.result2.ToString() ?? string.Empty; uiLabel41.Text = data?.temperature2.ToString() ?? string.Empty; uiLabel17.Text = data?.yuyan2.ToString() ?? string.Empty; uiLabel36.Text = data?.yuhui2.ToString() ?? string.Empty; uiLabel18.Text = data?.Isfire.ToString() ?? string.Empty; - uiLabel19.Text = data?.costTime2.ToString() ?? string.Empty; + uiLabel19.Text = data?.costTime2.ToString() ?? string.Empty; uiLabel46.Text = data?.penetime2.ToString() ?? string.Empty; break; } @@ -1276,5 +1335,31 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 break; } } + //相机 + private void uiButton8_Click(object sender, EventArgs e) + { + AutoCameraForm cameraForm = new AutoCameraForm(() => RunStatus); + this.SwitchToForm(() => cameraForm); + } + private void SwitchToForm(Func
formCreator) + { + using (Form form = formCreator()) + { + this.Hide(); + form.ShowDialog(); + this.Show(); + this.Activate(); + } + } + + private void uiButton10_Click(object sender, EventArgs e) + { + ma?.BtnClickFunctionForNew(Function.ButtonType.复归型, 41, 1);//清除 + } + + private void uiButton13_Click(object sender, EventArgs e) + { + this.Close();//返回主页面 + } } } diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs index e3195c7..93eed9a 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs @@ -858,7 +858,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 { costTime = costtime, FireDate = firetime, - Iszixi = false, + Iszixi = iszixi, O2 = selectedO2Text, result = classify, sampleType = uiLabel10.Text.Contains("1") ? 1 diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.Designer.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.Designer.cs index ad0d4b0..bb872db 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.Designer.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.Designer.cs @@ -32,6 +32,7 @@ uiTableLayoutPanel2 = new Sunny.UI.UITableLayoutPanel(); uiPanel3 = new Sunny.UI.UIPanel(); uiGroupBox2 = new Sunny.UI.UIGroupBox(); + uiButton8 = new Sunny.UI.UIButton(); uiLabel25 = new Sunny.UI.UILabel(); uiLabel26 = new Sunny.UI.UILabel(); uiLabel23 = new Sunny.UI.UILabel(); @@ -51,6 +52,8 @@ uiGroupBox3 = new Sunny.UI.UIGroupBox(); uiTableLayoutPanel3 = new Sunny.UI.UITableLayoutPanel(); uiPanel6 = new Sunny.UI.UIPanel(); + uiComboBox2 = new Sunny.UI.UIComboBox(); + uiLabel37 = new Sunny.UI.UILabel(); uiButton12 = new Sunny.UI.UIButton(); uiButton11 = new Sunny.UI.UIButton(); uiLabel14 = new Sunny.UI.UILabel(); @@ -71,24 +74,23 @@ uiGroupBox5 = new Sunny.UI.UIGroupBox(); uiLabel16 = new Sunny.UI.UILabel(); uiGroupBox4 = new Sunny.UI.UIGroupBox(); - uiLabel21 = new Sunny.UI.UILabel(); - uiLabel22 = new Sunny.UI.UILabel(); - uiLabel19 = new Sunny.UI.UILabel(); - uiLabel20 = new Sunny.UI.UILabel(); - uiLabel18 = new Sunny.UI.UILabel(); - uiLabel17 = new Sunny.UI.UILabel(); uiLabel10 = new Sunny.UI.UILabel(); uiLabel11 = new Sunny.UI.UILabel(); + uiButton13 = new Sunny.UI.UIButton(); + uiButton10 = new Sunny.UI.UIButton(); + uiButton9 = new Sunny.UI.UIButton(); + uiLabel21 = new Sunny.UI.UILabel(); uiLabel27 = new Sunny.UI.UILabel(); + uiLabel18 = new Sunny.UI.UILabel(); + uiLabel33 = new Sunny.UI.UILabel(); uiLabel28 = new Sunny.UI.UILabel(); uiLabel29 = new Sunny.UI.UILabel(); uiLabel30 = new Sunny.UI.UILabel(); - uiLabel31 = new Sunny.UI.UILabel(); - uiLabel32 = new Sunny.UI.UILabel(); - uiLabel33 = new Sunny.UI.UILabel(); - uiLabel34 = new Sunny.UI.UILabel(); - uiLabel35 = new Sunny.UI.UILabel(); - uiLabel36 = new Sunny.UI.UILabel(); + uiLabel22 = new Sunny.UI.UILabel(); + uiLabel19 = new Sunny.UI.UILabel(); + uiLabel20 = new Sunny.UI.UILabel(); + uiComboBox3 = new Sunny.UI.UIComboBox(); + uiLabel17 = new Sunny.UI.UILabel(); uiTableLayoutPanel1.SuspendLayout(); uiTableLayoutPanel2.SuspendLayout(); uiPanel3.SuspendLayout(); @@ -109,8 +111,8 @@ // uiTableLayoutPanel1.BackColor = Color.White; uiTableLayoutPanel1.ColumnCount = 2; - uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 40F)); - uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 60F)); + uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 45F)); + uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 55F)); uiTableLayoutPanel1.Controls.Add(uiTableLayoutPanel2, 0, 0); uiTableLayoutPanel1.Controls.Add(uiTableLayoutPanel4, 1, 0); uiTableLayoutPanel1.Dock = DockStyle.Fill; @@ -136,7 +138,7 @@ uiTableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 50F)); uiTableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 25F)); uiTableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 25F)); - uiTableLayoutPanel2.Size = new Size(754, 934); + uiTableLayoutPanel2.Size = new Size(849, 934); uiTableLayoutPanel2.TabIndex = 0; uiTableLayoutPanel2.TagString = null; // @@ -154,7 +156,7 @@ uiPanel3.Radius = 0; uiPanel3.RadiusSides = Sunny.UI.UICornerRadiusSides.None; uiPanel3.RectColor = Color.FromArgb(220, 223, 230); - uiPanel3.Size = new Size(746, 224); + uiPanel3.Size = new Size(841, 224); uiPanel3.Style = Sunny.UI.UIStyle.Custom; uiPanel3.StyleCustomMode = true; uiPanel3.TabIndex = 2; @@ -164,6 +166,7 @@ // uiGroupBox2 // uiGroupBox2.BackColor = Color.White; + uiGroupBox2.Controls.Add(uiButton8); uiGroupBox2.Controls.Add(uiLabel25); uiGroupBox2.Controls.Add(uiLabel26); uiGroupBox2.Controls.Add(uiLabel23); @@ -182,13 +185,38 @@ uiGroupBox2.Padding = new Padding(0, 32, 0, 0); uiGroupBox2.Radius = 6; uiGroupBox2.RectColor = Color.FromArgb(220, 223, 230); - uiGroupBox2.Size = new Size(746, 224); + uiGroupBox2.Size = new Size(841, 224); uiGroupBox2.Style = Sunny.UI.UIStyle.Custom; uiGroupBox2.StyleCustomMode = true; uiGroupBox2.TabIndex = 1; uiGroupBox2.Text = "测试控制"; uiGroupBox2.TextAlignment = ContentAlignment.MiddleLeft; // + // uiButton8 + // + uiButton8.Cursor = Cursors.Hand; + uiButton8.FillColor = Color.FromArgb(230, 162, 60); + uiButton8.FillColor2 = Color.FromArgb(230, 162, 60); + uiButton8.FillHoverColor = Color.FromArgb(235, 181, 99); + uiButton8.FillPressColor = Color.FromArgb(212, 145, 47); + uiButton8.FillSelectedColor = Color.FromArgb(212, 145, 47); + uiButton8.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton8.Location = new Point(688, 64); + uiButton8.MinimumSize = new Size(1, 1); + uiButton8.Name = "uiButton8"; + uiButton8.Radius = 8; + uiButton8.RectColor = Color.FromArgb(230, 162, 60); + uiButton8.RectHoverColor = Color.FromArgb(235, 181, 99); + uiButton8.RectPressColor = Color.FromArgb(212, 145, 47); + uiButton8.RectSelectedColor = Color.FromArgb(212, 145, 47); + uiButton8.Size = new Size(111, 85); + uiButton8.Style = Sunny.UI.UIStyle.Custom; + uiButton8.StyleCustomMode = true; + uiButton8.TabIndex = 10; + uiButton8.Text = "查看相机"; + uiButton8.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton8.Click += uiButton8_Click; + // // uiLabel25 // uiLabel25.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); @@ -249,7 +277,7 @@ uiButton3.FillPressColor = Color.FromArgb(212, 145, 47); uiButton3.FillSelectedColor = Color.FromArgb(212, 145, 47); uiButton3.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiButton3.Location = new Point(520, 64); + uiButton3.Location = new Point(464, 64); uiButton3.MinimumSize = new Size(1, 1); uiButton3.Name = "uiButton3"; uiButton3.Radius = 8; @@ -274,7 +302,7 @@ uiButton2.FillPressColor = Color.FromArgb(230, 81, 81); uiButton2.FillSelectedColor = Color.FromArgb(230, 81, 81); uiButton2.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiButton2.Location = new Point(285, 64); + uiButton2.Location = new Point(240, 64); uiButton2.MinimumSize = new Size(1, 1); uiButton2.Name = "uiButton2"; uiButton2.Radius = 8; @@ -299,7 +327,7 @@ uiButton1.FillPressColor = Color.FromArgb(84, 178, 38); uiButton1.FillSelectedColor = Color.FromArgb(84, 178, 38); uiButton1.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiButton1.Location = new Point(50, 64); + uiButton1.Location = new Point(22, 64); uiButton1.MinimumSize = new Size(1, 1); uiButton1.Name = "uiButton1"; uiButton1.Radius = 8; @@ -330,7 +358,7 @@ uiPanel2.Radius = 0; uiPanel2.RadiusSides = Sunny.UI.UICornerRadiusSides.None; uiPanel2.RectColor = Color.FromArgb(220, 223, 230); - uiPanel2.Size = new Size(746, 223); + uiPanel2.Size = new Size(841, 223); uiPanel2.Style = Sunny.UI.UIStyle.Custom; uiPanel2.StyleCustomMode = true; uiPanel2.TabIndex = 1; @@ -357,7 +385,7 @@ uiGroupBox1.Padding = new Padding(0, 32, 0, 0); uiGroupBox1.Radius = 6; uiGroupBox1.RectColor = Color.FromArgb(220, 223, 230); - uiGroupBox1.Size = new Size(744, 221); + uiGroupBox1.Size = new Size(839, 221); uiGroupBox1.Style = Sunny.UI.UIStyle.Custom; uiGroupBox1.StyleCustomMode = true; uiGroupBox1.TabIndex = 0; @@ -467,7 +495,7 @@ uiPanel1.Radius = 0; uiPanel1.RadiusSides = Sunny.UI.UICornerRadiusSides.None; uiPanel1.RectColor = Color.FromArgb(220, 223, 230); - uiPanel1.Size = new Size(746, 457); + uiPanel1.Size = new Size(841, 457); uiPanel1.Style = Sunny.UI.UIStyle.Custom; uiPanel1.StyleCustomMode = true; uiPanel1.TabIndex = 0; @@ -489,7 +517,7 @@ uiGroupBox3.Padding = new Padding(2, 32, 2, 2); uiGroupBox3.Radius = 6; uiGroupBox3.RectColor = Color.FromArgb(220, 223, 230); - uiGroupBox3.Size = new Size(746, 457); + uiGroupBox3.Size = new Size(841, 457); uiGroupBox3.Style = Sunny.UI.UIStyle.Custom; uiGroupBox3.StyleCustomMode = true; uiGroupBox3.TabIndex = 1; @@ -507,13 +535,15 @@ uiTableLayoutPanel3.Name = "uiTableLayoutPanel3"; uiTableLayoutPanel3.RowCount = 1; uiTableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - uiTableLayoutPanel3.Size = new Size(742, 423); + uiTableLayoutPanel3.Size = new Size(837, 423); uiTableLayoutPanel3.TabIndex = 0; uiTableLayoutPanel3.TagString = null; // // uiPanel6 // uiPanel6.BackColor = Color.White; + uiPanel6.Controls.Add(uiComboBox2); + uiPanel6.Controls.Add(uiLabel37); uiPanel6.Controls.Add(uiButton12); uiPanel6.Controls.Add(uiButton11); uiPanel6.Controls.Add(uiLabel14); @@ -539,13 +569,49 @@ uiPanel6.Radius = 0; uiPanel6.RadiusSides = Sunny.UI.UICornerRadiusSides.None; uiPanel6.RectColor = Color.FromArgb(220, 223, 230); - uiPanel6.Size = new Size(734, 413); + uiPanel6.Size = new Size(829, 413); uiPanel6.Style = Sunny.UI.UIStyle.Custom; uiPanel6.StyleCustomMode = true; uiPanel6.TabIndex = 1; uiPanel6.Text = null; uiPanel6.TextAlignment = ContentAlignment.MiddleCenter; // + // uiComboBox2 + // + uiComboBox2.DataSource = null; + uiComboBox2.FillColor = Color.White; + uiComboBox2.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiComboBox2.ItemHoverColor = Color.FromArgb(245, 247, 250); + uiComboBox2.ItemSelectForeColor = Color.FromArgb(64, 158, 255); + uiComboBox2.Location = new Point(195, 9); + uiComboBox2.Margin = new Padding(4, 5, 4, 5); + uiComboBox2.MinimumSize = new Size(63, 0); + uiComboBox2.Name = "uiComboBox2"; + uiComboBox2.Padding = new Padding(0, 0, 30, 2); + uiComboBox2.Radius = 4; + uiComboBox2.RectColor = Color.FromArgb(220, 223, 230); + uiComboBox2.Size = new Size(176, 44); + uiComboBox2.Style = Sunny.UI.UIStyle.Custom; + uiComboBox2.StyleCustomMode = true; + uiComboBox2.SymbolSize = 24; + uiComboBox2.TabIndex = 19; + uiComboBox2.Text = "选择样品"; + uiComboBox2.TextAlignment = ContentAlignment.MiddleLeft; + uiComboBox2.Watermark = "请选择氧浓度"; + // + // uiLabel37 + // + uiLabel37.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiLabel37.ForeColor = Color.FromArgb(96, 98, 102); + uiLabel37.Location = new Point(42, 12); + uiLabel37.Name = "uiLabel37"; + uiLabel37.Size = new Size(133, 34); + uiLabel37.Style = Sunny.UI.UIStyle.Custom; + uiLabel37.StyleCustomMode = true; + uiLabel37.TabIndex = 18; + uiLabel37.Text = "测试样品项:"; + uiLabel37.TextAlign = ContentAlignment.MiddleLeft; + // // uiButton12 // uiButton12.Cursor = Cursors.Hand; @@ -779,7 +845,7 @@ // uiLabel9.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel9.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel9.Location = new Point(40, 138); + uiLabel9.Location = new Point(42, 138); uiLabel9.Name = "uiLabel9"; uiLabel9.Size = new Size(133, 34); uiLabel9.Style = Sunny.UI.UIStyle.Custom; @@ -805,7 +871,7 @@ // uiLabel5.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel5.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel5.Location = new Point(40, 68); + uiLabel5.Location = new Point(42, 68); uiLabel5.Name = "uiLabel5"; uiLabel5.Size = new Size(133, 34); uiLabel5.Style = Sunny.UI.UIStyle.Custom; @@ -820,20 +886,20 @@ uiTableLayoutPanel4.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F)); uiTableLayoutPanel4.Controls.Add(uiTableLayoutPanel5, 0, 0); uiTableLayoutPanel4.Dock = DockStyle.Fill; - uiTableLayoutPanel4.Location = new Point(763, 3); + uiTableLayoutPanel4.Location = new Point(858, 3); uiTableLayoutPanel4.Name = "uiTableLayoutPanel4"; uiTableLayoutPanel4.RowCount = 1; uiTableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); uiTableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Absolute, 20F)); - uiTableLayoutPanel4.Size = new Size(1134, 934); + uiTableLayoutPanel4.Size = new Size(1039, 934); uiTableLayoutPanel4.TabIndex = 1; uiTableLayoutPanel4.TagString = null; // // uiTableLayoutPanel5 // uiTableLayoutPanel5.ColumnCount = 2; - uiTableLayoutPanel5.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F)); - uiTableLayoutPanel5.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F)); + uiTableLayoutPanel5.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 55F)); + uiTableLayoutPanel5.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 45F)); uiTableLayoutPanel5.Controls.Add(uiGroupBox5, 1, 0); uiTableLayoutPanel5.Controls.Add(uiGroupBox4, 0, 0); uiTableLayoutPanel5.Dock = DockStyle.Fill; @@ -841,7 +907,7 @@ uiTableLayoutPanel5.Name = "uiTableLayoutPanel5"; uiTableLayoutPanel5.RowCount = 1; uiTableLayoutPanel5.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - uiTableLayoutPanel5.Size = new Size(1128, 928); + uiTableLayoutPanel5.Size = new Size(1033, 928); uiTableLayoutPanel5.TabIndex = 2; uiTableLayoutPanel5.TagString = null; // @@ -853,14 +919,14 @@ uiGroupBox5.FillColor = Color.White; uiGroupBox5.Font = new Font("微软雅黑", 11F, FontStyle.Bold, GraphicsUnit.Point, 134); uiGroupBox5.ForeColor = Color.FromArgb(48, 49, 51); - uiGroupBox5.Location = new Point(568, 5); + uiGroupBox5.Location = new Point(572, 5); uiGroupBox5.Margin = new Padding(4, 5, 4, 5); uiGroupBox5.MinimumSize = new Size(1, 1); uiGroupBox5.Name = "uiGroupBox5"; uiGroupBox5.Padding = new Padding(0, 32, 0, 0); uiGroupBox5.Radius = 6; uiGroupBox5.RectColor = Color.FromArgb(220, 223, 230); - uiGroupBox5.Size = new Size(556, 918); + uiGroupBox5.Size = new Size(457, 918); uiGroupBox5.Style = Sunny.UI.UIStyle.Custom; uiGroupBox5.StyleCustomMode = true; uiGroupBox5.TabIndex = 1; @@ -878,28 +944,26 @@ uiLabel16.StyleCustomMode = true; uiLabel16.TabIndex = 0; uiLabel16.Text = "SI1: 未点火\r\nSI2:点火后自熄\r\nSI3:点火且不自熄\r\n\r\n根据 BS EN ISO 11810:2015 标准\r\n\r\n测试条件: 试样下方放置棉纱布，激光穿透试样后是否引燃棉纱布"; - uiLabel16.Click += uiLabel16_Click; // // uiGroupBox4 // uiGroupBox4.BackColor = Color.White; - uiGroupBox4.Controls.Add(uiLabel35); - uiGroupBox4.Controls.Add(uiLabel36); - uiGroupBox4.Controls.Add(uiLabel33); - uiGroupBox4.Controls.Add(uiLabel34); - uiGroupBox4.Controls.Add(uiLabel31); - uiGroupBox4.Controls.Add(uiLabel32); - uiGroupBox4.Controls.Add(uiLabel29); - uiGroupBox4.Controls.Add(uiLabel30); - uiGroupBox4.Controls.Add(uiLabel27); - uiGroupBox4.Controls.Add(uiLabel28); uiGroupBox4.Controls.Add(uiLabel10); uiGroupBox4.Controls.Add(uiLabel11); + uiGroupBox4.Controls.Add(uiButton13); + uiGroupBox4.Controls.Add(uiButton10); + uiGroupBox4.Controls.Add(uiButton9); uiGroupBox4.Controls.Add(uiLabel21); + uiGroupBox4.Controls.Add(uiLabel27); + uiGroupBox4.Controls.Add(uiLabel18); + uiGroupBox4.Controls.Add(uiLabel33); + uiGroupBox4.Controls.Add(uiLabel28); + uiGroupBox4.Controls.Add(uiLabel29); + uiGroupBox4.Controls.Add(uiLabel30); uiGroupBox4.Controls.Add(uiLabel22); uiGroupBox4.Controls.Add(uiLabel19); uiGroupBox4.Controls.Add(uiLabel20); - uiGroupBox4.Controls.Add(uiLabel18); + uiGroupBox4.Controls.Add(uiComboBox3); uiGroupBox4.Controls.Add(uiLabel17); uiGroupBox4.Dock = DockStyle.Fill; uiGroupBox4.FillColor = Color.White; @@ -912,77 +976,260 @@ uiGroupBox4.Padding = new Padding(0, 32, 0, 0); uiGroupBox4.Radius = 6; uiGroupBox4.RectColor = Color.FromArgb(220, 223, 230); - uiGroupBox4.Size = new Size(556, 918); + uiGroupBox4.Size = new Size(560, 918); uiGroupBox4.Style = Sunny.UI.UIStyle.Custom; uiGroupBox4.StyleCustomMode = true; uiGroupBox4.TabIndex = 0; uiGroupBox4.Text = "测试结果"; uiGroupBox4.TextAlignment = ContentAlignment.MiddleLeft; // + // uiLabel10 + // + uiLabel10.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); + uiLabel10.ForeColor = Color.FromArgb(103, 194, 58); + uiLabel10.Location = new Point(240, 381); + uiLabel10.Name = "uiLabel10"; + uiLabel10.Size = new Size(169, 31); + uiLabel10.Style = Sunny.UI.UIStyle.Custom; + uiLabel10.StyleCustomMode = true; + uiLabel10.TabIndex = 39; + uiLabel10.TextAlign = ContentAlignment.MiddleCenter; + // + // uiLabel11 + // + uiLabel11.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiLabel11.ForeColor = Color.FromArgb(96, 98, 102); + uiLabel11.Location = new Point(70, 381); + uiLabel11.Name = "uiLabel11"; + uiLabel11.Size = new Size(136, 31); + uiLabel11.Style = Sunny.UI.UIStyle.Custom; + uiLabel11.StyleCustomMode = true; + uiLabel11.TabIndex = 38; + uiLabel11.Text = "是否点火:"; + uiLabel11.TextAlign = ContentAlignment.MiddleLeft; + // + // uiButton13 + // + uiButton13.Cursor = Cursors.Hand; + uiButton13.FillColor = Color.FromArgb(64, 158, 255); + uiButton13.FillColor2 = Color.FromArgb(64, 158, 255); + uiButton13.FillHoverColor = Color.FromArgb(102, 177, 255); + uiButton13.FillPressColor = Color.FromArgb(47, 144, 255); + uiButton13.FillSelectedColor = Color.FromArgb(47, 144, 255); + uiButton13.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton13.Location = new Point(193, 665); + uiButton13.MinimumSize = new Size(1, 1); + uiButton13.Name = "uiButton13"; + uiButton13.Radius = 6; + uiButton13.RectColor = Color.FromArgb(64, 158, 255); + uiButton13.RectHoverColor = Color.FromArgb(102, 177, 255); + uiButton13.RectPressColor = Color.FromArgb(47, 144, 255); + uiButton13.RectSelectedColor = Color.FromArgb(47, 144, 255); + uiButton13.Size = new Size(208, 56); + uiButton13.Style = Sunny.UI.UIStyle.Custom; + uiButton13.StyleCustomMode = true; + uiButton13.TabIndex = 37; + uiButton13.Text = "返回主页面"; + uiButton13.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton13.Click += uiButton13_Click; + // + // uiButton10 + // + uiButton10.Cursor = Cursors.Hand; + uiButton10.FillColor = Color.FromArgb(230, 162, 60); + uiButton10.FillColor2 = Color.FromArgb(230, 162, 60); + uiButton10.FillHoverColor = Color.FromArgb(235, 181, 99); + uiButton10.FillPressColor = Color.FromArgb(212, 145, 47); + uiButton10.FillSelectedColor = Color.FromArgb(212, 145, 47); + uiButton10.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton10.Location = new Point(193, 570); + uiButton10.MinimumSize = new Size(1, 1); + uiButton10.Name = "uiButton10"; + uiButton10.Radius = 6; + uiButton10.RectColor = Color.FromArgb(230, 162, 60); + uiButton10.RectHoverColor = Color.FromArgb(235, 181, 99); + uiButton10.RectPressColor = Color.FromArgb(212, 145, 47); + uiButton10.RectSelectedColor = Color.FromArgb(212, 145, 47); + uiButton10.Size = new Size(208, 56); + uiButton10.Style = Sunny.UI.UIStyle.Custom; + uiButton10.StyleCustomMode = true; + uiButton10.TabIndex = 35; + uiButton10.Text = "清除"; + uiButton10.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton10.Click += uiButton10_Click_1; + // + // uiButton9 + // + uiButton9.Cursor = Cursors.Hand; + uiButton9.FillColor = Color.FromArgb(103, 194, 58); + uiButton9.FillColor2 = Color.FromArgb(103, 194, 58); + uiButton9.FillHoverColor = Color.FromArgb(133, 206, 97); + uiButton9.FillPressColor = Color.FromArgb(84, 178, 38); + uiButton9.FillSelectedColor = Color.FromArgb(84, 178, 38); + uiButton9.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton9.Location = new Point(193, 475); + uiButton9.MinimumSize = new Size(1, 1); + uiButton9.Name = "uiButton9"; + uiButton9.Radius = 6; + uiButton9.RectColor = Color.FromArgb(103, 194, 58); + uiButton9.RectHoverColor = Color.FromArgb(133, 206, 97); + uiButton9.RectPressColor = Color.FromArgb(84, 178, 38); + uiButton9.RectSelectedColor = Color.FromArgb(84, 178, 38); + uiButton9.Size = new Size(208, 56); + uiButton9.Style = Sunny.UI.UIStyle.Custom; + uiButton9.StyleCustomMode = true; + uiButton9.TabIndex = 36; + uiButton9.Text = "保存结果"; + uiButton9.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + // // uiLabel21 // uiLabel21.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); - uiLabel21.ForeColor = Color.FromArgb(103, 194, 58); - uiLabel21.Location = new Point(200, 117); + uiLabel21.ForeColor = Color.FromArgb(64, 158, 255); + uiLabel21.Location = new Point(193, 113); uiLabel21.Name = "uiLabel21"; - uiLabel21.Size = new Size(169, 31); + uiLabel21.Size = new Size(265, 31); uiLabel21.Style = Sunny.UI.UIStyle.Custom; uiLabel21.StyleCustomMode = true; - uiLabel21.TabIndex = 5; - uiLabel21.Text = "是"; + uiLabel21.TabIndex = 34; uiLabel21.TextAlign = ContentAlignment.MiddleCenter; // + // uiLabel27 + // + uiLabel27.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); + uiLabel27.ForeColor = Color.FromArgb(64, 158, 255); + uiLabel27.Location = new Point(240, 220); + uiLabel27.Name = "uiLabel27"; + uiLabel27.Size = new Size(169, 31); + uiLabel27.Style = Sunny.UI.UIStyle.Custom; + uiLabel27.StyleCustomMode = true; + uiLabel27.TabIndex = 33; + uiLabel27.TextAlign = ContentAlignment.MiddleCenter; + // + // uiLabel18 + // + uiLabel18.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); + uiLabel18.ForeColor = Color.FromArgb(103, 194, 58); + uiLabel18.Location = new Point(240, 322); + uiLabel18.Name = "uiLabel18"; + uiLabel18.Size = new Size(169, 31); + uiLabel18.Style = Sunny.UI.UIStyle.Custom; + uiLabel18.StyleCustomMode = true; + uiLabel18.TabIndex = 32; + uiLabel18.TextAlign = ContentAlignment.MiddleCenter; + // + // uiLabel33 + // + uiLabel33.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiLabel33.ForeColor = Color.FromArgb(96, 98, 102); + uiLabel33.Location = new Point(70, 326); + uiLabel33.Name = "uiLabel33"; + uiLabel33.Size = new Size(136, 31); + uiLabel33.Style = Sunny.UI.UIStyle.Custom; + uiLabel33.StyleCustomMode = true; + uiLabel33.TabIndex = 29; + uiLabel33.Text = "是否自熄:"; + uiLabel33.TextAlign = ContentAlignment.MiddleLeft; + // + // uiLabel28 + // + uiLabel28.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiLabel28.ForeColor = Color.FromArgb(96, 98, 102); + uiLabel28.Location = new Point(70, 220); + uiLabel28.Name = "uiLabel28"; + uiLabel28.Size = new Size(136, 31); + uiLabel28.Style = Sunny.UI.UIStyle.Custom; + uiLabel28.StyleCustomMode = true; + uiLabel28.TabIndex = 28; + uiLabel28.Text = "余焰时间(s):"; + uiLabel28.TextAlign = ContentAlignment.MiddleLeft; + // + // uiLabel29 + // + uiLabel29.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); + uiLabel29.ForeColor = Color.FromArgb(64, 158, 255); + uiLabel29.Location = new Point(240, 273); + uiLabel29.Name = "uiLabel29"; + uiLabel29.Size = new Size(169, 31); + uiLabel29.Style = Sunny.UI.UIStyle.Custom; + uiLabel29.StyleCustomMode = true; + uiLabel29.TabIndex = 27; + uiLabel29.TextAlign = ContentAlignment.MiddleCenter; + // + // uiLabel30 + // + uiLabel30.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiLabel30.ForeColor = Color.FromArgb(96, 98, 102); + uiLabel30.Location = new Point(70, 273); + uiLabel30.Name = "uiLabel30"; + uiLabel30.Size = new Size(136, 31); + uiLabel30.Style = Sunny.UI.UIStyle.Custom; + uiLabel30.StyleCustomMode = true; + uiLabel30.TabIndex = 26; + uiLabel30.Text = "余辉时间(s):"; + uiLabel30.TextAlign = ContentAlignment.MiddleLeft; + // // uiLabel22 // uiLabel22.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel22.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel22.Location = new Point(70, 117); + uiLabel22.Location = new Point(70, 113); uiLabel22.Name = "uiLabel22"; - uiLabel22.Size = new Size(132, 31); + uiLabel22.Size = new Size(136, 31); uiLabel22.Style = Sunny.UI.UIStyle.Custom; uiLabel22.StyleCustomMode = true; - uiLabel22.TabIndex = 4; - uiLabel22.Text = "是否自熄:"; + uiLabel22.TabIndex = 23; + uiLabel22.Text = "氧浓度:"; uiLabel22.TextAlign = ContentAlignment.MiddleLeft; // // uiLabel19 // uiLabel19.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel19.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel19.Location = new Point(200, 179); + uiLabel19.Location = new Point(240, 166); uiLabel19.Name = "uiLabel19"; uiLabel19.Size = new Size(169, 31); uiLabel19.Style = Sunny.UI.UIStyle.Custom; uiLabel19.StyleCustomMode = true; - uiLabel19.TabIndex = 3; - uiLabel19.Text = "I1"; + uiLabel19.TabIndex = 22; uiLabel19.TextAlign = ContentAlignment.MiddleCenter; // // uiLabel20 // uiLabel20.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel20.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel20.Location = new Point(70, 179); + uiLabel20.Location = new Point(70, 166); uiLabel20.Name = "uiLabel20"; - uiLabel20.Size = new Size(132, 31); + uiLabel20.Size = new Size(136, 31); uiLabel20.Style = Sunny.UI.UIStyle.Custom; uiLabel20.StyleCustomMode = true; - uiLabel20.TabIndex = 2; + uiLabel20.TabIndex = 21; uiLabel20.Text = "分类结果:"; uiLabel20.TextAlign = ContentAlignment.MiddleLeft; // - // uiLabel18 + // uiComboBox3 // - uiLabel18.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); - uiLabel18.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel18.Location = new Point(200, 60); - uiLabel18.Name = "uiLabel18"; - uiLabel18.Size = new Size(169, 31); - uiLabel18.Style = Sunny.UI.UIStyle.Custom; - uiLabel18.StyleCustomMode = true; - uiLabel18.TabIndex = 1; - uiLabel18.Text = "1"; - uiLabel18.TextAlign = ContentAlignment.MiddleCenter; + uiComboBox3.DataSource = null; + uiComboBox3.FillColor = Color.White; + uiComboBox3.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiComboBox3.ItemHoverColor = Color.FromArgb(245, 247, 250); + uiComboBox3.ItemSelectForeColor = Color.FromArgb(64, 158, 255); + uiComboBox3.Location = new Point(234, 53); + uiComboBox3.Margin = new Padding(4, 5, 4, 5); + uiComboBox3.MinimumSize = new Size(63, 0); + uiComboBox3.Name = "uiComboBox3"; + uiComboBox3.Padding = new Padding(0, 0, 30, 2); + uiComboBox3.Radius = 4; + uiComboBox3.RectColor = Color.FromArgb(220, 223, 230); + uiComboBox3.Size = new Size(176, 44); + uiComboBox3.Style = Sunny.UI.UIStyle.Custom; + uiComboBox3.StyleCustomMode = true; + uiComboBox3.SymbolSize = 24; + uiComboBox3.TabIndex = 20; + uiComboBox3.Text = "选择样品"; + uiComboBox3.TextAlignment = ContentAlignment.MiddleLeft; + uiComboBox3.Watermark = "请选择氧浓度"; + uiComboBox3.SelectedIndexChanged += uiComboBox3_SelectedIndexChanged; // // uiLabel17 // @@ -997,162 +1244,6 @@ uiLabel17.Text = "测试样品项:"; uiLabel17.TextAlign = ContentAlignment.MiddleLeft; // - // uiLabel10 - // - uiLabel10.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); - uiLabel10.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel10.Location = new Point(200, 234); - uiLabel10.Name = "uiLabel10"; - uiLabel10.Size = new Size(169, 31); - uiLabel10.Style = Sunny.UI.UIStyle.Custom; - uiLabel10.StyleCustomMode = true; - uiLabel10.TabIndex = 7; - uiLabel10.Text = "I1"; - uiLabel10.TextAlign = ContentAlignment.MiddleCenter; - // - // uiLabel11 - // - uiLabel11.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiLabel11.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel11.Location = new Point(70, 234); - uiLabel11.Name = "uiLabel11"; - uiLabel11.Size = new Size(132, 31); - uiLabel11.Style = Sunny.UI.UIStyle.Custom; - uiLabel11.StyleCustomMode = true; - uiLabel11.TabIndex = 6; - uiLabel11.Text = "分类结果:"; - uiLabel11.TextAlign = ContentAlignment.MiddleLeft; - // - // uiLabel27 - // - uiLabel27.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); - uiLabel27.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel27.Location = new Point(200, 295); - uiLabel27.Name = "uiLabel27"; - uiLabel27.Size = new Size(169, 31); - uiLabel27.Style = Sunny.UI.UIStyle.Custom; - uiLabel27.StyleCustomMode = true; - uiLabel27.TabIndex = 9; - uiLabel27.Text = "I1"; - uiLabel27.TextAlign = ContentAlignment.MiddleCenter; - // - // uiLabel28 - // - uiLabel28.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiLabel28.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel28.Location = new Point(70, 295); - uiLabel28.Name = "uiLabel28"; - uiLabel28.Size = new Size(132, 31); - uiLabel28.Style = Sunny.UI.UIStyle.Custom; - uiLabel28.StyleCustomMode = true; - uiLabel28.TabIndex = 8; - uiLabel28.Text = "分类结果:"; - uiLabel28.TextAlign = ContentAlignment.MiddleLeft; - // - // uiLabel29 - // - uiLabel29.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); - uiLabel29.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel29.Location = new Point(192, 364); - uiLabel29.Name = "uiLabel29"; - uiLabel29.Size = new Size(169, 31); - uiLabel29.Style = Sunny.UI.UIStyle.Custom; - uiLabel29.StyleCustomMode = true; - uiLabel29.TabIndex = 11; - uiLabel29.Text = "I1"; - uiLabel29.TextAlign = ContentAlignment.MiddleCenter; - // - // uiLabel30 - // - uiLabel30.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiLabel30.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel30.Location = new Point(62, 364); - uiLabel30.Name = "uiLabel30"; - uiLabel30.Size = new Size(132, 31); - uiLabel30.Style = Sunny.UI.UIStyle.Custom; - uiLabel30.StyleCustomMode = true; - uiLabel30.TabIndex = 10; - uiLabel30.Text = "分类结果:"; - uiLabel30.TextAlign = ContentAlignment.MiddleLeft; - // - // uiLabel31 - // - uiLabel31.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); - uiLabel31.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel31.Location = new Point(192, 434); - uiLabel31.Name = "uiLabel31"; - uiLabel31.Size = new Size(169, 31); - uiLabel31.Style = Sunny.UI.UIStyle.Custom; - uiLabel31.StyleCustomMode = true; - uiLabel31.TabIndex = 13; - uiLabel31.Text = "I1"; - uiLabel31.TextAlign = ContentAlignment.MiddleCenter; - // - // uiLabel32 - // - uiLabel32.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiLabel32.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel32.Location = new Point(62, 434); - uiLabel32.Name = "uiLabel32"; - uiLabel32.Size = new Size(132, 31); - uiLabel32.Style = Sunny.UI.UIStyle.Custom; - uiLabel32.StyleCustomMode = true; - uiLabel32.TabIndex = 12; - uiLabel32.Text = "分类结果:"; - uiLabel32.TextAlign = ContentAlignment.MiddleLeft; - // - // uiLabel33 - // - uiLabel33.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); - uiLabel33.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel33.Location = new Point(192, 492); - uiLabel33.Name = "uiLabel33"; - uiLabel33.Size = new Size(169, 31); - uiLabel33.Style = Sunny.UI.UIStyle.Custom; - uiLabel33.StyleCustomMode = true; - uiLabel33.TabIndex = 15; - uiLabel33.Text = "I1"; - uiLabel33.TextAlign = ContentAlignment.MiddleCenter; - // - // uiLabel34 - // - uiLabel34.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiLabel34.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel34.Location = new Point(62, 492); - uiLabel34.Name = "uiLabel34"; - uiLabel34.Size = new Size(132, 31); - uiLabel34.Style = Sunny.UI.UIStyle.Custom; - uiLabel34.StyleCustomMode = true; - uiLabel34.TabIndex = 14; - uiLabel34.Text = "分类结果:"; - uiLabel34.TextAlign = ContentAlignment.MiddleLeft; - // - // uiLabel35 - // - uiLabel35.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); - uiLabel35.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel35.Location = new Point(200, 559); - uiLabel35.Name = "uiLabel35"; - uiLabel35.Size = new Size(169, 31); - uiLabel35.Style = Sunny.UI.UIStyle.Custom; - uiLabel35.StyleCustomMode = true; - uiLabel35.TabIndex = 17; - uiLabel35.Text = "I1"; - uiLabel35.TextAlign = ContentAlignment.MiddleCenter; - // - // uiLabel36 - // - uiLabel36.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiLabel36.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel36.Location = new Point(70, 559); - uiLabel36.Name = "uiLabel36"; - uiLabel36.Size = new Size(132, 31); - uiLabel36.Style = Sunny.UI.UIStyle.Custom; - uiLabel36.StyleCustomMode = true; - uiLabel36.TabIndex = 16; - uiLabel36.Text = "分类结果:"; - uiLabel36.TextAlign = ContentAlignment.MiddleLeft; - // // SecondaryIgnitionForm // AutoScaleMode = AutoScaleMode.None; @@ -1226,25 +1317,27 @@ private Sunny.UI.UIGroupBox uiGroupBox5; private Sunny.UI.UILabel uiLabel16; private Sunny.UI.UIGroupBox uiGroupBox4; - private Sunny.UI.UILabel uiLabel21; - private Sunny.UI.UILabel uiLabel22; - private Sunny.UI.UILabel uiLabel19; - private Sunny.UI.UILabel uiLabel20; - private Sunny.UI.UILabel uiLabel18; private Sunny.UI.UILabel uiLabel17; private Sunny.UI.UIButton uiButton12; private Sunny.UI.UIButton uiButton11; private Sunny.UI.UIButton uiButton6; - private Sunny.UI.UILabel uiLabel35; - private Sunny.UI.UILabel uiLabel36; + private Sunny.UI.UIComboBox uiComboBox2; + private Sunny.UI.UILabel uiLabel37; + private Sunny.UI.UIComboBox uiComboBox3; + private Sunny.UI.UILabel uiLabel21; + private Sunny.UI.UILabel uiLabel27; + private Sunny.UI.UILabel uiLabel18; private Sunny.UI.UILabel uiLabel33; - private Sunny.UI.UILabel uiLabel34; - private Sunny.UI.UILabel uiLabel31; - private Sunny.UI.UILabel uiLabel32; + private Sunny.UI.UILabel uiLabel28; private Sunny.UI.UILabel uiLabel29; private Sunny.UI.UILabel uiLabel30; - private Sunny.UI.UILabel uiLabel27; - private Sunny.UI.UILabel uiLabel28; + private Sunny.UI.UILabel uiLabel22; + private Sunny.UI.UILabel uiLabel19; + private Sunny.UI.UILabel uiLabel20; + private Sunny.UI.UIButton uiButton8; + private Sunny.UI.UIButton uiButton13; + private Sunny.UI.UIButton uiButton10; + private Sunny.UI.UIButton uiButton9; private Sunny.UI.UILabel uiLabel10; private Sunny.UI.UILabel uiLabel11; } diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.cs index 9f56836..ed4e77b 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.cs @@ -1,4 +1,5 @@ -using Modbus.Device; +using BasicDemo; +using Modbus.Device; using Sunny.UI; using System; using System.Collections.Generic; @@ -13,6 +14,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using 外科辅料和患者防护罩激光抗性测试仪.Data; +using 外科辅料和患者防护罩激光抗性测试仪.Model; namespace 外科辅料和患者防护罩激光抗性测试仪 { @@ -27,12 +29,15 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 DataChange c = new DataChange(); private System.Windows.Forms.Timer _readtimer; + public bool RunStatus = false; public SecondaryIgnitionForm() { InitializeComponent(); InitComboBoxPattern(); + InitComboBox2Pattern(); + InitComboBox3Pattern(); InitTimer(); } @@ -232,6 +237,8 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 } } + private bool _lastRunStatus = false; + private bool _isReported = false; private async Task ReadStartStatusAsync() { try @@ -244,18 +251,25 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 }); if (registers2 != null && registers2.Length >= 1) { - bool value = registers2[0]; + bool currentRunStatus = registers2[0]; + RunStatus = currentRunStatus; this.Invoke(new Action(() => { - if (value) - { - uiLabel23.Text = "运行中"; - } - else - { - uiLabel23.Text = "空闲中"; - } + uiLabel23.Text = currentRunStatus ? "运行中" : "空闲中"; })); + if (!_lastRunStatus && currentRunStatus) + { + _isReported = false; + Debug.WriteLine("检测到运行开始，重置报表插入标记"); + } + + if (_lastRunStatus && !currentRunStatus && !_isReported) + { + _ = InsertReportAsync(); + _isReported = true; + } + + _lastRunStatus = currentRunStatus; } } catch (Exception ex) @@ -264,8 +278,435 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 } } + public async Task ReadModbusCoilAsync(ushort registerAddress, ushort readCount) + { + if (_modbusMaster == null) return null; + return await Task.Run(async () => + { + return await _modbusMaster.ReadCoilsAsync(1, registerAddress, readCount); + }); + } + + List reportList = new List(); + private string classify; + private float yy; + private float yh; + private bool iszixi; + private bool isdianhuo; + private async Task InsertReportAsync() + { + if (uiComboBox2.Text != null && uiComboBox2.Text.Trim() == "样品1") + { + bool[] value1 = await ReadModbusCoilAsync(230, 1); + bool[] value2 = await ReadModbusCoilAsync(231, 1); + bool[] value3 = await ReadModbusCoilAsync(232, 1); + bool[] value4 = await ReadModbusCoilAsync(233, 1); + + if (value1 != null && value1.Length > 0 && value1[0] && value3 != null && value3.Length > 0 && value3[0]) + { + classify = "SI3";//分类 + + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + if (value2[0]) + { + iszixi = true; //自熄 + } + else if (value3[0]) + { + iszixi = false; + } + if (value1[0]) + { + isdianhuo = true;//点火 + } + else if (value4[0]) + { + isdianhuo = false; + } + } + + else if (value1 != null && value1.Length > 0 && value1[0] && value2 != null && value2.Length > 0 && value2[0]) + { + classify = "SI2";//分类 + + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + if (value2[0]) + { + iszixi = true; //自熄 + } + else if (value3[0]) + { + iszixi = false; + } + if (value1[0]) + { + isdianhuo = true;//点火 + } + else if (value4[0]) + { + isdianhuo = false; + } + } + else if (value4 != null && value4.Length > 0 && value4[0]) + { + classify = "SI1";//分类 + iszixi = false; + isdianhuo = false; + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + } + + } + + if (uiComboBox2.Text != null && uiComboBox2.Text.Trim() == "样品2") + { + + bool[] value1 = await ReadModbusCoilAsync(230, 1); + bool[] value2 = await ReadModbusCoilAsync(231, 1); + bool[] value3 = await ReadModbusCoilAsync(232, 1); + bool[] value4 = await ReadModbusCoilAsync(233, 1); + + if (value1 != null && value1.Length > 0 && value1[0] && value3 != null && value3.Length > 0 && value3[0]) + { + classify = "SI3";//分类 + + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + if (value2[0]) + { + iszixi = true; //自熄 + } + else if (value3[0]) + { + iszixi = false; + } + if (value1[0]) + { + isdianhuo = true;//点火 + } + else if (value4[0]) + { + isdianhuo = false; + } + } + + else if (value1 != null && value1.Length > 0 && value1[0] && value2 != null && value2.Length > 0 && value2[0]) + { + classify = "SI2";//分类 + + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + if (value2[0]) + { + iszixi = true; //自熄 + } + else if (value3[0]) + { + iszixi = false; + } + if (value1[0]) + { + isdianhuo = true;//点火 + } + else if (value4[0]) + { + isdianhuo = false; + } + } + else if (value4 != null && value4.Length > 0 && value4[0]) + { + classify = "SI1";//分类 + iszixi = false; + isdianhuo = false; + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + } + } + + if (uiComboBox2.Text != null && uiComboBox2.Text.Trim() == "样品3") + { + + bool[] value1 = await ReadModbusCoilAsync(230, 1); + bool[] value2 = await ReadModbusCoilAsync(231, 1); + bool[] value3 = await ReadModbusCoilAsync(232, 1); + bool[] value4 = await ReadModbusCoilAsync(233, 1); + + if (value1 != null && value1.Length > 0 && value1[0] && value3 != null && value3.Length > 0 && value3[0]) + { + classify = "SI3";//分类 + + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + if (value2[0]) + { + iszixi = true; //自熄 + } + else if (value3[0]) + { + iszixi = false; + } + if (value1[0]) + { + isdianhuo = true;//点火 + } + else if (value4[0]) + { + isdianhuo = false; + } + } + + else if (value1 != null && value1.Length > 0 && value1[0] && value2 != null && value2.Length > 0 && value2[0]) + { + classify = "SI2";//分类 + + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + if (value2[0]) + { + iszixi = true; //自熄 + } + else if (value3[0]) + { + iszixi = false; + } + if (value1[0]) + { + isdianhuo = true;//点火 + } + else if (value4[0]) + { + isdianhuo = false; + } + } + else if (value4 != null && value4.Length > 0 && value4[0]) + { + classify = "SI1";//分类 + iszixi = false; + isdianhuo = false; + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + } + } + + if (uiComboBox2.Text != null && uiComboBox2.Text.Trim() == "样品4") + { + bool[] value1 = await ReadModbusCoilAsync(230, 1); + bool[] value2 = await ReadModbusCoilAsync(231, 1); + bool[] value3 = await ReadModbusCoilAsync(232, 1); + bool[] value4 = await ReadModbusCoilAsync(233, 1); + + if (value1 != null && value1.Length > 0 && value1[0] && value3 != null && value3.Length > 0 && value3[0]) + { + classify = "SI3";//分类 + + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + if (value2[0]) + { + iszixi = true; //自熄 + } + else if (value3[0]) + { + iszixi = false; + } + if (value1[0]) + { + isdianhuo = true;//点火 + } + else if (value4[0]) + { + isdianhuo = false; + } + } + + else if (value1 != null && value1.Length > 0 && value1[0] && value2 != null && value2.Length > 0 && value2[0]) + { + classify = "SI2";//分类 + + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + if (value2[0]) + { + iszixi = true; //自熄 + } + else if (value3[0]) + { + iszixi = false; + } + if (value1[0]) + { + isdianhuo = true;//点火 + } + else if (value4[0]) + { + isdianhuo = false; + } + } + else if (value4 != null && value4.Length > 0 && value4[0]) + { + classify = "SI1";//分类 + iszixi = false; + isdianhuo = false; + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + } + } + + if (uiComboBox2.Text != null && uiComboBox2.Text.Trim() == "样品5") + { + bool[] value1 = await ReadModbusCoilAsync(230, 1); + bool[] value2 = await ReadModbusCoilAsync(231, 1); + bool[] value3 = await ReadModbusCoilAsync(232, 1); + bool[] value4 = await ReadModbusCoilAsync(233, 1); + + if (value1 != null && value1.Length > 0 && value1[0] && value3 != null && value3.Length > 0 && value3[0]) + { + classify = "SI3";//分类 + + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + if (value2[0]) + { + iszixi = true; //自熄 + } + else if (value3[0]) + { + iszixi = false; + } + if (value1[0]) + { + isdianhuo = true;//点火 + } + else if (value4[0]) + { + isdianhuo = false; + } + } + + else if (value1 != null && value1.Length > 0 && value1[0] && value2 != null && value2.Length > 0 && value2[0]) + { + classify = "SI2";//分类 + + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + if (value2[0]) + { + iszixi = true; //自熄 + } + else if (value3[0]) + { + iszixi = false; + } + if (value1[0]) + { + isdianhuo = true;//点火 + } + else if (value4[0]) + { + isdianhuo = false; + } + } + else if (value4 != null && value4.Length > 0 && value4[0]) + { + classify = "SI1";//分类 + iszixi = false; + isdianhuo = false; + ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4); + if (yhlocation != null && yhlocation.Length >= 3) + { + yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰 + yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉 + } + } + } + + + try + { + string selectedO2Text = uiComboBox1.Text; + reportList.Add(new SecondaryIgnitionModel + { + Iszixi3 = iszixi, + Isdianhuo3 = isdianhuo, + O23 = selectedO2Text, + result3 = classify, + sampleType3 = uiComboBox2.Text.Contains("1") ? 1 + : uiComboBox2.Text.Contains("2") ? 2 + : uiComboBox2.Text.Contains("3") ? 3 + : uiComboBox2.Text.Contains("4") ? 4 + : uiComboBox2.Text.Contains("5") ? 5 : 0, + yuhui3 = yh, + yuyan3 = yy + }); + await Task.Delay(100); + + } + catch (Exception ex) + { + Debug.WriteLine($"报表插入失败: {ex.Message}"); + } + } + private void SecondaryIgnitionForm_Load(object sender, EventArgs e) { string plcIp = "192.168.1.10"; @@ -313,6 +754,38 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 }; uiComboBox1.Items.AddRange(options); + } + private void InitComboBox2Pattern() + { + // 清空原有选项（可选，避免重复添加） + //Combox_pattern.Items.Clear(); + + // 定义需要添加的选项数组 + string[] options = { + "样品1", + "样品2", + "样品3", + "样品4", + "样品5" + }; + uiComboBox2.Items.AddRange(options); + } + + private void InitComboBox3Pattern() + { + // 清空原有选项（可选，避免重复添加） + //Combox_pattern.Items.Clear(); + + // 定义需要添加的选项数组 + string[] options = { + "样品1", + "样品2", + "样品3", + "样品4", + "样品5" + }; + uiComboBox3.Items.AddRange(options); + } private void SecondaryIgnitionForm_FormClosed(object sender, FormClosedEventArgs e) @@ -407,9 +880,96 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 } } - private void uiLabel16_Click(object sender, EventArgs e) + private void uiButton8_Click(object sender, EventArgs e) { + AutoCameraForm cameraForm = new AutoCameraForm(() => RunStatus); + this.SwitchToForm(() => cameraForm); + } + private void SwitchToForm(Func formCreator) + { + using (Form form = formCreator()) + { + this.Hide(); + form.ShowDialog(); + this.Show(); + this.Activate(); + } + } + private void uiButton10_Click_1(object sender, EventArgs e) + { + ma?.BtnClickFunctionForNew(Function.ButtonType.复归型, 305, 1);//清除 + } + + private void uiButton13_Click(object sender, EventArgs e) + { + this.Close();//返回主页面 + } + + private void uiComboBox3_SelectedIndexChanged(object sender, EventArgs e) + { + string value = uiComboBox3.SelectedItem.ToString(); + + switch (value) + { + case "样品1": + { + var data = reportList?.FirstOrDefault(x => x.sampleType3 == 1); + uiLabel21.Text = data?.O23.ToString() ?? string.Empty; + uiLabel19.Text = data?.result3.ToString() ?? string.Empty; + uiLabel27.Text = data?.yuyan3.ToString() ?? string.Empty; + uiLabel29.Text = data?.yuhui3.ToString() ?? string.Empty; + uiLabel18.Text = data?.Iszixi3.ToString() ?? string.Empty; + uiLabel10.Text = data?.Isdianhuo3.ToString() ?? string.Empty; + break; + } + case "样品2": + { + var data = reportList?.FirstOrDefault(x => x.sampleType3 == 2); + uiLabel21.Text = data?.O23.ToString() ?? string.Empty; + uiLabel19.Text = data?.result3.ToString() ?? string.Empty; + uiLabel27.Text = data?.yuyan3.ToString() ?? string.Empty; + uiLabel29.Text = data?.yuhui3.ToString() ?? string.Empty; + uiLabel18.Text = data?.Iszixi3.ToString() ?? string.Empty; + uiLabel10.Text = data?.Isdianhuo3.ToString() ?? string.Empty; + break; + } + case "样品3": + { + var data = reportList?.FirstOrDefault(x => x.sampleType3 == 3); + uiLabel21.Text = data?.O23.ToString() ?? string.Empty; + uiLabel19.Text = data?.result3.ToString() ?? string.Empty; + uiLabel27.Text = data?.yuyan3.ToString() ?? string.Empty; + uiLabel29.Text = data?.yuhui3.ToString() ?? string.Empty; + uiLabel18.Text = data?.Iszixi3.ToString() ?? string.Empty; + uiLabel10.Text = data?.Isdianhuo3.ToString() ?? string.Empty; + break; + } + case "样品4": + { + var data = reportList?.FirstOrDefault(x => x.sampleType3 == 4); + uiLabel21.Text = data?.O23.ToString() ?? string.Empty; + uiLabel19.Text = data?.result3.ToString() ?? string.Empty; + uiLabel27.Text = data?.yuyan3.ToString() ?? string.Empty; + uiLabel29.Text = data?.yuhui3.ToString() ?? string.Empty; + uiLabel18.Text = data?.Iszixi3.ToString() ?? string.Empty; + uiLabel10.Text = data?.Isdianhuo3.ToString() ?? string.Empty; + break; + } + case "样品5": + { + var data = reportList?.FirstOrDefault(x => x.sampleType3 == 5); + uiLabel21.Text = data?.O23.ToString() ?? string.Empty; + uiLabel19.Text = data?.result3.ToString() ?? string.Empty; + uiLabel27.Text = data?.yuyan3.ToString() ?? string.Empty; + uiLabel29.Text = data?.yuhui3.ToString() ?? string.Empty; + uiLabel18.Text = data?.Iszixi3.ToString() ?? string.Empty; + uiLabel10.Text = data?.Isdianhuo3.ToString() ?? string.Empty; + break; + } + default: + break; + } } } } diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/bin/Debug/net8.0-windows7.0/BasicDemo_CS.exe b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/bin/Debug/net8.0-windows7.0/BasicDemo_CS.exe index 14490d35940484e57fcd3d16d07d72ca068b8f0e..1babf5b6fa21ac3f2e75e375fac7808c2420f7c7 100644 GIT binary patch delta 74 zcmZqp!rt(OeL@HG1m@Vr?ycR7tR(_jit!y8x9VM{>*>WV-qP2$eL)FhMI}hZbm@1D dk^(NRFC9uE%3WHsQ*SMMZFXh5%R9zB+yHwwA9w%& delta 74 zcmZqp!rt(OeL@Gb)1{ck?ycR7tR(`ki%;#z)!X3FbD`jrfQ*vo_5~%36_p?r)1}`r eN(#6exVthP>miW< diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/bin/Debug/net8.0-windows7.0/BasicDemo_CS.pdb b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/bin/Debug/net8.0-windows7.0/BasicDemo_CS.pdb index 6f7997029f6ca55235900e3ad39e4985cbdac50b..96b510e59faec91256de643e3c72f686586d8191 100644 GIT binary patch delta 69 zcmV-L0J{HxoC$!O39tw@2b%7 delta 36 scmZqhY4DlQ!R&M?W@C4uoIqed&%~@=1+P`RZkw%@zF@nVNB#>N02Ct*{{R30 diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/bin/Debug/net8.0-windows7.0/zh-CHS/BasicDemo_CS.resources.dll b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/bin/Debug/net8.0-windows7.0/zh-CHS/BasicDemo_CS.resources.dll index bd8723e2c8494a0243258e0fc4ef507efcc5b6f0..5d7787a51f0a241138d172b22f90ff113de01bc9 100644 GIT binary patch delta 38 wcmV+>0NMY5$N_-J0g#9TkON(@i>X@>E~XsI)E0S1yTCPe@$CYbvqW6H2SPCs2LJ#7 delta 38 ucmZoT!PszuaY6^P)1{b=-7BL7EM$vZ@16eT)bJ>z;oVmi*Uc_5d)NV0t`YYD