From dc0bb1876f5e85701c70ddf7b41ec13323df9f8b Mon Sep 17 00:00:00 2001 From: SaraP Date: Mon, 4 Aug 2025 15:18:41 +0200 Subject: [PATCH] EgtMachKernel : - in milling nel caso di lucidatura eliminato il limite sull'elevazione per lead in e lead out. --- Milling.cpp | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/Milling.cpp b/Milling.cpp index 484d8ef..df14a73 100644 --- a/Milling.cpp +++ b/Milling.cpp @@ -4744,7 +4744,9 @@ Milling::CalcLeadInStart( const Point3d& ptStart, const Vector3d& vtStart, const int nType = GetLeadInType() ; double dTang = m_Params.m_dLiTang ; double dPerp = m_Params.m_dLiPerp ; - double dElev = min( m_Params.m_dLiElev, dStElev + GetLeadInOutToler()) ; + double dElev = m_Params.m_dLiElev ; + if ( m_TParams.m_nType != TT_MILL_POLISHING) + dElev = min( m_Params.m_dLiElev, dStElev + GetLeadInOutToler()) ; // se step invertito if ( bInvert) { // va aggiustato se non zigzag o spirale @@ -4760,7 +4762,9 @@ Milling::CalcLeadInStart( const Point3d& ptStart, const Vector3d& vtStart, const if ( m_Params.m_nLeadOutType != MILL_LO_AS_LI) { dTang = m_Params.m_dLoTang ; dPerp = m_Params.m_dLoPerp ; - dElev = min( m_Params.m_dLoElev, dStElev + GetLeadInOutToler()) ; + dElev = m_Params.m_dLoElev ; + if ( m_TParams.m_nType != TT_MILL_POLISHING) + dElev = min( m_Params.m_dLoElev, dStElev + GetLeadInOutToler()) ; } } } @@ -4866,7 +4870,9 @@ Milling::AddLeadIn( const Point3d& ptP1, const Point3d& ptStart, const Vector3d& int nType = GetLeadInType() ; double dTang = m_Params.m_dLiTang ; double dPerp = m_Params.m_dLiPerp ; - double dElev = min( m_Params.m_dLiElev, dStElev + GetLeadInOutToler()) ; + double dElev = m_Params.m_dLiElev ; + if ( m_TParams.m_nType != TT_MILL_POLISHING) + dElev = min( m_Params.m_dLiElev, dStElev + GetLeadInOutToler()) ; // se step invertito if ( bInvert) { // va aggiustato se non zigzag o spirale @@ -4882,7 +4888,9 @@ Milling::AddLeadIn( const Point3d& ptP1, const Point3d& ptStart, const Vector3d& if ( m_Params.m_nLeadOutType != MILL_LO_AS_LI) { dTang = m_Params.m_dLoTang ; dPerp = m_Params.m_dLoPerp ; - dElev = min( m_Params.m_dLoElev, dStElev + GetLeadInOutToler()) ; + dElev = m_Params.m_dLoElev ; + if ( m_TParams.m_nType != TT_MILL_POLISHING) + dElev = min( m_Params.m_dLoElev, dStElev + GetLeadInOutToler()) ; } } } @@ -5104,7 +5112,9 @@ Milling::CalcLeadOutEnd( const Point3d& ptEnd, const Vector3d& vtEnd, const Vect int nType = GetLeadOutType() ; double dTang = m_Params.m_dLoTang ; double dPerp = m_Params.m_dLoPerp ; - double dElev = min( m_Params.m_dLoElev, dEndElev + GetLeadInOutToler()) ; + double dElev = m_Params.m_dLoElev ; + if ( m_TParams.m_nType != TT_MILL_POLISHING) + dElev = min( m_Params.m_dLoElev, dEndElev + GetLeadInOutToler()) ; // se uscita come ingresso o step invertito if ( nType == MILL_LO_AS_LI || bInvert) { int nLiType = GetLeadInType() ; @@ -5123,7 +5133,9 @@ Milling::CalcLeadOutEnd( const Point3d& ptEnd, const Vector3d& vtEnd, const Vect dTang = 0.5 * min( m_Params.m_dLiTang, m_TParams.m_dDiam) ; dPerp = dTang ; } - dElev = min( m_Params.m_dLiElev, dEndElev + GetLeadInOutToler()) ; + dElev = m_Params.m_dLiElev ; + if ( m_TParams.m_nType != TT_MILL_POLISHING) + dElev = min( m_Params.m_dLiElev, dEndElev + GetLeadInOutToler()) ; } // senso di rotazione da dir tg a dir esterna bool bCcwRot = (( ! bInvert && m_Params.m_nWorkSide == MILL_WS_LEFT) || @@ -5235,7 +5247,9 @@ Milling::AddLeadOut( const Point3d& ptEnd, const Vector3d& vtEnd, const Vector3d int nType = GetLeadOutType() ; double dTang = m_Params.m_dLoTang ; double dPerp = m_Params.m_dLoPerp ; - double dElev = min( m_Params.m_dLoElev, dEndElev + GetLeadInOutToler()) ; + double dElev = m_Params.m_dLoElev ; + if ( m_TParams.m_nType != TT_MILL_POLISHING) + dElev = min( m_Params.m_dLoElev, dEndElev + GetLeadInOutToler()) ; // se uscita come ingresso o step invertito if ( nType == MILL_LO_AS_LI || bInvert) { int nLiType = GetLeadInType() ; @@ -5254,7 +5268,9 @@ Milling::AddLeadOut( const Point3d& ptEnd, const Vector3d& vtEnd, const Vector3d dTang = 0.5 * min( m_Params.m_dLiTang, m_TParams.m_dDiam) ; dPerp = dTang ; } - dElev = min( m_Params.m_dLiElev, dEndElev + GetLeadInOutToler()) ; + dElev = m_Params.m_dLiElev ; + if ( m_TParams.m_nType != TT_MILL_POLISHING) + dElev = min( m_Params.m_dLiElev, dEndElev + GetLeadInOutToler()) ; } // senso di rotazione da dir tg a dir esterna bool bCcwRot = (( ! bInvert && m_Params.m_nWorkSide == MILL_WS_LEFT) ||