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

Merge commit '1097f2a19f77801d64fe615ec214a3cba214c818' into svuotature

Browse Source
This commit is contained in:
Riccardo Elitropi
2023-07-26 11:58:33 +02:00
parent ed677dfec6 1097f2a19f
commit 25f141fbf0
15 changed files with 109 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Operation.cpp
+17 -6
View File
@@ -1832,19 +1832,15 @@ Operation::SetBlockedRotAxis( const string& sBlockedAxis) const
int nLinAxes = m_pMchMgr->GetCurrLinAxes() ;
int nRotAxes = m_pMchMgr->GetCurrRotAxes() ;
// lo cerco tra i token degli assi rotanti correnti
bool bFound = false ;
for ( int i = 0 ; i < nRotAxes && ! bFound ; ++ i) {
for ( int i = 0 ; i < nRotAxes ; ++ i) {
string sAxToken ;
if ( m_pMchMgr->GetCurrMachine()->GetCurrAxisToken( i + nLinAxes, sAxToken) &&
sKey == Trim( sAxToken, " \t\r\n=")) {
string sAxis ;
m_pMchMgr->GetCurrMachine()->GetCurrAxisName( i + nLinAxes, sAxis) ;
m_pMchMgr->SetRotAxisBlock( sAxis, dVal) ;
bFound = true ;
return m_pMchMgr->SetRotAxisBlock( sAxis, dVal) ;
}
}
if ( bFound)
return true ;
// lo cerco tra gli assi rotanti della macchina
return m_pMchMgr->SetRotAxisBlock( sKey, dVal) ;
}
@@ -3182,6 +3178,21 @@ Operation::RemoveHome( void)
return true ;
}
//----------------------------------------------------------------------------
bool
Operation::RemoveClimbRiseHome( void)
{
// elimino le entità CLIMB, RISE e HOME delle diverse path dell'operazione
int nClId = m_pGeomDB->GetFirstNameInGroup( m_nOwnerId, MCH_CL) ;
int nClPathId = m_pGeomDB->GetFirstGroupInGroup( nClId) ;
while ( nClPathId != GDB_ID_NULL) {
RemoveClimb( nClPathId) ;
RemoveRise( nClPathId) ;
nClPathId = m_pGeomDB->GetNextGroup( nClPathId) ;
}
return ( nClId != GDB_ID_NULL) ;
}
//----------------------------------------------------------------------------
bool
Operation::CalcDeltaZForHeadRotation( const DBLVECTOR& vAxStart, const DBLVECTOR& vAxEnd, double& dDeltaZ) const