Skip to content

孙克 / AccAOI

转到一个项目
切换导航栏
切换导航栏固定状态
Commit c5138f5c 由 LN
选项

界面调整

1 个父辈 9e076ac3
全部展开
内嵌 并排
正在显示 9 个修改的文件 包含 60 行增加 和 16 行删除
AccAOI/FrmAoiSetting.cs
...@@ -60,11 +60,7 @@ namespace AccAOI ...@@ -60,11 +60,7 @@ namespace AccAOI
} }
private void FrmAoiSetting_Load(object sender, EventArgs e) private void FrmAoiSetting_Load(object sender, EventArgs e)
{ {
comType.ItemAdd(ControlType.Mark); LoadTypes();
comType.ItemAdd(ControlType.AOIBlob);
comType.ItemAdd(ControlType.AOIRGB);
comType.ItemAdd(ControlType.Match);
comType.Text = ControlType.Mark;
//string defaultImg = "F:\\电路板图片\\照片 2创建于2019年4月19日 11_34_53.jpg"; //string defaultImg = "F:\\电路板图片\\照片 2创建于2019年4月19日 11_34_53.jpg";
//if (System.IO.File.Exists(defaultImg)) //if (System.IO.File.Exists(defaultImg))
//{ //{
...@@ -90,6 +86,16 @@ namespace AccAOI ...@@ -90,6 +86,16 @@ namespace AccAOI
} }
} }
private void LoadTypes()
{
comType.Clear();
comType.ItemAdd(ControlType.Mark);
comType.ItemAdd(ControlType.AOIBlob);
comType.ItemAdd(ControlType.AOIRGB);
comType.ItemAdd(ControlType.Match);
comType.Text = ControlType.Mark;
}
private void btnOpenImage_Click(object sender, EventArgs e) private void btnOpenImage_Click(object sender, EventArgs e)
{ {
System.Windows.Forms.OpenFileDialog openDialog = new System.Windows.Forms.OpenFileDialog(); System.Windows.Forms.OpenFileDialog openDialog = new System.Windows.Forms.OpenFileDialog();
...@@ -699,5 +705,36 @@ namespace AccAOI ...@@ -699,5 +705,36 @@ namespace AccAOI
MessageBox.Show(ex.ToString()); MessageBox.Show(ex.ToString());
} }
} }
private void btnLan_Click(object sender, EventArgs e)
{
if (AOIResourceCulture.CurrLanguage.Equals(AOIResourceCulture.China))
{
AOIResourceCulture.SetCurrentCulture(AOIResourceCulture.English);
}
else
{
AOIResourceCulture.SetCurrentCulture(AOIResourceCulture.China);
}
LanguageProcess();
LanguagePro();
if (aoiControl != null)
{
aoiControl.LanguageProcess();
aoiControl.LanguagePro();
}
}
public override void LanguagePro()
{
if (AOIResourceCulture.CurrLanguage.Equals(AOIResourceCulture.China))
{
btnLan.Text = AOIResourceCulture.GetValue("英文");
}
else
{
btnLan.Text = AOIResourceCulture.GetValue("中文");
}
LoadTypes();
}
} }
} }
AccAOI/Properties/en-US.resource
...@@ -7,11 +7,11 @@ FrmAoiSetting_btnImageChange_Text=Switch to test Image ...@@ -7,11 +7,11 @@ FrmAoiSetting_btnImageChange_Text=Switch to test Image
FrmAoiSetting_btnDel_Text=Delete FrmAoiSetting_btnDel_Text=Delete
FrmAoiSetting_btnExcute_Text=Execute FrmAoiSetting_btnExcute_Text=Execute
FrmAoiSetting_btnGetCameraImg_Text=Get standard Image FrmAoiSetting_btnGetCameraImg_Text=Get standard Image
FrmAoiSetting_flatLabel1_Text=The camera list FrmAoiSetting_flatLabel1_Text=Cameras:
FrmAoiSetting_btnOpenImage_Text=Select reference picture FrmAoiSetting_btnOpenImage_Text=Select reference picture
FrmAoiSetting_btnNewAoi_Text=New FrmAoiSetting_btnNewAoi_Text=New
FrmAoiSetting_btnSavePro_Text=Save the project FrmAoiSetting_btnSavePro_Text=Save project
FrmAoiSetting_btnOpenPro_Text=Open the project FrmAoiSetting_btnOpenPro_Text=Open project
AioMarkControl_btnClearArea_Text=Clear AioMarkControl_btnClearArea_Text=Clear
AioMarkControl_panResult_Text=result judgment AioMarkControl_panResult_Text=result judgment
AioMarkControl_panParam_Text=parameter setting AioMarkControl_panParam_Text=parameter setting
...@@ -108,3 +108,5 @@ FrmMethodName_btnCancel_Text=Cancel ...@@ -108,3 +108,5 @@ FrmMethodName_btnCancel_Text=Cancel
椭圆=ellipse 椭圆=ellipse
参数设置=parameter setting 参数设置=parameter setting
结果判断=result judgment 结果判断=result judgment
中文=Chinese
英文=English
\ No newline at end of file \ No newline at end of file
AccAOI/Properties/zh-CN.resource
...@@ -7,7 +7,7 @@ FrmAoiSetting_btnImageChange_Text=切换为测试图片 ...@@ -7,7 +7,7 @@ FrmAoiSetting_btnImageChange_Text=切换为测试图片
FrmAoiSetting_btnDel_Text=删除 FrmAoiSetting_btnDel_Text=删除
FrmAoiSetting_btnExcute_Text=执行 FrmAoiSetting_btnExcute_Text=执行
FrmAoiSetting_btnGetCameraImg_Text=获取基准图片 FrmAoiSetting_btnGetCameraImg_Text=获取基准图片
FrmAoiSetting_flatLabel1_Text=相机列表 FrmAoiSetting_flatLabel1_Text=相机:
FrmAoiSetting_btnOpenImage_Text=选择基准图片 FrmAoiSetting_btnOpenImage_Text=选择基准图片
FrmAoiSetting_btnNewAoi_Text=新增 FrmAoiSetting_btnNewAoi_Text=新增
FrmAoiSetting_btnSavePro_Text=保存项目 FrmAoiSetting_btnSavePro_Text=保存项目
...@@ -108,3 +108,5 @@ FrmMethodName_btnCancel_Text=取消 ...@@ -108,3 +108,5 @@ FrmMethodName_btnCancel_Text=取消
椭圆=椭圆 椭圆=椭圆
参数设置=参数设置 参数设置=参数设置
结果判断=结果判断 结果判断=结果判断
中文=中文
英文=英文
\ No newline at end of file \ No newline at end of file
AccAOI/control/ABaseControl.Designer.cs
...@@ -81,7 +81,7 @@ namespace AccAOI.control ...@@ -81,7 +81,7 @@ namespace AccAOI.control
this.panResult.Location = new System.Drawing.Point(4, 491); this.panResult.Location = new System.Drawing.Point(4, 491);
this.panResult.Name = "panResult"; this.panResult.Name = "panResult";
this.panResult.Padding = new System.Windows.Forms.Padding(6, 30, 6, 6); this.panResult.Padding = new System.Windows.Forms.Padding(6, 30, 6, 6);
this.panResult.Size = new System.Drawing.Size(298, 330); this.panResult.Size = new System.Drawing.Size(298, 335);
this.panResult.TabIndex = 5; this.panResult.TabIndex = 5;
this.panResult.Text = "结果判断"; this.panResult.Text = "结果判断";
// //
...@@ -146,7 +146,7 @@ namespace AccAOI.control ...@@ -146,7 +146,7 @@ namespace AccAOI.control
this.panControl.Location = new System.Drawing.Point(0, 0); this.panControl.Location = new System.Drawing.Point(0, 0);
this.panControl.Name = "panControl"; this.panControl.Name = "panControl";
this.panControl.Padding = new System.Windows.Forms.Padding(6, 30, 6, 6); this.panControl.Padding = new System.Windows.Forms.Padding(6, 30, 6, 6);
this.panControl.Size = new System.Drawing.Size(309, 829); this.panControl.Size = new System.Drawing.Size(310, 831);
this.panControl.TabIndex = 0; this.panControl.TabIndex = 0;
this.panControl.Text = "斑点分析"; this.panControl.Text = "斑点分析";
// //
......
AccAOI/control/AioMarkControl.Designer.cs
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
this.panResult.Controls.Add(this.btnOpenImage); this.panResult.Controls.Add(this.btnOpenImage);
this.panResult.Controls.Add(this.btnTest); this.panResult.Controls.Add(this.btnTest);
this.panResult.Controls.Add(this.lblResult); this.panResult.Controls.Add(this.lblResult);
this.panResult.Size = new System.Drawing.Size(298, 333);
// //
// flatLabel1 // flatLabel1
// //
......
AccAOI/control/AioTempMatchControl.Designer.cs
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
this.panParam.Controls.Add(this.txtSamePercent); this.panParam.Controls.Add(this.txtSamePercent);
this.panParam.Controls.Add(this.trackBarSamePercent); this.panParam.Controls.Add(this.trackBarSamePercent);
this.panParam.Controls.Add(this.flatLabel3); this.panParam.Controls.Add(this.flatLabel3);
this.panParam.Size = new System.Drawing.Size(298, 88);
// //
// panResult // panResult
// //
...@@ -54,6 +55,8 @@ ...@@ -54,6 +55,8 @@
this.panResult.Controls.Add(this.btnOpenImage); this.panResult.Controls.Add(this.btnOpenImage);
this.panResult.Controls.Add(this.btnTest); this.panResult.Controls.Add(this.btnTest);
this.panResult.Controls.Add(this.lblResult); this.panResult.Controls.Add(this.lblResult);
this.panResult.Location = new System.Drawing.Point(4, 413);
this.panResult.Size = new System.Drawing.Size(298, 410);
// //
// lblResult // lblResult
// //
......
AccAOI/control/AoiBlobControl.Designer.cs
...@@ -51,16 +51,15 @@ ...@@ -51,16 +51,15 @@
// //
// panParam // panParam
// //
this.panParam.Location = new System.Drawing.Point(2, 319); this.panParam.Size = new System.Drawing.Size(298, 128);
this.panParam.Size = new System.Drawing.Size(302, 128);
// //
// panResult // panResult
// //
this.panResult.Controls.Add(this.lblList); this.panResult.Controls.Add(this.lblList);
this.panResult.Controls.Add(this.txtNumResult); this.panResult.Controls.Add(this.txtNumResult);
this.panResult.Controls.Add(this.btnUpdate); this.panResult.Controls.Add(this.btnUpdate);
this.panResult.Location = new System.Drawing.Point(2, 450); this.panResult.Location = new System.Drawing.Point(4, 450);
this.panResult.Size = new System.Drawing.Size(302, 370); this.panResult.Size = new System.Drawing.Size(298, 373);
// //
// flatLabel1 // flatLabel1
// //
...@@ -258,7 +257,7 @@ ...@@ -258,7 +257,7 @@
this.lblList.ForeColor = System.Drawing.Color.White; this.lblList.ForeColor = System.Drawing.Color.White;
this.lblList.Location = new System.Drawing.Point(6, 166); this.lblList.Location = new System.Drawing.Point(6, 166);
this.lblList.Name = "lblList"; this.lblList.Name = "lblList";
this.lblList.Size = new System.Drawing.Size(284, 198); this.lblList.Size = new System.Drawing.Size(280, 201);
this.lblList.TabIndex = 0; this.lblList.TabIndex = 0;
this.lblList.Text = "面积列表："; this.lblList.Text = "面积列表：";
// //
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!