Merge commit '083f896d50e8f859d8aa77b41586a87f9fd7ddb6' into NewLink

This commit is contained in:
Riccardo Elitropi
2026-04-08 10:25:13 +02:00
16 changed files with 483 additions and 164 deletions
+4 -2
View File
@@ -97,6 +97,7 @@ SimulatorSP::SimulatorSP( void)
m_bEnableVm = false ;
m_dSafeDist = SAFEDIST_STD ;
m_bEnableTrace = false ;
m_nTraceGroup = GDB_ID_NULL ;
m_nCurrTrace = GDB_ID_NULL ;
m_nAxesMask = 0 ;
m_bEnabAxes = true ;
@@ -1692,10 +1693,10 @@ SimulatorSP::EnableToolTipTrace( bool bEnable)
;
}
else {
int nTraceCrvId = m_nCurrTrace ;
int nTraceCrvId = m_pGeomDB->GetFirstInGroup( m_nTraceGroup) ;
while ( nTraceCrvId != GDB_ID_NULL) {
m_pGeomDB->SetStatus( nTraceCrvId, GDB_ST_OFF) ;
nTraceCrvId = m_pGeomDB->GetPrev( nTraceCrvId) ;
nTraceCrvId = m_pGeomDB->GetNext( nTraceCrvId) ;
}
m_nCurrTrace = GDB_ID_NULL ;
}
@@ -1715,6 +1716,7 @@ SimulatorSP::TraceToolTipMove( int nMoveType)
int nTraceGrpId ;
if ( ! m_pMachine->LuaGetGlobVar( GLOB_VAR + GVAR_TOOLTRACE, nTraceGrpId))
return false ;
m_nTraceGroup = nTraceGrpId ;
// recupero posizione utensile corrente
int nExitId = m_pMachine->GetExitId( m_sHead, m_nExit) ;
Frame3d frExit ;