From 73e6b8af602d5fdba17b1b3aa886b459c59ea5f2 Mon Sep 17 00:00:00 2001 From: jerryzeng Date: Sun, 1 Feb 2026 15:28:17 +0800 Subject: [PATCH] =?UTF-8?q?workpieceHolePositioning=20v1.1.1=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=BA=86=E6=96=B9=E5=90=91=E7=9F=A2=E9=87=8F=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sourceCode/workpieceHolePositioning.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sourceCode/workpieceHolePositioning.cpp b/sourceCode/workpieceHolePositioning.cpp index 7a95067..65f5674 100644 --- a/sourceCode/workpieceHolePositioning.cpp +++ b/sourceCode/workpieceHolePositioning.cpp @@ -8,7 +8,7 @@ //version 1.0.0 : base version release to customer //version 1.0.2 : 添加了工件姿态（欧拉角输出) //version 1.1.0 : c对工件姿态规范化为中心点（操作点）加三个方向矢量 -std::string m_strVersion = "1.1.0"; +std::string m_strVersion = "1.1.1"; const char* wd_workpieceHolePositioningVersion(void) { return m_strVersion.c_str(); @@ -509,13 +509,13 @@ void wd_workpieceHolePositioning( SVzNL3DPoint y_dir; if (p0.center.y < p2.center.y) - y_dir = { p0.center.x - p2.center.x, p0.center.y - p2.center.y, 0 }; - else y_dir = { p2.center.x - p0.center.x, p2.center.y - p0.center.y, 0 }; + else + y_dir = { p0.center.x - p2.center.x, p0.center.y - p2.center.y, 0 }; double modLen = sqrt(pow(y_dir.x, 2) + pow(y_dir.y, 2)); y_dir = { y_dir.x / modLen, y_dir.y / modLen, 0 }; a_workpiece.y_dir = { y_dir.x * 20 + a_workpiece.center.x, y_dir.y * 20 + a_workpiece.center.y, a_workpiece.center.z }; - a_workpiece.z_dir = { a_workpiece.center.x, a_workpiece.center.y, a_workpiece.center.z - 20 }; + a_workpiece.z_dir = { a_workpiece.center.x, a_workpiece.center.y, a_workpiece.center.z + 20 }; workpiecePositioning.push_back(a_workpiece); }