EgtMachKernel :

- aggiunta GetRawPartBBox
- corretta impostazione feed finale in Milling
- modifiche a Simulator per disposizioni con path vuoti e dati aux.
This commit is contained in:
Dario Sassi
2017-05-08 08:26:55 +00:00
parent 9e716a2d64
commit 73f37314a7
4 changed files with 42 additions and 10 deletions
+5 -5
View File
@@ -1672,7 +1672,7 @@ Milling::AddStandardMilling( const ICurveComposite* pCompo, const Vector3d& vtTo
dEndElev = dElev ;
// aggiungo uscita
Point3d ptP1 ;
SetFeed( GetStartFeed()) ;
SetFeed( GetEndFeed()) ;
if ( ! AddLeadOut( ptEnd, vtEnd, vtExtr, dEndElev, false, pCompo, bSplitArcs, ptP1)) {
m_pMchMgr->SetLastError( 2310, "Error in Milling : LeadOut not computable") ;
return false ;
@@ -1823,7 +1823,7 @@ Milling::AddZigZagMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
dEndElev = - LIO_ELEV_TOL ;
// aggiungo uscita
Point3d ptP1 ;
SetFeed( GetStartFeed()) ;
SetFeed( GetEndFeed()) ;
if ( ! AddLeadOut( ptEnd, vtEnd, vtExtr, dEndElev, bInvert, pCompo, bSplitArcs, ptP1)) {
m_pMchMgr->SetLastError( 2310, "Error in Milling : LeadOut not computable") ;
return false ;
@@ -1965,7 +1965,7 @@ Milling::AddOneWayMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
dEndElev = dElev ;
// aggiungo uscita
Point3d ptP1 ;
SetFeed( GetStartFeed()) ;
SetFeed( GetEndFeed()) ;
if ( ! AddLeadOut( ptEnd, vtEnd, vtExtr, dEndElev, false, pCompo, bSplitArcs, ptP1)) {
m_pMchMgr->SetLastError( 2310, "Error in Milling : LeadOut not computable") ;
return false ;
@@ -2104,7 +2104,7 @@ Milling::AddSpiralMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
dEndElev = dElev ;
// aggiungo uscita
Point3d ptP1 ;
SetFeed( GetStartFeed()) ;
SetFeed( GetEndFeed()) ;
if ( ! AddLeadOut( ptEnd, vtEnd, vtExtr, dEndElev, false, pCompo, bSplitArcs, ptP1)) {
m_pMchMgr->SetLastError( 2310, "Error in Milling : LeadOut not computable") ;
return false ;
@@ -2220,7 +2220,7 @@ Milling::AddSpiralMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
dEndElev = dElev ;
// aggiungo uscita
Point3d ptP1 ;
SetFeed( GetStartFeed()) ;
SetFeed( GetEndFeed()) ;
if ( ! AddLeadOut( ptEnd, vtEnd, vtExtr, dEndElev, bInvert, pCompo, bSplitArcs, ptP1)) {
m_pMchMgr->SetLastError( 2310, "Error in Milling : LeadOut not computable") ;
return false ;