|
|
@@ -1270,8 +1270,8 @@ namespace TeamAAS_VP.Core
|
|
|
float toolX = (float)(visionResults[0].X + visionResults[1].X) / 2;
|
|
|
float toolY = (float)(visionResults[0].Y + visionResults[1].Y) / 2;
|
|
|
_FixedUpCameraAngle = Common.CalculateAngleBetweenPointsDegrees(new PointF((float)visionResults[0].X, (float)visionResults[0].Y), new PointF((float)visionResults[1].X, (float)visionResults[1].Y));
|
|
|
- DowmCameraResults[cameraIndex] = new OpenCvSharp.Point3f(toolX, toolX, (float)_FixedUpCameraAngle);
|
|
|
- DownTool = new PointF(toolX, toolX);
|
|
|
+ DowmCameraResults[cameraIndex] = new OpenCvSharp.Point3f(toolX, toolY, (float)_FixedUpCameraAngle);
|
|
|
+ DownTool = new PointF(toolX, toolY);
|
|
|
await plc.WriteNodeAsync(addressConfig.Out_DownCameraStatus.Address, (Int16)1);
|
|
|
return;
|
|
|
}
|
|
|
@@ -1366,8 +1366,8 @@ namespace TeamAAS_VP.Core
|
|
|
float toolX = (float)(visionResults[0].X + visionResults[1].X) / 2;
|
|
|
float toolY = (float)(visionResults[0].Y + visionResults[1].Y) / 2;
|
|
|
_FixedUpCameraAngle = Common.CalculateAngleBetweenPointsDegrees(new PointF((float)visionResults[0].X, (float)visionResults[0].Y), new PointF((float)visionResults[1].X, (float)visionResults[1].Y));
|
|
|
- DowmCameraResults[cameraIndex] = new OpenCvSharp.Point3f(toolX, toolX, (float)_FixedUpCameraAngle);
|
|
|
- DownTool = new PointF(toolX, toolX);
|
|
|
+ DowmCameraResults[cameraIndex] = new OpenCvSharp.Point3f(toolX, toolY, (float)_FixedUpCameraAngle);
|
|
|
+ DownTool = new PointF(toolX, toolY);
|
|
|
await plc.WriteNodeAsync(addressConfig.Out_DownCameraStatus.Address, (Int16)1);
|
|
|
return;
|
|
|
}
|
|
|
@@ -1486,7 +1486,7 @@ namespace TeamAAS_VP.Core
|
|
|
if (robot == null)
|
|
|
{
|
|
|
SendTaskMessage($"未找到机器人,无法执行上相机锁附/组装拍照视觉任务", MessageLevel.Alarm);
|
|
|
- await plc.WriteNodeAsync(addressConfig.Out_DownCameraStatus.Address, (Int16)2);
|
|
|
+ await plc.WriteNodeAsync(addressConfig.Out_UpCameraPickStatus.Address, (Int16)2);
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
@@ -1558,7 +1558,7 @@ namespace TeamAAS_VP.Core
|
|
|
{
|
|
|
float tool1X = (float)(visionResults[0].X - visionResults[0].X);
|
|
|
float tool1Y = (float)(visionResults[0].Y - visionResults[0].Y);
|
|
|
- float tool2X = (float)(visionResults[1].Y - visionResults[1].Y);
|
|
|
+ float tool2X = (float)(visionResults[1].X - visionResults[1].X);
|
|
|
float tool2Y = (float)(visionResults[1].Y - visionResults[1].Y);
|
|
|
float toolX = (tool1X + tool2X) / 2;
|
|
|
float toolY = (tool1Y + tool2Y) / 2;
|