1.添加旋转功能

chu270213 2 years ago
parent b1ee0a5fdf
commit 213220dc25

@ -1 +1 @@
c9a2dce3f7ca9de12d24b70901df956a18582066
04bf2dc5143223b57ebea0cf2883e39dde73273d

@ -49,3 +49,16 @@ D:\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.csproj.CoreCompileI
D:\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.csproj.CopyComplete
D:\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.exe
D:\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.pdb
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Publish\Diaoyong.exe.config
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Publish\Diaoyong.exe
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Publish\Diaoyong.pdb
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Diaoyong\obj\Debug\Diaoyong.csproj.AssemblyReference.cache
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Diaoyong\obj\Debug\Diaoyong.csproj.SuggestedBindingRedirects.cache
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Diaoyong\obj\Debug\Diaoyong.ConnectionTest.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Diaoyong\obj\Debug\Diaoyong.Form1.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Diaoyong\obj\Debug\Diaoyong.Properties.Resources.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Diaoyong\obj\Debug\Diaoyong.csproj.GenerateResource.cache
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Diaoyong\obj\Debug\Diaoyong.csproj.CoreCompileInputs.cache
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Diaoyong\obj\Debug\Diaoyong.csproj.CopyComplete
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Diaoyong\obj\Debug\Diaoyong.exe
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Diaoyong\obj\Debug\Diaoyong.pdb

Binary file not shown.

Binary file not shown.

@ -63,8 +63,9 @@ namespace WindowsFormsApp2
DialogSetup.cam_setting.changeshift.Ch = Convert.ToInt32(this.numericUpDown_C_hour.Value);
DialogSetup.cam_setting.changeshift.Cm = Convert.ToInt32(this.numericUpDown_C_minute.Value);
///
this.Close();
MessageBox.Show("请点击‘保存参数’按钮,进行保存设置", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, MessageBoxOptions.ServiceNotification);
this.Close();
}
private void radioButton_byhand_CheckedChanged(object sender, EventArgs e)

@ -28,9 +28,24 @@
/// </summary>
private void InitializeComponent()
{
this.rotate = new System.Windows.Forms.Button();
this.singleCam1 = new WindowsFormsApp2.singleCam();
this.SuspendLayout();
//
// rotate
//
this.rotate.BackColor = System.Drawing.Color.Black;
this.rotate.BackgroundImage = global::WindowsFormsApp2.Properties.Resources.rotate;
this.rotate.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.rotate.FlatAppearance.BorderSize = 0;
this.rotate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.rotate.Location = new System.Drawing.Point(0, 0);
this.rotate.Name = "rotate";
this.rotate.Size = new System.Drawing.Size(51, 51);
this.rotate.TabIndex = 1;
this.rotate.UseVisualStyleBackColor = false;
this.rotate.Click += new System.EventHandler(this.rotate_Click);
//
// singleCam1
//
this.singleCam1.BackColor = System.Drawing.Color.Black;
@ -38,14 +53,15 @@
this.singleCam1.Location = new System.Drawing.Point(0, 0);
this.singleCam1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.singleCam1.Name = "singleCam1";
this.singleCam1.Size = new System.Drawing.Size(1177, 779);
this.singleCam1.Size = new System.Drawing.Size(1582, 853);
this.singleCam1.TabIndex = 0;
//
// FullScreen
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1177, 779);
this.ClientSize = new System.Drawing.Size(1582, 853);
this.Controls.Add(this.rotate);
this.Controls.Add(this.singleCam1);
this.Name = "FullScreen";
this.Text = "FullScreen";
@ -56,5 +72,6 @@
#endregion
private singleCam singleCam1;
private System.Windows.Forms.Button rotate;
}
}

@ -12,15 +12,31 @@ namespace WindowsFormsApp2
{
public partial class FullScreen : Form
{
public int camid;
public FullScreen()
{
InitializeComponent();
WindowState = System.Windows.Forms.FormWindowState.Maximized;
if(UserControl1.Debug)
{
this.rotate.Location = new Point(0, 0);
this.rotate.Visible = true;
}
else
{
this.rotate.Visible = false;
}
}
public void bindCam(int d)
{
singleCam1.setCamId(d);
camid = d;
}
private void rotate_Click(object sender, EventArgs e)
{
UserControl1.SendMsg(Convert.ToString(camid));
}
}
}

