Skip to content

孙克 / AccAOI

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

1

1 个父辈 e5aaae14
内嵌 并排
正在显示 5 个修改的文件 包含 63 行增加 和 10 行删除
AOI/AoiProject.cs
...@@ -29,8 +29,9 @@ namespace AOI ...@@ -29,8 +29,9 @@ namespace AOI
/// </summary> /// </summary>
public Dictionary<string, AoiMethod> methodMap = new Dictionary<string, AoiMethod>(); public Dictionary<string, AoiMethod> methodMap = new Dictionary<string, AoiMethod>();
public List<ResultBean> CheckAll(Image image, out Image resultImg) public List<ResultBean> CheckAll(Image scr, out Image resultImg)
{ {
Image image = (Image)scr.Clone();
//如果设置了校准方法,先校准图片 //如果设置了校准方法,先校准图片
var markMethodMap = methodMap.Where(kv=>kv.Value is AoiMarkMethod); var markMethodMap = methodMap.Where(kv=>kv.Value is AoiMarkMethod);
foreach (var item in markMethodMap) foreach (var item in markMethodMap)
...@@ -62,10 +63,10 @@ namespace AOI ...@@ -62,10 +63,10 @@ namespace AOI
{ {
foreach(ResultBean resultBean in resultBeans) foreach(ResultBean resultBean in resultBeans)
{ {
Pen pen = new Pen(Color.Green); Pen pen = new Pen(Color.YellowGreen,5);
if (!resultBean.result) if (!resultBean.result)
{ {
pen = new Pen(Color.Red); pen = new Pen(Color.Red,5);
} }
g.DrawPath(pen,resultBean.roiPath); g.DrawPath(pen,resultBean.roiPath);
} }
......
AOI/blob/AoiBlobMethod.cs
...@@ -80,7 +80,12 @@ namespace AOI ...@@ -80,7 +80,12 @@ namespace AOI
{ {
bool needCut = true; bool needCut = true;
cutImg = GetRoiImage(srcImg, needCut); cutImg = GetRoiImage(srcImg, needCut);
if (cutImg == null)
{
dstCutImg = null;
blobList = new List<CvBlob>();
return 0;
}
Mat srcMat = ImageUtil.ToMat(cutImg); Mat srcMat = ImageUtil.ToMat(cutImg);
Mat threshMat = new Mat(); Mat threshMat = new Mat();
Cv2.CvtColor(srcMat, threshMat, ColorConversionCodes.RGB2GRAY); Cv2.CvtColor(srcMat, threshMat, ColorConversionCodes.RGB2GRAY);
......
AccAOI/FrmAoiSetting.Designer.cs
...@@ -41,6 +41,7 @@ namespace AccAOI ...@@ -41,6 +41,7 @@ namespace AccAOI
this.comType = new Asa.Theme.FlatCombo(); this.comType = new Asa.Theme.FlatCombo();
this.panAoi = new System.Windows.Forms.Panel(); this.panAoi = new System.Windows.Forms.Panel();
this.imageBox1 = new Cyotek.Windows.Forms.ImageBox(); this.imageBox1 = new Cyotek.Windows.Forms.ImageBox();
this.btnExcute = new Asa.Theme.FlatButton();
this.SuspendLayout(); this.SuspendLayout();
// //
// aoiList // aoiList
...@@ -50,9 +51,9 @@ namespace AccAOI ...@@ -50,9 +51,9 @@ namespace AccAOI
this.aoiList.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.aoiList.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.aoiList.Index = -1; this.aoiList.Index = -1;
this.aoiList.Inside = false; this.aoiList.Inside = false;
this.aoiList.Location = new System.Drawing.Point(9, 202); this.aoiList.Location = new System.Drawing.Point(9, 223);
this.aoiList.Name = "aoiList"; this.aoiList.Name = "aoiList";
this.aoiList.Size = new System.Drawing.Size(287, 430); this.aoiList.Size = new System.Drawing.Size(287, 409);
this.aoiList.TabIndex = 2; this.aoiList.TabIndex = 2;
this.aoiList.IndexChanged += new System.EventHandler(this.aoiList_IndexChanged); this.aoiList.IndexChanged += new System.EventHandler(this.aoiList_IndexChanged);
// //
...@@ -167,10 +168,23 @@ namespace AccAOI ...@@ -167,10 +168,23 @@ namespace AccAOI
this.imageBox1.TabIndex = 4; this.imageBox1.TabIndex = 4;
this.imageBox1.SelectionRegionChanged += new System.EventHandler(this.imageBox1_SelectionRegionChanged); this.imageBox1.SelectionRegionChanged += new System.EventHandler(this.imageBox1_SelectionRegionChanged);
// //
// btnExcute
//
this.btnExcute.ImageSize = new System.Drawing.Size(0, 0);
this.btnExcute.Inside = false;
this.btnExcute.Location = new System.Drawing.Point(153, 187);
this.btnExcute.Name = "btnExcute";
this.btnExcute.Size = new System.Drawing.Size(109, 30);
this.btnExcute.StateColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.btnExcute.TabIndex = 16;
this.btnExcute.Text = "执行";
this.btnExcute.Click += new System.EventHandler(this.btnExcute_Click);
//
// FrmAoiSetting // FrmAoiSetting
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1271, 641); this.ClientSize = new System.Drawing.Size(1271, 641);
this.Controls.Add(this.btnExcute);
this.Controls.Add(this.panAoi); this.Controls.Add(this.panAoi);
this.Controls.Add(this.comType); this.Controls.Add(this.comType);
this.Controls.Add(this.btnGetCameraImg); this.Controls.Add(this.btnGetCameraImg);
...@@ -204,5 +218,6 @@ namespace AccAOI ...@@ -204,5 +218,6 @@ namespace AccAOI
private Asa.Theme.FlatButton btnGetCameraImg; private Asa.Theme.FlatButton btnGetCameraImg;
private Asa.Theme.FlatCombo comType; private Asa.Theme.FlatCombo comType;
private System.Windows.Forms.Panel panAoi; private System.Windows.Forms.Panel panAoi;
private Asa.Theme.FlatButton btnExcute;
} }
} }
\ No newline at end of file \ No newline at end of file
AccAOI/FrmAoiSetting.cs
...@@ -17,6 +17,7 @@ namespace AccAOI ...@@ -17,6 +17,7 @@ namespace AccAOI
private control.ABaseControl aoiControl = null; private control.ABaseControl aoiControl = null;
public static Image Img = null; public static Image Img = null;
private AoiProject Project = null; private AoiProject Project = null;
private bool CanSel = true;
public FrmAoiSetting() public FrmAoiSetting()
{ {
InitializeComponent(); InitializeComponent();
...@@ -159,6 +160,11 @@ namespace AccAOI ...@@ -159,6 +160,11 @@ namespace AccAOI
} }
private void ShowAoi(AoiMethod method) private void ShowAoi(AoiMethod method)
{ {
CanSel = false;
imageBox1.SelectNone();
imageBox1.Image = Img;
CanSel = true;
if (aoiControl == null) if (aoiControl == null)
{ {
if(method is AoiBlobMethod) if(method is AoiBlobMethod)
...@@ -189,8 +195,8 @@ namespace AccAOI ...@@ -189,8 +195,8 @@ namespace AccAOI
{ {
currPath = method.RoiPath; currPath = method.RoiPath;
imageBox1.SelectionRegion = method.RoiPath; imageBox1.SelectionRegion = method.RoiPath;
Image threshImage = CutImage(imageBox1.Image, currPath); //Image threshImage = CutImage(imageBox1.Image, currPath);
cutImage = threshImage; //cutImage = threshImage;
aoiControl.SetCurrPath(currPath,false); aoiControl.SetCurrPath(currPath,false);
} }
...@@ -269,6 +275,10 @@ namespace AccAOI ...@@ -269,6 +275,10 @@ namespace AccAOI
{ {
try try
{ {
if (!CanSel)
{
return;
}
if (imageBox1.Image == null || Img == null || aoiControl == null) if (imageBox1.Image == null || Img == null || aoiControl == null)
{ {
return; return;
...@@ -287,7 +297,7 @@ namespace AccAOI ...@@ -287,7 +297,7 @@ namespace AccAOI
// currPath.AddEllipse(region); // currPath.AddEllipse(region);
//} //}
currPath = imageBox1.SelectionRegion; currPath = imageBox1.SelectionRegion;
Image threshImage = CutImage(imageBox1.Image, currPath); Image threshImage = CutImage(Img , currPath);
cutImage = threshImage; cutImage = threshImage;
aoiControl.SetCurrPath( currPath); aoiControl.SetCurrPath( currPath);
...@@ -327,5 +337,27 @@ namespace AccAOI ...@@ -327,5 +337,27 @@ namespace AccAOI
return null; return null;
} }
private void btnExcute_Click(object sender, EventArgs e)
{
SaveCurrAoi();
CanSel = false;
if (Img == null)
{
return;
}
if (this.Project == null)
{
return;
}
Image outImage = null;
List<ResultBean> result = Project.CheckAll(Img, out outImage);
if (outImage != null)
{
this.imageBox1.SelectNone();
this.imageBox1.Image = outImage;
}
CanSel = true;
}
} }
} }
AccAOI/control/ABaseControl.cs
...@@ -89,7 +89,7 @@ namespace AccAOI.control ...@@ -89,7 +89,7 @@ namespace AccAOI.control
{ {
// this.BImageBox.CleearArea(); // this.BImageBox.CleearArea();
this.aoiImage.Image = null; this.aoiImage.Image = null;
BImageBox.SelectNone();
} }
private void btnImgType_Click(object sender, EventArgs e) private void btnImgType_Click(object sender, EventArgs e)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!