EgtMachKernel 2.1g5 :

- in fresature, con utensili NO_TIP feed mai di testa.
This commit is contained in:
Dario Sassi
2019-07-29 14:54:50 +00:00
parent 29c8cdec4e
commit 21a3636429
2 changed files with 4 additions and 4 deletions
BIN
View File
Binary file not shown.
+4 -4
View File
@@ -2215,7 +2215,7 @@ Milling::AddZigZagMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
}
// altrimenti, affondo in feed opportuna
else {
SetFeed( bOutStart ? GetStartFeed() : GetTipFeed()) ;
SetFeed( ( bOutStart || m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
if ( AddLinearMove( ptP1) == GDB_ID_NULL)
return false ;
}
@@ -2894,7 +2894,7 @@ Milling::AddSawZigZagMilling( const ICurveComposite* pCompo, const Vector3d& vtT
}
// altrimenti, affondo in feed opportuna
else {
SetFeed( bOutStart ? GetStartFeed() : GetTipFeed()) ;
SetFeed( ( bOutStart || m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
if ( AddLinearMove( ptP1) == GDB_ID_NULL)
return false ;
}
@@ -3030,7 +3030,7 @@ Milling::AddApproach( const Point3d& ptP, const Vector3d& vtTool, double dSafeZ,
}
// affondo al punto iniziale
SetFlag( 0) ;
SetFeed( bOutStart ? GetStartFeed() : GetTipFeed()) ;
SetFeed( ( bOutStart || m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
if ( AddLinearMove( ptP) == GDB_ID_NULL)
return false ;
}
@@ -3042,7 +3042,7 @@ Milling::AddApproach( const Point3d& ptP, const Vector3d& vtTool, double dSafeZ,
return false ;
// affondo al punto iniziale
SetFlag( 0) ;
SetFeed( bOutStart ? GetStartFeed() : GetTipFeed()) ;
SetFeed( ( bOutStart || m_TParams.m_nType == TT_MILL_NOTIP) ? GetStartFeed() : GetTipFeed()) ;
if ( AddLinearMove( ptP) == GDB_ID_NULL)
return false ;
}