From 4d158ec9fdfb8ccd38d01ae18672cff3df3bce6c Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 1 Aug 2022 12:30:20 +0200 Subject: [PATCH] EgtMachKernel 2.4g6 : - in Mortising plunge corretta gestione affondamento. --- EgtMachKernel.rc | Bin 11774 -> 11774 bytes Mortising.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 5f6c3d6438fc001c03f32bacdd885f834916234b..5d9cc6ba15a07119653fb07889c159cc9dbc7b82 100644 GIT binary patch delta 97 zcmewt{V#gMFE&QA&A-`fnHkL{Ka|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmUTDBd7oX delta 97 zcmewt{V#gMFE&Qg&A-`fnHfzdKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmUO4BcK2P diff --git a/Mortising.cpp b/Mortising.cpp index 2ee4bbc..4c27635 100644 --- a/Mortising.cpp +++ b/Mortising.cpp @@ -1291,7 +1291,7 @@ Mortising::ProcessPath( int nPathId, int nPvId, int nClId) if ( FromString( ExtractInfo( m_Params.m_sUserNotes, "MaxElev="), dMaxElev) && dElev > dMaxElev) dElev = dMaxElev ; - // affondamento speciale da note untente (!!! da trasformare in parametro come gli altri !!!) + // affondamento speciale da note utente (!!! da trasformare in parametro come gli altri !!!) int nPlunge = 0 ; FromString( ExtractInfo( m_Params.m_sUserNotes, "Plunge="), nPlunge) ; @@ -1566,19 +1566,19 @@ Mortising::GenerateOnePlungeCl( const Point3d& ptStart, const Point3d& ptEnd, co // 3 -> punto in affondamento SetFeed( GetStartFeed()) ; SetFlag( 0) ; - Point3d ptP3 = ptStart ; + Point3d ptP3 = ptStart + ( dDelta - dElev) * vtTool ; if ( AddLinearMove( ptP3) == GDB_ID_NULL) return false ; - ptLast = ptP3 ; + ptLast = ptStart ; } else if ( nPlunge == MORTISE_PLUNGE_END) { // 3 -> punto in affondamento SetFeed( GetStartFeed()) ; SetFlag( 0) ; - Point3d ptP3 = ptEnd ; + Point3d ptP3 = ptEnd + ( dDelta - dElev) * vtTool ; if ( AddLinearMove( ptP3) == GDB_ID_NULL) return false ; - ptLast = ptP3 ; + ptLast = ptEnd ; } else { // determino numero e affondamento degli step