diff --git a/Diaoyong/App.config b/Diaoyong/App.config index bae5d6d..4bfa005 100644 --- a/Diaoyong/App.config +++ b/Diaoyong/App.config @@ -1,6 +1,6 @@ - + diff --git a/Diaoyong/Diaoyong.csproj b/Diaoyong/Diaoyong.csproj index 40cf2c9..0e1babd 100644 --- a/Diaoyong/Diaoyong.csproj +++ b/Diaoyong/Diaoyong.csproj @@ -8,7 +8,7 @@ WinExe Diaoyong Diaoyong - v4.6.1 + v4.8 512 true diff --git a/Diaoyong/Properties/Resources.Designer.cs b/Diaoyong/Properties/Resources.Designer.cs index 23b27ee..3ccc5d2 100644 --- a/Diaoyong/Properties/Resources.Designer.cs +++ b/Diaoyong/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Diaoyong.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ namespace Diaoyong.Properties { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Diaoyong/Properties/Settings.Designer.cs b/Diaoyong/Properties/Settings.Designer.cs index e4304fe..0b12535 100644 --- a/Diaoyong/Properties/Settings.Designer.cs +++ b/Diaoyong/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Diaoyong.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Diaoyong/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Diaoyong/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 68b3aaa..8ff40bb 100644 Binary files a/Diaoyong/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Diaoyong/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Diaoyong/obj/Debug/Diaoyong.csproj.AssemblyReference.cache b/Diaoyong/obj/Debug/Diaoyong.csproj.AssemblyReference.cache index 6dbce94..c2d2d92 100644 Binary files a/Diaoyong/obj/Debug/Diaoyong.csproj.AssemblyReference.cache and b/Diaoyong/obj/Debug/Diaoyong.csproj.AssemblyReference.cache differ diff --git a/Diaoyong/obj/Debug/Diaoyong.csproj.CoreCompileInputs.cache b/Diaoyong/obj/Debug/Diaoyong.csproj.CoreCompileInputs.cache index ba31c39..c838808 100644 --- a/Diaoyong/obj/Debug/Diaoyong.csproj.CoreCompileInputs.cache +++ b/Diaoyong/obj/Debug/Diaoyong.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -774ef8506e7238e895c644d7bbd3b6f8ce76a83e +c9a2dce3f7ca9de12d24b70901df956a18582066 diff --git a/Diaoyong/obj/Debug/Diaoyong.csproj.FileListAbsolute.txt b/Diaoyong/obj/Debug/Diaoyong.csproj.FileListAbsolute.txt index 955d456..6d88182 100644 --- a/Diaoyong/obj/Debug/Diaoyong.csproj.FileListAbsolute.txt +++ b/Diaoyong/obj/Debug/Diaoyong.csproj.FileListAbsolute.txt @@ -36,15 +36,16 @@ C:\Users\PC\Downloads\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong. C:\Users\PC\Downloads\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.csproj.CopyComplete C:\Users\PC\Downloads\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.exe C:\Users\PC\Downloads\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.pdb -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Publish\Diaoyong.exe.config -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Publish\Diaoyong.exe -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Publish\Diaoyong.pdb -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Diaoyong\obj\Debug\Diaoyong.csproj.AssemblyReference.cache -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Diaoyong\obj\Debug\Diaoyong.ConnectionTest.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Diaoyong\obj\Debug\Diaoyong.Form1.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Diaoyong\obj\Debug\Diaoyong.Properties.Resources.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Diaoyong\obj\Debug\Diaoyong.csproj.GenerateResource.cache -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Diaoyong\obj\Debug\Diaoyong.csproj.CoreCompileInputs.cache -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Diaoyong\obj\Debug\Diaoyong.csproj.CopyComplete -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Diaoyong\obj\Debug\Diaoyong.exe -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Diaoyong\obj\Debug\Diaoyong.pdb +D:\230512-UDPSend\230508-UDPSend\Publish\Diaoyong.exe.config +D:\230512-UDPSend\230508-UDPSend\Publish\Diaoyong.exe +D:\230512-UDPSend\230508-UDPSend\Publish\Diaoyong.pdb +D:\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.csproj.AssemblyReference.cache +D:\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.csproj.SuggestedBindingRedirects.cache +D:\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.ConnectionTest.resources +D:\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.Form1.resources +D:\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.Properties.Resources.resources +D:\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.csproj.GenerateResource.cache +D:\230512-UDPSend\230508-UDPSend\Diaoyong\obj\Debug\Diaoyong.csproj.CoreCompileInputs.cache +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 diff --git a/Diaoyong/obj/Debug/Diaoyong.exe b/Diaoyong/obj/Debug/Diaoyong.exe index dea0289..b15d9c9 100644 Binary files a/Diaoyong/obj/Debug/Diaoyong.exe and b/Diaoyong/obj/Debug/Diaoyong.exe differ diff --git a/Diaoyong/obj/Debug/Diaoyong.pdb b/Diaoyong/obj/Debug/Diaoyong.pdb index 77f5628..7ff7b61 100644 Binary files a/Diaoyong/obj/Debug/Diaoyong.pdb and b/Diaoyong/obj/Debug/Diaoyong.pdb differ diff --git a/Diaoyong/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Diaoyong/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index c3a4ab9..135ac0e 100644 Binary files a/Diaoyong/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/Diaoyong/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/WindowsFormsApp2/App.config b/WindowsFormsApp2/App.config index bae5d6d..4bfa005 100644 --- a/WindowsFormsApp2/App.config +++ b/WindowsFormsApp2/App.config @@ -1,6 +1,6 @@ - + diff --git a/WindowsFormsApp2/Camera_glue.Designer.cs b/WindowsFormsApp2/Camera_glue.Designer.cs index d88da94..8c986c5 100644 --- a/WindowsFormsApp2/Camera_glue.Designer.cs +++ b/WindowsFormsApp2/Camera_glue.Designer.cs @@ -101,7 +101,6 @@ this.label_pic1.Size = new System.Drawing.Size(72, 20); this.label_pic1.TabIndex = 0; this.label_pic1.Text = "第一张"; - this.label_pic1.Click += new System.EventHandler(this.label1_Click); // // label_pic2 // @@ -134,7 +133,6 @@ this.label1.Size = new System.Drawing.Size(83, 20); this.label1.TabIndex = 3; this.label1.Text = "1号相机"; - this.label1.Click += new System.EventHandler(this.label4_Click); // // numericUpDown11 // @@ -205,7 +203,6 @@ this.label3.Size = new System.Drawing.Size(83, 20); this.label3.TabIndex = 11; this.label3.Text = "3号相机"; - this.label3.Click += new System.EventHandler(this.label6_Click); // // numericUpDown31 // @@ -230,7 +227,6 @@ this.numericUpDown33.Name = "numericUpDown33"; this.numericUpDown33.Size = new System.Drawing.Size(78, 25); this.numericUpDown33.TabIndex = 14; - this.numericUpDown33.ValueChanged += new System.EventHandler(this.numericUpDown33_ValueChanged); // // label_expo4 // @@ -277,7 +273,6 @@ this.label5.Size = new System.Drawing.Size(83, 20); this.label5.TabIndex = 19; this.label5.Text = "5号相机"; - this.label5.Click += new System.EventHandler(this.label9_Click); // // numericUpDown51 // @@ -286,7 +281,6 @@ this.numericUpDown51.Name = "numericUpDown51"; this.numericUpDown51.Size = new System.Drawing.Size(78, 25); this.numericUpDown51.TabIndex = 20; - this.numericUpDown51.ValueChanged += new System.EventHandler(this.numericUpDown51_ValueChanged); // // numericUpDown52 // @@ -295,7 +289,6 @@ this.numericUpDown52.Name = "numericUpDown52"; this.numericUpDown52.Size = new System.Drawing.Size(78, 25); this.numericUpDown52.TabIndex = 21; - this.numericUpDown52.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged); // // numericUpDown53 // @@ -304,7 +297,6 @@ this.numericUpDown53.Name = "numericUpDown53"; this.numericUpDown53.Size = new System.Drawing.Size(78, 25); this.numericUpDown53.TabIndex = 22; - this.numericUpDown53.ValueChanged += new System.EventHandler(this.numericUpDown2_ValueChanged); // // label_gain2 // @@ -324,7 +316,6 @@ this.numericUpDown61.Name = "numericUpDown61"; this.numericUpDown61.Size = new System.Drawing.Size(78, 25); this.numericUpDown61.TabIndex = 24; - this.numericUpDown61.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); // // numericUpDown62 // @@ -341,7 +332,6 @@ this.numericUpDown63.Name = "numericUpDown63"; this.numericUpDown63.Size = new System.Drawing.Size(78, 25); this.numericUpDown63.TabIndex = 26; - this.numericUpDown63.ValueChanged += new System.EventHandler(this.numericUpDown5_ValueChanged); // // label_gain3 @@ -413,7 +403,6 @@ this.numericUpDown83.Name = "numericUpDown83"; this.numericUpDown83.Size = new System.Drawing.Size(78, 25); this.numericUpDown83.TabIndex = 34; - this.numericUpDown83.ValueChanged += new System.EventHandler(this.numericUpDown14_ValueChanged); // // button_pwd_ok diff --git a/WindowsFormsApp2/Camera_glue.cs b/WindowsFormsApp2/Camera_glue.cs index 2db56d1..202a898 100644 --- a/WindowsFormsApp2/Camera_glue.cs +++ b/WindowsFormsApp2/Camera_glue.cs @@ -18,26 +18,6 @@ namespace WindowsFormsApp2 InitializeComponent(); } - private void label4_Click(object sender, EventArgs e) - { - - } - - private void label6_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - private void listBox1_SelectedIndexChanged(object sender, EventArgs e) - { - - } - private void Camera_glue_Load(object sender, EventArgs e) { this.numericUpDown11.Value = DialogSetup.cam_setting.Cameraglue[0].shoot[0]; @@ -111,45 +91,5 @@ namespace WindowsFormsApp2 this.Close(); MessageBox.Show("请点击‘保存参数’按钮，进行保存设置", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly); } - - private void label9_Click(object sender, EventArgs e) - { - - } - - private void numericUpDown2_ValueChanged(object sender, EventArgs e) - { - - } - - private void numericUpDown51_ValueChanged(object sender, EventArgs e) - { - - } - - private void numericUpDown1_ValueChanged(object sender, EventArgs e) - { - - } - - private void numericUpDown33_ValueChanged(object sender, EventArgs e) - { - - } - - private void numericUpDown6_ValueChanged(object sender, EventArgs e) - { - - } - - private void numericUpDown5_ValueChanged(object sender, EventArgs e) - { - - } - - private void numericUpDown14_ValueChanged(object sender, EventArgs e) - { - - } } } diff --git a/WindowsFormsApp2/Change_shift.Designer.cs b/WindowsFormsApp2/Change_shift.Designer.cs index 7ba4019..dfe000b 100644 --- a/WindowsFormsApp2/Change_shift.Designer.cs +++ b/WindowsFormsApp2/Change_shift.Designer.cs @@ -64,7 +64,6 @@ this.label1.Size = new System.Drawing.Size(30, 15); this.label1.TabIndex = 0; this.label1.Text = "A班"; - this.label1.Click += new System.EventHandler(this.label1_Click); // // label2 // @@ -272,6 +271,7 @@ this.Name = "Change_shift"; this.Text = "换班设置"; this.Load += new System.EventHandler(this.Change_shift_Load); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_A_hour)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_A_minute)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_B_minute)).EndInit(); diff --git a/WindowsFormsApp2/Change_shift.cs b/WindowsFormsApp2/Change_shift.cs index dd8de20..8293266 100644 --- a/WindowsFormsApp2/Change_shift.cs +++ b/WindowsFormsApp2/Change_shift.cs @@ -10,32 +10,51 @@ namespace WindowsFormsApp2 public Change_shift() { InitializeComponent(); - - } - - private void label1_Click(object sender, EventArgs e) - { - + if (DialogSetup.cam_setting.changeshift.shift_byhand == 1) + { + this.radioButton_byhand.Checked = true; + this.radioButton_time.Checked = false; + } + else if (DialogSetup.cam_setting.changeshift.shift_time == 1) + { + this.radioButton_time.Checked = true; + this.radioButton_byhand.Checked = false; + } } private void Change_shift_Load(object sender, EventArgs e) { + //if (DialogSetup.cam_setting.changeshift.shift_byhand == 1) + //{ + // this.radioButton_byhand.Checked = true; + // this.radioButton_time.Checked = false; + //} + //else if (DialogSetup.cam_setting.changeshift.shift_time == 1) + //{ + // this.radioButton_time.Checked = true; + // this.radioButton_byhand.Checked = false; + //} + this.radioButton_byhand.Checked = DialogSetup.cam_setting.changeshift.shift_byhand == 1 ? true: false; + this.radioButton_time.Checked = DialogSetup.cam_setting.changeshift.shift_time == 1 ? true : false; + this.numericUpDown_A_hour.Value = DialogSetup.cam_setting.changeshift.Ah; this.numericUpDown_A_minute.Value = DialogSetup.cam_setting.changeshift.Am; this.numericUpDown_B_hour.Value = DialogSetup.cam_setting.changeshift.Bh; this.numericUpDown_B_minute.Value = DialogSetup.cam_setting.changeshift.Bm; this.numericUpDown_C_hour.Value = DialogSetup.cam_setting.changeshift.Ch; this.numericUpDown_C_minute.Value = DialogSetup.cam_setting.changeshift.Cm; + + } private void button_apply_Click(object sender, EventArgs e) { - if (this.radioButton_time.Checked == true) { - cam_setting.shift_byhand = 0; - cam_setting.shift_time = 1; - } else if (this.radioButton_byhand.Checked == true) { - cam_setting.shift_byhand = 1; - cam_setting.shift_time = 0; + if (this.radioButton_time.Checked) { + DialogSetup.cam_setting.changeshift.shift_byhand = Convert.ToInt32(this.radioButton_byhand.Checked); + DialogSetup.cam_setting.changeshift.shift_time = Convert.ToInt32(this.radioButton_time.Checked); + } else if (this.radioButton_byhand.Checked) { + DialogSetup.cam_setting.changeshift.shift_byhand = Convert.ToInt32(this.radioButton_byhand.Checked); + DialogSetup.cam_setting.changeshift.shift_time = Convert.ToInt32(this.radioButton_time.Checked); } DialogSetup.cam_setting.changeshift.Ah = Convert.ToInt32(this.numericUpDown_A_hour.Value); DialogSetup.cam_setting.changeshift.Am = Convert.ToInt32(this.numericUpDown_A_minute.Value); @@ -50,30 +69,33 @@ namespace WindowsFormsApp2 private void radioButton_byhand_CheckedChanged(object sender, EventArgs e) { - /// 点手动换班 A/B/C三班时间清0 - if (this.radioButton_byhand.Checked) - { - this.radioButton_byhand.Checked = true; - this.radioButton_time.Checked = false; + /// 选择“手动换班”按钮 -> A/B/C三班时间清0 + /// + if (this.radioButton_byhand.Checked) { + DialogSetup.cam_setting.changeshift.shift_byhand = Convert.ToInt32(this.radioButton_byhand.Checked); + DialogSetup.cam_setting.changeshift.shift_time = Convert.ToInt32(this.radioButton_time.Checked); } + DialogSetup.cam_setting.changeshift.Ah = Convert.ToInt32(this.numericUpDown_A_hour.Minimum); DialogSetup.cam_setting.changeshift.Am = Convert.ToInt32(this.numericUpDown_A_minute.Minimum); DialogSetup.cam_setting.changeshift.Bh = Convert.ToInt32(this.numericUpDown_B_hour.Minimum); DialogSetup.cam_setting.changeshift.Bm = Convert.ToInt32(this.numericUpDown_B_minute.Minimum); DialogSetup.cam_setting.changeshift.Ch = Convert.ToInt32(this.numericUpDown_C_hour.Minimum); DialogSetup.cam_setting.changeshift.Cm = Convert.ToInt32(this.numericUpDown_C_minute.Minimum); - this.Close(); - MessageBox.Show("请点击‘保存参数’按钮，进行保存设置", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, MessageBoxOptions.ServiceNotification); - + //this.Close(); + //MessageBox.Show("请点击‘保存参数’按钮，进行保存设置", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, MessageBoxOptions.ServiceNotification); } private void radioButton_time_CheckedChanged(object sender, EventArgs e) { /// 定时换班 if (this.radioButton_time.Checked) { - this.radioButton_time.Checked = true; - this.radioButton_byhand.Checked = false; + DialogSetup.cam_setting.changeshift.shift_byhand = Convert.ToInt32(this.radioButton_byhand.Checked); + DialogSetup.cam_setting.changeshift.shift_time = Convert.ToInt32(this.radioButton_time.Checked); } + //DialogSetup.cam_setting.changeshift.shift_time = 1; + //DialogSetup.cam_setting.changeshift.shift_byhand = 0; + } } } diff --git a/WindowsFormsApp2/DialogSetup.Designer.cs b/WindowsFormsApp2/DialogSetup.Designer.cs index ac94b33..56ca110 100644 --- a/WindowsFormsApp2/DialogSetup.Designer.cs +++ b/WindowsFormsApp2/DialogSetup.Designer.cs @@ -1044,7 +1044,7 @@ this.button3.TabIndex = 12; this.button3.Text = "保存参数"; this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.button3_Click_1); + this.button3.Click += new System.EventHandler(this.button3_Click); // // button4 // diff --git a/WindowsFormsApp2/DialogSetup.cs b/WindowsFormsApp2/DialogSetup.cs index 5013372..55af203 100644 --- a/WindowsFormsApp2/DialogSetup.cs +++ b/WindowsFormsApp2/DialogSetup.cs @@ -33,6 +33,8 @@ namespace WindowsFormsApp2 public int Ch; public int Cm; + public int shift_time; + public int shift_byhand; public static implicit operator ChangeShift(int v) { throw new NotImplementedException(); @@ -55,8 +57,6 @@ namespace WindowsFormsApp2 public PassWord mapsd; public PassWord oppsd; public ChangeShift changeshift; - public int shift_time; - public int shift_byhand; [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType =UnmanagedType.Struct)] public CameraGlue[] Cameraglue; }; @@ -120,8 +120,6 @@ namespace WindowsFormsApp2 cam_setting.IsAutoOpenCam = false; cam_setting.IsAutoWork = false; cam_setting.saveimage = 0; - cam_setting.shift_time = 0; - cam_setting.shift_byhand = 0; cam_setting.camerasetting = new CamSetting[NumberOfSupportedCameras]; for (; index < NumberOfSupportedCameras; index++) { @@ -130,6 +128,9 @@ namespace WindowsFormsApp2 cam_setting.camerasetting[index].filt = 0; } index = 6 + NumberOfSupportedCameras * 3; + cam_setting.changeshift.shift_byhand = 0; + cam_setting.changeshift.shift_time = 0; + index = index + 2; cam_setting.changeshift.Ah = 0; cam_setting.changeshift.Am = 0; cam_setting.changeshift.Bh = 0; @@ -137,6 +138,7 @@ namespace WindowsFormsApp2 cam_setting.changeshift.Ch = 0; cam_setting.changeshift.Cm = 0; index = index + 6; + cam_setting.Cameraglue = new CameraGlue[NumberOfSupportedCameras]; for (int i = 0; i < NumberOfSupportedCameras; i++) @@ -197,11 +199,6 @@ namespace WindowsFormsApp2 outputStatistic.ShowDialog(); } - private void button3_Click(object sender, EventArgs e) - { - - } - private void checkBox_auto_open_CheckedChanged(object sender, EventArgs e) { cam_setting.IsAutoOpenCam = this.checkBox_auto_open.Checked; @@ -372,8 +369,9 @@ namespace WindowsFormsApp2 cam_setting.camerasetting[7].filt = Convert.ToInt32(this.textBox_filter_8.Text.ToString()); } - private void button3_Click_1(object sender, EventArgs e) - { + private void button3_Click(object sender, EventArgs e) + { + // 保存参数 String msg = "UPDSETTING:"; msg += NumberOfSupportedCameras.ToString() + ":"; msg += cam_setting.IsAutoOpenCam.ToString() + ":"; @@ -385,6 +383,8 @@ namespace WindowsFormsApp2 msg += cam_setting.camerasetting[index].gain.ToString() + ":"; msg += cam_setting.camerasetting[index].filt.ToString() + ":"; } + msg += cam_setting.changeshift.shift_byhand.ToString() + ":"; + msg += cam_setting.changeshift.shift_time.ToString() + ":"; msg += cam_setting.changeshift.Ah.ToString() + ":"; msg += cam_setting.changeshift.Am.ToString() + ":"; msg += cam_setting.changeshift.Bh.ToString() + ":"; diff --git a/WindowsFormsApp2/FullScreen.cs b/WindowsFormsApp2/FullScreen.cs index bb81b43..5843f27 100644 --- a/WindowsFormsApp2/FullScreen.cs +++ b/WindowsFormsApp2/FullScreen.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; namespace WindowsFormsApp2 { - public partial class FullScreen : Form + public partial class FullScreen : Form { public FullScreen() { @@ -22,6 +22,5 @@ namespace WindowsFormsApp2 { singleCam1.setCamId(d); } - } } diff --git a/WindowsFormsApp2/Properties/Resources.Designer.cs b/WindowsFormsApp2/Properties/Resources.Designer.cs index 1141dc8..bbd8107 100644 --- a/WindowsFormsApp2/Properties/Resources.Designer.cs +++ b/WindowsFormsApp2/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace WindowsFormsApp2.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ namespace WindowsFormsApp2.Properties { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/WindowsFormsApp2/Properties/Settings.Designer.cs b/WindowsFormsApp2/Properties/Settings.Designer.cs index 2841d43..cf04d55 100644 --- a/WindowsFormsApp2/Properties/Settings.Designer.cs +++ b/WindowsFormsApp2/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace WindowsFormsApp2.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/WindowsFormsApp2/UserControl1.Designer.cs b/WindowsFormsApp2/UserControl1.Designer.cs index ec11e33..224ba09 100644 --- a/WindowsFormsApp2/UserControl1.Designer.cs +++ b/WindowsFormsApp2/UserControl1.Designer.cs @@ -279,7 +279,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.ForeColor = System.Drawing.Color.Lime; + this.label7.ForeColor = System.Drawing.Color.White; this.label7.Location = new System.Drawing.Point(6, 536); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(101, 25); @@ -288,14 +288,14 @@ this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label7.DoubleClick += new System.EventHandler(this.label7_DoubleClick); // - // button1 + // button_apply // this.button1.BackgroundImage = global::WindowsFormsApp2.Properties.Resources.start; this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.Location = new System.Drawing.Point(4, 80); this.button1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.button1.Name = "button1"; + this.button1.Name = "button_apply"; this.button1.Size = new System.Drawing.Size(104, 91); this.button1.TabIndex = 0; this.button1.UseVisualStyleBackColor = true; diff --git a/WindowsFormsApp2/UserControl1.cs b/WindowsFormsApp2/UserControl1.cs index 6a8223d..fd1c1bd 100644 --- a/WindowsFormsApp2/UserControl1.cs +++ b/WindowsFormsApp2/UserControl1.cs @@ -33,8 +33,6 @@ namespace WindowsFormsApp2 UdpClient fileu = null; public static int[] status = new int[5]; DialogSetup setup = new DialogSetup(); - - public static bool Stop = true;//停止 protected virtual void OnClosing(System.ComponentModel.CancelEventArgs e) { m_Done = true; @@ -392,8 +390,6 @@ namespace WindowsFormsApp2 DialogSetup.cam_setting.IsAutoOpenCam = Convert.ToBoolean(int.Parse(str[1])); DialogSetup.cam_setting.IsAutoWork = Convert.ToBoolean(int.Parse(str[2])); DialogSetup.cam_setting.saveimage = int.Parse(str[3]); - DialogSetup.cam_setting.shift_time = int.Parse(str[1]); - DialogSetup.cam_setting.shift_byhand = int.Parse(str[1]); for (;indexLibrary WindowsFormsApp2 WindowsFormsApp2 - v4.6.1 + v4.8 512 true @@ -167,6 +167,7 @@ UserControl1.cs + Designer DialogLogin.cs diff --git a/WindowsFormsApp2/displayResult.Designer.cs b/WindowsFormsApp2/displayResult.Designer.cs index 1f79627..e8d668b 100644 --- a/WindowsFormsApp2/displayResult.Designer.cs +++ b/WindowsFormsApp2/displayResult.Designer.cs @@ -28,27 +28,17 @@ /// private void InitializeComponent() { - this.singleCam5 = new WindowsFormsApp2.singleCam(); this.singleCam8 = new WindowsFormsApp2.singleCam(); this.singleCam7 = new WindowsFormsApp2.singleCam(); this.singleCam6 = new WindowsFormsApp2.singleCam(); - this.singleCam4 = new WindowsFormsApp2.singleCam(); + this.singleCam5 = new WindowsFormsApp2.singleCam(); this.singleCam3 = new WindowsFormsApp2.singleCam(); + this.singleCam4 = new WindowsFormsApp2.singleCam(); this.singleCam2 = new WindowsFormsApp2.singleCam(); this.singleCam1 = new WindowsFormsApp2.singleCam(); this.userControl11 = new WindowsFormsApp2.UserControl1(); this.SuspendLayout(); // - // singleCam5 - // - this.singleCam5.BackColor = System.Drawing.Color.Black; - this.singleCam5.Location = new System.Drawing.Point(720, 67); - this.singleCam5.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - 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); - // // singleCam8 // this.singleCam8.BackColor = System.Drawing.Color.Black; @@ -76,14 +66,15 @@ this.singleCam6.Size = new System.Drawing.Size(600, 200); this.singleCam6.TabIndex = 6; // - // singleCam4 + // singleCam5 // - this.singleCam4.BackColor = System.Drawing.Color.Black; - this.singleCam4.Location = new System.Drawing.Point(112, 685); - this.singleCam4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.singleCam4.Name = "singleCam4"; - this.singleCam4.Size = new System.Drawing.Size(600, 200); - this.singleCam4.TabIndex = 4; + this.singleCam5.BackColor = System.Drawing.Color.Black; + this.singleCam5.Location = new System.Drawing.Point(720, 67); + this.singleCam5.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + 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); // // singleCam3 // @@ -93,7 +84,15 @@ this.singleCam3.Name = "singleCam3"; this.singleCam3.Size = new System.Drawing.Size(600, 200); this.singleCam3.TabIndex = 3; - //this.singleCam3.Load += new System.EventHandler(this.singleCam3_Load); + // + // singleCam4 + // + this.singleCam4.BackColor = System.Drawing.Color.Black; + this.singleCam4.Location = new System.Drawing.Point(112, 685); + this.singleCam4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.singleCam4.Name = "singleCam4"; + this.singleCam4.Size = new System.Drawing.Size(600, 200); + this.singleCam4.TabIndex = 4; // // singleCam2 // @@ -112,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 // @@ -122,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 // @@ -144,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); } diff --git a/WindowsFormsApp2/displayResult.cs b/WindowsFormsApp2/displayResult.cs index 8cd541e..5a115ba 100644 --- a/WindowsFormsApp2/displayResult.cs +++ b/WindowsFormsApp2/displayResult.cs @@ -1,12 +1,10 @@ -using System.Drawing; -using System.Reflection.Emit; -using System.Windows.Forms; +using System.Windows.Forms; namespace WindowsFormsApp2 { public partial class displayResult : UserControl { - + public displayResult() { InitializeComponent(); @@ -27,14 +25,12 @@ namespace WindowsFormsApp2 { dial.bindCam(id); dial.Show(); - } } public void init() - { - + { singleCam1.setCamId(0); singleCam2.setCamId(1); singleCam3.setCamId(2); @@ -58,6 +54,38 @@ 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(); + //} + } } } diff --git a/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 99927ad..758b8b7 100644 Binary files a/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 3c00d5a..11e8890 100644 Binary files a/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/WindowsFormsApp2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/WindowsFormsApp2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 23da832..aa3c9de 100644 Binary files a/WindowsFormsApp2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/WindowsFormsApp2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.UserControl1.resources b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.UserControl1.resources index cc4ac99..b5c03c9 100644 Binary files a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.UserControl1.resources and b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.UserControl1.resources differ diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.AssemblyReference.cache b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.AssemblyReference.cache index da5612b..6fd3a89 100644 Binary files a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.AssemblyReference.cache and b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.AssemblyReference.cache differ diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.CoreCompileInputs.cache b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.CoreCompileInputs.cache index 72ace2c..ec0b5bb 100644 --- a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.CoreCompileInputs.cache +++ b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -3cb51a4ee86f4329065ded9e51221a519b65346f +efae7d3405c08cd599c1ade1c54aa61a6fa5c3a5 diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.FileListAbsolute.txt b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.FileListAbsolute.txt index f9e9826..3de048e 100644 --- a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.FileListAbsolute.txt +++ b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.FileListAbsolute.txt @@ -59,24 +59,24 @@ C:\Users\PC\Downloads\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\W C:\Users\PC\Downloads\230512-UDPSend\230508-UDPSend\Publish\WindowsFormsApp2.dll.config C:\Users\PC\Downloads\230512-UDPSend\230508-UDPSend\Publish\WindowsFormsApp2.dll C:\Users\PC\Downloads\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.dll -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Publish\WindowsFormsApp2.dll.config -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Publish\WindowsFormsApp2.dll -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\Publish\WindowsFormsApp2.pdb -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.AssemblyReference.cache -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Alarm_Record.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Camera_glue.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Change_shift.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.displayResult.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Form1.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.DialogSetup.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.FullScreen.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Output_statistic.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Properties.Resources.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.singleCam.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.singleCam2.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.UserControl1.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.DialogLogin.resources -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.GenerateResource.cache -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.CoreCompileInputs.cache -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.dll -D:\烟厂资料\烟厂程序\程序测试\远程端\230517-UDPSend-尹工修改双击放大\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.pdb +D:\230512-UDPSend\230508-UDPSend\Publish\WindowsFormsApp2.dll.config +D:\230512-UDPSend\230508-UDPSend\Publish\WindowsFormsApp2.dll +D:\230512-UDPSend\230508-UDPSend\Publish\WindowsFormsApp2.pdb +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.AssemblyReference.cache +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Alarm_Record.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Camera_glue.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Change_shift.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.displayResult.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Form1.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.DialogSetup.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.FullScreen.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Output_statistic.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Properties.Resources.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.singleCam.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.singleCam2.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.UserControl1.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.DialogLogin.resources +D:\230512-UDPSend\230508-UDPSend\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.GenerateResource.cache +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 diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.GenerateResource.cache b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.GenerateResource.cache index a9c2cc4..1bd6966 100644 Binary files a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.GenerateResource.cache and b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.GenerateResource.cache differ diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.dll b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.dll index 301f2da..2d83111 100644 Binary files a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.dll and b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.dll differ diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.pdb b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.pdb index 719f5ec..dff1757 100644 Binary files a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.pdb and b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.pdb differ diff --git a/WindowsFormsApp2/singleCam.Designer.cs b/WindowsFormsApp2/singleCam.Designer.cs index af4013d..535a06b 100644 --- a/WindowsFormsApp2/singleCam.Designer.cs +++ b/WindowsFormsApp2/singleCam.Designer.cs @@ -66,7 +66,7 @@ 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); + this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // // groupBox1 // @@ -89,7 +89,7 @@ this.groupBox1.TabIndex = 9; this.groupBox1.TabStop = false; this.groupBox1.Text = "1#分析结果"; - //this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); + this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); // // textBox7 // @@ -103,7 +103,7 @@ 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); + this.textBox7.TextChanged += new System.EventHandler(this.textBox7_TextChanged); // // label7 // @@ -119,7 +119,6 @@ // // label8 // - this.label8.AccessibleRole = System.Windows.Forms.AccessibleRole.Window; this.label8.BackColor = System.Drawing.Color.Lime; this.label8.Font = new System.Drawing.Font("宋体", 15F); this.label8.Location = new System.Drawing.Point(525, 20); @@ -128,8 +127,7 @@ this.label8.Size = new System.Drawing.Size(60, 24); this.label8.TabIndex = 15; this.label8.Text = " OK "; - this.label8.Visible = false; - // this.label8.Click += new System.EventHandler(this.label8_Click); + this.label8.Click += new System.EventHandler(this.label8_Click); // // textBox6 // @@ -143,7 +141,7 @@ 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); + this.textBox6.TextChanged += new System.EventHandler(this.textBox6_TextChanged); // // label6 // @@ -156,7 +154,7 @@ 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); + this.label6.Click += new System.EventHandler(this.label6_Click); // // textBox5 // @@ -164,13 +162,13 @@ 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, 22); + this.textBox5.Location = new System.Drawing.Point(91, 19); 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); + this.textBox5.TextChanged += new System.EventHandler(this.textBox5_TextChanged); // // label5 // @@ -183,7 +181,7 @@ 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); + this.label5.Click += new System.EventHandler(this.label5_Click); // // panel2 // @@ -195,7 +193,7 @@ 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); + this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint); // // pictureBox1 // @@ -210,7 +208,7 @@ 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.Click += new System.EventHandler(this.pictureBox1_Click); this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick); // // panel3 @@ -232,7 +230,7 @@ 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); + this.panel3.Paint += new System.Windows.Forms.PaintEventHandler(this.panel3_Paint); // // textBox4 // @@ -246,7 +244,7 @@ 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); + this.textBox4.TextChanged += new System.EventHandler(this.textBox4_TextChanged); // // textBox3 // @@ -260,7 +258,7 @@ 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); + this.textBox3.TextChanged += new System.EventHandler(this.textBox3_TextChanged); // // textBox2 // @@ -274,7 +272,7 @@ 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); + this.textBox2.TextChanged += new System.EventHandler(this.textBox2_TextChanged); // // textBox1 // @@ -288,7 +286,7 @@ 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); + this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged); // // label4 // @@ -300,7 +298,7 @@ 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); + this.label4.Click += new System.EventHandler(this.label4_Click); // // label3 // @@ -312,7 +310,7 @@ 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); + this.label3.Click += new System.EventHandler(this.label3_Click); // // label2 // @@ -324,7 +322,7 @@ 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); + this.label2.Click += new System.EventHandler(this.label2_Click); // // label1 // @@ -336,7 +334,7 @@ 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); + this.label1.Click += new System.EventHandler(this.label1_Click); // // singleCam // @@ -363,6 +361,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Label label8; private System.Windows.Forms.TextBox textBox6; private System.Windows.Forms.Label label6; private System.Windows.Forms.Panel panel2; @@ -380,6 +379,5 @@ private System.Windows.Forms.Label label7; private System.Windows.Forms.TextBox textBox7; public System.Windows.Forms.PictureBox pictureBox1; - public System.Windows.Forms.Label label8; } } diff --git a/WindowsFormsApp2/singleCam.cs b/WindowsFormsApp2/singleCam.cs index 4c03403..5543988 100644 --- a/WindowsFormsApp2/singleCam.cs +++ b/WindowsFormsApp2/singleCam.cs @@ -12,7 +12,7 @@ namespace WindowsFormsApp2 { public partial class singleCam : UserControl { - // UserControl1 u1 = new UserControl1();// + static singleCam() { @@ -195,28 +195,124 @@ namespace WindowsFormsApp2 if (label8.InvokeRequired) { label8.Invoke(new Action(updateLabel), ok); return; } else { - if (UserControl1.Stop) + if (ok) { - label8.Visible = true; - if (ok) - { - label8.Text = "OK"; - label8.BackColor = Color.Lime; - } - else - { - label8.Text = "NG"; - label8.BackColor = Color.Red; - } + label8.Text = "OK"; + label8.BackColor = Color.Lime; } else { - label8.Visible = false; - + label8.Text = "NG"; + label8.BackColor = Color.Red; } - } } + + 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 callback = null; private int thisId = -1;