From a997be46ff8b23f46abb4a6f80b929110caaf5f9 Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Fri, 19 Jun 2026 08:54:53 +0200 Subject: [PATCH] EgtMachKernel : - Aggiunto parametro per CalcPocketing. --- PocketingNT.cpp | 10 +++++----- SurfFinishing.cpp | 10 +++++----- SurfRoughing.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/PocketingNT.cpp b/PocketingNT.cpp index db7c6c4..79f8788 100644 --- a/PocketingNT.cpp +++ b/PocketingNT.cpp @@ -4835,11 +4835,11 @@ PocketingNT::CalcPaths( STEPINFOPOVECTOR& vStepInfo, bool& bEmpty) for ( int i = 0 ; i < ssize( vStepInfo) ; ++ i) { // calcolo i percorsi di Pocketing ( o di lucidatura se richiesto) ICRVCOMPOPOVECTOR vCrvPaths ; - if ( ! CalcPocketing( vStepInfo[i].pSfrPock, m_TParams.m_dDiam / 2, GetOffsR(), dSideStep, - m_Params.m_dSideAngle, m_dOpenMinSafe, m_Params.m_nSubType, true, true, m_Params.m_bInvert, - false, bConventionalMilling, true, bAdjustFeed, ptStartRef, vStepInfo[i].pSfrLimit, bAllOffset, dMaxOptSize, - GetLeadInType(), m_Params.m_dLiTang, m_Params.m_dLiElev, GetLeadOutType(), m_Params.m_dLoTang, - bPolishing, m_Params.m_dEpicyclesRad, m_Params.m_dEpicyclesDist, bToolComp, vCrvPaths)) { + if ( ! CalcPocketing( vStepInfo[i].pSfrPock, m_TParams.m_dDiam / 2, GetOffsR(), dSideStep, m_Params.m_dSideAngle, m_dOpenMinSafe, + m_Params.m_nSubType, true, true, m_Params.m_bInvert, false, bConventionalMilling, true, m_bOpenOutRaw, + bAdjustFeed, ptStartRef, vStepInfo[i].pSfrLimit, bAllOffset, dMaxOptSize, GetLeadInType(), m_Params.m_dLiTang, + m_Params.m_dLiElev, GetLeadOutType(), m_Params.m_dLoTang, bPolishing, m_Params.m_dEpicyclesRad, + m_Params.m_dEpicyclesDist, bToolComp, vCrvPaths)) { m_pMchMgr->SetLastError( 2442, "Error in PocketingNT : Error in CalcPocketing") ; return false ; } diff --git a/SurfFinishing.cpp b/SurfFinishing.cpp index dc05169..d5b5592 100644 --- a/SurfFinishing.cpp +++ b/SurfFinishing.cpp @@ -2646,7 +2646,7 @@ SurfFinishing::AddZigZag( ICAvToolSurfTm* pCAvTlStm, const Frame3d& frSurf, cons // calcolo lo ZigZag ICRVCOMPOPOVECTOR vpCrvs ; if ( ! CalcPocketing( pSfrCnt, m_TParams.m_dDiam / 2., 0., m_Params.m_dSideStep, GetLocalSideAngle(), 5., - POCKET_ZIGZAG, false, false, m_Params.m_bInvert, true, true, false, false, P_INVALID, nullptr, true, m_Params.m_dSideStep, + POCKET_ZIGZAG, false, false, m_Params.m_bInvert, true, true, false, false, false, P_INVALID, nullptr, true, m_Params.m_dSideStep, GetLeadInType(), m_Params.m_dLiTang, 0., GetLeadOutType(), m_Params.m_dLoTang, false, 0., 0., false, vpCrvs)) { m_pMchMgr->SetLastError( 3125, "Error in SurfFinishing : CalcPocketing failed") ; return false ; @@ -2673,7 +2673,7 @@ SurfFinishing::AddOneWay( ICAvToolSurfTm* pCAvTlStm, const Frame3d& frSurf, cons // calcolo OneWay ICRVCOMPOPOVECTOR vpCrvs ; if ( ! CalcPocketing( pSfrCnt, m_TParams.m_dDiam / 2., 0., m_Params.m_dSideStep, GetLocalSideAngle(), 5., - POCKET_ONEWAY, false, false, m_Params.m_bInvert, true, true, false, false, P_INVALID, nullptr, true, m_Params.m_dSideStep, + POCKET_ONEWAY, false, false, m_Params.m_bInvert, true, true, false, false, false, P_INVALID, nullptr, true, m_Params.m_dSideStep, GetLeadInType(), m_Params.m_dLiTang, 0., GetLeadOutType(), m_Params.m_dLoTang, false, 0., 0., false, vpCrvs)) { m_pMchMgr->SetLastError( 3125, "Error in SurfFinishing : CalcPocketing failed") ; return false ; @@ -2701,7 +2701,7 @@ SurfFinishing::AddSpiral( ICAvToolSurfTm* pCAvTlStm, const Frame3d& frSurf, cons int nType = ( bInVsOut ? POCKET_SPIRALIN : POCKET_SPIRALOUT) ; ICRVCOMPOPOVECTOR vpCrvs ; if ( ! CalcPocketing( pSfrCnt, m_TParams.m_dDiam / 2., 0., m_Params.m_dSideStep, GetLocalSideAngle(), 5., - nType, false, false, m_Params.m_bInvert, true, true, false, false, P_INVALID, nullptr, true, m_Params.m_dSideStep, + nType, false, false, m_Params.m_bInvert, true, true, false, false, false, P_INVALID, nullptr, true, m_Params.m_dSideStep, GetLeadInType(), m_Params.m_dLiTang, 0., GetLeadOutType(), m_Params.m_dLoTang, false, 0., 0., false, vpCrvs)) { m_pMchMgr->SetLastError( 3125, "Error in SurfFinishing : CalcPocketing failed") ; return false ; @@ -5145,7 +5145,7 @@ SurfFinishing::GetOffsetCurvesFromPencilProjection( const ICRVCOMPOPOVECTOR& vCr // lavoro a ZigZag ICRVCOMPOPOVECTOR vCrvZigZag ; if ( ! CalcPocketing( pSfrChunk, m_TParams.m_dDiam / 2., 0., m_Params.m_dSideStep, m_Params.m_dSideAngle, - 5., POCKET_SUB_ZIGZAG, false, false, m_Params.m_bInvert, true, true, false, + 5., POCKET_SUB_ZIGZAG, false, false, m_Params.m_bInvert, true, true, false, false, false, P_INVALID, nullptr, true, INFINITO, GetLeadInType(), m_Params.m_dLiTang, 0., GetLeadOutType(), m_Params.m_dLoTang, false, 0., 0., false, vCrvZigZag)) return false ; @@ -5833,7 +5833,7 @@ SurfFinishing::CalcOptimalZigZagCurves( ISURFFRPOVECTOR& vSfrZigZagProj, const F // eseguo il calcolo della lavorazione ZigZag ICRVCOMPOPOVECTOR vpCrvs ; if ( ! CalcPocketing( pSfrChunk, m_TParams.m_dDiam / 2., 0., m_Params.m_dSideStep, GetLocalSideAngle(), 5., - nSubType, false, false, false, true, true, false, false, P_INVALID, nullptr, true, m_Params.m_dSideStep, + nSubType, false, false, false, true, true, false, false, false, P_INVALID, nullptr, true, m_Params.m_dSideStep, GetLeadInType(), m_Params.m_dLiTang, 0., GetLeadOutType(), m_Params.m_dLoTang, false, 0., 0., false, vpCrvs)) { m_pMchMgr->SetLastError( 3125, "Error in SurfFinishing : CalcPocketing failed") ; return false ; diff --git a/SurfRoughing.cpp b/SurfRoughing.cpp index edce84d..ae81386 100644 --- a/SurfRoughing.cpp +++ b/SurfRoughing.cpp @@ -3043,7 +3043,7 @@ SurfRoughing::CalcPaths( const INTINTVECTOR& vPocket, STEPINFOSRVECTOR& vStepInf ICRVCOMPOPOVECTOR vCrvPaths ; if ( ! CalcPocketing( vStepInfo[nInd].pSfrPock, m_TParams.m_dDiam / 2, 0., m_Params.m_dSideStep, m_Params.m_dSideAngle, 5., vStepInfo[nInd].nSubType, true, true, vStepInfo[nInd].bInverted, - false, bConventionalMilling, true, true, ptEndLastPath, vStepInfo[nInd].pSfrLimit, false, m_Params.m_dSideStep, + false, bConventionalMilling, true, false, true, ptEndLastPath, vStepInfo[nInd].pSfrLimit, false, m_Params.m_dSideStep, GetLeadInType(), m_Params.m_dLiTang, m_Params.m_dLiElev, GetLeadOutType(), m_Params.m_dLoTang, false, 0., 0., false, vCrvPaths)) { if ( vStepInfo[nInd].bIsExtraStep) {