EgtGeomKernel :

- piccole modifiche a Pocketing.
This commit is contained in:
Dario Sassi
2024-06-03 09:10:04 +02:00
parent e20b4b5b78
commit cd0fc4e449
+5 -4
View File
@@ -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<ISurfFlatRegion> 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 :