徐孝锋 преди 8 месеца
родител
ревизия
cc95b28433
променени са 2 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 2 2
      TeamAAS-VM/Properties/AssemblyInfo.cs
  2. 4 4
      TeamAAS-VM/ViewModels/Product/PlcPointParamsViewModel.cs

+ 2 - 2
TeamAAS-VM/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*",如下所示:
 //通过使用 "*",如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.0.1")]
+[assembly: AssemblyFileVersion("1.2.0.1")]

+ 4 - 4
TeamAAS-VM/ViewModels/Product/PlcPointParamsViewModel.cs

@@ -659,7 +659,7 @@ namespace TeamAAS_VP.ViewModels.Product
 
 
                     var curpos1 = await Robot.GetRobotPosAsync();
                     var curpos1 = await Robot.GetRobotPosAsync();
                     //将当前点位转换为产品Local坐标系下的点位
                     //将当前点位转换为产品Local坐标系下的点位
-                    var localPoint = local.ToOldCoord(curpos1.X, curpos1.Y);
+                    var localPoint = local.ToNewCoord(curpos1.X, curpos1.Y);
                     SelectedPoint.X_Position = (float)localPoint[0];
                     SelectedPoint.X_Position = (float)localPoint[0];
                     SelectedPoint.Y_Position = (float)localPoint[1];
                     SelectedPoint.Y_Position = (float)localPoint[1];
                     SelectedPoint.Z_Position_Start = curpos1.Z;
                     SelectedPoint.Z_Position_Start = curpos1.Z;
@@ -1332,9 +1332,9 @@ namespace TeamAAS_VP.ViewModels.Product
                 //移动机器人至拍照点位,拍照
                 //移动机器人至拍照点位,拍照
                 var rpoint = new RPoint()
                 var rpoint = new RPoint()
                 {
                 {
-                    X = point.X_Position,
-                    Y = point.Y_Position,
-                    Z = point.Z_Position_Start,
+                    X = point1.X_Position,
+                    Y = point1.Y_Position,
+                    Z = point1.Z_Position_Start,
                 };
                 };
                 await Robot.CalibMotionAsync(rpoint, 0);
                 await Robot.CalibMotionAsync(rpoint, 0);