lhiven
/
Rs.SkyLine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、优化存图

Browse Source 
2、修复治具报警跳过后周转吸嘴状态未清除
develop
lhiven 11 months ago
parent 5867ccfa94
commit 68d882e4c7
5 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File

3
Rs.SkyLine/Commom/VisionProcess.cs
Unescape Escape View File

@ -206,7 +206,8 @@ namespace Rs.MotionPlat.Commom
{ {
FindCode(hImage, ref mr); FindCode(hImage, ref mr);
} }
string dirname = $"d://images/{DateTime.Now.ToString("yyyyMMdd")}";
string dirname = $"{GlobalVar.ImageSavePath}/{DateTime.Now.ToString("yyyyMMdd")}";
if (!Directory.Exists(dirname)) if (!Directory.Exists(dirname))
{ {
Directory.CreateDirectory(dirname); Directory.CreateDirectory(dirname);

7
Rs.SkyLine/Flow/Camera/VisionManager.cs
Unescape Escape View File

@ -222,12 +222,15 @@ namespace Rs.MotionPlat.Flow.Camera
} }
else else
{ {
string dirname = $"d://images/{DateTime.Now.ToString("yyyyMMdd")}/scanbarcode"; if(GlobalVar.ImageSaveDays>0)
{
string dirname = $"{GlobalVar.ImageSavePath}/{DateTime.Now.ToString("yyyyMMdd")}/scanbarcode";
if (!Directory.Exists(dirname)) if (!Directory.Exists(dirname))
{ {
Directory.CreateDirectory(dirname); Directory.CreateDirectory(dirname);
} }
HOperatorSet.WriteImage(image, "bmp", 0, $"{dirname}//{sn}_{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{slotIndex}"); HOperatorSet.WriteImage(image, "bmp", 0, $"{dirname}//{sn}_{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{slotIndex}");
}
vr.ScanBarCodeOK = true; vr.ScanBarCodeOK = true;
vr.SN = sn; vr.SN = sn;
} }
@ -305,7 +308,7 @@ namespace Rs.MotionPlat.Flow.Camera
} }
if (mode == "maximum_recognition") if (mode == "maximum_recognition")
{ {
string saveDir = $"d://images//{DateTime.Now.ToString("yyyyMMdd")}//Ng"; string saveDir = $"{GlobalVar.ImageSavePath}//{DateTime.Now.ToString("yyyyMMdd")}//Ng";
if(!Directory.Exists(saveDir)) if(!Directory.Exists(saveDir))
{ {
Directory.CreateDirectory(saveDir); Directory.CreateDirectory(saveDir);

11
Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
Unescape Escape View File

@ -1341,20 +1341,24 @@ namespace Rs.MotionPlat.Flow
if (curNozzle.ToType == TurnoverType.Turnover) if (curNozzle.ToType == TurnoverType.Turnover)
{ {
//判断文件夹是否存在 //判断文件夹是否存在
string dirname = $"d://images/{DateTime.Now.ToString("yyyyMMdd")}/load"; string dirname = $"{GlobalVar.ImageSavePath}/{DateTime.Now.ToString("yyyyMMdd")}/load";
if (!Directory.Exists(dirname)) if (!Directory.Exists(dirname))
{ {
Directory.CreateDirectory(dirname); Directory.CreateDirectory(dirname);
} }
if (mrs != null && mrs.Count > 0 && mrs.Count >= curNozzle.NozzleIndex && mrs[curNozzle.NozzleIndex - 1].Himage != null) if (mrs != null && mrs.Count > 0 && mrs.Count >= curNozzle.NozzleIndex && mrs[curNozzle.NozzleIndex - 1].Himage != null)
{
if (GlobalVar.ImageSaveDays > 0)
{ {
HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{curNozzle.ToIndex + 1}"); HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{curNozzle.ToIndex + 1}");
} }
}
} }
else else
{ {
//判断文件夹是否存在 //判断文件夹是否存在
string dirname = $"d://images/{DateTime.Now.ToString("yyyyMMdd")}/unload"; string dirname = $"{GlobalVar.ImageSavePath}/{DateTime.Now.ToString("yyyyMMdd")}/unload";
if (!Directory.Exists(dirname)) if (!Directory.Exists(dirname))
{ {
Directory.CreateDirectory(dirname); Directory.CreateDirectory(dirname);
@ -1363,9 +1367,12 @@ namespace Rs.MotionPlat.Flow
{ {
//HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{curNozzle.FromIndex + 1}"); //HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{curNozzle.FromIndex + 1}");
if (!string.IsNullOrEmpty(curNozzle.SN)) if (!string.IsNullOrEmpty(curNozzle.SN))
{
if (GlobalVar.ImageSaveDays > 0)
{ {
HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{curNozzle.SN}_{curNozzle.FromIndex + 1}"); HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{curNozzle.SN}_{curNozzle.FromIndex + 1}");
} }
}
else else
{ {
HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{curNozzle.FromIndex + 1}"); HOperatorSet.WriteImage(mrs[curNozzle.NozzleIndex - 1].Himage, "bmp", 0, $"{dirname}//{DateTime.Now.ToString("yyyyMMddHHmmssfff")}_{curNozzle.FromIndex + 1}");

1
Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
Unescape Escape View File

@ -1413,6 +1413,7 @@ namespace Rs.MotionPlat.Flow
if (!heightResult.HasProduct) if (!heightResult.HasProduct)
{ {
nozzle.Clear(); nozzle.Clear();
GlobalTray.TurnoverNozzle.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.NotHave);
exit = true; exit = true;
} }
break; break;

2
Rs.SkyLine/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
// //
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
[assembly: AssemblyVersion("3.20.24.24")] [assembly: AssemblyVersion("3.20.24.25")]
//[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]

Write Preview
Loading…
Cancel
Save