diff --git a/CalcPocketing.cpp b/CalcPocketing.cpp index 7927a87..574c457 100644 --- a/CalcPocketing.cpp +++ b/CalcPocketing.cpp @@ -3625,7 +3625,7 @@ GetSpiralOptimizedCurves( const ISurfFlatRegion* pSfrChunk, const PocketParams& bOkSpiral = ( dRad - dOffs > 10 * EPS_SMALL) ; if ( bOkSpiral) { double dIntRad = 0 ; - if ( PockParam.nType == POCKET_SPIRALOUT && PockParam.nType == POCKET_LI_HELIX) + if ( PockParam.nType == POCKET_SPIRALOUT && PockParam.nType == LEAD_IN_HELIX) dIntRad = min( 0.5 * min( PockParam.dLiTang, 2. * PockParam.dRad), dRad - dOffs) ; bool bOkSpiral = CalcCircleSpiral( ptCen, pSfrChunk->GetNormVersor(), dRad - dOffs, dIntRad, PockParam, pCrvRes) ; if ( bOkSpiral && pCrvRes->IsValid() && pCrvRes->GetCurveCount() > 0) { @@ -7795,6 +7795,8 @@ ExtendConformalOffsAndSetFeed( const ISurfFlatRegion* pSfrPock, const ISurfFlatR if ( IsNull( pSfrUncleared)) return false ; if ( GetUnclearedRegionAndSetFeed( vCrvFirstOffs, vCrvOffs, vCrvLinks, pSfrOrig, PockParams, pSfrUncleared)) { + + // estendo i percorsi di Offset se richiesto if ( ! RemoveUnclearedRegions( pSfrUncleared, vCrvOffs, vCrvFirstOffs, PockParams)) return false ;