|
|
@@ -1667,7 +1667,7 @@ namespace TeamAAS_VP.Services
|
|
|
/// <param name="robotCoord"></param>
|
|
|
/// <param name="cancellationToken"></param>
|
|
|
/// <returns></returns>
|
|
|
- public async Task<(bool IsSucceed, double X, double Y, double U)> ExecutePhotoGetSinglePoint(ProcedureModel procedure, Dictionary<string, string> InputTerminal, double[] robotCoord, CancellationToken cancellationToken, int? index, string remark)
|
|
|
+ public async Task<(bool IsSucceed, double X, double Y, double U)> ExecutePhotoGetSinglePoint(ProcedureModel procedure, Dictionary<string, string> InputTerminal, double[] robotCoord, CancellationToken cancellationToken, string remark)
|
|
|
{
|
|
|
DateTime nowtime = DateTime.Now;
|
|
|
await SetLightBeforePhoto(procedure);
|
|
|
@@ -1689,6 +1689,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (!outputCollection.Contains("Found"))
|
|
|
{
|
|
|
SendTaskMessage(Lang.未找到视觉输出结果, MessageLevel.Error);
|
|
|
+ await RecordPhotoCaptureAsync(procedure, robotCoord, false, new double[] { 0, 0, 0 }, new double[] { 0, 0, 0 }, string.Empty, remark);
|
|
|
return (false, 0, 0, 0);
|
|
|
}
|
|
|
|
|
|
@@ -1717,17 +1718,20 @@ namespace TeamAAS_VP.Services
|
|
|
var calibResult = _calibrationService.ConvertPixelToPosition((_pixel_x, _pixel_y, _pixel_u), robotCoord, calib, RobotBrand.XYZ_Platform);
|
|
|
if (!calibResult.IsSucceed)
|
|
|
{
|
|
|
+ await RecordPhotoCaptureAsync(procedure, robotCoord, false, new double[] { _pixel_x, _pixel_y, _pixel_u }, new double[] { 0, 0, 0 }, string.Empty, remark);
|
|
|
return (false, 0, 0, 0);
|
|
|
}
|
|
|
- await RecordPhotoCaptureAsync(procedure, robotCoord,true, new double[] { _pixel_x, _pixel_y, _pixel_u }, new double[] { calibResult.X, calibResult.Y, calibResult.U }, string.Empty, string.Empty);
|
|
|
+ await RecordPhotoCaptureAsync(procedure, robotCoord,true, new double[] { _pixel_x, _pixel_y, _pixel_u }, new double[] { calibResult.X, calibResult.Y, calibResult.U }, string.Empty, remark);
|
|
|
return (true, calibResult.X, calibResult.Y, calibResult.U);
|
|
|
}
|
|
|
SendTaskMessage(Lang.多次拍照失败, MessageLevel.Alarm);
|
|
|
+ await RecordPhotoCaptureAsync(procedure, robotCoord, false, new double[] { 0, 0, 0 }, new double[] { 0, 0, 0 }, string.Empty, remark);
|
|
|
return (false, 0, 0, 0);
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
LogHelper.WriteLogError(Lang.执行相机取图并获取单点位时出错, ex);
|
|
|
+ await RecordPhotoCaptureAsync(procedure, robotCoord, false, new double[] { 0, 0, 0 }, new double[] { 0, 0, 0 }, string.Empty, remark);
|
|
|
return (false, 0, 0, 0);
|
|
|
}
|
|
|
finally
|