|
|
@@ -662,14 +662,14 @@ namespace TeamAAS_VP.ViewModels.Product
|
|
|
double upCameraU = Common.CalculateAngleBetweenPointsDegrees(new PointF((float)_PutPoints[0].X, (float)_PutPoints[0].Y), new PointF((float)_PutPoints[1].X, (float)_PutPoints[1].Y));
|
|
|
|
|
|
var curpos1 = await Robot.GetRobotPosAsync();
|
|
|
- var addpos = await Robot.GetAdditionalAxisCurrentPosAsync(Robot.AdditionalAxisList[1].Name);
|
|
|
+ //var addpos = await Robot.GetAdditionalAxisCurrentPosAsync(Robot.AdditionalAxisList[1].Name);
|
|
|
//将当前点位转换为产品Local坐标系下的点位
|
|
|
SelectedPoint.X_Position = (float)curpos1.X;
|
|
|
SelectedPoint.Y_Position = (float)curpos1.Y;
|
|
|
SelectedPoint.Z_Position_Start = curpos1.Z;
|
|
|
SelectedPoint.U_Position = curpos1.U;
|
|
|
SelectedPoint.R_Position = curpos1.V;
|
|
|
- SelectedPoint.Z_Position_Stop = addpos;
|
|
|
+ //SelectedPoint.Z_Position_Stop = addpos;
|
|
|
_eventAggregator.GetEvent<SnackbarMessageNotification>().Publish(new MessageParameter() { Msg = $"{Lang.完成}!", Duration = 0.4 });
|
|
|
return;
|
|
|
}
|
|
|
@@ -716,7 +716,7 @@ namespace TeamAAS_VP.ViewModels.Product
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
- var addpos = await Robot.GetAdditionalAxisCurrentPosAsync(Robot.AdditionalAxisList[0].Name);
|
|
|
+ var addpos = await Robot.GetAdditionalAxisCurrentPosAsync(Robot.AdditionalAxisList[1].Name);
|
|
|
SelectedPoint.Z_Position_Start = addpos;
|
|
|
_eventAggregator.GetEvent<SnackbarMessageNotification>().Publish(new MessageParameter() { Msg = $"{Lang.完成}!", Duration = 0.4 });
|
|
|
return;
|