From cd0fc4e449d9c049d5dd6ab765e54d1e4a61a218 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 3 Jun 2024 09:10:04 +0200 Subject: [PATCH] EgtGeomKernel : - piccole modifiche a Pocketing. --- CalcPocketing.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CalcPocketing.cpp b/CalcPocketing.cpp index 5002402..38cdcda 100644 --- a/CalcPocketing.cpp +++ b/CalcPocketing.cpp @@ -4809,7 +4809,7 @@ CalcSpiral( const ISurfFlatRegion* pSrfPock, const PocketParams& PockParams, int pRCrv->Clear() ; // Offset corrente ( il primo รจ definito dal raggio utensile) - double dOffs = PockParams.dRad ; + double dOffs = PockParams.dRad + PockParams.dRadialOffset ; // recupero il versore normale della superficie, ruotandola nel piano XY PtrOwner pSrfToWork( pSrfPock->Clone()) ; @@ -5876,7 +5876,7 @@ AddOneWay( const ISurfFlatRegion* pSrfPock, const PocketParams& PockParams, ICRV //---------------------------------------------------------------------------- bool -CalcPocketing( const ISurfFlatRegion* pSfr, double dRad, double dStep, double dAngle, int nType, bool bSmooth, +CalcPocketing( const ISurfFlatRegion* pSfr, double dRad, double dRadOffs, double dStep, double dAngle, int nType, bool bSmooth, ICRVCOMPOPOVECTOR& vCrvCompoRes) { // controllo dei parametri @@ -5892,6 +5892,7 @@ CalcPocketing( const ISurfFlatRegion* pSfr, double dRad, double dStep, double dA PocketParams myParams ; myParams.nType = nType ; myParams.dRad = dRad ; + myParams.dRadialOffset = dRadOffs ; myParams.bSmooth = bSmooth ; myParams.dAngle = dAngle ; myParams.dSideStep = dStep ; @@ -5918,11 +5919,11 @@ CalcPocketing( const ISurfFlatRegion* pSfr, double dRad, double dStep, double dA // calcolo delle curve elementari della superficie switch ( nType) { case POCKET_ZIGZAG : - if ( ! AddZigZag( pSfr, myParams, vCrvCompoRes)) + if ( ! AddZigZag( pSfrAdj, myParams, vCrvCompoRes)) return false ; break ; case POCKET_ONEWAY : - if ( ! AddOneWay( pSfr, myParams, vCrvCompoRes)) + if ( ! AddOneWay( pSfrAdj, myParams, vCrvCompoRes)) return false ; break ; case POCKET_SPIRALIN :