diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs
index 4b72dd5..92c839d 100644
--- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs
+++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs
@@ -113,6 +113,8 @@
uiLabel43 = new Sunny.UI.UILabel();
uiGroupBox5 = new Sunny.UI.UIGroupBox();
uiLabel16 = new Sunny.UI.UILabel();
+ uiButton9 = new Sunny.UI.UIButton();
+ uiButton11 = new Sunny.UI.UIButton();
uiTableLayoutPanel1.SuspendLayout();
uiTableLayoutPanel2.SuspendLayout();
uiPanel3.SuspendLayout();
@@ -189,6 +191,7 @@
// uiGroupBox2
//
uiGroupBox2.BackColor = Color.White;
+ uiGroupBox2.Controls.Add(uiButton11);
uiGroupBox2.Controls.Add(uiButton8);
uiGroupBox2.Controls.Add(uiLabel29);
uiGroupBox2.Controls.Add(uiLabel30);
@@ -302,7 +305,7 @@
uiButton3.FillPressColor = Color.FromArgb(212, 145, 47);
uiButton3.FillSelectedColor = Color.FromArgb(212, 145, 47);
uiButton3.Font = new Font("微软雅黑", 12F, FontStyle.Bold | FontStyle.Italic, GraphicsUnit.Point, 134);
- uiButton3.Location = new Point(601, 64);
+ uiButton3.Location = new Point(574, 64);
uiButton3.MinimumSize = new Size(1, 1);
uiButton3.Name = "uiButton3";
uiButton3.Radius = 8;
@@ -327,7 +330,7 @@
uiButton2.FillPressColor = Color.FromArgb(230, 81, 81);
uiButton2.FillSelectedColor = Color.FromArgb(230, 81, 81);
uiButton2.Font = new Font("微软雅黑", 12F, FontStyle.Bold | FontStyle.Italic, GraphicsUnit.Point, 134);
- uiButton2.Location = new Point(366, 64);
+ uiButton2.Location = new Point(345, 64);
uiButton2.MinimumSize = new Size(1, 1);
uiButton2.Name = "uiButton2";
uiButton2.Radius = 8;
@@ -393,6 +396,7 @@
// uiGroupBox1
//
uiGroupBox1.BackColor = Color.White;
+ uiGroupBox1.Controls.Add(uiButton9);
uiGroupBox1.Controls.Add(uiLabel28);
uiGroupBox1.Controls.Add(uiLight3);
uiGroupBox1.Controls.Add(uiTextBox2);
@@ -792,9 +796,9 @@
//
statusStrip1.ImageScalingSize = new Size(24, 24);
statusStrip1.Items.AddRange(new ToolStripItem[] { toolStripStatusLabel1 });
- statusStrip1.Location = new Point(0, 387);
+ statusStrip1.Location = new Point(0, 382);
statusStrip1.Name = "statusStrip1";
- statusStrip1.Size = new Size(1114, 26);
+ statusStrip1.Size = new Size(1114, 31);
statusStrip1.TabIndex = 22;
statusStrip1.Text = "statusStrip1";
//
@@ -802,7 +806,7 @@
//
toolStripStatusLabel1.BackColor = Color.Red;
toolStripStatusLabel1.Name = "toolStripStatusLabel1";
- toolStripStatusLabel1.Size = new Size(99, 20);
+ toolStripStatusLabel1.Size = new Size(118, 24);
toolStripStatusLabel1.Text = "功率计未连接";
//
// uiLabel25
@@ -1542,6 +1546,48 @@
uiLabel16.TabIndex = 0;
uiLabel16.Text = "P1:t ≥ 10 s\r\nP2:3 s ≤ t≤ 10 s\r\nP3:1 s ≤ t ≤3 s\r\nP4:t≤1 s\r\n\r\n注: P1材料需测量背面温度";
//
+ // uiButton9
+ //
+ uiButton9.Cursor = Cursors.Hand;
+ uiButton9.FillColor = Color.FromArgb(46, 204, 113);
+ uiButton9.FillColor2 = Color.FromArgb(46, 204, 113);
+ uiButton9.FillHoverColor = Color.FromArgb(39, 174, 96);
+ uiButton9.FillPressColor = Color.FromArgb(39, 174, 96);
+ uiButton9.Font = new Font("微软雅黑", 13F, FontStyle.Bold, GraphicsUnit.Point, 134);
+ uiButton9.Location = new Point(759, 167);
+ uiButton9.MinimumSize = new Size(1, 1);
+ uiButton9.Name = "uiButton9";
+ uiButton9.Radius = 8;
+ uiButton9.RectColor = Color.FromArgb(46, 204, 113);
+ uiButton9.RectHoverColor = Color.FromArgb(39, 174, 96);
+ uiButton9.Size = new Size(180, 44);
+ uiButton9.Style = Sunny.UI.UIStyle.Custom;
+ uiButton9.StyleCustomMode = true;
+ uiButton9.TabIndex = 20;
+ uiButton9.Text = "手动混氧";
+ uiButton9.TipsFont = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+ //
+ // uiButton11
+ //
+ uiButton11.Cursor = Cursors.Hand;
+ uiButton11.FillColor = Color.FromArgb(241, 196, 15);
+ uiButton11.FillColor2 = Color.FromArgb(241, 196, 15);
+ uiButton11.FillHoverColor = Color.FromArgb(243, 156, 18);
+ uiButton11.FillPressColor = Color.FromArgb(243, 156, 18);
+ uiButton11.Font = new Font("微软雅黑", 13F, FontStyle.Bold, GraphicsUnit.Point, 134);
+ uiButton11.Location = new Point(803, 64);
+ uiButton11.MinimumSize = new Size(1, 1);
+ uiButton11.Name = "uiButton11";
+ uiButton11.Radius = 8;
+ uiButton11.RectColor = Color.FromArgb(241, 196, 15);
+ uiButton11.RectHoverColor = Color.FromArgb(243, 156, 18);
+ uiButton11.Size = new Size(180, 85);
+ uiButton11.Style = Sunny.UI.UIStyle.Custom;
+ uiButton11.StyleCustomMode = true;
+ uiButton11.TabIndex = 23;
+ uiButton11.Text = "💡 灯开关";
+ uiButton11.TipsFont = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+ //
// PenetrationForm
//
AutoScaleMode = AutoScaleMode.None;
@@ -1664,5 +1710,7 @@
private Sunny.UI.UILabel uiLabel49;
private Sunny.UI.UILabel uiLabel50;
private Sunny.UI.UILabel uiLabel51;
+ private Sunny.UI.UIButton uiButton9;
+ private Sunny.UI.UIButton uiButton11;
}
}
\ No newline at end of file
diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.resx b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.resx
index cc3d870..66cf578 100644
--- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.resx
+++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.resx
@@ -120,4 +120,7 @@
17, 17
+
+ 17, 17
+
\ No newline at end of file
diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs
index 18ac3b3..6ad5066 100644
--- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs
+++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs
@@ -102,6 +102,8 @@
uiLabel17 = new Sunny.UI.UILabel();
uiGroupBox5 = new Sunny.UI.UIGroupBox();
uiLabel16 = new Sunny.UI.UILabel();
+ uiButton9 = new Sunny.UI.UIButton();
+ uiButton14 = new Sunny.UI.UIButton();
uiTableLayoutPanel1.SuspendLayout();
uiTableLayoutPanel2.SuspendLayout();
uiPanel3.SuspendLayout();
@@ -177,6 +179,7 @@
// uiGroupBox2
//
uiGroupBox2.BackColor = Color.White;
+ uiGroupBox2.Controls.Add(uiButton14);
uiGroupBox2.Controls.Add(uiButton8);
uiGroupBox2.Controls.Add(uiLabel25);
uiGroupBox2.Controls.Add(uiLabel26);
@@ -290,7 +293,7 @@
uiButton3.FillPressColor = Color.FromArgb(212, 145, 47);
uiButton3.FillSelectedColor = Color.FromArgb(212, 145, 47);
uiButton3.Font = new Font("微软雅黑", 12F, FontStyle.Bold | FontStyle.Italic, GraphicsUnit.Point, 134);
- uiButton3.Location = new Point(564, 65);
+ uiButton3.Location = new Point(505, 65);
uiButton3.MinimumSize = new Size(1, 1);
uiButton3.Name = "uiButton3";
uiButton3.Radius = 8;
@@ -315,7 +318,7 @@
uiButton2.FillPressColor = Color.FromArgb(230, 81, 81);
uiButton2.FillSelectedColor = Color.FromArgb(230, 81, 81);
uiButton2.Font = new Font("微软雅黑", 12F, FontStyle.Bold | FontStyle.Italic, GraphicsUnit.Point, 134);
- uiButton2.Location = new Point(366, 65);
+ uiButton2.Location = new Point(307, 65);
uiButton2.MinimumSize = new Size(1, 1);
uiButton2.Name = "uiButton2";
uiButton2.Radius = 8;
@@ -340,7 +343,7 @@
uiButton1.FillPressColor = Color.FromArgb(84, 178, 38);
uiButton1.FillSelectedColor = Color.FromArgb(84, 178, 38);
uiButton1.Font = new Font("微软雅黑", 12F, FontStyle.Bold | FontStyle.Italic, GraphicsUnit.Point, 134);
- uiButton1.Location = new Point(168, 65);
+ uiButton1.Location = new Point(109, 65);
uiButton1.MinimumSize = new Size(1, 1);
uiButton1.Name = "uiButton1";
uiButton1.Radius = 8;
@@ -381,6 +384,7 @@
// uiGroupBox1
//
uiGroupBox1.BackColor = Color.White;
+ uiGroupBox1.Controls.Add(uiButton9);
uiGroupBox1.Controls.Add(uiComboBox1);
uiGroupBox1.Controls.Add(uiLabel6);
uiGroupBox1.Controls.Add(uiLabel3);
@@ -1383,6 +1387,48 @@
uiLabel16.TabIndex = 0;
uiLabel16.Text = "I1: 未点火\r\nI2: 点火后自熄\r\nI3: 点火时间 > 4s 且不自熄\r\nI4: 点火时间 ≤ 4s 且不自熄\r\n\r\n根据 BS EN ISO 11810:2015 标准";
//
+ // uiButton9
+ //
+ uiButton9.Cursor = Cursors.Hand;
+ uiButton9.FillColor = Color.FromArgb(46, 204, 113);
+ uiButton9.FillColor2 = Color.FromArgb(46, 204, 113);
+ uiButton9.FillHoverColor = Color.FromArgb(39, 174, 96);
+ uiButton9.FillPressColor = Color.FromArgb(39, 174, 96);
+ uiButton9.Font = new Font("微软雅黑", 13F, FontStyle.Bold, GraphicsUnit.Point, 134);
+ uiButton9.Location = new Point(722, 150);
+ uiButton9.MinimumSize = new Size(1, 1);
+ uiButton9.Name = "uiButton9";
+ uiButton9.Radius = 8;
+ uiButton9.RectColor = Color.FromArgb(46, 204, 113);
+ uiButton9.RectHoverColor = Color.FromArgb(39, 174, 96);
+ uiButton9.Size = new Size(180, 44);
+ uiButton9.Style = Sunny.UI.UIStyle.Custom;
+ uiButton9.StyleCustomMode = true;
+ uiButton9.TabIndex = 21;
+ uiButton9.Text = "手动混氧";
+ uiButton9.TipsFont = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+ //
+ // uiButton14
+ //
+ uiButton14.Cursor = Cursors.Hand;
+ uiButton14.FillColor = Color.FromArgb(241, 196, 15);
+ uiButton14.FillColor2 = Color.FromArgb(241, 196, 15);
+ uiButton14.FillHoverColor = Color.FromArgb(243, 156, 18);
+ uiButton14.FillPressColor = Color.FromArgb(243, 156, 18);
+ uiButton14.Font = new Font("微软雅黑", 13F, FontStyle.Bold, GraphicsUnit.Point, 134);
+ uiButton14.Location = new Point(707, 65);
+ uiButton14.MinimumSize = new Size(1, 1);
+ uiButton14.Name = "uiButton14";
+ uiButton14.Radius = 8;
+ uiButton14.RectColor = Color.FromArgb(241, 196, 15);
+ uiButton14.RectHoverColor = Color.FromArgb(243, 156, 18);
+ uiButton14.Size = new Size(180, 85);
+ uiButton14.Style = Sunny.UI.UIStyle.Custom;
+ uiButton14.StyleCustomMode = true;
+ uiButton14.TabIndex = 24;
+ uiButton14.Text = "💡 灯开关";
+ uiButton14.TipsFont = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+ //
// PrimaryIgnitionForm
//
AutoScaleMode = AutoScaleMode.None;
@@ -1494,5 +1540,7 @@
private Sunny.UI.UILabel uiLabel49;
private Sunny.UI.UILabel uiLabel42;
private Sunny.UI.UILabel uiLabel43;
+ private Sunny.UI.UIButton uiButton9;
+ private Sunny.UI.UIButton uiButton14;
}
}
\ No newline at end of file
diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.Designer.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.Designer.cs
index efe43eb..4d03a00 100644
--- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.Designer.cs
+++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.Designer.cs
@@ -80,6 +80,8 @@
uiGroupBox5 = new Sunny.UI.UIGroupBox();
uiLabel16 = new Sunny.UI.UILabel();
uiGroupBox4 = new Sunny.UI.UIGroupBox();
+ uiLabel42 = new Sunny.UI.UILabel();
+ uiLabel43 = new Sunny.UI.UILabel();
uiLabel10 = new Sunny.UI.UILabel();
uiLabel11 = new Sunny.UI.UILabel();
uiButton13 = new Sunny.UI.UIButton();
@@ -96,8 +98,7 @@
uiLabel20 = new Sunny.UI.UILabel();
uiComboBox3 = new Sunny.UI.UIComboBox();
uiLabel17 = new Sunny.UI.UILabel();
- uiLabel42 = new Sunny.UI.UILabel();
- uiLabel43 = new Sunny.UI.UILabel();
+ uiButton9 = new Sunny.UI.UIButton();
uiTableLayoutPanel1.SuspendLayout();
uiTableLayoutPanel2.SuspendLayout();
uiPanel3.SuspendLayout();
@@ -377,6 +378,7 @@
// uiGroupBox1
//
uiGroupBox1.BackColor = Color.White;
+ uiGroupBox1.Controls.Add(uiButton9);
uiGroupBox1.Controls.Add(uiComboBox1);
uiGroupBox1.Controls.Add(uiLabel6);
uiGroupBox1.Controls.Add(uiLabel3);
@@ -1077,6 +1079,31 @@
uiGroupBox4.Text = "测试结果";
uiGroupBox4.TextAlignment = ContentAlignment.MiddleLeft;
//
+ // uiLabel42
+ //
+ uiLabel42.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134);
+ uiLabel42.ForeColor = Color.FromArgb(64, 158, 255);
+ uiLabel42.Location = new Point(171, 433);
+ uiLabel42.Name = "uiLabel42";
+ uiLabel42.Size = new Size(265, 31);
+ uiLabel42.Style = Sunny.UI.UIStyle.Custom;
+ uiLabel42.StyleCustomMode = true;
+ uiLabel42.TabIndex = 41;
+ uiLabel42.TextAlign = ContentAlignment.MiddleCenter;
+ //
+ // uiLabel43
+ //
+ uiLabel43.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
+ uiLabel43.ForeColor = Color.FromArgb(96, 98, 102);
+ uiLabel43.Location = new Point(48, 432);
+ uiLabel43.Name = "uiLabel43";
+ uiLabel43.Size = new Size(136, 31);
+ uiLabel43.Style = Sunny.UI.UIStyle.Custom;
+ uiLabel43.StyleCustomMode = true;
+ uiLabel43.TabIndex = 40;
+ uiLabel43.Text = "测试时间:";
+ uiLabel43.TextAlign = ContentAlignment.MiddleLeft;
+ //
// uiLabel10
//
uiLabel10.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134);
@@ -1314,30 +1341,26 @@
uiLabel17.Text = "测试样品项:";
uiLabel17.TextAlign = ContentAlignment.MiddleLeft;
//
- // uiLabel42
+ // uiButton9
//
- uiLabel42.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134);
- uiLabel42.ForeColor = Color.FromArgb(64, 158, 255);
- uiLabel42.Location = new Point(171, 433);
- uiLabel42.Name = "uiLabel42";
- uiLabel42.Size = new Size(265, 31);
- uiLabel42.Style = Sunny.UI.UIStyle.Custom;
- uiLabel42.StyleCustomMode = true;
- uiLabel42.TabIndex = 41;
- uiLabel42.TextAlign = ContentAlignment.MiddleCenter;
- //
- // uiLabel43
- //
- uiLabel43.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
- uiLabel43.ForeColor = Color.FromArgb(96, 98, 102);
- uiLabel43.Location = new Point(48, 432);
- uiLabel43.Name = "uiLabel43";
- uiLabel43.Size = new Size(136, 31);
- uiLabel43.Style = Sunny.UI.UIStyle.Custom;
- uiLabel43.StyleCustomMode = true;
- uiLabel43.TabIndex = 40;
- uiLabel43.Text = "测试时间:";
- uiLabel43.TextAlign = ContentAlignment.MiddleLeft;
+ uiButton9.Cursor = Cursors.Hand;
+ uiButton9.FillColor = Color.FromArgb(46, 204, 113);
+ uiButton9.FillColor2 = Color.FromArgb(46, 204, 113);
+ uiButton9.FillHoverColor = Color.FromArgb(39, 174, 96);
+ uiButton9.FillPressColor = Color.FromArgb(39, 174, 96);
+ uiButton9.Font = new Font("微软雅黑", 13F, FontStyle.Bold, GraphicsUnit.Point, 134);
+ uiButton9.Location = new Point(733, 148);
+ uiButton9.MinimumSize = new Size(1, 1);
+ uiButton9.Name = "uiButton9";
+ uiButton9.Radius = 8;
+ uiButton9.RectColor = Color.FromArgb(46, 204, 113);
+ uiButton9.RectHoverColor = Color.FromArgb(39, 174, 96);
+ uiButton9.Size = new Size(180, 44);
+ uiButton9.Style = Sunny.UI.UIStyle.Custom;
+ uiButton9.StyleCustomMode = true;
+ uiButton9.TabIndex = 21;
+ uiButton9.Text = "手动混氧";
+ uiButton9.TipsFont = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
//
// SecondaryIgnitionForm
//
@@ -1443,5 +1466,6 @@
private Sunny.UI.UILabel uiLabel15;
private Sunny.UI.UILabel uiLabel42;
private Sunny.UI.UILabel uiLabel43;
+ private Sunny.UI.UIButton uiButton9;
}
}
\ No newline at end of file