Skip to content

孙克 / AccAOI

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

字体修正,界面修改

1 个父辈 1b971ff5
全部展开
内嵌 并排
正在显示 15 个修改的文件 包含 95 行增加 和 62 行删除
AOI/AoiProject.cs
...@@ -157,6 +157,7 @@ namespace AOI ...@@ -157,6 +157,7 @@ namespace AOI
AoiMethod aoiMethod = (AoiMethod)o; AoiMethod aoiMethod = (AoiMethod)o;
string PathDataStr = obj.Value<string>("PathDataStr"); string PathDataStr = obj.Value<string>("PathDataStr");
PathData pathData = JsonUtil.DeserializeJsonToObject<PathData>(PathDataStr); PathData pathData = JsonUtil.DeserializeJsonToObject<PathData>(PathDataStr);
if (pathData!=null && pathData.Points.Length>0)
aoiMethod.RoiPath = new GraphicsPath(pathData.Points, pathData.Types); aoiMethod.RoiPath = new GraphicsPath(pathData.Points, pathData.Types);
aoiProject.methodMap.Add(item.Key, aoiMethod); aoiProject.methodMap.Add(item.Key, aoiMethod);
Thread.Sleep(1); Thread.Sleep(1);
......
AccAOI/AOIResourceCulture.cs
...@@ -145,6 +145,8 @@ namespace AccAOI ...@@ -145,6 +145,8 @@ namespace AccAOI
public static string GetString(string id, string defaultStr) public static string GetString(string id, string defaultStr)
{ {
string strCurLanguage = defaultStr; string strCurLanguage = defaultStr;
if (ResourceMap == null)
return defaultStr;
try try
{ {
......
AccAOI/AccAOI.csproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <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')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -11,6 +12,8 @@ ...@@ -11,6 +12,8 @@
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
...@@ -43,18 +46,15 @@ ...@@ -43,18 +46,15 @@
<HintPath>..\dll\MvCameraControl.Net.dll</HintPath> <HintPath>..\dll\MvCameraControl.Net.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"> <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> <HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net40\OpenCvSharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"> <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> <HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net40\OpenCvSharp.Blob.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"> <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> <HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net40\OpenCvSharp.Extensions.dll</HintPath>
</Reference> </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> <HintPath>..\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net40\OpenCvSharp.UserInterface.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
...@@ -171,6 +171,7 @@ ...@@ -171,6 +171,7 @@
<Content Include="Properties\en-US.resource"> <Content Include="Properties\en-US.resource">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
...@@ -199,4 +200,10 @@ ...@@ -199,4 +200,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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> </Project>
\ No newline at end of file \ No newline at end of file
AccAOI/FrmAoiSetting.cs
...@@ -33,6 +33,8 @@ namespace AccAOI ...@@ -33,6 +33,8 @@ namespace AccAOI
public FrmAoiSetting(string programPath, Image image = null, string defaultPath = "") 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; this.WindowState = FormWindowState.Maximized;
if (!programPath.Equals("")) if (!programPath.Equals(""))
{ {
...@@ -59,6 +61,7 @@ namespace AccAOI ...@@ -59,6 +61,7 @@ namespace AccAOI
DefaultPath = defaultPath; DefaultPath = defaultPath;
} }
string CurrentCamera="";
private void FrmAoiSetting_Load(object sender, EventArgs e) private void FrmAoiSetting_Load(object sender, EventArgs e)
{ {
LoadTypes(); LoadTypes();
...@@ -75,11 +78,7 @@ namespace AccAOI ...@@ -75,11 +78,7 @@ namespace AccAOI
foreach (string str in CameraManager.hikNameList) foreach (string str in CameraManager.hikNameList)
{ {
cmbCameraList.ItemAdd(str); CurrentCamera = str;
}
if (CameraManager.hikNameList.Count > 0)
{
cmbCameraList.Text = CameraManager.hikNameList[0];
} }
if (Project != null) if (Project != null)
{ {
...@@ -87,13 +86,15 @@ namespace AccAOI ...@@ -87,13 +86,15 @@ namespace AccAOI
} }
} }
private void LoadTypes() private void LoadTypes()
{ {
comType.Clear(); comType.Clear();
comType.ItemAdd(ControlType.Mark); comType.ItemAdd(ControlType.Mark);
comType.ItemAdd(ControlType.AOIBlob); comType.ItemAdd(ControlType.AOIBlob);
comType.ItemAdd(ControlType.AOIRGB); comType.ItemAdd(ControlType.AOIRGB);
comType.ItemAdd(ControlType.Match); //comType.ItemAdd(ControlType.Match);
comType.ItemAdd(ControlType.ColorMatch); comType.ItemAdd(ControlType.ColorMatch);
comType.Text = ControlType.Mark; comType.Text = ControlType.Mark;
} }
...@@ -133,10 +134,10 @@ namespace AccAOI ...@@ -133,10 +134,10 @@ namespace AccAOI
{ {
try try
{ {
string camera = cmbCameraList.Text; string camera = CurrentCamera;
if (camera.Equals("")) if (camera.Equals(""))
{ {
MyMessage.Show("清先选择相机"); MyMessage.Show(AOIResourceCulture.GetValue("没有找到相机"));
return; return;
} //将图片保存到本地重新加载 } //将图片保存到本地重新加载
// string filePath = Application.StartupPath + @"\aimage\" + DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + DateTime.Now.Millisecond.ToString().PadLeft(3, '0') ; // 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 ...@@ -485,7 +486,7 @@ namespace AccAOI
} }
if (TestImage == null) if (TestImage == null)
{ {
MyMessage.Show("请选择测试图片"); //MyMessage.Show("请选择测试图片");
return; return;
} }
lblTestResult.Text = ""; lblTestResult.Text = "";
...@@ -594,10 +595,10 @@ namespace AccAOI ...@@ -594,10 +595,10 @@ namespace AccAOI
private void flatButton1_Click(object sender, EventArgs e) private void flatButton1_Click(object sender, EventArgs e)
{ {
string camera = cmbCameraList.Text; string camera = CurrentCamera;
if (camera.Equals("")) if (camera.Equals(""))
{ {
MyMessage.Show("清先选择相机"); MyMessage.Show(AOIResourceCulture.GetValue("没有找到相机"));
return; return;
} }
...@@ -741,11 +742,11 @@ namespace AccAOI ...@@ -741,11 +742,11 @@ namespace AccAOI
{ {
if (AOIResourceCulture.CurrLanguage.Equals(AOIResourceCulture.China)) if (AOIResourceCulture.CurrLanguage.Equals(AOIResourceCulture.China))
{ {
btnLan.Text = AOIResourceCulture.GetValue("英文"); //btnLan.Text = AOIResourceCulture.GetValue("英文");
} }
else else
{ {
btnLan.Text = AOIResourceCulture.GetValue("中文"); //btnLan.Text = AOIResourceCulture.GetValue("中文");
} }
LoadTypes(); LoadTypes();
} }
......
AccAOI/FrmMethodName.Designer.cs
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
// txtName // txtName
// //
this.txtName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.txtName.Location = new System.Drawing.Point(66, 80); this.txtName.Location = new System.Drawing.Point(66, 80);
this.txtName.Name = "txtName"; this.txtName.Name = "txtName";
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
// btnCancel // btnCancel
// //
this.btnCancel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.ImageSize = new System.Drawing.Size(0, 0);
this.btnCancel.Inside = false; this.btnCancel.Inside = false;
this.btnCancel.Location = new System.Drawing.Point(66, 144); this.btnCancel.Location = new System.Drawing.Point(66, 144);
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
// btnOk // btnOk
// //
this.btnOk.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.ImageSize = new System.Drawing.Size(0, 0);
this.btnOk.Inside = false; this.btnOk.Inside = false;
this.btnOk.Location = new System.Drawing.Point(190, 144); this.btnOk.Location = new System.Drawing.Point(190, 144);
......
AccAOI/control/ABaseControl.Designer.cs
...@@ -48,7 +48,7 @@ namespace AccAOI.control ...@@ -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.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnSetArea.Enabled = false; 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.ImageSize = new System.Drawing.Size(0, 0);
this.btnSetArea.Inside = false; this.btnSetArea.Inside = false;
this.btnSetArea.Location = new System.Drawing.Point(124, 30); this.btnSetArea.Location = new System.Drawing.Point(124, 30);
...@@ -62,7 +62,7 @@ namespace AccAOI.control ...@@ -62,7 +62,7 @@ namespace AccAOI.control
// btnClearArea // btnClearArea
// //
this.btnClearArea.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.ImageSize = new System.Drawing.Size(0, 0);
this.btnClearArea.Inside = false; this.btnClearArea.Inside = false;
this.btnClearArea.Location = new System.Drawing.Point(213, 30); this.btnClearArea.Location = new System.Drawing.Point(213, 30);
...@@ -116,7 +116,7 @@ namespace AccAOI.control ...@@ -116,7 +116,7 @@ namespace AccAOI.control
// btnImgType // btnImgType
// //
this.btnImgType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.ImageSize = new System.Drawing.Size(0, 0);
this.btnImgType.Inside = false; this.btnImgType.Inside = false;
this.btnImgType.Location = new System.Drawing.Point(6, 30); this.btnImgType.Location = new System.Drawing.Point(6, 30);
...@@ -164,16 +164,16 @@ namespace AccAOI.control ...@@ -164,16 +164,16 @@ namespace AccAOI.control
// //
// ABaseControl // ABaseControl
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ActiveCaptionText; 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.panResult);
this.Controls.Add(this.panParam); this.Controls.Add(this.panParam);
this.Controls.Add(this.panAreaSet); this.Controls.Add(this.panAreaSet);
this.Controls.Add(this.aoiImage); this.Controls.Add(this.aoiImage);
this.Controls.Add(this.panAreaImage); this.Controls.Add(this.panAreaImage);
this.Controls.Add(this.panControl); this.Controls.Add(this.panControl);
this.Font = new System.Drawing.Font("微软雅黑", 9F);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "ABaseControl"; this.Name = "ABaseControl";
this.Load += new System.EventHandler(this.ABaseControl_Load); this.Load += new System.EventHandler(this.ABaseControl_Load);
......
AccAOI/control/ABaseControl.cs
...@@ -11,6 +11,7 @@ using AOI; ...@@ -11,6 +11,7 @@ using AOI;
using System.Drawing.Drawing2D; using System.Drawing.Drawing2D;
using Acc.ImageBox; using Acc.ImageBox;
using Asa.Theme; using Asa.Theme;
using System.Diagnostics;
namespace AccAOI.control namespace AccAOI.control
{ {
...@@ -191,12 +192,24 @@ namespace AccAOI.control ...@@ -191,12 +192,24 @@ namespace AccAOI.control
private void ABaseControl_VisibleChanged(object sender, EventArgs e) private void ABaseControl_VisibleChanged(object sender, EventArgs e)
{ {
if (IsDesignMode())
return;
if (this.Visible.Equals(true)) if (this.Visible.Equals(true))
{ {
LanguageProcess(); LanguageProcess();
} }
} }
public static bool IsDesignMode()
{
bool returnFlag = false;
if (Process.GetCurrentProcess().ProcessName == "devenv")
{
returnFlag = true;
}
return returnFlag;
}
public virtual void LanguagePro() public virtual void LanguagePro()
{ {
panAreaSet.Text = AOIResourceCulture.GetValue("区域设置 - 矩形"); panAreaSet.Text = AOIResourceCulture.GetValue("区域设置 - 矩形");
...@@ -212,6 +225,8 @@ namespace AccAOI.control ...@@ -212,6 +225,8 @@ namespace AccAOI.control
} }
private void ABaseControl_Load(object sender, EventArgs e) private void ABaseControl_Load(object sender, EventArgs e)
{ {
if (IsDesignMode())
return;
LanguagePro(); LanguagePro();
} }
} }
......
AccAOI/control/AioMarkControl.Designer.cs
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
// flatLabel1 // flatLabel1
// //
this.flatLabel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel1.Location = new System.Drawing.Point(5, 90); this.flatLabel1.Location = new System.Drawing.Point(5, 90);
this.flatLabel1.Name = "flatLabel1"; this.flatLabel1.Name = "flatLabel1";
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
// flatTextSearchZoom // flatTextSearchZoom
// //
this.flatTextSearchZoom.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatTextSearchZoom.Location = new System.Drawing.Point(208, 91); this.flatTextSearchZoom.Location = new System.Drawing.Point(208, 91);
this.flatTextSearchZoom.Name = "flatTextSearchZoom"; this.flatTextSearchZoom.Name = "flatTextSearchZoom";
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
// flatLabel2 // flatLabel2
// //
this.flatLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel2.Location = new System.Drawing.Point(109, 90); this.flatLabel2.Location = new System.Drawing.Point(109, 90);
this.flatLabel2.Name = "flatLabel2"; this.flatLabel2.Name = "flatLabel2";
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
// btnTest // btnTest
// //
this.btnTest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.ImageSize = new System.Drawing.Size(0, 0);
this.btnTest.Inside = false; this.btnTest.Inside = false;
this.btnTest.Location = new System.Drawing.Point(92, 40); this.btnTest.Location = new System.Drawing.Point(92, 40);
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
// flatLabel3 // flatLabel3
// //
this.flatLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel3.Location = new System.Drawing.Point(5, 37); this.flatLabel3.Location = new System.Drawing.Point(5, 37);
this.flatLabel3.Name = "flatLabel3"; this.flatLabel3.Name = "flatLabel3";
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
// txtSamePercent // txtSamePercent
// //
this.txtSamePercent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.txtSamePercent.Location = new System.Drawing.Point(81, 37); this.txtSamePercent.Location = new System.Drawing.Point(81, 37);
this.txtSamePercent.Name = "txtSamePercent"; this.txtSamePercent.Name = "txtSamePercent";
...@@ -167,9 +167,9 @@ ...@@ -167,9 +167,9 @@
// //
// AioMarkControl // AioMarkControl
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(312, 833); this.ClientSize = new System.Drawing.Size(312, 833);
this.Font = new System.Drawing.Font("微软雅黑", 9F);
this.Name = "AioMarkControl"; this.Name = "AioMarkControl";
this.TitleName = "Mark设置"; this.TitleName = "Mark设置";
this.panParam.ResumeLayout(false); this.panParam.ResumeLayout(false);
......
AccAOI/control/AioTempMatchControl.Designer.cs
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
// btnTest // btnTest
// //
this.btnTest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.ImageSize = new System.Drawing.Size(0, 0);
this.btnTest.Inside = false; this.btnTest.Inside = false;
this.btnTest.Location = new System.Drawing.Point(92, 36); this.btnTest.Location = new System.Drawing.Point(92, 36);
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
// flatLabel3 // flatLabel3
// //
this.flatLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel3.Location = new System.Drawing.Point(6, 37); this.flatLabel3.Location = new System.Drawing.Point(6, 37);
this.flatLabel3.Name = "flatLabel3"; this.flatLabel3.Name = "flatLabel3";
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
// txtSamePercent // txtSamePercent
// //
this.txtSamePercent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.txtSamePercent.Location = new System.Drawing.Point(82, 37); this.txtSamePercent.Location = new System.Drawing.Point(82, 37);
this.txtSamePercent.Name = "txtSamePercent"; this.txtSamePercent.Name = "txtSamePercent";
...@@ -129,9 +129,9 @@ ...@@ -129,9 +129,9 @@
// //
// AioTempMatchControl // AioTempMatchControl
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(312, 833); this.ClientSize = new System.Drawing.Size(312, 833);
this.Font = new System.Drawing.Font("微软雅黑", 9F);
this.Name = "AioTempMatchControl"; this.Name = "AioTempMatchControl";
this.TitleName = "模板匹配"; this.TitleName = "模板匹配";
this.panParam.ResumeLayout(false); this.panParam.ResumeLayout(false);
......
AccAOI/control/AoiBlobControl.Designer.cs
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
// flatLabel1 // flatLabel1
// //
this.flatLabel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel1.Location = new System.Drawing.Point(8, 350); this.flatLabel1.Location = new System.Drawing.Point(8, 350);
this.flatLabel1.Name = "flatLabel1"; this.flatLabel1.Name = "flatLabel1";
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
// lblthresh // lblthresh
// //
this.lblthresh.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.lblthresh.Location = new System.Drawing.Point(265, 350); this.lblthresh.Location = new System.Drawing.Point(265, 350);
this.lblthresh.Name = "lblthresh"; this.lblthresh.Name = "lblthresh";
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
// flatLabel3 // flatLabel3
// //
this.flatLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel3.Location = new System.Drawing.Point(6, 484); this.flatLabel3.Location = new System.Drawing.Point(6, 484);
this.flatLabel3.Name = "flatLabel3"; this.flatLabel3.Name = "flatLabel3";
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
// flatLabel2 // flatLabel2
// //
this.flatLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel2.Location = new System.Drawing.Point(8, 405); this.flatLabel2.Location = new System.Drawing.Point(8, 405);
this.flatLabel2.Name = "flatLabel2"; this.flatLabel2.Name = "flatLabel2";
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
// txtminArea // txtminArea
// //
this.txtminArea.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.txtminArea.Location = new System.Drawing.Point(132, 484); this.txtminArea.Location = new System.Drawing.Point(132, 484);
this.txtminArea.Name = "txtminArea"; this.txtminArea.Name = "txtminArea";
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
// txtmaxArea // txtmaxArea
// //
this.txtmaxArea.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.txtmaxArea.Location = new System.Drawing.Point(225, 484); this.txtmaxArea.Location = new System.Drawing.Point(225, 484);
this.txtmaxArea.Name = "txtmaxArea"; this.txtmaxArea.Name = "txtmaxArea";
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
// flatLabel5 // flatLabel5
// //
this.flatLabel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel5.Location = new System.Drawing.Point(197, 490); this.flatLabel5.Location = new System.Drawing.Point(197, 490);
this.flatLabel5.Name = "flatLabel5"; this.flatLabel5.Name = "flatLabel5";
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
// flatLabel4 // flatLabel4
// //
this.flatLabel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel4.Location = new System.Drawing.Point(197, 526); this.flatLabel4.Location = new System.Drawing.Point(197, 526);
this.flatLabel4.Name = "flatLabel4"; this.flatLabel4.Name = "flatLabel4";
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
// txtmaxNum // txtmaxNum
// //
this.txtmaxNum.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.txtmaxNum.Location = new System.Drawing.Point(225, 526); this.txtmaxNum.Location = new System.Drawing.Point(225, 526);
this.txtmaxNum.Name = "txtmaxNum"; this.txtmaxNum.Name = "txtmaxNum";
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
// txtminNum // txtminNum
// //
this.txtminNum.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.txtminNum.Location = new System.Drawing.Point(132, 526); this.txtminNum.Location = new System.Drawing.Point(132, 526);
this.txtminNum.Name = "txtminNum"; this.txtminNum.Name = "txtminNum";
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
// flatLabel6 // flatLabel6
// //
this.flatLabel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel6.Location = new System.Drawing.Point(6, 526); this.flatLabel6.Location = new System.Drawing.Point(6, 526);
this.flatLabel6.Name = "flatLabel6"; this.flatLabel6.Name = "flatLabel6";
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
// btnUpdate // btnUpdate
// //
this.btnUpdate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.ImageSize = new System.Drawing.Size(0, 0);
this.btnUpdate.Inside = false; this.btnUpdate.Inside = false;
this.btnUpdate.Location = new System.Drawing.Point(204, 122); this.btnUpdate.Location = new System.Drawing.Point(204, 122);
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
// flatLabel7 // flatLabel7
// //
this.flatLabel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel7.Location = new System.Drawing.Point(6, 571); this.flatLabel7.Location = new System.Drawing.Point(6, 571);
this.flatLabel7.Name = "flatLabel7"; this.flatLabel7.Name = "flatLabel7";
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
// //
this.txtNumResult.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.txtNumResult.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.txtNumResult.Enabled = false; 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.Inside = false;
this.txtNumResult.Location = new System.Drawing.Point(130, 121); this.txtNumResult.Location = new System.Drawing.Point(130, 121);
this.txtNumResult.Name = "txtNumResult"; this.txtNumResult.Name = "txtNumResult";
...@@ -263,8 +263,7 @@ ...@@ -263,8 +263,7 @@
// //
// AoiBlobControl // AoiBlobControl
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(312, 833); this.ClientSize = new System.Drawing.Size(312, 833);
this.Controls.Add(this.flatLabel7); this.Controls.Add(this.flatLabel7);
this.Controls.Add(this.flatLabel4); this.Controls.Add(this.flatLabel4);
......
AccAOI/control/AoiColorMatchControl.Designer.cs
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
// btnTest // btnTest
// //
this.btnTest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.ImageSize = new System.Drawing.Size(0, 0);
this.btnTest.Inside = false; this.btnTest.Inside = false;
this.btnTest.Location = new System.Drawing.Point(92, 36); this.btnTest.Location = new System.Drawing.Point(92, 36);
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
// flatLabel3 // flatLabel3
// //
this.flatLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.flatLabel3.Location = new System.Drawing.Point(6, 37); this.flatLabel3.Location = new System.Drawing.Point(6, 37);
this.flatLabel3.Name = "flatLabel3"; this.flatLabel3.Name = "flatLabel3";
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
// txtSamePercent // txtSamePercent
// //
this.txtSamePercent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); 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.Inside = false;
this.txtSamePercent.Location = new System.Drawing.Point(82, 37); this.txtSamePercent.Location = new System.Drawing.Point(82, 37);
this.txtSamePercent.Name = "txtSamePercent"; this.txtSamePercent.Name = "txtSamePercent";
...@@ -127,12 +127,11 @@ ...@@ -127,12 +127,11 @@
this.txtSamePercent.Text = "50"; this.txtSamePercent.Text = "50";
this.txtSamePercent.TextChanged += new System.EventHandler(this.txtSamePercent_TextChanged); 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.None;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(312, 833); this.ClientSize = new System.Drawing.Size(312, 833);
this.Name = "AioTempMatchControl"; this.Name = "AoiColorMatchControl";
this.TitleName = "颜色匹配"; this.TitleName = "颜色匹配";
this.panParam.ResumeLayout(false); this.panParam.ResumeLayout(false);
this.panParam.PerformLayout(); this.panParam.PerformLayout();
......
AccAOI/control/AoiRgbControl.cs
...@@ -236,5 +236,10 @@ namespace AccAOI.control ...@@ -236,5 +236,10 @@ namespace AccAOI.control
tb.Value = value; 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 \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!