From 52bcc690238d32eeafcd31af025868961d3bc5a0 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 15 Dec 2023 19:57:55 +0100 Subject: [PATCH] EgtMachKernel 2.5l3 : - in fresature migliorato calcolo di retrazione orizzontale quando quasi sotto il pezzo con utensile lama o fresa notip. --- EgtMachKernel.rc | Bin 11782 -> 11782 bytes Milling.cpp | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 2375a6a73d9558a98320352b04f155e55000c58c..7fb1ee7a0e2e688dc1f09ebbb7c02a2c77171a4c 100644 GIT binary patch delta 97 zcmZpRX^YwLhmFyA^ItYwW=7-5j>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHPhB8F delta 97 zcmZpRX^YwLhmFx_^ItYwW=5mQj>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHP01iS diff --git a/Milling.cpp b/Milling.cpp index deba898..b04a8e4 100644 --- a/Milling.cpp +++ b/Milling.cpp @@ -4231,7 +4231,13 @@ Milling::AddSawBladeSideRetract( const Point3d& ptP, const Vector3d& vtRetr, con if ( ! m_bTiltingTab && vtRetr.z < LIM_DOWN_APPRZ) { Vector3d vtMove = Vector3d( vtTool.x, vtTool.y, 0) ; if ( vtMove.Normalize()) { - Point3d ptP4b = ptP4 + vtMove * ( dEndElev + dSafeZ) ; + double dSawEndElev ; + if ( ! m_bAboveHead || + ! GetAhPointUnderRaw( ptP4, vtTool, m_TParams.m_dTDiam / 2, + GetRadiusForStartEndElevation( false), + m_TParams.m_dLen, true, dSafeZ, vtMove, dSawEndElev)) + dSawEndElev = dEndElev ; + Point3d ptP4b = ptP4 + vtMove * ( dSawEndElev + dSafeZ) ; if ( AddRapidMove( ptP4b) == GDB_ID_NULL) return false ; }