diff --git a/SurfRoughing.cpp b/SurfRoughing.cpp index 0d925de..8cde5e4 100644 --- a/SurfRoughing.cpp +++ b/SurfRoughing.cpp @@ -2632,21 +2632,16 @@ SurfRoughing::AddPocket( const INTINTVECTOR& vPocket, const Vector3d& vtTool, do DrawFeed( pLine, dCoeffFeed * GetRightFeed( vtMove, vtTool)) ; #endif SetFeed( dCoeffFeed * GetRightFeed( vtMove, vtTool)) ; - if ( AddLinearMove( ptP3) == GDB_ID_NULL) + if ( AddLinearMove( ptP3, bSplitArcs) == GDB_ID_NULL) return false ; } else if ( pCurve->GetType() == CRV_ARC) { ICurveArc* pArc = GetCurveArc( pCurve) ; - Point3d ptCen = pArc->GetCenter() ; - double dAngCen = pArc->GetAngCenter() ; - Vector3d vtN = pArc->GetNormVersor() ; - Point3d ptP3 ; - pArc->GetEndPoint( ptP3) ; #if ENABLE_DEBUG_FEEDS DrawFeed( pArc, dCoeffFeed * GetFeed()) ; #endif SetFeed( dCoeffFeed * GetFeed()) ; - if ( AddArcMove( ptP3, ptCen, dAngCen, vtN) == GDB_ID_NULL) + if ( AddCurveMove( pArc, bSplitArcs) == GDB_ID_NULL) return false ; } @@ -2721,9 +2716,9 @@ SurfRoughing::AddPocket( const INTINTVECTOR& vPocket, const Vector3d& vtTool, do } // tratto lineare sopra al punto corrente SetFeed( GetEndFeed()) ; - AddLinearMove( ptEnd + vtTool * dCurrElev) ; + AddLinearMove( ptEnd + vtTool * dCurrElev, bSplitArcs) ; // tratto lineare sopra a ptDest - AddLinearMove( ptDest + vtTool * dNextElev) ; + AddLinearMove( ptDest + vtTool * dNextElev, bSplitArcs) ; // aggiorno le elevazioni dCurrElev = dNextElev ; }