Egalware/EgtMachKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtMachKernel :

Browse Source 
- corretto AddRise (deve restituire i valori degli assi anche se non si aggiunge movimento).
This commit is contained in:
DarioS
2021-05-04 10:26:58 +02:00
parent fd811f4077
commit bccbedb92f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Operation.cpp
+7 -4
View File
@@ -2138,9 +2138,6 @@ Operation::AddRise( DBLVECTOR& vAxVal, double dDelta, int nClPathId, bool bZHome
{
if ( m_pMchMgr == nullptr || m_pGeomDB == nullptr)
return false ;
// se risalita praticamente nulla, esco con successo
if ( abs( dDelta) < 10 * EPS_SMALL)
return true ;
// recupero gruppo per geometria di lavorazione (Cutter Location)
int nClId = m_pGeomDB->GetFirstNameInGroup( GetOwner(), MCH_CL) ;
if ( nClId == GDB_ID_NULL)
@@ -2161,9 +2158,15 @@ Operation::AddRise( DBLVECTOR& vAxVal, double dDelta, int nClPathId, bool bZHome
if ( nEntId == GDB_ID_NULL)
return false ;
// ne recupero i dati Cam
CamData* pCamData = GetCamData( m_pGeomDB->GetUserObj( nEntId)) ;
const CamData* pCamData = GetCamData( m_pGeomDB->GetUserObj( nEntId)) ;
if ( pCamData == nullptr)
return false ;
// se risalita praticamente nulla, esco con successo
if ( abs( dDelta) < 10 * EPS_SMALL) {
// recupero i valori degli assi
vAxVal = pCamData->GetAxesVal() ;
return ( vAxVal.size() >= 3) ;
}
// creo oggetto punto per DB geometrico
PtrOwner<IGeoPoint3d> pGP( CreateGeoPoint3d()) ;
if ( IsNull( pGP))