@ -80,6 +80,16 @@ namespace WindowsFormsApp2.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap rotate {
get {
object obj = ResourceManager.GetObject("rotate", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>

@ -118,6 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pause" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="unlock" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\unlock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -127,7 +130,7 @@
<data name="start" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pause" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="rotate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\rotate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

@ -33,6 +33,8 @@ namespace WindowsFormsApp2
UdpClient fileu = null;
public static int[] status = new int[5];
DialogSetup setup = new DialogSetup();
public static bool Stop = true;//停止
public static bool Debug;//调试状态
protected virtual void OnClosing(System.ComponentModel.CancelEventArgs e)
{
m_Done = true;
@ -423,38 +425,47 @@ namespace WindowsFormsApp2
if(alarm_code == 0)
{
label7.Text = "无报警";
label7.ForeColor = Color.Lime;
}
if (alarm_code == 5)
{
label7.Text = "1#相机断开";
label7.ForeColor= Color.Red;
}
if (alarm_code == 6)
{
label7.Text = "2#相机断开";
label7.ForeColor = Color.Red;
}
if (alarm_code == 7)
{
label7.Text = "重连1#相机";
label7.Text = "3#相机断开";
label7.ForeColor = Color.Red;
}
if (alarm_code == 8)
{
label7.Text = "重连2#相机";
label7.Text = "4#相机断开";
label7.ForeColor = Color.Red;
}
if (alarm_code == 9)
{
label7.Text = "重连3#相机";
label7.Text = "5#相机断开";
label7.ForeColor = Color.Red;
}
if (alarm_code == 10)
{
label7.Text = "重连4#相机";
label7.Text = "6#相机断开";
label7.ForeColor = Color.Red;
}
if (alarm_code == 11)
{
label7.Text = "重连5#相机";
label7.Text = "7#相机断开";
label7.ForeColor = Color.Red;
}
if (alarm_code == 12)
{
label7.Text = "重连6#相机";
}
if (alarm_code == 13)
{
label7.Text = "重连7#相机";
}
if (alarm_code == 14)
{
label7.Text = "重连8#相机";
label7.Text = "8#相机断开";
label7.ForeColor = Color.Red;
}
}
}
@ -539,11 +550,13 @@ namespace WindowsFormsApp2
private void button1_Click(object sender, EventArgs e)
{
Stop = true;
SendMsg("START");
}
private void button2_Click(object sender, EventArgs e)
{
Stop = false;
SendMsg("END");
}
@ -573,11 +586,13 @@ namespace WindowsFormsApp2
{
SendMsg("DEBUGEN");
this.checkBox1.Checked = false;
Debug = true;
}
else
{
SendMsg("DEBUGDIS");
this.checkBox1.Checked = true;
Debug = false;
}
}

@ -171,7 +171,7 @@
RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAAOvwAADr8BOAVTJAAAI+pJREFUeF7Vegd4FOX+
j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAAOvgAADr4B6kKxwAAAI+pJREFUeF7Vegd4FOX+
9Y/QsSCiSJUiRRREBZQuSBFFpAqCgEAoivQiHSH0HkoSIPQAgQRCEiABQgkkIYWQTnpI74X0urvnf97d
RLHcexXv9zzfXZ7DOzM7s5lz3l+deSUqGf8YT9IgD0MLZc12Lzl1MVEiozTyOLRcQisRFq6Rhw+fyi4z
F/np7MNh088Fne0609qry4gDzpNXXlzgnlD4cmyxTqIL8VsUQWJLdHLhbq7Y3sqUuAIey4HEPP3v4U8J

@ -197,5 +197,8 @@
<ItemGroup>
<None Include="Resources\pause.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\rotate.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

@ -74,7 +74,7 @@
this.singleCam5.Name = "singleCam5";
this.singleCam5.Size = new System.Drawing.Size(600, 200);
this.singleCam5.TabIndex = 5;
this.singleCam5.DoubleClick += new System.EventHandler(this.singleCam5_DoubleClick);
// this.singleCam5.DoubleClick += new System.EventHandler(this.singleCam5_DoubleClick);
//
// singleCam3
//
@ -111,7 +111,7 @@
this.singleCam1.Name = "singleCam1";
this.singleCam1.Size = new System.Drawing.Size(600, 200);
this.singleCam1.TabIndex = 1;
this.singleCam1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.singleCam1_MouseDoubleClick);
// this.singleCam1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.singleCam1_MouseDoubleClick);
//
// userControl11
//
@ -121,7 +121,7 @@
this.userControl11.Name = "userControl11";
this.userControl11.Size = new System.Drawing.Size(1330, 900);
this.userControl11.TabIndex = 0;
this.userControl11.Load += new System.EventHandler(this.userControl11_Load);
// this.userControl11.Load += new System.EventHandler(this.userControl11_Load);
//
// displayResult
//
@ -143,7 +143,7 @@
this.MinimumSize = new System.Drawing.Size(1330, 900);
this.Name = "displayResult";
this.Size = new System.Drawing.Size(1330, 900);
this.Load += new System.EventHandler(this.displayResult_Load);
// this.Load += new System.EventHandler(this.displayResult_Load);
this.ResumeLayout(false);
}

