diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3e8a155..0000000 --- a/.gitignore +++ /dev/null @@ -1,341 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ -# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true -**/wwwroot/lib/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb diff --git a/Diaoyong/App.config b/Diaoyong/App.config index 4bfa005..bae5d6d 100644 --- a/Diaoyong/App.config +++ b/Diaoyong/App.config @@ -1,6 +1,6 @@ - + diff --git a/Diaoyong/Diaoyong.csproj b/Diaoyong/Diaoyong.csproj index 0e1babd..40cf2c9 100644 --- a/Diaoyong/Diaoyong.csproj +++ b/Diaoyong/Diaoyong.csproj @@ -8,7 +8,7 @@ WinExe Diaoyong Diaoyong - v4.8 + v4.6.1 512 true diff --git a/Diaoyong/Properties/Resources.Designer.cs b/Diaoyong/Properties/Resources.Designer.cs index 8f52670..23b27ee 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", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.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 2134229..e4304fe 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", "16.10.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.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.sln b/WindowsFormsApp2.sln index eb79c4e..c07a4a3 100644 --- a/WindowsFormsApp2.sln +++ b/WindowsFormsApp2.sln @@ -10,8 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diaoyong", "Diaoyong\Diaoyo {83837354-1A01-4DF5-99D7-27FE79D43A86} = {83837354-1A01-4DF5-99D7-27FE79D43A86} EndProjectSection EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{A190CCAE-FFB9-4CD1-AC87-BD96DE971927}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -36,10 +34,6 @@ Global {5B1A5431-03F2-4D26-802B-C68D64FC6064}.Release|Any CPU.Build.0 = Release|Any CPU {5B1A5431-03F2-4D26-802B-C68D64FC6064}.Release|x64.ActiveCfg = Release|Any CPU {5B1A5431-03F2-4D26-802B-C68D64FC6064}.Release|x64.Build.0 = Release|Any CPU - {A190CCAE-FFB9-4CD1-AC87-BD96DE971927}.Debug|Any CPU.ActiveCfg = Debug - {A190CCAE-FFB9-4CD1-AC87-BD96DE971927}.Debug|x64.ActiveCfg = Debug - {A190CCAE-FFB9-4CD1-AC87-BD96DE971927}.Release|Any CPU.ActiveCfg = Release - {A190CCAE-FFB9-4CD1-AC87-BD96DE971927}.Release|x64.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/WindowsFormsApp2/App.config b/WindowsFormsApp2/App.config index 4bfa005..bae5d6d 100644 --- a/WindowsFormsApp2/App.config +++ b/WindowsFormsApp2/App.config @@ -1,6 +1,6 @@ - + diff --git a/WindowsFormsApp2/Properties/Resources.Designer.cs b/WindowsFormsApp2/Properties/Resources.Designer.cs index bbd8107..1141dc8 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", "17.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.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 d95aa43..2841d43 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", "16.10.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.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/WindowsFormsApp2.csproj b/WindowsFormsApp2/WindowsFormsApp2.csproj index 327e1d0..6f9e3f0 100644 --- a/WindowsFormsApp2/WindowsFormsApp2.csproj +++ b/WindowsFormsApp2/WindowsFormsApp2.csproj @@ -8,7 +8,7 @@ Library WindowsFormsApp2 WindowsFormsApp2 - v4.8 + v4.6.1 512 true @@ -87,6 +87,12 @@ DialogSetup.cs + + Form + + + FullScreen.cs + Form @@ -137,6 +143,9 @@ DialogSetup.cs + + FullScreen.cs + Output_statistic.cs diff --git a/WindowsFormsApp2/displayResult.Designer.cs b/WindowsFormsApp2/displayResult.Designer.cs index 59a6474..e8d668b 100644 --- a/WindowsFormsApp2/displayResult.Designer.cs +++ b/WindowsFormsApp2/displayResult.Designer.cs @@ -74,6 +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); // // singleCam3 // @@ -110,6 +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); // // userControl11 // @@ -149,7 +151,6 @@ #endregion private UserControl1 userControl11; - private singleCam singleCam1; private singleCam singleCam2; private singleCam singleCam3; private singleCam singleCam4; @@ -157,5 +158,6 @@ private singleCam singleCam6; private singleCam singleCam7; private singleCam singleCam8; + public singleCam singleCam1; } } diff --git a/WindowsFormsApp2/displayResult.cs b/WindowsFormsApp2/displayResult.cs index 54b61a2..5a115ba 100644 --- a/WindowsFormsApp2/displayResult.cs +++ b/WindowsFormsApp2/displayResult.cs @@ -4,11 +4,31 @@ namespace WindowsFormsApp2 { public partial class displayResult : UserControl { + public displayResult() { InitializeComponent(); + singleCam1.callback = callback; + singleCam2.callback = callback; + singleCam3.callback = callback; + singleCam4.callback = callback; + singleCam5.callback = callback; + singleCam6.callback = callback; + singleCam7.callback = callback; + singleCam8.callback = callback; } + void callback(int id) + { + FullScreen dial = new FullScreen(); + if (id > -1) + { + dial.bindCam(id); + dial.Show(); + } + } + + public void init() { singleCam1.setCamId(0); @@ -43,5 +63,29 @@ namespace WindowsFormsApp2 { } + + 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/singleCam.Designer.cs b/WindowsFormsApp2/singleCam.Designer.cs index a079325..535a06b 100644 --- a/WindowsFormsApp2/singleCam.Designer.cs +++ b/WindowsFormsApp2/singleCam.Designer.cs @@ -61,10 +61,10 @@ // this.panel1.Controls.Add(this.groupBox1); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(0, 150); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.panel1.Location = new System.Drawing.Point(0, 897); + this.panel1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 50); + this.panel1.Size = new System.Drawing.Size(1576, 50); this.panel1.TabIndex = 0; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // @@ -82,10 +82,10 @@ this.groupBox1.Font = new System.Drawing.Font("宋体", 10F); this.groupBox1.ForeColor = System.Drawing.Color.White; this.groupBox1.Location = new System.Drawing.Point(0, 0); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.groupBox1.Size = new System.Drawing.Size(600, 50); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 2, 4, 2); + this.groupBox1.Size = new System.Drawing.Size(1576, 50); this.groupBox1.TabIndex = 9; this.groupBox1.TabStop = false; this.groupBox1.Text = "1#分析结果"; @@ -97,33 +97,33 @@ this.textBox7.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox7.Font = new System.Drawing.Font("宋体", 11F); this.textBox7.ForeColor = System.Drawing.Color.White; - this.textBox7.Location = new System.Drawing.Point(430, 24); - this.textBox7.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.textBox7.Location = new System.Drawing.Point(429, 24); + this.textBox7.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); this.textBox7.Name = "textBox7"; this.textBox7.ReadOnly = true; - this.textBox7.Size = new System.Drawing.Size(70, 21); + this.textBox7.Size = new System.Drawing.Size(69, 21); this.textBox7.TabIndex = 18; this.textBox7.TextChanged += new System.EventHandler(this.textBox7_TextChanged); // - // label_expo4 + // label7 // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("宋体", 10F); this.label7.ForeColor = System.Drawing.Color.White; this.label7.Location = new System.Drawing.Point(345, 24); this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label7.Name = "label_expo4"; + this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(93, 17); this.label7.TabIndex = 16; this.label7.Text = "识别时间："; // - // label_tips + // label8 // this.label8.BackColor = System.Drawing.Color.Lime; this.label8.Font = new System.Drawing.Font("宋体", 15F); - this.label8.Location = new System.Drawing.Point(526, 20); + this.label8.Location = new System.Drawing.Point(525, 20); this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label8.Name = "label_tips"; + this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(60, 24); this.label8.TabIndex = 15; this.label8.Text = " OK "; @@ -135,49 +135,49 @@ this.textBox6.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox6.Font = new System.Drawing.Font("宋体", 11F); this.textBox6.ForeColor = System.Drawing.Color.White; - this.textBox6.Location = new System.Drawing.Point(260, 23); - this.textBox6.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.textBox6.Location = new System.Drawing.Point(260, 22); + this.textBox6.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); this.textBox6.Name = "textBox6"; this.textBox6.ReadOnly = true; - this.textBox6.Size = new System.Drawing.Size(70, 21); + this.textBox6.Size = new System.Drawing.Size(69, 21); this.textBox6.TabIndex = 12; this.textBox6.TextChanged += new System.EventHandler(this.textBox6_TextChanged); // - // label_expo3 + // label6 // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("宋体", 10F); this.label6.ForeColor = System.Drawing.Color.White; - this.label6.Location = new System.Drawing.Point(175, 23); + this.label6.Location = new System.Drawing.Point(175, 22); this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label6.Name = "label_expo3"; + this.label6.Name = "label6"; 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); // - // textBox_op_new_pwd + // textBox5 // this.textBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); 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(90, 19); - this.textBox5.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.textBox5.Name = "textBox_op_new_pwd"; + 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(70, 21); + this.textBox5.Size = new System.Drawing.Size(69, 21); this.textBox5.TabIndex = 10; this.textBox5.TextChanged += new System.EventHandler(this.textBox5_TextChanged); // - // label_expo2 + // label5 // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("宋体", 10F); this.label5.ForeColor = System.Drawing.Color.White; this.label5.Location = new System.Drawing.Point(5, 24); this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label5.Name = "label_expo2"; + this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(85, 17); this.label5.TabIndex = 9; this.label5.Text = "采集速度:"; @@ -189,23 +189,27 @@ this.panel2.Controls.Add(this.panel3); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.panel2.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(600, 150); + 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 // + this.pictureBox1.AccessibleRole = System.Windows.Forms.AccessibleRole.Window; this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBox1.Location = new System.Drawing.Point(0, 0); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); + this.pictureBox1.MaximumSize = new System.Drawing.Size(1400, 900); + this.pictureBox1.MinimumSize = new System.Drawing.Size(400, 150); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(400, 150); + this.pictureBox1.Size = new System.Drawing.Size(1376, 897); 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 // @@ -221,112 +225,112 @@ this.panel3.Dock = System.Windows.Forms.DockStyle.Right; this.panel3.Font = new System.Drawing.Font("宋体", 11F); this.panel3.ForeColor = System.Drawing.Color.White; - this.panel3.Location = new System.Drawing.Point(400, 0); - this.panel3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.panel3.Location = new System.Drawing.Point(1376, 0); + this.panel3.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(200, 150); + this.panel3.Size = new System.Drawing.Size(200, 897); this.panel3.TabIndex = 0; this.panel3.Paint += new System.Windows.Forms.PaintEventHandler(this.panel3_Paint); // - // textBox_op_old_pwd + // textBox4 // this.textBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); this.textBox4.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox4.ForeColor = System.Drawing.Color.White; this.textBox4.Location = new System.Drawing.Point(120, 120); - this.textBox4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.textBox4.Name = "textBox_op_old_pwd"; + this.textBox4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); + this.textBox4.Name = "textBox4"; this.textBox4.ReadOnly = true; 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); // - // textBox_confirm_pwd + // textBox3 // this.textBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox3.ForeColor = System.Drawing.Color.White; this.textBox3.Location = new System.Drawing.Point(120, 85); - this.textBox3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.textBox3.Name = "textBox_confirm_pwd"; + this.textBox3.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); + this.textBox3.Name = "textBox3"; this.textBox3.ReadOnly = true; 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); // - // textBox_new_pwd + // textBox2 // this.textBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox2.ForeColor = System.Drawing.Color.White; this.textBox2.Location = new System.Drawing.Point(120, 50); - this.textBox2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.textBox2.Name = "textBox_new_pwd"; + this.textBox2.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); + this.textBox2.Name = "textBox2"; this.textBox2.ReadOnly = true; 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); // - // textBox_old_pwd + // textBox1 // this.textBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox1.ForeColor = System.Drawing.Color.White; this.textBox1.Location = new System.Drawing.Point(120, 15); - this.textBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.textBox1.Name = "textBox_old_pwd"; + this.textBox1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); + this.textBox1.Name = "textBox1"; this.textBox1.ReadOnly = true; 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); // - // label_expo1 + // label4 // this.label4.AutoSize = true; this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Location = new System.Drawing.Point(10, 120); + this.label4.Location = new System.Drawing.Point(11, 120); this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label4.Name = "label_expo1"; + this.label4.Name = "label4"; 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); // - // label_pic3 + // label3 // this.label3.AutoSize = true; this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(10, 85); + this.label3.Location = new System.Drawing.Point(11, 85); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label3.Name = "label_pic3"; + this.label3.Name = "label3"; 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); // - // label_pic2 + // label2 // this.label2.AutoSize = true; this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(10, 50); + this.label2.Location = new System.Drawing.Point(11, 50); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label2.Name = "label_pic2"; + this.label2.Name = "label2"; 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); // - // label_pic1 + // label1 // this.label1.AutoSize = true; this.label1.ForeColor = System.Drawing.Color.White; this.label1.Location = new System.Drawing.Point(8, 15); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label1.Name = "label_pic1"; + this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(86, 19); this.label1.TabIndex = 0; this.label1.Text = "1#检测数"; @@ -339,9 +343,9 @@ this.BackColor = System.Drawing.Color.Black; this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); - this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2); this.Name = "singleCam"; - this.Size = new System.Drawing.Size(600, 200); + this.Size = new System.Drawing.Size(1576, 947); this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); @@ -361,7 +365,6 @@ private System.Windows.Forms.TextBox textBox6; private System.Windows.Forms.Label label6; private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.TextBox textBox5; private System.Windows.Forms.Label label5; private System.Windows.Forms.Panel panel3; @@ -375,5 +378,6 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label7; private System.Windows.Forms.TextBox textBox7; + public System.Windows.Forms.PictureBox pictureBox1; } } diff --git a/WindowsFormsApp2/singleCam.cs b/WindowsFormsApp2/singleCam.cs index ac0a7cb..5543988 100644 --- a/WindowsFormsApp2/singleCam.cs +++ b/WindowsFormsApp2/singleCam.cs @@ -47,6 +47,7 @@ namespace WindowsFormsApp2 { try { + thisId = id; updateUIID(id); client.bindCamId(id); //client.InitLicenseData(updateTime, updateJd, updateOK, updateNG, updateSpeed, updatekick, updateTotal); @@ -58,11 +59,6 @@ namespace WindowsFormsApp2 return; } } - - /* - - - */ private void _update(string data) { string info_frame = "1"; @@ -316,5 +312,13 @@ namespace WindowsFormsApp2 { } + + public Action callback = null; + private int thisId = -1; + + private void pictureBox1_DoubleClick(object sender, EventArgs e) + { + callback?.Invoke(thisId); + } } }