EgtMachKernel :

- migliorati test su tolleranza fori
- piccole correzioni per lavorazioni vuote o disabilitate.
This commit is contained in:
Dario Sassi
2016-02-01 07:44:24 +00:00
parent 5558e368f3
commit da24353a11
6 changed files with 52 additions and 14 deletions
+10 -2
View File
@@ -530,9 +530,17 @@ Machining::CalculateAxesValues( void)
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
// recupero la lavorazione precedente
int nPrevOpId = m_pMchMgr->GetPrevOperation( GetOwner()) ;
// recupero la lavorazione precedente non vuota
int nPrevOpId = m_pMchMgr->GetPrevActiveOperation( m_nOwnerId) ;
Machining* pPrevMch = dynamic_cast<Machining*>( m_pGeomDB->GetUserObj( nPrevOpId)) ;
while ( pPrevMch != nullptr) {
if ( pPrevMch->IsNotEmpty())
break ;
else {
nPrevOpId = m_pMchMgr->GetPrevActiveOperation( nPrevOpId) ;
pPrevMch = dynamic_cast<Machining*>( m_pGeomDB->GetUserObj( nPrevOpId)) ;
}
}
// recupero l'utensile precedente
string sPrevTool ;
if ( pPrevMch != nullptr)