@ -1,4 +1,6 @@
using System.Windows.Forms;
using System.Drawing;
using System.Reflection.Emit;
using System.Windows.Forms;
namespace WindowsFormsApp2
{
@ -54,38 +56,6 @@ namespace WindowsFormsApp2
userControl11.closeSocket();
}
private void displayResult_Load(object sender, System.EventArgs e)
{
}
private void userControl11_Load(object sender, System.EventArgs e)
{
}
private void singleCam5_DoubleClick(object sender, System.EventArgs e)
{
}
private void singleCam1_MouseDoubleClick(object sender, MouseEventArgs e)
{
//////双击图片时进入全屏或者还原
//if (singleCam1.pictureBox1.Size == singleCam1.pictureBox1.MaximumSize)
//{
// singleCam1.pictureBox1.Size = singleCam1.pictureBox1.MinimumSize;
// this.singleCam1.pictureBox1.Dock = DockStyle.None;
// this.singleCam1.pictureBox1.Refresh();
//}
//else
//{
// singleCam1.pictureBox1.Size = singleCam1.pictureBox1.MaximumSize;
// this.singleCam1.pictureBox1.Dock = DockStyle.None;
// this.singleCam1.pictureBox1.Refresh();
//}
}
}
}

@ -80,3 +80,24 @@ D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csp
D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.CoreCompileInputs.cache
D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.dll
D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.pdb
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Publish\WindowsFormsApp2.dll.config
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Publish\WindowsFormsApp2.dll
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\Publish\WindowsFormsApp2.pdb
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.AssemblyReference.cache
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Alarm_Record.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Camera_glue.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Change_shift.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.displayResult.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Form1.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.DialogSetup.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.FullScreen.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Output_statistic.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Properties.Resources.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.singleCam.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.singleCam2.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.UserControl1.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.DialogLogin.resources
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.GenerateResource.cache
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.CoreCompileInputs.cache
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.dll
D:\烟厂资料\烟厂程序\程序测试\远程端\230519-解决配方、换班设置问题\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.pdb

