Skip to content

孙克 / AccAOI

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 408eb5a5 由 刘韬
选项

字体修正,界面修改

1 个父辈 1b971ff5
内嵌 并排
正在显示 15 个修改的文件 包含 203 行增加 和 225 行删除
AOI/AoiProject.cs
......@@ -157,7 +157,8 @@ namespace AOI
AoiMethod aoiMethod = (AoiMethod)o;
string PathDataStr = obj.Value<string>("PathDataStr");
PathData pathData = JsonUtil.DeserializeJsonToObject<PathData>(PathDataStr);
aoiMethod.RoiPath = new GraphicsPath(pathData.Points, pathData.Types);
if (pathData!=null && pathData.Points.Length>0)
aoiMethod.RoiPath = new GraphicsPath(pathData.Points, pathData.Types);
aoiProject.methodMap.Add(item.Key, aoiMethod);
Thread.Sleep(1);
......
AccAOI/AOIResourceCulture.cs
......@@ -145,6 +145,8 @@ namespace AccAOI
public static string GetString(string id, string defaultStr)
{
string strCurLanguage = defaultStr;
if (ResourceMap == null)
return defaultStr;
try
{
......
AccAOI/AccAOI.csproj
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\build\OpenCvSharp3-AnyCPU.props" Condition="Exists('..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\build\OpenCvSharp3-AnyCPU.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
......@@ -11,6 +12,8 @@
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
......@@ -43,18 +46,15 @@
<HintPath>..\dll\MvCameraControl.Net.dll</HintPath>
</Reference>
<Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net40\OpenCvSharp.dll</HintPath>
</Reference>
<Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net40\OpenCvSharp.Blob.dll</HintPath>
</Reference>
<Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net40\OpenCvSharp.Extensions.dll</HintPath>
</Reference>
<Reference Include="OpenCvSharp.UserInterface">
<Reference Include="OpenCvSharp.UserInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
<HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net40\OpenCvSharp.UserInterface.dll</HintPath>
</Reference>
<Reference Include="System" />
......@@ -171,6 +171,7 @@
<Content Include="Properties\en-US.resource">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
......@@ -199,4 +200,10 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\build\OpenCvSharp3-AnyCPU.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\build\OpenCvSharp3-AnyCPU.props'))" />
</Target>
</Project>
\ No newline at end of file
AccAOI/FrmAoiSetting.Designer.cs
......@@ -38,7 +38,6 @@ namespace AccAOI
this.btnSavePro = new Asa.Theme.FlatButton();
this.btnNewAoi = new Asa.Theme.FlatButton();
this.btnOpenImage = new Asa.Theme.FlatButton();
this.cmbCameraList = new Asa.Theme.FlatCombo();
this.btnGetCameraImg = new Asa.Theme.FlatButton();
this.comType = new Asa.Theme.FlatCombo();
this.panAoi = new System.Windows.Forms.Panel();
......@@ -49,12 +48,10 @@ namespace AccAOI
this.flatButton2 = new Asa.Theme.FlatButton();
this.lblCurrImage = new System.Windows.Forms.Label();
this.btnUpdateName = new Asa.Theme.FlatButton();
this.btnLan = new Asa.Theme.FlatButton();
this.flatLabel1 = new Asa.Theme.FlatLabel();
this.panTest = new System.Windows.Forms.Panel();
this.testImageBox1 = new Acc.ImageBox.AccImageBox();
this.panel1 = new System.Windows.Forms.Panel();
this.lblTestResult = new System.Windows.Forms.Label();
this.testImageBox1 = new Acc.ImageBox.AccImageBox();
this.imageBox1 = new Acc.ImageBox.AccImageBox();
this.btnCopy = new Asa.Theme.FlatButton();
this.panTest.SuspendLayout();
......@@ -67,10 +64,10 @@ namespace AccAOI
| System.Windows.Forms.AnchorStyles.Left)));
this.aoiList.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.aoiList.Inside = false;
this.aoiList.Location = new System.Drawing.Point(7, 177);
this.aoiList.Location = new System.Drawing.Point(249, 141);
this.aoiList.Name = "aoiList";
this.aoiList.SelectedIndex = -1;
this.aoiList.Size = new System.Drawing.Size(275, 456);
this.aoiList.Size = new System.Drawing.Size(156, 474);
this.aoiList.TabIndex = 2;
this.aoiList.SelectedIndexChanged += new Asa.Theme.Event.SelectedIndexChanged(this.aoiList_IndexChanged);
//
......@@ -82,7 +79,7 @@ namespace AccAOI
this.btnOpenPro.Inside = false;
this.btnOpenPro.Location = new System.Drawing.Point(7, 33);
this.btnOpenPro.Name = "btnOpenPro";
this.btnOpenPro.Size = new System.Drawing.Size(135, 30);
this.btnOpenPro.Size = new System.Drawing.Size(115, 30);
this.btnOpenPro.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnOpenPro.TabIndex = 6;
this.btnOpenPro.Text = "打开项目";
......@@ -94,9 +91,9 @@ namespace AccAOI
this.btnSavePro.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePro.ImageSize = new System.Drawing.Size(0, 0);
this.btnSavePro.Inside = false;
this.btnSavePro.Location = new System.Drawing.Point(146, 33);
this.btnSavePro.Location = new System.Drawing.Point(128, 33);
this.btnSavePro.Name = "btnSavePro";
this.btnSavePro.Size = new System.Drawing.Size(135, 30);
this.btnSavePro.Size = new System.Drawing.Size(115, 30);
this.btnSavePro.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnSavePro.TabIndex = 7;
this.btnSavePro.Text = "保存项目";
......@@ -108,9 +105,9 @@ namespace AccAOI
this.btnNewAoi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNewAoi.ImageSize = new System.Drawing.Size(0, 0);
this.btnNewAoi.Inside = false;
this.btnNewAoi.Location = new System.Drawing.Point(146, 105);
this.btnNewAoi.Location = new System.Drawing.Point(330, 68);
this.btnNewAoi.Name = "btnNewAoi";
this.btnNewAoi.Size = new System.Drawing.Size(135, 30);
this.btnNewAoi.Size = new System.Drawing.Size(75, 30);
this.btnNewAoi.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnNewAoi.TabIndex = 8;
this.btnNewAoi.Text = "新增";
......@@ -122,34 +119,23 @@ namespace AccAOI
this.btnOpenImage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenImage.ImageSize = new System.Drawing.Size(0, 0);
this.btnOpenImage.Inside = false;
this.btnOpenImage.Location = new System.Drawing.Point(1083, 33);
this.btnOpenImage.Location = new System.Drawing.Point(7, 138);
this.btnOpenImage.Name = "btnOpenImage";
this.btnOpenImage.Size = new System.Drawing.Size(162, 30);
this.btnOpenImage.Size = new System.Drawing.Size(236, 30);
this.btnOpenImage.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnOpenImage.TabIndex = 10;
this.btnOpenImage.Text = "选择基准图片";
this.btnOpenImage.Click += new System.EventHandler(this.btnOpenImage_Click);
//
// cmbCameraList
//
this.cmbCameraList.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cmbCameraList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbCameraList.Inside = false;
this.cmbCameraList.Location = new System.Drawing.Point(616, 33);
this.cmbCameraList.Name = "cmbCameraList";
this.cmbCameraList.SelectedIndex = 0;
this.cmbCameraList.Size = new System.Drawing.Size(300, 30);
this.cmbCameraList.TabIndex = 12;
//
// btnGetCameraImg
//
this.btnGetCameraImg.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnGetCameraImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGetCameraImg.ImageSize = new System.Drawing.Size(0, 0);
this.btnGetCameraImg.Inside = false;
this.btnGetCameraImg.Location = new System.Drawing.Point(918, 33);
this.btnGetCameraImg.Location = new System.Drawing.Point(7, 102);
this.btnGetCameraImg.Name = "btnGetCameraImg";
this.btnGetCameraImg.Size = new System.Drawing.Size(162, 30);
this.btnGetCameraImg.Size = new System.Drawing.Size(236, 30);
this.btnGetCameraImg.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnGetCameraImg.TabIndex = 13;
this.btnGetCameraImg.Text = "获取基准图片";
......@@ -160,10 +146,10 @@ namespace AccAOI
this.comType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.comType.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comType.Inside = false;
this.comType.Location = new System.Drawing.Point(7, 69);
this.comType.Location = new System.Drawing.Point(249, 33);
this.comType.Name = "comType";
this.comType.SelectedIndex = 0;
this.comType.Size = new System.Drawing.Size(274, 30);
this.comType.Size = new System.Drawing.Size(156, 30);
this.comType.TabIndex = 14;
//
// panAoi
......@@ -171,9 +157,9 @@ namespace AccAOI
this.panAoi.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.panAoi.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.panAoi.Location = new System.Drawing.Point(288, 33);
this.panAoi.Location = new System.Drawing.Point(411, 33);
this.panAoi.Name = "panAoi";
this.panAoi.Size = new System.Drawing.Size(317, 599);
this.panAoi.Size = new System.Drawing.Size(317, 582);
this.panAoi.TabIndex = 15;
//
// btnExcute
......@@ -182,9 +168,9 @@ namespace AccAOI
this.btnExcute.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnExcute.ImageSize = new System.Drawing.Size(0, 0);
this.btnExcute.Inside = false;
this.btnExcute.Location = new System.Drawing.Point(754, 69);
this.btnExcute.Location = new System.Drawing.Point(6, 327);
this.btnExcute.Name = "btnExcute";
this.btnExcute.Size = new System.Drawing.Size(162, 30);
this.btnExcute.Size = new System.Drawing.Size(237, 50);
this.btnExcute.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnExcute.TabIndex = 16;
this.btnExcute.Text = "执行";
......@@ -196,9 +182,9 @@ namespace AccAOI
this.btnDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDel.ImageSize = new System.Drawing.Size(0, 0);
this.btnDel.Inside = false;
this.btnDel.Location = new System.Drawing.Point(9, 104);
this.btnDel.Location = new System.Drawing.Point(249, 68);
this.btnDel.Name = "btnDel";
this.btnDel.Size = new System.Drawing.Size(135, 30);
this.btnDel.Size = new System.Drawing.Size(75, 30);
this.btnDel.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnDel.TabIndex = 17;
this.btnDel.Text = "删除";
......@@ -210,9 +196,9 @@ namespace AccAOI
this.btnImageChange.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnImageChange.ImageSize = new System.Drawing.Size(0, 0);
this.btnImageChange.Inside = false;
this.btnImageChange.Location = new System.Drawing.Point(918, 104);
this.btnImageChange.Location = new System.Drawing.Point(6, 271);
this.btnImageChange.Name = "btnImageChange";
this.btnImageChange.Size = new System.Drawing.Size(162, 30);
this.btnImageChange.Size = new System.Drawing.Size(237, 50);
this.btnImageChange.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnImageChange.TabIndex = 18;
this.btnImageChange.Text = "切换为测试图片";
......@@ -224,9 +210,9 @@ namespace AccAOI
this.flatButton1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.flatButton1.ImageSize = new System.Drawing.Size(0, 0);
this.flatButton1.Inside = false;
this.flatButton1.Location = new System.Drawing.Point(918, 69);
this.flatButton1.Location = new System.Drawing.Point(6, 174);
this.flatButton1.Name = "flatButton1";
this.flatButton1.Size = new System.Drawing.Size(162, 30);
this.flatButton1.Size = new System.Drawing.Size(237, 30);
this.flatButton1.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatButton1.TabIndex = 20;
this.flatButton1.Text = "获取测试图片";
......@@ -238,9 +224,9 @@ namespace AccAOI
this.flatButton2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.flatButton2.ImageSize = new System.Drawing.Size(0, 0);
this.flatButton2.Inside = false;
this.flatButton2.Location = new System.Drawing.Point(1083, 69);
this.flatButton2.Location = new System.Drawing.Point(6, 210);
this.flatButton2.Name = "flatButton2";
this.flatButton2.Size = new System.Drawing.Size(162, 30);
this.flatButton2.Size = new System.Drawing.Size(237, 30);
this.flatButton2.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatButton2.TabIndex = 19;
this.flatButton2.Text = "选择测试图片";
......@@ -251,7 +237,7 @@ namespace AccAOI
this.lblCurrImage.AutoSize = true;
this.lblCurrImage.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCurrImage.ForeColor = System.Drawing.Color.LawnGreen;
this.lblCurrImage.Location = new System.Drawing.Point(612, 108);
this.lblCurrImage.Location = new System.Drawing.Point(734, 33);
this.lblCurrImage.Name = "lblCurrImage";
this.lblCurrImage.Size = new System.Drawing.Size(74, 22);
this.lblCurrImage.TabIndex = 22;
......@@ -265,58 +251,42 @@ namespace AccAOI
this.btnUpdateName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdateName.ImageSize = new System.Drawing.Size(0, 0);
this.btnUpdateName.Inside = false;
this.btnUpdateName.Location = new System.Drawing.Point(146, 141);
this.btnUpdateName.Location = new System.Drawing.Point(330, 104);
this.btnUpdateName.Name = "btnUpdateName";
this.btnUpdateName.Size = new System.Drawing.Size(135, 30);
this.btnUpdateName.Size = new System.Drawing.Size(75, 30);
this.btnUpdateName.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnUpdateName.TabIndex = 23;
this.btnUpdateName.Text = "修改";
this.btnUpdateName.Click += new System.EventHandler(this.btnUpdateName_Click);
//
// btnLan
//
this.btnLan.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnLan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLan.ImageSize = new System.Drawing.Size(0, 0);
this.btnLan.Inside = false;
this.btnLan.Location = new System.Drawing.Point(1083, 105);
this.btnLan.Name = "btnLan";
this.btnLan.Size = new System.Drawing.Size(162, 30);
this.btnLan.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnLan.TabIndex = 24;
this.btnLan.Text = "英文";
this.btnLan.Click += new System.EventHandler(this.btnLan_Click);
//
// flatLabel1
//
this.flatLabel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.flatLabel1.Inside = false;
this.flatLabel1.Location = new System.Drawing.Point(616, 33);
this.flatLabel1.Name = "flatLabel1";
this.flatLabel1.Size = new System.Drawing.Size(78, 30);
this.flatLabel1.TabIndex = 11;
this.flatLabel1.Text = "相机：";
this.flatLabel1.Visible = false;
//
// panTest
//
this.panTest.Controls.Add(this.panel1);
this.panTest.Controls.Add(this.testImageBox1);
this.panTest.Location = new System.Drawing.Point(616, 142);
this.panTest.Location = new System.Drawing.Point(738, 58);
this.panTest.Name = "panTest";
this.panTest.Size = new System.Drawing.Size(508, 432);
this.panTest.Size = new System.Drawing.Size(448, 446);
this.panTest.TabIndex = 25;
//
// testImageBox1
//
this.testImageBox1.BackColor = System.Drawing.Color.Silver;
this.testImageBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.testImageBox1.DragHandleSize = 9;
this.testImageBox1.Location = new System.Drawing.Point(0, 0);
this.testImageBox1.Name = "testImageBox1";
this.testImageBox1.SelectionColor = System.Drawing.Color.Blue;
this.testImageBox1.Size = new System.Drawing.Size(448, 446);
this.testImageBox1.TabIndex = 21;
//
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
| System.Windows.Forms.AnchorStyles.Left)));
this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.lblTestResult);
this.panel1.Location = new System.Drawing.Point(232, 3);
this.panel1.Location = new System.Drawing.Point(6, 394);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(273, 425);
this.panel1.Size = new System.Drawing.Size(236, 221);
this.panel1.TabIndex = 22;
//
// lblTestResult
......@@ -326,22 +296,9 @@ namespace AccAOI
this.lblTestResult.ForeColor = System.Drawing.Color.White;
this.lblTestResult.Location = new System.Drawing.Point(3, 5);
this.lblTestResult.Name = "lblTestResult";
this.lblTestResult.Size = new System.Drawing.Size(53, 17);
this.lblTestResult.Size = new System.Drawing.Size(43, 17);
this.lblTestResult.TabIndex = 22;
this.lblTestResult.Text = "Result ?";
//
// testImageBox1
//
this.testImageBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.testImageBox1.BackColor = System.Drawing.Color.Silver;
this.testImageBox1.DragHandleSize = 9;
this.testImageBox1.Location = new System.Drawing.Point(0, 0);
this.testImageBox1.Name = "testImageBox1";
this.testImageBox1.SelectionColor = System.Drawing.Color.Blue;
this.testImageBox1.Size = new System.Drawing.Size(228, 431);
this.testImageBox1.TabIndex = 21;
this.lblTestResult.Text = "Result";
//
// imageBox1
//
......@@ -349,11 +306,11 @@ namespace AccAOI
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.imageBox1.DragHandleSize = 9;
this.imageBox1.Location = new System.Drawing.Point(610, 140);
this.imageBox1.Location = new System.Drawing.Point(738, 58);
this.imageBox1.Name = "imageBox1";
this.imageBox1.SelectionColor = System.Drawing.Color.Blue;
this.imageBox1.SelectionMode = Acc.ImageBox.ImageBoxSelectionMode.Rectangle;
this.imageBox1.Size = new System.Drawing.Size(653, 493);
this.imageBox1.Size = new System.Drawing.Size(560, 557);
this.imageBox1.TabIndex = 4;
this.imageBox1.SelectionRegionChanged += new System.EventHandler(this.imageBox1_SelectionRegionChanged);
//
......@@ -363,9 +320,9 @@ namespace AccAOI
this.btnCopy.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCopy.ImageSize = new System.Drawing.Size(0, 0);
this.btnCopy.Inside = false;
this.btnCopy.Location = new System.Drawing.Point(7, 140);
this.btnCopy.Location = new System.Drawing.Point(249, 104);
this.btnCopy.Name = "btnCopy";
this.btnCopy.Size = new System.Drawing.Size(135, 30);
this.btnCopy.Size = new System.Drawing.Size(75, 30);
this.btnCopy.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnCopy.TabIndex = 26;
this.btnCopy.Text = "复制";
......@@ -374,10 +331,10 @@ namespace AccAOI
// FrmAoiSetting
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1270, 641);
this.ClientSize = new System.Drawing.Size(1307, 624);
this.Controls.Add(this.panel1);
this.Controls.Add(this.btnCopy);
this.Controls.Add(this.panTest);
this.Controls.Add(this.btnLan);
this.Controls.Add(this.btnUpdateName);
this.Controls.Add(this.lblCurrImage);
this.Controls.Add(this.flatButton1);
......@@ -388,8 +345,6 @@ namespace AccAOI
this.Controls.Add(this.panAoi);
this.Controls.Add(this.comType);
this.Controls.Add(this.btnGetCameraImg);
this.Controls.Add(this.cmbCameraList);
this.Controls.Add(this.flatLabel1);
this.Controls.Add(this.btnOpenImage);
this.Controls.Add(this.btnNewAoi);
this.Controls.Add(this.btnSavePro);
......@@ -397,6 +352,7 @@ namespace AccAOI
this.Controls.Add(this.imageBox1);
this.Controls.Add(this.aoiList);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Maximized = true;
this.Name = "FrmAoiSetting";
this.Text = "AOI";
this.Load += new System.EventHandler(this.FrmAoiSetting_Load);
......@@ -417,7 +373,6 @@ namespace AccAOI
private Asa.Theme.FlatButton btnSavePro;
private Asa.Theme.FlatButton btnNewAoi;
private Asa.Theme.FlatButton btnOpenImage;
private Asa.Theme.FlatCombo cmbCameraList;
private Asa.Theme.FlatButton btnGetCameraImg;
private Asa.Theme.FlatCombo comType;
private System.Windows.Forms.Panel panAoi;
......@@ -429,8 +384,6 @@ namespace AccAOI
private AccImageBox testImageBox1;
private System.Windows.Forms.Label lblCurrImage;
private Asa.Theme.FlatButton btnUpdateName;
private Asa.Theme.FlatButton btnLan;
private Asa.Theme.FlatLabel flatLabel1;
private System.Windows.Forms.Panel panTest;
private System.Windows.Forms.Label lblTestResult;
private System.Windows.Forms.Panel panel1;
......
AccAOI/FrmAoiSetting.cs
......@@ -32,7 +32,9 @@ namespace AccAOI
}
public FrmAoiSetting(string programPath, Image image = null, string defaultPath = "")
{
InitializeComponent();
InitializeComponent();
this.Width = Screen.PrimaryScreen.WorkingArea.Width;
this.Height = Screen.PrimaryScreen.WorkingArea.Height;
this.WindowState = FormWindowState.Maximized;
if (!programPath.Equals(""))
{
......@@ -59,6 +61,7 @@ namespace AccAOI
DefaultPath = defaultPath;
}
string CurrentCamera="";
private void FrmAoiSetting_Load(object sender, EventArgs e)
{
LoadTypes();
......@@ -75,11 +78,7 @@ namespace AccAOI
foreach (string str in CameraManager.hikNameList)
{
cmbCameraList.ItemAdd(str);
}
if (CameraManager.hikNameList.Count > 0)
{
cmbCameraList.Text = CameraManager.hikNameList[0];
CurrentCamera = str;
}
if (Project != null)
{
......@@ -87,13 +86,15 @@ namespace AccAOI
}
}
private void LoadTypes()
{
comType.Clear();
comType.ItemAdd(ControlType.Mark);
comType.ItemAdd(ControlType.AOIBlob);
comType.ItemAdd(ControlType.AOIRGB);
comType.ItemAdd(ControlType.Match);
//comType.ItemAdd(ControlType.Match);
comType.ItemAdd(ControlType.ColorMatch);
comType.Text = ControlType.Mark;
}
......@@ -133,10 +134,10 @@ namespace AccAOI
{
try
{
string camera = cmbCameraList.Text;
string camera = CurrentCamera;
if (camera.Equals(""))
{
MyMessage.Show("清先选择相机");
MyMessage.Show(AOIResourceCulture.GetValue("没有找到相机"));
return;
} //将图片保存到本地重新加载
// string filePath = Application.StartupPath + @"\aimage\" + DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + DateTime.Now.Millisecond.ToString().PadLeft(3, '0') ;
......@@ -485,7 +486,7 @@ namespace AccAOI
}
if (TestImage == null)
{
MyMessage.Show("请选择测试图片");
//MyMessage.Show("请选择测试图片");
return;
}
lblTestResult.Text = "";
......@@ -594,10 +595,10 @@ namespace AccAOI
private void flatButton1_Click(object sender, EventArgs e)
{
string camera = cmbCameraList.Text;
string camera = CurrentCamera;
if (camera.Equals(""))
{
MyMessage.Show("清先选择相机");
MyMessage.Show(AOIResourceCulture.GetValue("没有找到相机"));
return;
}
......@@ -741,11 +742,11 @@ namespace AccAOI
{
if (AOIResourceCulture.CurrLanguage.Equals(AOIResourceCulture.China))
{
btnLan.Text = AOIResourceCulture.GetValue("英文");
//btnLan.Text = AOIResourceCulture.GetValue("英文");
}
else
{
btnLan.Text = AOIResourceCulture.GetValue("中文");
//btnLan.Text = AOIResourceCulture.GetValue("中文");
}
LoadTypes();
}
......
AccAOI/FrmMethodName.Designer.cs
......@@ -37,7 +37,7 @@
// txtName
//
this.txtName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtName.Font = new System.Drawing.Font("宋体", 9F);
this.txtName.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtName.Inside = false;
this.txtName.Location = new System.Drawing.Point(66, 80);
this.txtName.Name = "txtName";
......@@ -47,7 +47,7 @@
// btnCancel
//
this.btnCancel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnCancel.Font = new System.Drawing.Font("宋体", 9F);
this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 9F);
this.btnCancel.ImageSize = new System.Drawing.Size(0, 0);
this.btnCancel.Inside = false;
this.btnCancel.Location = new System.Drawing.Point(66, 144);
......@@ -61,7 +61,7 @@
// btnOk
//
this.btnOk.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnOk.Font = new System.Drawing.Font("宋体", 9F);
this.btnOk.Font = new System.Drawing.Font("微软雅黑", 9F);
this.btnOk.ImageSize = new System.Drawing.Size(0, 0);
this.btnOk.Inside = false;
this.btnOk.Location = new System.Drawing.Point(190, 144);
......
AccAOI/control/ABaseControl.Designer.cs
......@@ -48,7 +48,7 @@ namespace AccAOI.control
//
this.btnSetArea.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnSetArea.Enabled = false;
this.btnSetArea.Font = new System.Drawing.Font("宋体", 9F);
this.btnSetArea.Font = new System.Drawing.Font("微软雅黑", 9F);
this.btnSetArea.ImageSize = new System.Drawing.Size(0, 0);
this.btnSetArea.Inside = false;
this.btnSetArea.Location = new System.Drawing.Point(124, 30);
......@@ -62,7 +62,7 @@ namespace AccAOI.control
// btnClearArea
//
this.btnClearArea.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnClearArea.Font = new System.Drawing.Font("宋体", 9F);
this.btnClearArea.Font = new System.Drawing.Font("微软雅黑", 9F);
this.btnClearArea.ImageSize = new System.Drawing.Size(0, 0);
this.btnClearArea.Inside = false;
this.btnClearArea.Location = new System.Drawing.Point(213, 30);
......@@ -116,7 +116,7 @@ namespace AccAOI.control
// btnImgType
//
this.btnImgType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnImgType.Font = new System.Drawing.Font("宋体", 9F);
this.btnImgType.Font = new System.Drawing.Font("微软雅黑", 9F);
this.btnImgType.ImageSize = new System.Drawing.Size(0, 0);
this.btnImgType.Inside = false;
this.btnImgType.Location = new System.Drawing.Point(6, 30);
......@@ -164,16 +164,16 @@ namespace AccAOI.control
//
// ABaseControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
this.ClientSize = new System.Drawing.Size(312, 833);
this.ClientSize = new System.Drawing.Size(312, 776);
this.Controls.Add(this.panResult);
this.Controls.Add(this.panParam);
this.Controls.Add(this.panAreaSet);
this.Controls.Add(this.aoiImage);
this.Controls.Add(this.panAreaImage);
this.Controls.Add(this.panControl);
this.Font = new System.Drawing.Font("微软雅黑", 9F);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "ABaseControl";
this.Load += new System.EventHandler(this.ABaseControl_Load);
......
AccAOI/control/ABaseControl.cs
......@@ -11,6 +11,7 @@ using AOI;
using System.Drawing.Drawing2D;
using Acc.ImageBox;
using Asa.Theme;
using System.Diagnostics;
namespace AccAOI.control
{
......@@ -191,12 +192,24 @@ namespace AccAOI.control
private void ABaseControl_VisibleChanged(object sender, EventArgs e)
{
if (IsDesignMode())
return;
if (this.Visible.Equals(true))
{
LanguageProcess();
}
}
public static bool IsDesignMode()
{
bool returnFlag = false;
if (Process.GetCurrentProcess().ProcessName == "devenv")
{
returnFlag = true;
}
return returnFlag;
}
public virtual void LanguagePro()
{
panAreaSet.Text = AOIResourceCulture.GetValue("区域设置 - 矩形");
......@@ -212,6 +225,8 @@ namespace AccAOI.control
}
private void ABaseControl_Load(object sender, EventArgs e)
{
if (IsDesignMode())
return;
LanguagePro();
}
}
......
AccAOI/control/AioMarkControl.Designer.cs
......@@ -61,7 +61,7 @@
// flatLabel1
//
this.flatLabel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel1.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel1.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel1.Inside = false;
this.flatLabel1.Location = new System.Drawing.Point(5, 90);
this.flatLabel1.Name = "flatLabel1";
......@@ -73,7 +73,7 @@
// flatTextSearchZoom
//
this.flatTextSearchZoom.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatTextSearchZoom.Font = new System.Drawing.Font("宋体", 9F);
this.flatTextSearchZoom.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatTextSearchZoom.Inside = false;
this.flatTextSearchZoom.Location = new System.Drawing.Point(208, 91);
this.flatTextSearchZoom.Name = "flatTextSearchZoom";
......@@ -84,7 +84,7 @@
// flatLabel2
//
this.flatLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel2.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel2.Inside = false;
this.flatLabel2.Location = new System.Drawing.Point(109, 90);
this.flatLabel2.Name = "flatLabel2";
......@@ -106,7 +106,7 @@
// btnTest
//
this.btnTest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnTest.Font = new System.Drawing.Font("宋体", 9F);
this.btnTest.Font = new System.Drawing.Font("微软雅黑", 9F);
this.btnTest.ImageSize = new System.Drawing.Size(0, 0);
this.btnTest.Inside = false;
this.btnTest.Location = new System.Drawing.Point(92, 40);
......@@ -143,7 +143,7 @@
// flatLabel3
//
this.flatLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel3.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel3.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel3.Inside = false;
this.flatLabel3.Location = new System.Drawing.Point(5, 37);
this.flatLabel3.Name = "flatLabel3";
......@@ -155,7 +155,7 @@
// txtSamePercent
//
this.txtSamePercent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtSamePercent.Font = new System.Drawing.Font("宋体", 9F);
this.txtSamePercent.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtSamePercent.Inside = false;
this.txtSamePercent.Location = new System.Drawing.Point(81, 37);
this.txtSamePercent.Name = "txtSamePercent";
......@@ -167,9 +167,9 @@
//
// AioMarkControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(312, 833);
this.Font = new System.Drawing.Font("微软雅黑", 9F);
this.Name = "AioMarkControl";
this.TitleName = "Mark设置";
this.panParam.ResumeLayout(false);
......
AccAOI/control/AioTempMatchControl.Designer.cs
......@@ -68,7 +68,7 @@
// btnTest
//
this.btnTest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnTest.Font = new System.Drawing.Font("宋体", 9F);
this.btnTest.Font = new System.Drawing.Font("微软雅黑", 9F);
this.btnTest.ImageSize = new System.Drawing.Size(0, 0);
this.btnTest.Inside = false;
this.btnTest.Location = new System.Drawing.Point(92, 36);
......@@ -105,7 +105,7 @@
// flatLabel3
//
this.flatLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel3.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel3.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel3.Inside = false;
this.flatLabel3.Location = new System.Drawing.Point(6, 37);
this.flatLabel3.Name = "flatLabel3";
......@@ -117,7 +117,7 @@
// txtSamePercent
//
this.txtSamePercent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtSamePercent.Font = new System.Drawing.Font("宋体", 9F);
this.txtSamePercent.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtSamePercent.Inside = false;
this.txtSamePercent.Location = new System.Drawing.Point(82, 37);
this.txtSamePercent.Name = "txtSamePercent";
......@@ -129,9 +129,9 @@
//
// AioTempMatchControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(312, 833);
this.Font = new System.Drawing.Font("微软雅黑", 9F);
this.Name = "AioTempMatchControl";
this.TitleName = "模板匹配";
this.panParam.ResumeLayout(false);
......
AccAOI/control/AoiBlobControl.Designer.cs
......@@ -64,7 +64,7 @@
// flatLabel1
//
this.flatLabel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel1.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel1.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel1.Inside = false;
this.flatLabel1.Location = new System.Drawing.Point(8, 350);
this.flatLabel1.Name = "flatLabel1";
......@@ -89,7 +89,7 @@
// lblthresh
//
this.lblthresh.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.lblthresh.Font = new System.Drawing.Font("宋体", 9F);
this.lblthresh.Font = new System.Drawing.Font("微软雅黑", 9F);
this.lblthresh.Inside = false;
this.lblthresh.Location = new System.Drawing.Point(265, 350);
this.lblthresh.Name = "lblthresh";
......@@ -100,7 +100,7 @@
// flatLabel3
//
this.flatLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel3.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel3.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel3.Inside = false;
this.flatLabel3.Location = new System.Drawing.Point(6, 484);
this.flatLabel3.Name = "flatLabel3";
......@@ -121,7 +121,7 @@
// flatLabel2
//
this.flatLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel2.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel2.Inside = false;
this.flatLabel2.Location = new System.Drawing.Point(8, 405);
this.flatLabel2.Name = "flatLabel2";
......@@ -133,7 +133,7 @@
// txtminArea
//
this.txtminArea.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtminArea.Font = new System.Drawing.Font("宋体", 9F);
this.txtminArea.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtminArea.Inside = false;
this.txtminArea.Location = new System.Drawing.Point(132, 484);
this.txtminArea.Name = "txtminArea";
......@@ -145,7 +145,7 @@
// txtmaxArea
//
this.txtmaxArea.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtmaxArea.Font = new System.Drawing.Font("宋体", 9F);
this.txtmaxArea.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtmaxArea.Inside = false;
this.txtmaxArea.Location = new System.Drawing.Point(225, 484);
this.txtmaxArea.Name = "txtmaxArea";
......@@ -157,7 +157,7 @@
// flatLabel5
//
this.flatLabel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel5.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel5.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel5.Inside = false;
this.flatLabel5.Location = new System.Drawing.Point(197, 490);
this.flatLabel5.Name = "flatLabel5";
......@@ -168,7 +168,7 @@
// flatLabel4
//
this.flatLabel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel4.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel4.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel4.Inside = false;
this.flatLabel4.Location = new System.Drawing.Point(197, 526);
this.flatLabel4.Name = "flatLabel4";
......@@ -179,7 +179,7 @@
// txtmaxNum
//
this.txtmaxNum.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtmaxNum.Font = new System.Drawing.Font("宋体", 9F);
this.txtmaxNum.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtmaxNum.Inside = false;
this.txtmaxNum.Location = new System.Drawing.Point(225, 526);
this.txtmaxNum.Name = "txtmaxNum";
......@@ -191,7 +191,7 @@
// txtminNum
//
this.txtminNum.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtminNum.Font = new System.Drawing.Font("宋体", 9F);
this.txtminNum.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtminNum.Inside = false;
this.txtminNum.Location = new System.Drawing.Point(132, 526);
this.txtminNum.Name = "txtminNum";
......@@ -203,7 +203,7 @@
// flatLabel6
//
this.flatLabel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel6.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel6.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel6.Inside = false;
this.flatLabel6.Location = new System.Drawing.Point(6, 526);
this.flatLabel6.Name = "flatLabel6";
......@@ -214,7 +214,7 @@
// btnUpdate
//
this.btnUpdate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnUpdate.Font = new System.Drawing.Font("宋体", 9F);
this.btnUpdate.Font = new System.Drawing.Font("微软雅黑", 9F);
this.btnUpdate.ImageSize = new System.Drawing.Size(0, 0);
this.btnUpdate.Inside = false;
this.btnUpdate.Location = new System.Drawing.Point(204, 122);
......@@ -228,7 +228,7 @@
// flatLabel7
//
this.flatLabel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel7.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel7.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel7.Inside = false;
this.flatLabel7.Location = new System.Drawing.Point(6, 571);
this.flatLabel7.Name = "flatLabel7";
......@@ -240,7 +240,7 @@
//
this.txtNumResult.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtNumResult.Enabled = false;
this.txtNumResult.Font = new System.Drawing.Font("宋体", 9F);
this.txtNumResult.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtNumResult.Inside = false;
this.txtNumResult.Location = new System.Drawing.Point(130, 121);
this.txtNumResult.Name = "txtNumResult";
......@@ -263,8 +263,7 @@
//
// AoiBlobControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(312, 833);
this.Controls.Add(this.flatLabel7);
this.Controls.Add(this.flatLabel4);
......
AccAOI/control/AoiColorMatchControl.Designer.cs
......@@ -68,7 +68,7 @@
// btnTest
//
this.btnTest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnTest.Font = new System.Drawing.Font("宋体", 9F);
this.btnTest.Font = new System.Drawing.Font("微软雅黑", 9F);
this.btnTest.ImageSize = new System.Drawing.Size(0, 0);
this.btnTest.Inside = false;
this.btnTest.Location = new System.Drawing.Point(92, 36);
......@@ -105,7 +105,7 @@
// flatLabel3
//
this.flatLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel3.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel3.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel3.Inside = false;
this.flatLabel3.Location = new System.Drawing.Point(6, 37);
this.flatLabel3.Name = "flatLabel3";
......@@ -117,7 +117,7 @@
// txtSamePercent
//
this.txtSamePercent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtSamePercent.Font = new System.Drawing.Font("宋体", 9F);
this.txtSamePercent.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtSamePercent.Inside = false;
this.txtSamePercent.Location = new System.Drawing.Point(82, 37);
this.txtSamePercent.Name = "txtSamePercent";
......@@ -127,12 +127,11 @@
this.txtSamePercent.Text = "50";
this.txtSamePercent.TextChanged += new System.EventHandler(this.txtSamePercent_TextChanged);
//
// AioTempMatchControl
// AoiColorMatchControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(312, 833);
this.Name = "AioTempMatchControl";
this.Name = "AoiColorMatchControl";
this.TitleName = "颜色匹配";
this.panParam.ResumeLayout(false);
this.panParam.PerformLayout();
......
AccAOI/control/AoiRgbControl.Designer.cs
......@@ -67,6 +67,7 @@ namespace AccAOI.control
//
// panParam
//
this.panParam.Controls.Add(this.flatLabel2);
this.panParam.Controls.Add(this.tbMinB);
this.panParam.Controls.Add(this.tbMaxG);
this.panParam.Controls.Add(this.tbMinG);
......@@ -85,22 +86,26 @@ namespace AccAOI.control
this.panParam.Controls.Add(this.txtMinG);
this.panParam.Controls.Add(this.tbMaxB);
this.panParam.Location = new System.Drawing.Point(4, 317);
this.panParam.Size = new System.Drawing.Size(298, 325);
this.panParam.Size = new System.Drawing.Size(298, 263);
//
// panResult
//
this.panResult.Controls.Add(this.flatLabel5);
this.panResult.Controls.Add(this.btnUpdate);
this.panResult.Controls.Add(this.txtmaxRate);
this.panResult.Controls.Add(this.txtminRate);
this.panResult.Controls.Add(this.flatLabel9);
this.panResult.Controls.Add(this.flatLabel3);
this.panResult.Controls.Add(this.txtRate);
this.panResult.Location = new System.Drawing.Point(4, 646);
this.panResult.Size = new System.Drawing.Size(298, 183);
this.panResult.Location = new System.Drawing.Point(4, 586);
this.panResult.Size = new System.Drawing.Size(298, 239);
//
// flatLabel5
//
this.flatLabel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel5.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel5.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel5.Inside = false;
this.flatLabel5.Location = new System.Drawing.Point(210, 685);
this.flatLabel5.Location = new System.Drawing.Point(205, 41);
this.flatLabel5.Name = "flatLabel5";
this.flatLabel5.Size = new System.Drawing.Size(18, 25);
this.flatLabel5.TabIndex = 23;
......@@ -109,9 +114,9 @@ namespace AccAOI.control
// txtmaxRate
//
this.txtmaxRate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtmaxRate.Font = new System.Drawing.Font("宋体", 9F);
this.txtmaxRate.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtmaxRate.Inside = false;
this.txtmaxRate.Location = new System.Drawing.Point(228, 677);
this.txtmaxRate.Location = new System.Drawing.Point(223, 33);
this.txtmaxRate.Name = "txtmaxRate";
this.txtmaxRate.Padding = new System.Windows.Forms.Padding(3);
this.txtmaxRate.Size = new System.Drawing.Size(67, 30);
......@@ -120,9 +125,9 @@ namespace AccAOI.control
// txtminRate
//
this.txtminRate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtminRate.Font = new System.Drawing.Font("宋体", 9F);
this.txtminRate.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtminRate.Inside = false;
this.txtminRate.Location = new System.Drawing.Point(139, 677);
this.txtminRate.Location = new System.Drawing.Point(134, 33);
this.txtminRate.Name = "txtminRate";
this.txtminRate.Padding = new System.Windows.Forms.Padding(3);
this.txtminRate.Size = new System.Drawing.Size(67, 30);
......@@ -131,9 +136,9 @@ namespace AccAOI.control
// flatLabel3
//
this.flatLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel3.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel3.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel3.Inside = false;
this.flatLabel3.Location = new System.Drawing.Point(10, 677);
this.flatLabel3.Location = new System.Drawing.Point(5, 33);
this.flatLabel3.Name = "flatLabel3";
this.flatLabel3.Size = new System.Drawing.Size(122, 30);
this.flatLabel3.TabIndex = 20;
......@@ -142,9 +147,9 @@ namespace AccAOI.control
// flatLabel1
//
this.flatLabel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel1.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel1.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel1.Inside = false;
this.flatLabel1.Location = new System.Drawing.Point(15, 80);
this.flatLabel1.Location = new System.Drawing.Point(15, 67);
this.flatLabel1.Name = "flatLabel1";
this.flatLabel1.Size = new System.Drawing.Size(35, 30);
this.flatLabel1.TabIndex = 27;
......@@ -153,9 +158,9 @@ namespace AccAOI.control
// txtMaxR
//
this.txtMaxR.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtMaxR.Font = new System.Drawing.Font("宋体", 9F);
this.txtMaxR.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtMaxR.Inside = false;
this.txtMaxR.Location = new System.Drawing.Point(59, 80);
this.txtMaxR.Location = new System.Drawing.Point(56, 67);
this.txtMaxR.Name = "txtMaxR";
this.txtMaxR.Padding = new System.Windows.Forms.Padding(3);
this.txtMaxR.Size = new System.Drawing.Size(41, 30);
......@@ -166,9 +171,9 @@ namespace AccAOI.control
// txtMinR
//
this.txtMinR.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtMinR.Font = new System.Drawing.Font("宋体", 9F);
this.txtMinR.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtMinR.Inside = false;
this.txtMinR.Location = new System.Drawing.Point(59, 33);
this.txtMinR.Location = new System.Drawing.Point(56, 31);
this.txtMinR.Name = "txtMinR";
this.txtMinR.Padding = new System.Windows.Forms.Padding(3);
this.txtMinR.Size = new System.Drawing.Size(41, 30);
......@@ -179,9 +184,9 @@ namespace AccAOI.control
// flatLabel2
//
this.flatLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel2.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel2.Inside = false;
this.flatLabel2.Location = new System.Drawing.Point(19, 348);
this.flatLabel2.Location = new System.Drawing.Point(15, 31);
this.flatLabel2.Name = "flatLabel2";
this.flatLabel2.Size = new System.Drawing.Size(35, 30);
this.flatLabel2.TabIndex = 24;
......@@ -190,9 +195,9 @@ namespace AccAOI.control
// flatLabel4
//
this.flatLabel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel4.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel4.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel4.Inside = false;
this.flatLabel4.Location = new System.Drawing.Point(15, 176);
this.flatLabel4.Location = new System.Drawing.Point(15, 139);
this.flatLabel4.Name = "flatLabel4";
this.flatLabel4.Size = new System.Drawing.Size(35, 30);
this.flatLabel4.TabIndex = 31;
......@@ -201,9 +206,9 @@ namespace AccAOI.control
// txtMaxG
//
this.txtMaxG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtMaxG.Font = new System.Drawing.Font("宋体", 9F);
this.txtMaxG.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtMaxG.Inside = false;
this.txtMaxG.Location = new System.Drawing.Point(59, 176);
this.txtMaxG.Location = new System.Drawing.Point(56, 139);
this.txtMaxG.Name = "txtMaxG";
this.txtMaxG.Padding = new System.Windows.Forms.Padding(3);
this.txtMaxG.Size = new System.Drawing.Size(41, 30);
......@@ -214,9 +219,9 @@ namespace AccAOI.control
// txtMinG
//
this.txtMinG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtMinG.Font = new System.Drawing.Font("宋体", 9F);
this.txtMinG.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtMinG.Inside = false;
this.txtMinG.Location = new System.Drawing.Point(59, 127);
this.txtMinG.Location = new System.Drawing.Point(56, 103);
this.txtMinG.Name = "txtMinG";
this.txtMinG.Padding = new System.Windows.Forms.Padding(3);
this.txtMinG.Size = new System.Drawing.Size(41, 30);
......@@ -228,9 +233,9 @@ namespace AccAOI.control
//
this.flatLabel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel6.Cursor = System.Windows.Forms.Cursors.Default;
this.flatLabel6.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel6.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel6.Inside = false;
this.flatLabel6.Location = new System.Drawing.Point(15, 127);
this.flatLabel6.Location = new System.Drawing.Point(15, 103);
this.flatLabel6.Name = "flatLabel6";
this.flatLabel6.Size = new System.Drawing.Size(35, 30);
this.flatLabel6.TabIndex = 28;
......@@ -239,9 +244,9 @@ namespace AccAOI.control
// flatLabel7
//
this.flatLabel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel7.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel7.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel7.Inside = false;
this.flatLabel7.Location = new System.Drawing.Point(15, 274);
this.flatLabel7.Location = new System.Drawing.Point(15, 211);
this.flatLabel7.Name = "flatLabel7";
this.flatLabel7.Size = new System.Drawing.Size(35, 30);
this.flatLabel7.TabIndex = 35;
......@@ -250,9 +255,9 @@ namespace AccAOI.control
// txtMaxB
//
this.txtMaxB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtMaxB.Font = new System.Drawing.Font("宋体", 9F);
this.txtMaxB.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtMaxB.Inside = false;
this.txtMaxB.Location = new System.Drawing.Point(59, 274);
this.txtMaxB.Location = new System.Drawing.Point(56, 211);
this.txtMaxB.Name = "txtMaxB";
this.txtMaxB.Padding = new System.Windows.Forms.Padding(3);
this.txtMaxB.Size = new System.Drawing.Size(41, 30);
......@@ -263,9 +268,9 @@ namespace AccAOI.control
// txtMinB
//
this.txtMinB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtMinB.Font = new System.Drawing.Font("宋体", 9F);
this.txtMinB.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtMinB.Inside = false;
this.txtMinB.Location = new System.Drawing.Point(59, 224);
this.txtMinB.Location = new System.Drawing.Point(56, 175);
this.txtMinB.Name = "txtMinB";
this.txtMinB.Padding = new System.Windows.Forms.Padding(3);
this.txtMinB.Size = new System.Drawing.Size(41, 30);
......@@ -276,9 +281,9 @@ namespace AccAOI.control
// flatLabel8
//
this.flatLabel8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel8.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel8.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel8.Inside = false;
this.flatLabel8.Location = new System.Drawing.Point(15, 224);
this.flatLabel8.Location = new System.Drawing.Point(15, 175);
this.flatLabel8.Name = "flatLabel8";
this.flatLabel8.Size = new System.Drawing.Size(35, 30);
this.flatLabel8.TabIndex = 32;
......@@ -288,18 +293,19 @@ namespace AccAOI.control
//
this.txtRate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtRate.Enabled = false;
this.txtRate.Font = new System.Drawing.Font("宋体", 9F);
this.txtRate.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtRate.Inside = false;
this.txtRate.Location = new System.Drawing.Point(135, 67);
this.txtRate.Name = "txtRate";
this.txtRate.Padding = new System.Windows.Forms.Padding(3);
this.txtRate.Size = new System.Drawing.Size(67, 30);
this.txtRate.TabIndex = 36;
this.txtRate.TextChanged += new System.EventHandler(this.txtRate_TextChanged);
//
// flatLabel9
//
this.flatLabel9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.flatLabel9.Font = new System.Drawing.Font("宋体", 9F);
this.flatLabel9.Font = new System.Drawing.Font("微软雅黑", 9F);
this.flatLabel9.Inside = false;
this.flatLabel9.Location = new System.Drawing.Point(6, 67);
this.flatLabel9.Name = "flatLabel9";
......@@ -310,7 +316,7 @@ namespace AccAOI.control
// btnUpdate
//
this.btnUpdate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnUpdate.Font = new System.Drawing.Font("宋体", 9F);
this.btnUpdate.Font = new System.Drawing.Font("微软雅黑", 9F);
this.btnUpdate.ImageSize = new System.Drawing.Size(0, 0);
this.btnUpdate.Inside = false;
this.btnUpdate.Location = new System.Drawing.Point(207, 67);
......@@ -324,7 +330,7 @@ namespace AccAOI.control
// tbMinR
//
this.tbMinR.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.tbMinR.Location = new System.Drawing.Point(107, 33);
this.tbMinR.Location = new System.Drawing.Point(106, 31);
this.tbMinR.Maximum = 255;
this.tbMinR.Name = "tbMinR";
this.tbMinR.Size = new System.Drawing.Size(179, 45);
......@@ -335,7 +341,7 @@ namespace AccAOI.control
// tbMaxR
//
this.tbMaxR.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.tbMaxR.Location = new System.Drawing.Point(107, 82);
this.tbMaxR.Location = new System.Drawing.Point(106, 67);
this.tbMaxR.Maximum = 255;
this.tbMaxR.Name = "tbMaxR";
this.tbMaxR.Size = new System.Drawing.Size(179, 45);
......@@ -347,7 +353,7 @@ namespace AccAOI.control
// tbMaxG
//
this.tbMaxG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.tbMaxG.Location = new System.Drawing.Point(107, 180);
this.tbMaxG.Location = new System.Drawing.Point(106, 139);
this.tbMaxG.Maximum = 255;
this.tbMaxG.Name = "tbMaxG";
this.tbMaxG.Size = new System.Drawing.Size(179, 45);
......@@ -359,7 +365,7 @@ namespace AccAOI.control
// tbMinG
//
this.tbMinG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.tbMinG.Location = new System.Drawing.Point(107, 131);
this.tbMinG.Location = new System.Drawing.Point(106, 103);
this.tbMinG.Maximum = 255;
this.tbMinG.Name = "tbMinG";
this.tbMinG.Size = new System.Drawing.Size(179, 45);
......@@ -370,7 +376,7 @@ namespace AccAOI.control
// tbMaxB
//
this.tbMaxB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.tbMaxB.Location = new System.Drawing.Point(107, 278);
this.tbMaxB.Location = new System.Drawing.Point(106, 213);
this.tbMaxB.Maximum = 255;
this.tbMaxB.Name = "tbMaxB";
this.tbMaxB.Size = new System.Drawing.Size(179, 45);
......@@ -382,7 +388,7 @@ namespace AccAOI.control
// tbMinB
//
this.tbMinB.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.tbMinB.Location = new System.Drawing.Point(107, 229);
this.tbMinB.Location = new System.Drawing.Point(106, 175);
this.tbMinB.Maximum = 255;
this.tbMinB.Name = "tbMinB";
this.tbMinB.Size = new System.Drawing.Size(179, 45);
......@@ -392,24 +398,10 @@ namespace AccAOI.control
//
// AoiRgbControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(312, 837);
this.Controls.Add(this.flatLabel2);
this.Controls.Add(this.flatLabel5);
this.Controls.Add(this.txtmaxRate);
this.Controls.Add(this.txtminRate);
this.Controls.Add(this.flatLabel3);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(312, 830);
this.Name = "AoiRgbControl";
this.TitleName = "颜色抽取";
this.Controls.SetChildIndex(this.aoiImage, 0);
this.Controls.SetChildIndex(this.panParam, 0);
this.Controls.SetChildIndex(this.panResult, 0);
this.Controls.SetChildIndex(this.flatLabel3, 0);
this.Controls.SetChildIndex(this.txtminRate, 0);
this.Controls.SetChildIndex(this.txtmaxRate, 0);
this.Controls.SetChildIndex(this.flatLabel5, 0);
this.Controls.SetChildIndex(this.flatLabel2, 0);
this.panParam.ResumeLayout(false);
this.panParam.PerformLayout();
this.panResult.ResumeLayout(false);
......
AccAOI/control/AoiRgbControl.cs
......@@ -236,5 +236,10 @@ namespace AccAOI.control
tb.Value = value;
}
}
private void txtRate_TextChanged(object sender, EventArgs e)
{
}
}
}
AccAOI/packages.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OpenCvSharp3-AnyCPU" version="4.0.0.20181129" targetFramework="net46" />
</packages>
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!