优化3区吸盘分派逻辑

SCADA_DAQ/Customer/Machines/SortMachine.cs

@@ -477,15 +477,17 @@ namespace SCADA_DAQ.Customer.Machines
                             {
                                 if (area == 1)
                                 {
-                                    BoardInfo.Rotation = 90;
-                                    var cup1NewCenter = new Point(Cup1Center.Y, -1 * (double)Cup1Center.X);  //旋转后的坐标
+                                    BoardInfo.Rotation = -90;
+                                    var cup1NewCenter = new Point(-1 * Cup1Center.Y, (double)Cup1Center.X);  //旋转后的坐标
                                     BoardInfo.CupCenter = new Point(BoardInfo.CupCenter.X - cup1NewCenter.X, BoardInfo.CupCenter.Y - cup1NewCenter.Y);
                                     BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 - 30;
                                     CupNewCenter = cup1NewCenter;
+                              
                                 }
                                 else if (area == 3)
                                 {
-                                    var cup1NewCenter = new Point(Cup1Center.X, Cup1Center.Y);  //旋转后的坐标
+                                    BoardInfo.Rotation = 90;
+                                    var cup1NewCenter = new Point(Cup1Center.Y, -1 * (double)Cup1Center.X);  //旋转后的坐标
                                     BoardInfo.CupCenter = new Point(BoardInfo.CupCenter.X - cup1NewCenter.X, BoardInfo.CupCenter.Y - cup1NewCenter.Y);
                                     BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 - 30;
                                     CupNewCenter = cup1NewCenter;
@@ -495,8 +497,8 @@ namespace SCADA_DAQ.Customer.Machines
                             {
                                 if (area == 2)
                                 {
-                                    BoardInfo.Rotation = -90;
-                                    var cup1NewCenter = new Point(-1 * Cup1Center.Y, (double)Cup1Center.X);  //旋转后的坐标
+
+                                    var cup1NewCenter = new Point(Cup1Center.X, Cup1Center.Y);  //旋转后的坐标
                                     BoardInfo.CupCenter = new Point(BoardInfo.CupCenter.X - cup1NewCenter.X, BoardInfo.CupCenter.Y - cup1NewCenter.Y);
                                     BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 - 30;
                                     CupNewCenter = cup1NewCenter;
@@ -541,9 +543,7 @@ namespace SCADA_DAQ.Customer.Machines
                                     var cup3NewCenter = new Point(Cup3Center.Y, -1 * (double)Cup3Center.X);  //旋转后的坐标
                                     BoardInfo.CupCenter = new Point(BoardInfo.CupCenter.X - cup3NewCenter.X, BoardInfo.CupCenter.Y - cup3NewCenter.Y);
                                     BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 - 30;
-                                    CupNewCenter = cup3NewCenter;
-
-  
+                                    CupNewCenter = cup3NewCenter; 
                                 }
                                 else if (area == 4)
                                 {
@@ -573,13 +573,9 @@ namespace SCADA_DAQ.Customer.Machines
                                     BoardInfo.CupCenter = new Point(BoardInfo.CupCenter.X - cup3NewCenter.X, BoardInfo.CupCenter.Y - cup3NewCenter.Y);
                                     BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 - 30;
                                     CupNewCenter = cup3NewCenter;
-
-                       
                                 }
                             }
-
                         }
-
                     }
 
                     GetListenReg(Tag_PhotoAngle).WriteObject(null, (float)BoardInfo.Rotation);