@ -66,7 +66,6 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1576, 50);
this.panel1.TabIndex = 0;
this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
//
// groupBox1
//
@ -89,7 +88,6 @@
this.groupBox1.TabIndex = 9;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "1#分析结果";
this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter);
//
// textBox7
//
@ -103,7 +101,6 @@
this.textBox7.ReadOnly = true;
this.textBox7.Size = new System.Drawing.Size(69, 21);
this.textBox7.TabIndex = 18;
this.textBox7.TextChanged += new System.EventHandler(this.textBox7_TextChanged);
//
// label7
//
@ -127,7 +124,7 @@
this.label8.Size = new System.Drawing.Size(60, 24);
this.label8.TabIndex = 15;
this.label8.Text = " OK ";
this.label8.Click += new System.EventHandler(this.label8_Click);
this.label8.Visible = false;
//
// textBox6
//
@ -141,7 +138,6 @@
this.textBox6.ReadOnly = true;
this.textBox6.Size = new System.Drawing.Size(69, 21);
this.textBox6.TabIndex = 12;
this.textBox6.TextChanged += new System.EventHandler(this.textBox6_TextChanged);
//
// label6
//
@ -154,7 +150,6 @@
this.label6.Size = new System.Drawing.Size(93, 17);
this.label6.TabIndex = 11;
this.label6.Text = "胶点个数:";
this.label6.Click += new System.EventHandler(this.label6_Click);
//
// textBox5
//
@ -162,13 +157,12 @@
this.textBox5.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.textBox5.Font = new System.Drawing.Font("宋体", 11F);
this.textBox5.ForeColor = System.Drawing.Color.White;
this.textBox5.Location = new System.Drawing.Point(91, 19);
this.textBox5.Location = new System.Drawing.Point(91, 23);
this.textBox5.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.textBox5.Name = "textBox5";
this.textBox5.ReadOnly = true;
this.textBox5.Size = new System.Drawing.Size(69, 21);
this.textBox5.TabIndex = 10;
this.textBox5.TextChanged += new System.EventHandler(this.textBox5_TextChanged);
//
// label5
//
@ -181,7 +175,6 @@
this.label5.Size = new System.Drawing.Size(85, 17);
this.label5.TabIndex = 9;
this.label5.Text = "采集速度:";
this.label5.Click += new System.EventHandler(this.label5_Click);
//
// panel2
//
@ -193,7 +186,6 @@
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1576, 897);
this.panel2.TabIndex = 2;
this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint);
//
// pictureBox1
//
@ -208,7 +200,6 @@
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 1;
this.pictureBox1.TabStop = false;
this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
//
// panel3
@ -230,7 +221,6 @@
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(200, 897);
this.panel3.TabIndex = 0;
this.panel3.Paint += new System.Windows.Forms.PaintEventHandler(this.panel3_Paint);
//
// textBox4
//
@ -244,7 +234,6 @@
this.textBox4.Size = new System.Drawing.Size(60, 21);
this.textBox4.TabIndex = 7;
this.textBox4.Text = "0";
this.textBox4.TextChanged += new System.EventHandler(this.textBox4_TextChanged);
//
// textBox3
//
@ -258,7 +247,6 @@
this.textBox3.Size = new System.Drawing.Size(60, 21);
this.textBox3.TabIndex = 6;
this.textBox3.Text = "0";
this.textBox3.TextChanged += new System.EventHandler(this.textBox3_TextChanged);
//
// textBox2
//
@ -272,7 +260,6 @@
this.textBox2.Size = new System.Drawing.Size(60, 21);
this.textBox2.TabIndex = 5;
this.textBox2.Text = "0";
this.textBox2.TextChanged += new System.EventHandler(this.textBox2_TextChanged);
//
// textBox1
//
@ -286,7 +273,6 @@
this.textBox1.Size = new System.Drawing.Size(60, 21);
this.textBox1.TabIndex = 4;
this.textBox1.Text = "0";
this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
//
// label4
//
@ -298,7 +284,6 @@
this.label4.Size = new System.Drawing.Size(86, 19);
this.label4.TabIndex = 3;
this.label4.Text = "1#剔除数";
this.label4.Click += new System.EventHandler(this.label4_Click);
//
// label3
//
@ -310,7 +295,6 @@
this.label3.Size = new System.Drawing.Size(68, 19);
this.label3.TabIndex = 2;
this.label3.Text = "1#NG数";
this.label3.Click += new System.EventHandler(this.label3_Click);
//
// label2
//
@ -322,7 +306,6 @@
this.label2.Size = new System.Drawing.Size(68, 19);
this.label2.TabIndex = 1;
this.label2.Text = "1#OK数";
this.label2.Click += new System.EventHandler(this.label2_Click);
//
// label1
//
@ -334,7 +317,6 @@
this.label1.Size = new System.Drawing.Size(86, 19);
this.label1.TabIndex = 0;
this.label1.Text = "1#检测数";
this.label1.Click += new System.EventHandler(this.label1_Click);
//
// singleCam
//

@ -195,124 +195,28 @@ namespace WindowsFormsApp2
if (label8.InvokeRequired) { label8.Invoke(new Action<bool>(updateLabel), ok); return; }
else
{
if (ok)
if (UserControl1.Stop)
{
label8.Text = "OK";
label8.BackColor = Color.Lime;
label8.Visible = true;
if (ok)
{
label8.Text = "OK";
label8.BackColor = Color.Lime;
}
else
{
label8.Text = "NG";
label8.BackColor = Color.Red;
}
}
else
{
label8.Text = "NG";
label8.BackColor = Color.Red;
label8.Visible = false;
}
}
}
private void pictureBox1_Click(object sender, EventArgs e)
{
}
private void panel3_Paint(object sender, PaintEventArgs e)
{
}
private void label4_Click(object sender, EventArgs e)
{
}
private void textBox3_TextChanged(object sender, EventArgs e)
{
}
private void groupBox1_Enter(object sender, EventArgs e)
{
}
private void panel1_Paint(object sender, PaintEventArgs e)
{
}
private void label8_Click(object sender, EventArgs e)
{
}
private void textBox7_TextChanged(object sender, EventArgs e)
{
}
private void label7_Click(object sender, EventArgs e)
{
}
private void textBox6_TextChanged(object sender, EventArgs e)
{
}
private void label6_Click(object sender, EventArgs e)
{
}
private void textBox5_TextChanged(object sender, EventArgs e)
{
}
private void label5_Click(object sender, EventArgs e)
{
}
private void panel2_Paint(object sender, PaintEventArgs e)
{
}
private void label1_Click(object sender, EventArgs e)
{
}
private void label2_Click(object sender, EventArgs e)
{
}
private void label3_Click(object sender, EventArgs e)
{
}
private void textBox1_TextChanged(object sender, EventArgs e)
{
}
private void textBox2_TextChanged(object sender, EventArgs e)
{
}
private void textBox4_TextChanged(object sender, EventArgs e)
{
}
private void textBox7_TextChanged_1(object sender, EventArgs e)
{
}
public Action<int> callback = null;
private int thisId = -1;

Loading…
Cancel
Save