Merge commit '16970fff3c2d0a96dc01544b8d1cd0a5d64b3f11'
This commit is contained in:
+4
-3
@@ -52,6 +52,7 @@ using namespace std ;
|
||||
static string KEY_OPEN = "OPEN" ;
|
||||
static string KEY_THICK = "THICK" ;
|
||||
static int LINK_CURVE_PROP = -3 ;
|
||||
static double EXTRA_ELEV = 5. ;
|
||||
// Parametri avanzati da UserNotes
|
||||
const string UN_MAXELEV = "MaxElev" ;
|
||||
const string UN_OPEN = "Open" ;
|
||||
@@ -3064,14 +3065,14 @@ PocketingNT::AddPocket( STEPINFOPOVECTOR& vStepInfo, const Vector3d& vtTool, dou
|
||||
else
|
||||
dNextElev -= vStepInfo[i+1].dDepth ;
|
||||
}
|
||||
// tratto lineare sopra al punto corrente
|
||||
// tratto lineare sopra al punto corrente ( leggermente alzato)
|
||||
SetFeed( GetEndFeed()) ;
|
||||
Point3d ptCheck ;
|
||||
if ( GetCurrPos( ptCheck) && ! AreSamePointApprox( ptCheck, ptEnd + vtTool * dCurrElev))
|
||||
AddLinearMove( ptEnd + vtTool * dCurrElev, bSplitArcs) ;
|
||||
AddLinearMove( ptEnd + vtTool * ( dCurrElev + EXTRA_ELEV), bSplitArcs) ;
|
||||
// tratto lineare sopra a ptDest
|
||||
if ( GetCurrPos( ptCheck) && ! AreSamePointApprox( ptCheck, ptDest + vtTool * dNextElev))
|
||||
AddLinearMove( ptDest + vtTool * dNextElev, bSplitArcs) ;
|
||||
AddLinearMove( ptDest + vtTool * ( dNextElev + EXTRA_ELEV), bSplitArcs) ;
|
||||
// aggiorno le elevazioni
|
||||
dCurrElev = dNextElev ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user