From 8b0bbe4ab00b1eadd43faa9fcea16367c2b4dda1 Mon Sep 17 00:00:00 2001 From: DarioS Date: Tue, 31 Jan 2023 19:53:35 +0100 Subject: [PATCH] EgtMachKernel 2.5a4 : - corretto controllo e modifica approcci e retrazioni lame in milling. --- EgtMachKernel.rc | Bin 11774 -> 11774 bytes Milling.cpp | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 471d5ce2017b71eeeb0296e2d14e1a2be5916f08..7c43de356fb1662bfea9cf4407a0b0716818f5ed 100644 GIT binary patch delta 97 zcmewt{V#gMFE&P#&A-`fnHfzcKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmUI`BbWdH delta 97 zcmewt{V#gMFE&Qw&A-`fnHh~IKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmUD-Bai?9 diff --git a/Milling.cpp b/Milling.cpp index 38b1ac0..76171a3 100644 --- a/Milling.cpp +++ b/Milling.cpp @@ -2338,21 +2338,21 @@ Milling::AddStandardMilling( const ICurveComposite* pCompo, const Vector3d& vtTo Vector3d vtAppr2 = ptP1 - ptStart ; if ( ! vtAppr2.Normalize()) vtAppr2 = CalcCorrDir( pCompo, i) ; - double dSawStartElev1, dSawStartElev2 ; + double dSawStartElev1 = -1, dSawStartElev2 = -1 ; GetElevation( m_nPhase, ptTest, vtTool, 0.5 * m_TParams.m_dDiam, vtAppr1, dSawStartElev1) ; GetElevation( m_nPhase, ptTest, vtTool, 0.5 * m_TParams.m_dDiam, vtAppr2, dSawStartElev2) ; - if ( dSawStartElev1 > EPS_SMALL && dSawStartElev2 > EPS_SMALL) { + if ( dSawStartElev1 > -EPS_SMALL && dSawStartElev2 > -EPS_SMALL) { bool bFirst = ( dSawStartElev1 < dSawStartElev2) ; vtAppr = ( bFirst ? vtAppr1 : vtAppr2) ; dSawStartElev = ( bFirst ? dSawStartElev1 : dSawStartElev2) ; bSideStart = true ; } - else if ( dSawStartElev1 > EPS_SMALL) { + else if ( dSawStartElev1 > -EPS_SMALL) { vtAppr = vtAppr1 ; dSawStartElev = dSawStartElev1 ; bSideStart = true ; } - else if ( dSawStartElev2 > EPS_SMALL) { + else if ( dSawStartElev2 > -EPS_SMALL) { vtAppr = vtAppr2 ; dSawStartElev = dSawStartElev2 ; bSideStart = true ; @@ -2497,18 +2497,18 @@ Milling::AddStandardMilling( const ICurveComposite* pCompo, const Vector3d& vtTo double dSawEndElev1, dSawEndElev2 ; GetElevation( m_nPhase, ptTest, vtTool, 0.5 * m_TParams.m_dDiam, vtRetr1, dSawEndElev1) ; GetElevation( m_nPhase, ptTest, vtTool, 0.5 * m_TParams.m_dDiam, vtRetr2, dSawEndElev2) ; - if ( dSawEndElev1 > EPS_SMALL && dSawEndElev2 > EPS_SMALL) { + if ( dSawEndElev1 > -EPS_SMALL && dSawEndElev2 > -EPS_SMALL) { bool bFirst = ( dSawEndElev1 < dSawEndElev2) ; vtRetr = ( bFirst ? vtRetr1 : vtRetr2) ; dSawEndElev = ( bFirst ? dSawEndElev1 : dSawEndElev2) ; bSideEnd = true ; } - else if ( dSawEndElev1 > EPS_SMALL) { + else if ( dSawEndElev1 > -EPS_SMALL) { vtRetr = vtRetr1 ; dSawEndElev = dSawEndElev1 ; bSideEnd = true ; } - else if ( dSawEndElev2 > EPS_SMALL) { + else if ( dSawEndElev2 > -EPS_SMALL) { vtRetr = vtRetr2 ; dSawEndElev = dSawEndElev2 ; bSideEnd = true ;